Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ZIPFLDR][BOOTDATA] Support UTF-8 Zip packing (#5450)
by Katayama Hirofumi MZ 22 Jul '23

22 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=104ef25fcc8c9859e327e… commit 104ef25fcc8c9859e327e17149d2f7fe8bac1dfe Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 22 12:57:32 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 22 12:57:32 2023 +0900 [ZIPFLDR][BOOTDATA] Support UTF-8 Zip packing (#5450) New ReactOS can zip/unzip files and folders in UTF-8 filenames. You can also choose the codepage of filenames to zip/unzip via the ZipCodePage / UnZipCodePage registry values on the registry key HKEY_CURRENT_USER\Software\ReactOS. Windows 8 or later also support UTF-8 zipped folders. You can also use 3rd party software to zip/unzip in older Windows. - Use <atlconv.h> for string conversion. - Use zipOpenNewFileInZip4_64 instead of zipOpenNewFileInZip3_64, and then add MINIZIP_UTF8_FLAG flag. - Set the filenames in UTF-8 by using CP_UTF8 codepage. - Codepage is user selectable via registry settings. CORE-16668 --- boot/bootdata/hivedef.inf | 4 ++++ dll/shellext/zipfldr/CZipCreator.cpp | 20 ++++++++------------ dll/shellext/zipfldr/CZipEnumerator.hpp | 8 +++++--- dll/shellext/zipfldr/precomp.h | 7 +++---- dll/shellext/zipfldr/zipfldr.cpp | 29 ++++++++++++++++++++++------- 5 files changed, 42 insertions(+), 26 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 484c4cbbb7b..2b7a2c53c47 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1978,6 +1978,10 @@ HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\WINXP", HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\WINXP","SPMajorVersion",0x00010001,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\WINXP","SPMinorVersion",0x00010001,0x00000000 +; Zip/UnZip codepages +HKCU,"SOFTWARE\ReactOS","ZipCodePage",0x00000000,"65001" ; CP_UTF8 +HKCU,"SOFTWARE\ReactOS","UnZipCodePage",0x00000000,"0" ; CP_ACP + ; DEBUG: Windows Messages SPY configuration HKCU,"SOFTWARE\ReactOS\Debug","SpyInclude",0x00020000,"INCLUDEALL" ;HKCU,"SOFTWARE\ReactOS\Debug","SpyExclude",0x00020000,"" diff --git a/dll/shellext/zipfldr/CZipCreator.cpp b/dll/shellext/zipfldr/CZipCreator.cpp index 00f44932b42..fdae3f3cf59 100644 --- a/dll/shellext/zipfldr/CZipCreator.cpp +++ b/dll/shellext/zipfldr/CZipCreator.cpp @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Create a zip file * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) - * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * Copyright 2019-2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -34,13 +34,6 @@ static CStringW DoGetZipName(PCWSTR filename) return ret; } -static CStringA DoGetAnsiName(PCWSTR filename) -{ - CHAR buf[MAX_PATH]; - WideCharToMultiByte(CP_ACP, 0, filename, -1, buf, _countof(buf), NULL, NULL); - return buf; -} - static CStringW DoGetBaseName(PCWSTR filename) { WCHAR szBaseName[MAX_PATH]; @@ -51,7 +44,7 @@ static CStringW DoGetBaseName(PCWSTR filename) } static CStringA -DoGetNameInZip(const CStringW& basename, const CStringW& filename) +DoGetNameInZip(const CStringW& basename, const CStringW& filename, UINT nCodePage) { CStringW basenameI = basename, filenameI = filename; basenameI.MakeUpper(); @@ -65,7 +58,7 @@ DoGetNameInZip(const CStringW& basename, const CStringW& filename) ret.Replace(L'\\', L'/'); - return DoGetAnsiName(ret); + return CStringA(CW2AEX<MAX_PATH>(ret, nCodePage)); } static BOOL @@ -279,6 +272,7 @@ unsigned CZipCreatorImpl::JustDoIt() int err = 0; CStringW strTarget, strBaseName = DoGetBaseName(m_items[0]); + UINT nCodePage = GetZipCodePage(FALSE); for (INT iFile = 0; iFile < files.GetSize(); ++iFile) { const CStringW& strFile = files[iFile]; @@ -298,8 +292,8 @@ unsigned CZipCreatorImpl::JustDoIt() // TODO: crc = ...; } - CStringA strNameInZip = DoGetNameInZip(strBaseName, strFile); - err = zipOpenNewFileInZip3_64(zf, + CStringA strNameInZip = DoGetNameInZip(strBaseName, strFile, nCodePage); + err = zipOpenNewFileInZip4_64(zf, strNameInZip, &zi, NULL, @@ -315,6 +309,8 @@ unsigned CZipCreatorImpl::JustDoIt() Z_DEFAULT_STRATEGY, password, crc, + MINIZIP_COMPATIBLE_VERSION, + (nCodePage == CP_UTF8 ? MINIZIP_UTF8_FLAG : 0), zip64); if (err) { diff --git a/dll/shellext/zipfldr/CZipEnumerator.hpp b/dll/shellext/zipfldr/CZipEnumerator.hpp index 3e7037c1e5d..81752116ea2 100644 --- a/dll/shellext/zipfldr/CZipEnumerator.hpp +++ b/dll/shellext/zipfldr/CZipEnumerator.hpp @@ -12,9 +12,11 @@ private: CComPtr<IZip> m_Zip; bool m_First; CAtlList<CStringW> m_Returned; + UINT m_nCodePage; public: CZipEnumerator() - :m_First(true) + : m_First(true) + , m_nCodePage(GetZipCodePage(TRUE)) { } @@ -92,9 +94,9 @@ public: nameA.Replace('\\', '/'); if (info.flag & MINIZIP_UTF8_FLAG) - Utf8ToWide(nameA, name); + name = CA2WEX<MAX_PATH>(nameA, CP_UTF8); else - name = CStringW(nameA); + name = CA2WEX<MAX_PATH>(nameA, m_nCodePage); } return err == UNZ_OK; } diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h index 7eaab9c3738..448e8ad5528 100644 --- a/dll/shellext/zipfldr/precomp.h +++ b/dll/shellext/zipfldr/precomp.h @@ -11,6 +11,7 @@ #include <atlbase.h> #include <atlcom.h> #include <atlcoll.h> +#include <atlconv.h> #include <atlstr.h> #include <ui/rosdlgs.h> #include <shlwapi.h> @@ -21,8 +22,6 @@ #include <reactos/debug.h> #include <shellutils.h> -void Utf8ToWide(const CStringA& strUtf8, CStringW& strWide); - #define EXTRACT_VERBA "extract" #define EXTRACT_VERBW L"extract" @@ -36,10 +35,10 @@ EXTERN_C const GUID CLSID_ZipFolderExtractAllCommand; extern LONG g_ModuleRefCnt; - +UINT GetZipCodePage(BOOL bUnZip); WCHAR* guid2string(REFCLSID iid); - +#define MINIZIP_COMPATIBLE_VERSION 36 #define MINIZIP_PASSWORD_FLAG 1 #define MINIZIP_UTF8_FLAG (1 << 11) diff --git a/dll/shellext/zipfldr/zipfldr.cpp b/dll/shellext/zipfldr/zipfldr.cpp index 07fcc3a01b5..df2079e1827 100644 --- a/dll/shellext/zipfldr/zipfldr.cpp +++ b/dll/shellext/zipfldr/zipfldr.cpp @@ -48,13 +48,6 @@ static void init_zlib() fill_win32_filefunc64W(&g_FFunc); } -void Utf8ToWide(const CStringA& strUtf8, CStringW& strWide) -{ - INT cchWide = MultiByteToWideChar(CP_UTF8, 0, strUtf8, -1, NULL, 0); - MultiByteToWideChar(CP_UTF8, 0, strUtf8, -1, strWide.GetBuffer(cchWide), cchWide); - strWide.ReleaseBuffer(); -} - static BOOL CreateEmptyFile(PCWSTR pszFile) { @@ -94,6 +87,28 @@ GetDefaultUserSendTo(PWSTR pszPath) SHGFP_TYPE_DEFAULT, pszPath); } +UINT GetZipCodePage(BOOL bUnZip) +{ + WCHAR szValue[16]; + DWORD dwType, cbValue = sizeof(szValue); + UINT nDefaultCodePage = (bUnZip ? CP_ACP : CP_UTF8); + + LONG error = SHGetValueW(HKEY_CURRENT_USER, L"Software\\ReactOS", + (bUnZip ? L"UnZipCodePage" : L"ZipCodePage"), + &dwType, szValue, &cbValue); + if (error != ERROR_SUCCESS) + return nDefaultCodePage; + + if (cbValue == sizeof(DWORD) && (dwType == REG_DWORD || dwType == REG_BINARY)) + return *(DWORD*)szValue; + + if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) + return nDefaultCodePage; + + szValue[_countof(szValue) - 1] = UNICODE_NULL; + return (UINT)wcstol(szValue, NULL, 0); +} + EXTERN_C BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) {

1 0

[reactos] 01/01: [APPWIZ] 'Create Shortcut' wizard: Accept arguments (#5456)
by Katayama Hirofumi MZ 22 Jul '23

22 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=059427e31d64730938409… commit 059427e31d6473093840964848726054d62709c7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 22 12:39:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 22 12:39:51 2023 +0900 [APPWIZ] 'Create Shortcut' wizard: Accept arguments (#5456) Allow command line as Create Shortcut wizard's target. CORE-5866 --- dll/cpl/appwiz/appwiz.h | 3 +- dll/cpl/appwiz/createlink.c | 79 +++++++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/dll/cpl/appwiz/appwiz.h b/dll/cpl/appwiz/appwiz.h index fa388848695..6148da7a98c 100644 --- a/dll/cpl/appwiz/appwiz.h +++ b/dll/cpl/appwiz/appwiz.h @@ -27,9 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwiz); typedef struct { - WCHAR szTarget[MAX_PATH]; + WCHAR szTarget[2 * MAX_PATH]; WCHAR szWorkingDirectory[MAX_PATH]; WCHAR szDescription[MAX_PATH]; + WCHAR szArguments[2 * MAX_PATH]; WCHAR szOrigin[MAX_PATH]; WCHAR szOldFile[MAX_PATH]; WCHAR szLinkName[MAX_PATH]; diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 9f80dc5aa7c..ea1ecc48e6d 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -14,6 +14,7 @@ #include <commctrl.h> #include <shellapi.h> #include <strsafe.h> +#include <shlwapi_undoc.h> // for PathFindOnPathExW BOOL IsShortcut(HKEY hKey) @@ -126,6 +127,8 @@ CreateShortcut(PCREATE_LINK_CONTEXT pContext) return FALSE; pShellLink->lpVtbl->SetPath(pShellLink, Path); + if (pContext->szArguments[0]) + pShellLink->lpVtbl->SetArguments(pShellLink, pContext->szArguments); pShellLink->lpVtbl->SetDescription(pShellLink, pContext->szDescription); pShellLink->lpVtbl->SetWorkingDirectory(pShellLink, pContext->szWorkingDirectory); @@ -237,7 +240,6 @@ WelcomeDlgProc(HWND hwndDlg, WCHAR szTitle[100]; BROWSEINFOW brws; LPITEMIDLIST pidllist; - LPWSTR pch; SHFILEINFOW FileInfo; switch(uMsg) @@ -250,6 +252,7 @@ WelcomeDlgProc(HWND hwndDlg, SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION), SHACF_DEFAULT); break; case WM_COMMAND: + { switch(HIWORD(wParam)) { case EN_CHANGE: @@ -306,56 +309,66 @@ WelcomeDlgProc(HWND hwndDlg, { GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget, _countof(pContext->szTarget)); StrTrimW(pContext->szTarget, L" \t"); - ExpandEnvironmentStringsW(pContext->szTarget, szPath, _countof(szPath)); - StringCchCopyW(pContext->szTarget, _countof(pContext->szTarget), szPath); - if (IsInternetLocation(pContext->szTarget)) + if (IsInternetLocation(szPath)) /* The internet location */ { - /* internet */ WCHAR szName[128]; LoadStringW(hApplet, IDS_NEW_INTERNET_SHORTCUT, szName, _countof(szName)); StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription), szName); - pContext->szWorkingDirectory[0] = 0; + pContext->szArguments[0] = 0; + return FALSE; } - else if (GetFileAttributesW(pContext->szTarget) != INVALID_FILE_ATTRIBUTES) + + /* Split and build args */ + LPWSTR pszArgs = PathGetArgsW(szPath); + if (pszArgs && pszArgs > szPath) { - /* file */ - SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); - SetFocus(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION)); - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); - - /* get display name */ - FileInfo.szDisplayName[0] = 0; - if (SHGetFileInfoW(pContext->szTarget, 0, &FileInfo, sizeof(FileInfo), SHGFI_DISPLAYNAME)) - StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription), FileInfo.szDisplayName); - - /* set working directory */ - StringCchCopyW(pContext->szWorkingDirectory, _countof(pContext->szWorkingDirectory), - pContext->szTarget); - PathRemoveBackslashW(pContext->szWorkingDirectory); - pch = PathFindFileNameW(pContext->szWorkingDirectory); - if (pch && *pch) - *pch = 0; - PathRemoveBackslashW(pContext->szWorkingDirectory); + PathRemoveArgsW(szPath); + StringCchCopyW(pContext->szArguments, _countof(pContext->szArguments), pszArgs); } else { - /* not found */ - WCHAR szError[MAX_PATH + 100]; + pContext->szArguments[0] = 0; + } + /* Find the file */ + WCHAR szFound[MAX_PATH]; + StringCchCopyW(szFound, _countof(szFound), szPath); + if (!PathFindOnPathExW(szFound, NULL, WHICH_DEFAULT) && + FindExecutableW(szPath, NULL, szFound) <= (HINSTANCE)(INT_PTR)32) + { + /* Not found */ SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); LoadStringW(hApplet, IDS_CREATE_SHORTCUT, szDesc, _countof(szDesc)); LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, _countof(szPath)); + + WCHAR szError[MAX_PATH + 100]; StringCchPrintfW(szError, _countof(szError), szPath, pContext->szTarget); MessageBoxW(hwndDlg, szError, szDesc, MB_ICONERROR); - /* prevent the wizard to go next */ + /* Prevent the wizard to go next */ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1); return TRUE; } + + /* Rebuild target */ + StringCchCopyW(pContext->szTarget, _countof(pContext->szTarget), szFound); + + /* Get display name */ + FileInfo.szDisplayName[0] = 0; + if (SHGetFileInfoW(szFound, 0, &FileInfo, sizeof(FileInfo), SHGFI_DISPLAYNAME)) + StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription), FileInfo.szDisplayName); + + /* Set working directory */ + StringCchCopyW(pContext->szWorkingDirectory, _countof(pContext->szWorkingDirectory), szFound); + PathRemoveBackslashW(pContext->szWorkingDirectory); + PathRemoveFileSpecW(pContext->szWorkingDirectory); + PathRemoveBackslashW(pContext->szWorkingDirectory); + + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); } else if (lppsn->hdr.code == PSN_RESET && !lppsn->lParam) { @@ -364,6 +377,7 @@ WelcomeDlgProc(HWND hwndDlg, SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, pContext->szOldFile, NULL); } break; + } } return FALSE; } @@ -378,7 +392,6 @@ FinishDlgProc(HWND hwndDlg, LPPROPSHEETPAGEW ppsp; PCREATE_LINK_CONTEXT pContext; LPPSHNOTIFY lppsn; - LPWSTR pch; WCHAR szText[MAX_PATH]; WCHAR szMessage[128]; @@ -450,9 +463,7 @@ FinishDlgProc(HWND hwndDlg, PathAppendW(pContext->szLinkName, pContext->szDescription); /* change extension if any */ - pch = PathFindExtensionW(pContext->szLinkName); - if (pch && *pch) - *pch = 0; + PathRemoveExtensionW(pContext->szLinkName); StringCchCatW(pContext->szLinkName, _countof(pContext->szLinkName), L".url"); if (!CreateInternetShortcut(pContext)) @@ -469,9 +480,7 @@ FinishDlgProc(HWND hwndDlg, PathAppendW(pContext->szLinkName, pContext->szDescription); /* change extension if any */ - pch = PathFindExtensionW(pContext->szLinkName); - if (pch && *pch) - *pch = 0; + PathRemoveExtensionW(pContext->szLinkName); StringCchCatW(pContext->szLinkName, _countof(pContext->szLinkName), L".lnk"); if (!CreateShortcut(pContext))

1 0

[reactos] 01/01: [APPWIZ] Update Japanese (ja-JP) translation
by Katayama Hirofumi MZ 21 Jul '23

21 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=252026352de606d93be4f… commit 252026352de606d93be4f1f5996a74cec136954e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 21 09:36:32 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 21 09:38:01 2023 +0900 [APPWIZ] Update Japanese (ja-JP) translation CORE-18706 --- dll/cpl/appwiz/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 5a532f9a1f9..a8e93c6b894 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -86,5 +86,5 @@ BEGIN IDS_NO_DIRECTORY "ディレクトリが与えられてません!" IDS_INVALID_PATH "与えられたパスは無効です!" IDS_INVALID_NAME "入力したショートカット名にファイル名としては無効な文字が含まれているか長すぎます。" - IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" + IDS_BROWSE_FOR_TARGET "ショートカットの参照先を下からお選び下さい:" END

1 0

[reactos] 01/01: [URL] Implement OpenURLA function
by Katayama Hirofumi MZ 20 Jul '23

20 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c91b0b61ddb893e7fb52… commit 1c91b0b61ddb893e7fb52e84c8d415fe426915de Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 21 08:24:26 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 21 08:24:26 2023 +0900 [URL] Implement OpenURLA function CORE-18625 --- dll/win32/url/url_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/url/url_main.c b/dll/win32/url/url_main.c index 8ad413b6ea9..aeaba70f258 100644 --- a/dll/win32/url/url_main.c +++ b/dll/win32/url/url_main.c @@ -105,7 +105,12 @@ void WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, int */ void WINAPI OpenURLA(HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT show) { +#ifdef __REACTOS__ + TRACE("(%p, %p, %s, %d)\n", hwnd, inst, debugstr_a(cmdline), show); + ShellExecuteA(hwnd, NULL, cmdline, NULL, NULL, show); +#else FIXME("(%p, %p, %s, %d): stub!\n", hwnd, inst, debugstr_a(cmdline), show); +#endif } /***********************************************************************

1 0

[reactos] 01/01: [SDK][HAL] Enable x86Bios on x86 (#5454)
by Adam Słaboń 20 Jul '23

20 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce2d4740a6d0393870f4d… commit ce2d4740a6d0393870f4dcf48496f6d501870426 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Thu Jul 20 21:44:44 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 21:44:44 2023 +0200 [SDK][HAL] Enable x86Bios on x86 (#5454) This will be needed for compatibility with x86 Windows Vista/7 videoprt.sys builds. Might be also useful in future for platforms (x86 , ...) where V86 mode is not available or buggy. CORE-11954, CORE-18185 --- hal/hal.spec | 15 ++++++++++----- hal/halx86/CMakeLists.txt | 10 ++-------- hal/halx86/generic.cmake | 3 ++- hal/halx86/generic/halinit.c | 6 ++---- hal/halx86/{amd64 => generic}/x86bios.c | 2 ++ hal/halx86/include/halp.h | 3 +-- hal/halx86/pc98.cmake | 3 ++- hal/halx86/xbox.cmake | 1 + sdk/include/ndk/halfuncs.h | 4 ---- sdk/include/ndk/haltypes.h | 4 ---- 10 files changed, 22 insertions(+), 29 deletions(-) diff --git a/hal/hal.spec b/hal/hal.spec index 4f8e0bec939..94bb141afee 100644 --- a/hal/hal.spec +++ b/hal/hal.spec @@ -101,8 +101,13 @@ @ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long) -@ stdcall -arch=x86_64 x86BiosAllocateBuffer() -@ stdcall -arch=x86_64 x86BiosCall() -@ stdcall -arch=x86_64 x86BiosFreeBuffer() -@ stdcall -arch=x86_64 x86BiosReadMemory() -@ stdcall -arch=x86_64 x86BiosWriteMemory() +@ stdcall -version=0x0502 -arch=x86_64 x86BiosAllocateBuffer(ptr ptr ptr) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosAllocateBuffer(ptr ptr ptr) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosCall(long ptr) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosCall(long ptr) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosFreeBuffer(long long) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosFreeBuffer(long long) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosReadMemory(long long ptr long) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosReadMemory(long long ptr long) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosWriteMemory(long long ptr long) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosWriteMemory(long long ptr long) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 50e1342f47f..dc22b0c9614 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -23,9 +23,9 @@ function(add_hal _halname) ${CMAKE_CURRENT_BINARY_DIR}/hal.def) if(${_halname} STREQUAL "hal") - target_link_libraries(${_halname} libcntpr arbiter) + target_link_libraries(${_halname} libcntpr arbiter fast486) else() - target_link_libraries(${_halname} libcntpr) + target_link_libraries(${_halname} libcntpr fast486) endif() add_importlibs(${_halname} ntoskrnl) @@ -71,13 +71,7 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") - list(APPEND HAL_SOURCE - amd64/x86bios.c) - add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi up apic) - target_link_libraries(hal fast486) - add_hal(halmp SOURCES ${HAL_SOURCE} COMPONENTS generic acpi smp apic) - target_link_libraries(halmp fast486) endif() diff --git a/hal/halx86/generic.cmake b/hal/halx86/generic.cmake index e9e60264e2b..b04bd23616d 100644 --- a/hal/halx86/generic.cmake +++ b/hal/halx86/generic.cmake @@ -13,7 +13,8 @@ list(APPEND HAL_GENERIC_SOURCE generic/pic.c generic/reboot.c generic/sysinfo.c - generic/usage.c) + generic/usage.c + generic/x86bios.c) if(ARCH STREQUAL "i386") list(APPEND HAL_GENERIC_SOURCE diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c index 868e1b48ffa..bbd3c49204e 100644 --- a/hal/halx86/generic/halinit.c +++ b/hal/halx86/generic/halinit.c @@ -142,9 +142,8 @@ HalInitSystem(IN ULONG BootPhase, /* Do some HAL-specific initialization */ HalpInitPhase0(LoaderBlock); -#ifdef _M_AMD64 + /* Initialize Phase 0 of the x86 emulator */ HalInitializeBios(0, LoaderBlock); -#endif } else if (BootPhase == 1) { @@ -154,9 +153,8 @@ HalInitSystem(IN ULONG BootPhase, /* Do some HAL-specific initialization */ HalpInitPhase1(); -#ifdef _M_AMD64 + /* Initialize Phase 1 of the x86 emulator */ HalInitializeBios(1, LoaderBlock); -#endif } /* All done, return */ diff --git a/hal/halx86/amd64/x86bios.c b/hal/halx86/generic/x86bios.c similarity index 99% rename from hal/halx86/amd64/x86bios.c rename to hal/halx86/generic/x86bios.c index 80cefebc322..9a3c7e3bdfb 100644 --- a/hal/halx86/amd64/x86bios.c +++ b/hal/halx86/generic/x86bios.c @@ -493,6 +493,7 @@ x86BiosCall( return TRUE; } +#ifdef _M_AMD64 BOOLEAN NTAPI HalpBiosDisplayReset(VOID) @@ -521,3 +522,4 @@ HalpBiosDisplayReset(VOID) return FALSE; #endif } +#endif // _M_AMD64 diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 5446482dfc8..9ea22e8c3c5 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -555,8 +555,6 @@ HalpInitializeClockPc98(VOID); extern ULONG PIT_FREQUENCY; #endif /* SARCH_PC98 */ -#ifdef _M_AMD64 - VOID NTAPI HalInitializeBios( @@ -564,6 +562,7 @@ HalInitializeBios( _In_ PLOADER_PARAMETER_BLOCK LoaderBlock ); +#ifdef _M_AMD64 #define KfLowerIrql KeLowerIrql #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #define KiEoiHelper(TrapFrame) return /* Just return to the caller */ diff --git a/hal/halx86/pc98.cmake b/hal/halx86/pc98.cmake index 3a46043df3a..3f28342eb2c 100644 --- a/hal/halx86/pc98.cmake +++ b/hal/halx86/pc98.cmake @@ -19,7 +19,8 @@ list(APPEND HAL_PC98_SOURCE generic/nmi.c generic/portio.c generic/sysinfo.c - generic/usage.c) + generic/usage.c + generic/x86bios.c) list(APPEND HAL_PC98_ASM_SOURCE generic/v86.S) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index 90db5a730b3..4f08c0c2437 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -21,6 +21,7 @@ list(APPEND HAL_XBOX_SOURCE generic/usage.c generic/bios.c generic/portio.c + generic/x86bios.c legacy/bus/bushndlr.c legacy/bus/cmosbus.c legacy/bus/isabus.c diff --git a/sdk/include/ndk/halfuncs.h b/sdk/include/ndk/halfuncs.h index 6c5e480acb9..2c4b56075ad 100644 --- a/sdk/include/ndk/halfuncs.h +++ b/sdk/include/ndk/halfuncs.h @@ -298,8 +298,6 @@ HalSetTimeIncrement( // // BIOS call API // -#ifdef _M_AMD64 - NTSTATUS NTAPI x86BiosAllocateBuffer( @@ -335,7 +333,5 @@ x86BiosCall( _In_ ULONG InterruptNumber, _Inout_ PX86_BIOS_REGISTERS Registers); -#endif // _M_AMD64 - #endif // NTOS_MODE_USER #endif // _HALFUNCS_H diff --git a/sdk/include/ndk/haltypes.h b/sdk/include/ndk/haltypes.h index 8e850e11c0e..ccba81a536d 100644 --- a/sdk/include/ndk/haltypes.h +++ b/sdk/include/ndk/haltypes.h @@ -289,8 +289,6 @@ extern NTHALAPI PUCHAR KdComPortInUse; // // BIOS call structure // -#ifdef _M_AMD64 - typedef struct _X86_BIOS_REGISTERS { ULONG Eax; @@ -304,8 +302,6 @@ typedef struct _X86_BIOS_REGISTERS USHORT SegEs; } X86_BIOS_REGISTERS, *PX86_BIOS_REGISTERS; -#endif // _M_AMD64 - #endif #endif

1 0

[reactos] 01/01: [APPWIZ] Update Russian (ru-RU) translation
by Stanislav Motylkov 20 Jul '23

20 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27ebedb3678e7f89eb14f… commit 27ebedb3678e7f89eb14fbeb7f6a69b997b57938 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 20 16:06:54 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 20 16:06:54 2023 +0300 [APPWIZ] Update Russian (ru-RU) translation --- dll/cpl/appwiz/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 8f30157d963..25a825bd639 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -85,6 +85,6 @@ BEGIN IDS_NO_MEMORY "Невозможно выделить память." IDS_NO_DIRECTORY "Не указано ни одного каталога!" IDS_INVALID_PATH "Указанный путь неверен!" - IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." - IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" + IDS_INVALID_NAME "Заданное имя ярлыка содержит символы, недопустимые в именах файлов, или имеет слишком большую длину." + IDS_BROWSE_FOR_TARGET "Укажите объект для ярлыка:" END

1 0

[reactos] 01/01: [APPWIZ] Add title caption to 'Browse for Folder' #5460
by Katayama Hirofumi MZ 20 Jul '23

20 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08d42a7ec7dd4273904a5… commit 08d42a7ec7dd4273904a56338782b94b7881cacf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 20:17:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 20:17:22 2023 +0900 [APPWIZ] Add title caption to 'Browse for Folder' #5460 - Add IDS_BROWSE_FOR_TARGET resource string. - Use it in setting the title caption of "Browse for Folder" dialog. CORE-5866 --- dll/cpl/appwiz/createlink.c | 3 +++ dll/cpl/appwiz/lang/bg-BG.rc | 1 + dll/cpl/appwiz/lang/cs-CZ.rc | 1 + dll/cpl/appwiz/lang/de-DE.rc | 1 + dll/cpl/appwiz/lang/el-GR.rc | 1 + dll/cpl/appwiz/lang/en-US.rc | 1 + dll/cpl/appwiz/lang/es-ES.rc | 1 + dll/cpl/appwiz/lang/et-EE.rc | 1 + dll/cpl/appwiz/lang/fr-FR.rc | 1 + dll/cpl/appwiz/lang/he-IL.rc | 1 + dll/cpl/appwiz/lang/hu-HU.rc | 1 + dll/cpl/appwiz/lang/id-ID.rc | 1 + dll/cpl/appwiz/lang/it-IT.rc | 1 + dll/cpl/appwiz/lang/ja-JP.rc | 1 + dll/cpl/appwiz/lang/no-NO.rc | 1 + dll/cpl/appwiz/lang/pl-PL.rc | 1 + dll/cpl/appwiz/lang/pt-BR.rc | 1 + dll/cpl/appwiz/lang/pt-PT.rc | 1 + dll/cpl/appwiz/lang/ro-RO.rc | 1 + dll/cpl/appwiz/lang/ru-RU.rc | 1 + dll/cpl/appwiz/lang/sk-SK.rc | 1 + dll/cpl/appwiz/lang/sq-AL.rc | 1 + dll/cpl/appwiz/lang/tr-TR.rc | 1 + dll/cpl/appwiz/lang/uk-UA.rc | 1 + dll/cpl/appwiz/lang/zh-CN.rc | 1 + dll/cpl/appwiz/lang/zh-HK.rc | 1 + dll/cpl/appwiz/lang/zh-TW.rc | 1 + dll/cpl/appwiz/resource.h | 1 + 28 files changed, 30 insertions(+) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 25de942ed2b..9f80dc5aa7c 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -234,6 +234,7 @@ WelcomeDlgProc(HWND hwndDlg, LPPSHNOTIFY lppsn; WCHAR szPath[MAX_PATH * 2]; WCHAR szDesc[100]; + WCHAR szTitle[100]; BROWSEINFOW brws; LPITEMIDLIST pidllist; LPWSTR pch; @@ -265,10 +266,12 @@ WelcomeDlgProc(HWND hwndDlg, switch(LOWORD(wParam)) { case IDC_SHORTCUT_BROWSE: + LoadStringW(hApplet, IDS_BROWSE_FOR_TARGET, szTitle, _countof(szTitle)); ZeroMemory(&brws, sizeof(brws)); brws.hwndOwner = hwndDlg; brws.pidlRoot = NULL; brws.pszDisplayName = szPath; + brws.lpszTitle = szTitle; brws.ulFlags = BIF_BROWSEINCLUDEFILES | BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE | BIF_SHAREABLE; brws.lpfn = NULL; diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 5dd00adec24..b472e7b75de 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index 76f9163173a..60e7acd2dd4 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -91,4 +91,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index df7c01c0cc8..7a1b2508e15 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 6911ffdfc39..8669a85588d 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 1cf1a7ab924..29c51714a0c 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 824035af140..23cb4c36f58 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -96,4 +96,5 @@ BEGIN IDS_NO_DIRECTORY "No se ha especificado directorio alguno" IDS_INVALID_PATH "La ruta proporcionada es inválida" IDS_INVALID_NAME "El nombre del acceso directo que has introducido contiene o bien caracteres inválidos, o su nombre es demasiado largo." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 2e1bcf4b404..4d9825e3ec9 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -93,4 +93,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index 59a069a0739..c304ac8f323 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index cb068fdaec9..c0a1628ba01 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -87,4 +87,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/hu-HU.rc b/dll/cpl/appwiz/lang/hu-HU.rc index 7b28593ab34..c2f868fafd3 100644 --- a/dll/cpl/appwiz/lang/hu-HU.rc +++ b/dll/cpl/appwiz/lang/hu-HU.rc @@ -90,4 +90,5 @@ BEGIN IDS_NO_DIRECTORY "Nincs megadva mappa!" IDS_INVALID_PATH "A megadott mappa érvénytelen!" IDS_INVALID_NAME "A megadott parancsikon név érvénytelen fájlnév karaktereket tartalmaz, vagy túl hosszú." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 4be97de03c6..2992561f292 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "Direktori belum diberi!" IDS_INVALID_PATH "Jalur yang diberikan tidak sah!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index c545681392a..ed400f1523c 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 3c9b052a5dd..5a532f9a1f9 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "ディレクトリが与えられてません!" IDS_INVALID_PATH "与えられたパスは無効です!" IDS_INVALID_NAME "入力したショートカット名にファイル名としては無効な文字が含まれているか長すぎます。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 72b6971e4ee..7719769826b 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 8cbb5f3a136..bdd2a0cf284 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -97,4 +97,5 @@ BEGIN IDS_NO_DIRECTORY "Nie podano ścieżki!" IDS_INVALID_PATH "Podana ścieżka jest niepoprawna!" IDS_INVALID_NAME "Wprowadzona nazwa skrótu zawiera nieprawidłowe znaki lub jest za długa." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index 1b5fb17e00c..e3165c75d30 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -88,4 +88,5 @@ BEGIN IDS_NO_DIRECTORY "Sem diretoria!" IDS_INVALID_PATH "O caminho é invalido!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index 940d84b0744..4e03e1cc06f 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -88,4 +88,5 @@ BEGIN IDS_NO_DIRECTORY "Sem directoria!" IDS_INVALID_PATH "O caminho é invalido!" IDS_INVALID_NAME "O nome do atalho contém caracteres inválidos para nomes de ficheiro ou é muito longo." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 2b7f0a4a4ce..1ff04fc7495 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_DIRECTORY "Nu a fost dat niciun director!" IDS_INVALID_PATH "Calea dată este nevalidă!" IDS_INVALID_NAME "Numele comenzii rapide pe care l-ați introdus conținea fie caractere nevalide pentru numele fișierelor, fie era prea lung." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index fcabc788e33..8f30157d963 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "Не указано ни одного каталога!" IDS_INVALID_PATH "Указанный путь неверен!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index 0e10958df79..1e85530000e 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -90,4 +90,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index 284231fd78c..f0598c3aef3 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -90,4 +90,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index e233bf0fbf3..f9d5e06ce50 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -88,4 +88,5 @@ BEGIN IDS_NO_DIRECTORY "Hiç dizin verilmedi!" IDS_INVALID_PATH "Verilen yol geçersiz!" IDS_INVALID_NAME "Girdiğiniz kısayol adı, ya geçersiz karakterler içeriyor ya dosya adları için geçersiz ya da çok uzun." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index 79af27fdb4f..bdcdc9d45ba 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_DIRECTORY "Не вказано жодного каталогу!" IDS_INVALID_PATH "Вказаний шлях недійсний!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index ba5886c7a20..a1b57cfbbf1 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -95,4 +95,5 @@ BEGIN IDS_NO_DIRECTORY "没有指定路径。" IDS_INVALID_PATH "指定的路径无效。" IDS_INVALID_NAME "您输入的快捷方式名称过长，或含有不能在文件名中使用的字符。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/zh-HK.rc b/dll/cpl/appwiz/lang/zh-HK.rc index 14e59763e3d..5f32adf1dbd 100644 --- a/dll/cpl/appwiz/lang/zh-HK.rc +++ b/dll/cpl/appwiz/lang/zh-HK.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_DIRECTORY "沒有指定路徑。" IDS_INVALID_PATH "指定的路徑無效。" IDS_INVALID_NAME "您輸入的捷徑名稱太長，或包含不能在檔案名稱中使用的字元。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index 9ab2051d539..413ae7285bd 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -95,4 +95,5 @@ BEGIN IDS_NO_DIRECTORY "沒有指定路徑。" IDS_INVALID_PATH "指定的路徑無效。" IDS_INVALID_NAME "您輸入的捷徑名稱過長，或包含不能在檔案名稱中使用的字元。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/resource.h b/dll/cpl/appwiz/resource.h index 28ddc864cf7..9b780c71867 100644 --- a/dll/cpl/appwiz/resource.h +++ b/dll/cpl/appwiz/resource.h @@ -29,6 +29,7 @@ #define IDS_NO_DIRECTORY 2027 #define IDS_INVALID_PATH 2028 #define IDS_INVALID_NAME 2029 +#define IDS_BROWSE_FOR_TARGET 2030 #define IDS_DOWNLOADING 14 #define IDS_INSTALLING 15

1 0

[reactos] 01/01: [SHELL32] CD-ROM drive shouldn't be renamed (#5461)
by Katayama Hirofumi MZ 20 Jul '23

20 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62eaad1811b47187a3849… commit 62eaad1811b47187a38490aca97f29d7fabbf773 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 16:53:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 16:53:04 2023 +0900 [SHELL32] CD-ROM drive shouldn't be renamed (#5461) - Add _ILGetDriveType helper function. - Use _ILGetDrive and GetDriveType functions to determine the drive type. - If it was a CD-ROM drive, then remove SFGAO_CANRENAME flag. CORE-18272 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 24df6235f4a..2293884e9ea 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -55,6 +55,17 @@ static int iDriveTypeIds[7] = { IDS_DRIVE_FIXED, /* DRIVE_UNKNOWN */ IDS_DRIVE_FIXED /* DRIVE_RAMDISK*/ }; +BOOL _ILGetDriveType(LPCITEMIDLIST pidl) +{ + char szDrive[8]; + if (!_ILGetDrive(pidl, szDrive, _countof(szDrive))) + { + ERR("pidl %p is not a drive\n", pidl); + return DRIVE_UNKNOWN; + } + return ::GetDriveTypeA(szDrive); +} + /*********************************************************************** * IShellFolder implementation */ @@ -660,7 +671,12 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST if (pdwAttributes && *pdwAttributes) { if (_ILIsDrive(pidlTemp)) + { *pdwAttributes &= dwDriveAttributes; + + if (_ILGetDriveType(pidlTemp) == DRIVE_CDROM) + *pdwAttributes &= ~SFGAO_CANRENAME; // CD-ROM drive cannot rename + } else if (_ILIsSpecialFolder(pidlTemp)) m_regFolder->GetAttributesOf(1, &pidlTemp, pdwAttributes); else @@ -877,7 +893,12 @@ HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY a for (UINT i = 0; i < cidl; ++i) { if (_ILIsDrive(apidl[i])) + { *rgfInOut &= dwDriveAttributes; + + if (_ILGetDriveType(apidl[i]) == DRIVE_CDROM) + *rgfInOut &= ~SFGAO_CANRENAME; // CD-ROM drive cannot rename + } else if (_ILIsControlPanel(apidl[i])) *rgfInOut &= dwControlPanelAttributes; else if (_ILIsSpecialFolder(*apidl))

1 0

[reactos] 01/01: [APPWIZ] "Create Shortcut" wizard: Only filesystem items (#5455)
by Katayama Hirofumi MZ 19 Jul '23

19 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca62121b4dd9d7fb763d4… commit ca62121b4dd9d7fb763d4634b89b1ed95ce02106 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 08:46:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 08:46:51 2023 +0900 [APPWIZ] "Create Shortcut" wizard: Only filesystem items (#5455) - Add (BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE | BIF_SHAREABLE) flags. - Consider the failure of SHGetPathFromIDListW. CORE-5866 --- dll/cpl/appwiz/createlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 5646ce29477..25de942ed2b 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -269,7 +269,8 @@ WelcomeDlgProc(HWND hwndDlg, brws.hwndOwner = hwndDlg; brws.pidlRoot = NULL; brws.pszDisplayName = szPath; - brws.ulFlags = BIF_BROWSEINCLUDEFILES; + brws.ulFlags = BIF_BROWSEINCLUDEFILES | BIF_RETURNONLYFSDIRS | + BIF_NEWDIALOGSTYLE | BIF_SHAREABLE; brws.lpfn = NULL; pidllist = SHBrowseForFolderW(&brws); if (!pidllist) @@ -281,6 +282,11 @@ WelcomeDlgProc(HWND hwndDlg, SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, WM_SETFOCUS, 0, 0); SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); } + else + { + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, NULL); + } + /* Free memory, if possible */ CoTaskMemFree(pidllist); break;

1 0

[reactos] 01/01: [ATL][ATL_APITEST] Add <atlconv.h> and atlconv testcase (#5449)
by Katayama Hirofumi MZ 19 Jul '23

19 Jul '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1191bcaf03ae005332f92… commit 1191bcaf03ae005332f92a9f3b2665fc2fc631c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 07:54:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 07:54:11 2023 +0900 [ATL][ATL_APITEST] Add <atlconv.h> and atlconv testcase (#5449) - Add <atlconv.h> header file. - Add atlconv testcase to atl_apitest.exe. CORE-16668 --- modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/atlconv.cpp | 218 +++++++++++++ modules/rostests/apitests/atl/atltest.h | 2 +- modules/rostests/apitests/atl/devenv/.gitignore | 4 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 + .../rostests/apitests/atl/devenv/atlconv.vcxproj | 154 +++++++++ modules/rostests/apitests/atl/testlist.c | 2 + sdk/lib/atl/atlconv.h | 348 +++++++++++++++++++++ 8 files changed, 738 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index dfaddd62b61..411c5ad068c 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -3,6 +3,7 @@ add_definitions(-DINITGUID -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE AtlObjMap.cpp + atlconv.cpp atltypes.cpp CAtlFileMapping.cpp CAtlArray.cpp diff --git a/modules/rostests/apitests/atl/atlconv.cpp b/modules/rostests/apitests/atl/atlconv.cpp new file mode 100644 index 00000000000..96cbac21790 --- /dev/null +++ b/modules/rostests/apitests/atl/atlconv.cpp @@ -0,0 +1,218 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for <atlconv.h> + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#ifdef HAVE_APITEST + #include <apitest.h> +#else + #include "atltest.h" +#endif +#include <atlbase.h> +#include <atlconv.h> + +START_TEST(atlconv) +{ + char dataA[MAX_PATH]; + wchar_t dataW[MAX_PATH]; + const char *dataAX = "test12345"; + const wchar_t *dataWX = L"test12345"; + using namespace ATL; + + // + // Initialize long data + // + FillMemory(dataA, sizeof(dataA), 'A'); + dataA[_countof(dataA) - 1] = 0; + + for (size_t i = 0; i < _countof(dataW); ++i) + dataW[i] = L'A'; + dataW[_countof(dataW) - 1] = 0; + + // + // The NULL strings + // + { + CA2A a2a(NULL); + ok_ptr((LPSTR)a2a, NULL); + ok_ptr(a2a.m_psz, NULL); + ok_int(a2a.m_szBuffer[0], 0); + + CW2A w2a(NULL); + ok_ptr((LPSTR)w2a, NULL); + ok_ptr(w2a.m_psz, NULL); + ok_int(w2a.m_szBuffer[0], 0); + + CA2W a2w(NULL); + ok_ptr((LPWSTR)a2w, NULL); + ok_ptr(a2w.m_psz, NULL); + ok_int(a2w.m_szBuffer[0], 0); + + CW2W w2w(NULL); + ok_ptr((LPWSTR)w2w, NULL); + ok_ptr(w2w.m_psz, NULL); + ok_int(w2w.m_szBuffer[0], 0); + } + + // + // The zero-length strings + // + { + CA2A a2a(""); + ok_str((LPSTR)a2a, ""); + ok_str(a2a.m_psz, ""); + ok_int(a2a.m_szBuffer[0], 0); + ok_ptr(a2a.m_psz, a2a.m_szBuffer); + + CW2A w2a(L""); + ok_str((LPSTR)w2a, ""); + ok_str(w2a.m_psz, ""); + ok_int(w2a.m_szBuffer[0], 0); + ok_ptr(w2a.m_psz, w2a.m_szBuffer); + + CA2W a2w(""); + ok_wstr((LPWSTR)a2w, L""); + ok_wstr(a2w.m_psz, L""); + ok_int(a2w.m_szBuffer[0], 0); + ok_ptr(a2w.m_psz, a2w.m_szBuffer); + + CW2W w2w(L""); + ok_wstr((LPWSTR)w2w, L""); + ok_wstr(w2w.m_psz, L""); + ok_int(w2w.m_szBuffer[0], 0); + ok_ptr(w2w.m_psz, w2w.m_szBuffer); + } + + // + // The short strings + // + { + CA2A a2a("TEST123"); + ok_str((LPSTR)a2a, "TEST123"); + ok_str(a2a.m_psz, "TEST123"); + ok_ptr(a2a.m_psz, a2a.m_szBuffer); + + CW2A w2a(L"TEST123"); + ok_str((LPSTR)w2a, "TEST123"); + ok_str(w2a.m_psz, "TEST123"); + ok_ptr(w2a.m_psz, w2a.m_szBuffer); + + CA2W a2w("TEST123"); + ok_wstr((LPWSTR)a2w, L"TEST123"); + ok_wstr(a2w.m_psz, L"TEST123"); + ok_ptr(a2w.m_psz, a2w.m_szBuffer); + + CW2W w2w(L"TEST123"); + ok_wstr((LPWSTR)w2w, L"TEST123"); + ok_wstr(w2w.m_psz, L"TEST123"); + ok_ptr(w2w.m_psz, w2w.m_szBuffer); + } + + // + // The short strings (EX) + // + { + CA2AEX<5> a2ax("123"); + ok_str((LPSTR)a2ax, "123"); + ok_str(a2ax.m_psz, "123"); + ok_ptr(a2ax.m_psz, a2ax.m_szBuffer); + + CW2AEX<5> w2ax(L"123"); + ok_str((LPSTR)w2ax, "123"); + ok_str(w2ax.m_psz, "123"); + ok(w2ax.m_psz != w2ax.m_szBuffer, "w2ax.m_psz == w2ax.m_szBuffer\n"); // corner case + + CA2WEX<5> a2wx("123"); + ok_wstr((LPWSTR)a2wx, L"123"); + ok_wstr(a2wx.m_psz, L"123"); + ok_ptr(a2wx.m_psz, a2wx.m_szBuffer); + + CW2WEX<5> w2wx(L"123"); + ok_wstr((LPWSTR)w2wx, L"123"); + ok_wstr(w2wx.m_psz, L"123"); + ok_ptr(w2wx.m_psz, w2wx.m_szBuffer); + } + + // + // The long strings + // + { + CA2A a2a2(dataA); + ok_str((LPSTR)a2a2, dataA); + ok_str(a2a2.m_psz, dataA); + ok_str(a2a2.m_szBuffer, ""); + ok(a2a2.m_psz != dataA, "a2a2.m_psz == dataA\n"); + ok(a2a2.m_psz != a2a2.m_szBuffer, "a2a2.m_psz == a2a2.m_szBuffer\n"); + + CW2A w2a2(dataW); + ok_str((LPSTR)w2a2, dataA); + ok_str(w2a2.m_psz, dataA); + ok_str(w2a2.m_szBuffer, ""); + ok(w2a2.m_psz != dataA, "w2a2.m_psz == dataA\n"); + ok(w2a2.m_psz != w2a2.m_szBuffer, "w2a2.m_psz == w2a2.m_szBuffer\n"); + + CA2W a2w2(dataA); + ok_wstr((LPWSTR)a2w2, dataW); + ok_wstr(a2w2.m_psz, dataW); + ok_wstr(a2w2.m_szBuffer, L""); + ok(a2w2.m_psz != dataW, "a2w2.m_psz == dataW\n"); + ok(a2w2.m_psz != a2w2.m_szBuffer, "a2w2.m_psz == a2w2.m_szBuffer\n"); + + CW2W w2w2(dataW); + ok_wstr((LPWSTR)w2w2, dataW); + ok_wstr(w2w2.m_psz, dataW); + ok_wstr(w2w2.m_szBuffer, L""); + ok(w2w2.m_psz != dataW, "w2w2.m_psz == dataW\n"); + ok(w2w2.m_psz != w2w2.m_szBuffer, "w2w2.m_psz == w2w2.m_szBuffer\n"); + } + + // + // The long strings (EX) + // + { + CA2AEX<5> a2a2x(dataAX); + ok_str((LPSTR)a2a2x, dataAX); + ok_str(a2a2x.m_psz, dataAX); + ok_str(a2a2x.m_szBuffer, ""); + ok(a2a2x.m_psz != dataAX, "a2a2x.m_psz == dataAX\n"); + ok(a2a2x.m_psz != a2a2x.m_szBuffer, "a2a2x.m_psz == a2a2x.m_szBuffer\n"); + + CW2AEX<5> w2a2x(dataWX); + ok_str((LPSTR)w2a2x, dataAX); + ok_str(w2a2x.m_psz, dataAX); + ok_str(w2a2x.m_szBuffer, ""); + ok(w2a2x.m_psz != dataAX, "w2a2x.m_psz == dataAX\n"); + ok(w2a2x.m_psz != w2a2x.m_szBuffer, "w2a2x.m_psz == w2a2x.m_szBuffer\n"); + + CA2WEX<5> a2w2x(dataAX); + ok_wstr((LPWSTR)a2w2x, dataWX); + ok_wstr(a2w2x.m_psz, dataWX); + ok_wstr(a2w2x.m_szBuffer, L""); + ok(a2w2x.m_psz != dataWX, "a2w2x.m_psz == dataWX\n"); + ok(a2w2x.m_psz != a2w2x.m_szBuffer, "a2w2x.m_psz == a2w2x.m_szBuffer\n"); + + CW2WEX<5> w2w2x(dataWX); + ok_wstr((LPWSTR)w2w2x, dataWX); + ok_wstr(w2w2x.m_psz, dataWX); + ok_wstr(w2w2x.m_szBuffer, L""); + ok(w2w2x.m_psz != dataWX, "w2w2x.m_psz == dataWX\n"); + ok(w2w2x.m_psz != w2w2x.m_szBuffer, "w2w2x.m_psz == w2w2x.m_szBuffer\n"); + } + + // + // The const strings + // + { + CA2CA a2ca(dataA); + ok_str((LPCSTR)a2ca, dataA); + ok_str(a2ca.m_psz, dataA); + ok_ptr(a2ca.m_psz, dataA); + + CW2CW w2cw(dataW); + ok_wstr((LPCWSTR)w2cw, dataW); + ok_wstr(w2cw.m_psz, dataW); + ok_ptr(w2cw.m_psz, dataW); + } +} diff --git a/modules/rostests/apitests/atl/atltest.h b/modules/rostests/apitests/atl/atltest.h index 9fb1ede6ac5..42740868814 100644 --- a/modules/rostests/apitests/atl/atltest.h +++ b/modules/rostests/apitests/atl/atltest.h @@ -107,7 +107,7 @@ char *wine_dbgstr_w(const wchar_t *wstr) #define ok_ptr(expression, result) \ do { \ - void *_value = (expression); \ + const void *_value = (expression); \ ok(_value == (result), "Wrong value for '%s', expected: " #result " (%p), got: %p\n", \ #expression, (void*)(result), _value); \ } while (0) diff --git a/modules/rostests/apitests/atl/devenv/.gitignore b/modules/rostests/apitests/atl/devenv/.gitignore index 15eeeeb1607..442c28bde1d 100644 --- a/modules/rostests/apitests/atl/devenv/.gitignore +++ b/modules/rostests/apitests/atl/devenv/.gitignore @@ -1,7 +1,11 @@ *.opendb *.db +*.user +*.filters x64/ .vs/ +ipch/ +atlconv/ CAtlArray/ CAtlFileMapping/ CAtlList/ diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 5b3cc7d4247..128101222af 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -31,6 +31,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPath", "CPath.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AtlObjMap", "AtlObjMap.vcxproj", "{B628C42A-A38E-488E-8512-2B997B75E95C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlconv", "atlconv.vcxproj", "{85194CA3-A828-4270-962A-333743E2BF83}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -151,6 +153,14 @@ Global {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x64.Build.0 = Release|x64 {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x86.ActiveCfg = Release|Win32 {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x86.Build.0 = Release|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x64.ActiveCfg = Debug|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x64.Build.0 = Debug|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x86.ActiveCfg = Debug|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x86.Build.0 = Debug|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x64.ActiveCfg = Release|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x64.Build.0 = Release|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x86.ActiveCfg = Release|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/atlconv.vcxproj b/modules/rostests/apitests/atl/devenv/atlconv.vcxproj new file mode 100644 index 00000000000..606a5db9987 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/atlconv.vcxproj @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\atlconv.cpp" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{85194CA3-A828-4270-962A-333743E2BF83}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>atlconv</RootNamespace> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>Use</PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 2309a421512..c56b2024d53 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -2,6 +2,7 @@ #include <apitest.h> extern void func_AtlObjMap(void); +extern void func_atlconv(void); extern void func_atltypes(void); extern void func_CAtlFileMapping(void); extern void func_CAtlArray(void); @@ -23,6 +24,7 @@ extern void func_SubclassWindow(void); const struct test winetest_testlist[] = { { "AtlObjMap", func_AtlObjMap }, + { "atlconv", func_atlconv }, { "atltypes", func_atltypes }, { "CAtlFileMapping", func_CAtlFileMapping }, { "CAtlArray", func_CAtlArray }, diff --git a/sdk/lib/atl/atlconv.h b/sdk/lib/atl/atlconv.h new file mode 100644 index 00000000000..7ba62045575 --- /dev/null +++ b/sdk/lib/atl/atlconv.h @@ -0,0 +1,348 @@ +/* + * PROJECT: ReactOS ATL + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: String conversion + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#ifndef __ATLCONV_H__ +#define __ATLCONV_H__ + +#pragma once + +#include "atlbase.h" + +namespace ATL +{ + +// This class does not own the string +template <int t_nBufferLength = 128> +class CA2CAEX +{ +public: + LPCSTR m_psz; + + CA2CAEX(_In_z_ LPCSTR psz) : m_psz(psz) { } + + CA2CAEX(_In_z_ LPCSTR psz, _In_ UINT nCodePage) : m_psz(psz) + { + UNREFERENCED_PARAMETER(nCodePage); + } + + ~CA2CAEX() throw() { } // There is nothing to free here + + _Ret_z_ operator LPCSTR() const throw() { return m_psz; } + +private: + // CA2CAEX is not copyable + CA2CAEX(_In_ const CA2CAEX&) throw() = delete; + CA2CAEX& operator=(_In_ const CA2CAEX&) throw() = delete; +}; + +// This class does not own the string +template <int t_nBufferLength = 128> +class CW2CWEX +{ +public: + LPCWSTR m_psz; + + CW2CWEX(_In_z_ LPCWSTR psz) : m_psz(psz) { } + + CW2CWEX(_In_z_ LPCWSTR psz, _In_ UINT nCodePage) : m_psz(psz) + { + UNREFERENCED_PARAMETER(nCodePage); + } + + ~CW2CWEX() throw() { } // There is nothing to free here + + _Ret_z_ operator LPCWSTR() const throw() { return m_psz; } + +private: + // CW2CWEX is not copyable + CW2CWEX(_In_ const CW2CWEX&) throw() = delete; + CW2CWEX& operator=(_In_ const CW2CWEX&) throw() = delete; +}; + +template <int t_nBufferLength = 128> +class CA2AEX +{ +public: + LPSTR m_psz; + char m_szBuffer[t_nBufferLength]; + + CA2AEX(_In_z_ LPCSTR psz) + { + Init(psz); + } + + CA2AEX(_In_z_ LPCSTR psz, _In_ UINT nCodePage) + { + UNREFERENCED_PARAMETER(nCodePage); + Init(psz); + } + + ~CA2AEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPSTR() const throw() + { + return m_psz; + } + +private: + // CA2AEX is not copyable + CA2AEX(_In_ const CA2AEX &) throw() = delete; + CA2AEX& operator=(_In_ const CA2AEX &) throw() = delete; + + void Init(_In_z_ LPCSTR psz) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + int cchMax = lstrlenA(psz) + 1; + if (cchMax <= t_nBufferLength) + { +#ifdef _STRSAFE_H_INCLUDED_ + StringCchCopyA(m_szBuffer, _countof(m_szBuffer), psz); +#else + lstrcpynA(m_szBuffer, psz, _countof(m_szBuffer)); +#endif + m_psz = m_szBuffer; + return; + } + + m_szBuffer[0] = 0; + m_psz = _strdup(psz); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } +}; + +template <int t_nBufferLength = 128> +class CW2WEX +{ +public: + LPWSTR m_psz; + wchar_t m_szBuffer[t_nBufferLength]; + + CW2WEX(_In_z_ LPCWSTR psz) + { + Init(psz); + } + + CW2WEX(_In_z_ LPCWSTR psz, _In_ UINT nCodePage) + { + UNREFERENCED_PARAMETER(nCodePage); + Init(psz); + } + + ~CW2WEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPWSTR() const throw() + { + return m_psz; + } + +private: + // CW2WEX is not copyable + CW2WEX(_In_ const CW2WEX&) throw() = delete; + CW2WEX& operator=(_In_ const CW2WEX&) throw() = delete; + + void Init(_In_z_ LPCWSTR psz) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + int cchMax = lstrlenW(psz); + if (cchMax <= t_nBufferLength) + { +#ifdef _STRSAFE_H_INCLUDED_ + StringCchCopyW(m_szBuffer, _countof(m_szBuffer), psz); +#else + lstrcpynW(m_szBuffer, psz, _countof(m_szBuffer)); +#endif + m_psz = m_szBuffer; + return; + } + + m_szBuffer[0] = 0; + m_psz = _wcsdup(psz); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } +}; + +template <int t_nBufferLength = 128> +class CA2WEX +{ +public: + LPWSTR m_psz; + wchar_t m_szBuffer[t_nBufferLength]; + + CA2WEX(_In_z_ LPCSTR psz) + { + Init(psz, CP_ACP); + } + + CA2WEX(_In_z_ LPCSTR psz, _In_ UINT nCodePage) + { + Init(psz, nCodePage); + } + + ~CA2WEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPWSTR() const throw() + { + return m_psz; + } + +private: + // CA2WEX is not copyable + CA2WEX(_In_ const CA2WEX&) throw() = delete; + CA2WEX& operator=(_In_ const CA2WEX&) throw() = delete; + + void Init(_In_z_ LPCSTR psz, _In_ UINT nCodePage) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + +#if 1 + int cchMax = lstrlenA(psz) + 1; // This is 3 times faster +#else + int cchMax = MultiByteToWideChar(nCodePage, 0, psz, -1, NULL, 0); // It's slow +#endif + if (cchMax <= (int)_countof(m_szBuffer)) + { + // Use the static buffer + m_psz = m_szBuffer; + cchMax = _countof(m_szBuffer); + } + else + { + // Allocate a new buffer + m_szBuffer[0] = 0; + m_psz = (LPWSTR)malloc(cchMax * sizeof(WCHAR)); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } + + MultiByteToWideChar(nCodePage, 0, psz, -1, m_psz, cchMax); + m_psz[cchMax - 1] = 0; + } +}; + +template <int t_nBufferLength = 128> +class CW2AEX +{ +public: + LPSTR m_psz; + char m_szBuffer[t_nBufferLength]; + + CW2AEX(_In_z_ LPCWSTR psz) + { + Init(psz, CP_ACP); + } + + CW2AEX(_In_z_ LPCWSTR psz, _In_ UINT nCodePage) + { + Init(psz, nCodePage); + } + + ~CW2AEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPSTR() const throw() + { + return m_psz; + } + +private: + // CW2AEX is not copyable + CW2AEX(_In_ const CW2AEX&) throw() = delete; + CW2AEX& operator=(_In_ const CW2AEX&) throw() = delete; + + void Init(_In_z_ LPCWSTR psz, _In_ UINT nConvertCodePage) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + + // NOTE: This has a failure. + int cchMax = WideCharToMultiByte(nConvertCodePage, 0, psz, -1, NULL, 0, NULL, NULL); + if (cchMax <= (int)_countof(m_szBuffer)) + { + // Use the static buffer + m_psz = m_szBuffer; + cchMax = _countof(m_szBuffer); + } + else + { + // Allocate a new buffer + m_szBuffer[0] = 0; + m_psz = (LPSTR)malloc(cchMax * sizeof(CHAR)); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } + + WideCharToMultiByte(nConvertCodePage, 0, psz, -1, m_psz, cchMax, NULL, NULL); + m_psz[cchMax - 1] = 0; + } +}; + +typedef CA2AEX<> CA2A; +typedef CW2AEX<> CW2A; +typedef CA2WEX<> CA2W; +typedef CW2WEX<> CW2W; +typedef CA2CAEX<> CA2CA; +typedef CW2CWEX<> CW2CW; + +#ifdef UNICODE + #define CA2CTEX CA2WEX + #define CA2TEX CA2WEX + #define CT2AEX CW2AEX + #define CT2CAEX CW2AEX + #define CT2CWEX CW2CWEX + #define CT2WEX CW2WEX + #define CW2CTEX CW2CWEX + #define CW2CTEX CW2CWEX +#else + #define CA2CTEX CA2CAEX + #define CA2TEX CA2AEX + #define CT2AEX CA2AEX + #define CT2CAEX CA2CAEX + #define CT2CWEX CA2WEX + #define CT2WEX CA2WEX + #define CW2CTEX CW2AEX + #define CW2TEX CW2AEX +#endif + +} // namespace ATL + +#endif // ndef __ATLCONV_H__

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