Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] INI file property bag (#5546)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56d95154eeaf2e96d5f3c… commit 56d95154eeaf2e96d5f3c6cd47baa03e50435235 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 19 11:22:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 19 11:22:55 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] INI file property bag (#5546) - Add SHGetIniStringUTF7W and SHSetIniStringUTF7W functions. - Add CIniPropertyBag class. - Implement SHCreatePropertyBagOnProfileSection function. CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 302 +++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 6 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 137 ++++++++++ sdk/include/reactos/shlwapi_undoc.h | 23 ++ 4 files changed, 465 insertions(+), 3 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index 28e22736d5d..ce65aa6c6a0 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -693,3 +693,305 @@ SHSetIniStringW( return ret; } + +/************************************************************************** + * SHGetIniStringUTF7W (SHLWAPI.473) + * + * Retrieves a string value from an INI file. + * + * @param lpAppName The section name. + * @param lpKeyName The key name. + * If this string begins from '@', the value will be interpreted as UTF-7. + * @param lpReturnedString Receives a wide string value. + * @param nSize The number of characters in lpReturnedString. + * @param lpFileName The INI file. + * @return The number of characters copied to the buffer if succeeded. + */ +EXTERN_C DWORD WINAPI +SHGetIniStringUTF7W( + _In_opt_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _Out_writes_to_(nSize, return + 1) _Post_z_ LPWSTR lpReturnedString, + _In_ DWORD nSize, + _In_z_ LPCWSTR lpFileName) +{ + if (*lpKeyName == L'@') // UTF-7 + return SHGetIniStringW(lpAppName, lpKeyName + 1, lpReturnedString, nSize, lpFileName); + + return GetPrivateProfileStringW(lpAppName, lpKeyName, L"", lpReturnedString, nSize, lpFileName); +} + +/************************************************************************** + * SHSetIniStringUTF7W (SHLWAPI.474) + * + * Sets a string value on an INI file. + * + * @param lpAppName The section name. + * @param lpKeyName The key name. + * If this begins from '@', the value will be stored as UTF-7. + * @param lpString The wide string value to be set. + * @param lpFileName The INI file. + * @return TRUE if successful. FALSE if failed. + */ +EXTERN_C BOOL WINAPI +SHSetIniStringUTF7W( + _In_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _In_opt_z_ LPCWSTR lpString, + _In_z_ LPCWSTR lpFileName) +{ + if (*lpKeyName == L'@') // UTF-7 + return SHSetIniStringW(lpAppName, lpKeyName + 1, lpString, lpFileName); + + return WritePrivateProfileStringW(lpAppName, lpKeyName, lpString, lpFileName); +} + +class CIniPropertyBag : public CBasePropertyBag +{ +protected: + LPWSTR m_pszFileName; + LPWSTR m_pszSection; + BOOL m_bAlternateStream; // ADS (Alternate Data Stream) + + static BOOL LooksLikeAnAlternateStream(LPCWSTR pszStart) + { + LPCWSTR pch = StrRChrW(pszStart, NULL, L'\\'); + if (!pch) + pch = pszStart; + return StrChrW(pch, L':') != NULL; + } + + HRESULT + _GetSectionAndName( + LPCWSTR pszStart, + LPWSTR pszSection, + UINT cchSectionMax, + LPWSTR pszName, + UINT cchNameMax); + +public: + CIniPropertyBag(DWORD dwMode) + : CBasePropertyBag(dwMode) + , m_pszFileName(NULL) + , m_pszSection(NULL) + , m_bAlternateStream(FALSE) + { + } + + ~CIniPropertyBag() override + { + ::LocalFree(m_pszFileName); + ::LocalFree(m_pszSection); + } + + HRESULT Init(LPCWSTR pszIniFile, LPCWSTR pszSection); + + STDMETHODIMP Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override; +}; + +HRESULT CIniPropertyBag::Init(LPCWSTR pszIniFile, LPCWSTR pszSection) +{ + m_pszFileName = StrDupW(pszIniFile); + if (!m_pszFileName) + return E_OUTOFMEMORY; + + // Is it an ADS (Alternate Data Stream) pathname? + m_bAlternateStream = LooksLikeAnAlternateStream(m_pszFileName); + + if (pszSection) + { + m_pszSection = StrDupW(pszSection); + if (!m_pszSection) + return E_OUTOFMEMORY; + } + + return S_OK; +} + +HRESULT +CIniPropertyBag::_GetSectionAndName( + LPCWSTR pszStart, + LPWSTR pszSection, + UINT cchSectionMax, + LPWSTR pszName, + UINT cchNameMax) +{ + LPCWSTR pchSep = StrChrW(pszStart, L'\\'); + if (pchSep) + { + UINT cchSep = (UINT)(pchSep - pszStart + 1); + StrCpyNW(pszSection, pszStart, min(cchSep, cchSectionMax)); + StrCpyNW(pszName, pchSep + 1, cchNameMax); + return S_OK; + } + + if (m_pszSection) + { + StrCpyNW(pszSection, m_pszSection, cchSectionMax); + StrCpyNW(pszName, pszStart, cchNameMax); + return S_OK; + } + + ERR("%p: %s\n", this, debugstr_w(pszStart)); + return E_INVALIDARG; +} + +STDMETHODIMP +CIniPropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + UNREFERENCED_PARAMETER(pErrorLog); + + TRACE("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); + + VARTYPE vt = V_VT(pvari); + + ::VariantInit(pvari); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } + + WCHAR szSection[64], szName[64]; + HRESULT hr = + _GetSectionAndName(pszPropName, szSection, _countof(szSection), szName, _countof(szName)); + if (FAILED(hr)) + return hr; + + const INT cchBuffMax = 4 * MAX_PATH; // UTF-7 needs 4 times length buffer. + CComHeapPtr<WCHAR> pszBuff; + if (!pszBuff.Allocate(cchBuffMax * sizeof(WCHAR))) + return E_OUTOFMEMORY; + + if (!SHGetIniStringUTF7W(szSection, szName, pszBuff, cchBuffMax, m_pszFileName)) + return E_FAIL; + + BSTR bstr = ::SysAllocString(pszBuff); + V_BSTR(pvari) = bstr; + if (!bstr) + return E_OUTOFMEMORY; + + V_VT(pvari) = VT_BSTR; + return ::VariantChangeTypeForRead(pvari, vt); +} + +STDMETHODIMP +CIniPropertyBag::Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) +{ + TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } + + HRESULT hr; + BSTR bstr; + VARIANTARG vargTemp = { 0 }; + switch (V_VT(pvari)) + { + case VT_EMPTY: + bstr = NULL; + break; + + case VT_BSTR: + bstr = V_BSTR(pvari); + break; + + default: + hr = ::VariantChangeType(&vargTemp, pvari, 0, VT_BSTR); + if (FAILED(hr)) + goto Quit; + + bstr = V_BSTR(&vargTemp); + break; + } + + WCHAR szSection[64], szName[64]; + hr = _GetSectionAndName(pszPropName, szSection, _countof(szSection), szName, _countof(szName)); + if (SUCCEEDED(hr)) + { + if (SHSetIniStringUTF7W(szSection, szName, bstr, m_pszFileName)) + { + if (!m_bAlternateStream) + SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATHW, m_pszFileName, NULL); + } + else + { + hr = E_FAIL; + } + } + +Quit: + ::VariantClear(&vargTemp); + return hr; +} + +/************************************************************************** + * SHCreatePropertyBagOnProfileSection (SHLWAPI.472) + * + * Creates a property bag object on INI file. + * + * @param lpFileName The INI filename. + * @param pszSection The optional section name. + * @param dwMode The combination of STGM_READ, STGM_WRITE, STGM_READWRITE, and STGM_CREATE. + * @param riid Specifies either IID_IUnknown, IID_IPropertyBag or IID_IPropertyBag2. + * @param ppvObj Receives an IPropertyBag pointer. + * @return An HRESULT value. S_OK on success, non-zero on failure. + * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/cre… + */ +EXTERN_C HRESULT WINAPI +SHCreatePropertyBagOnProfileSection( + _In_z_ LPCWSTR lpFileName, + _In_opt_z_ LPCWSTR pszSection, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj) +{ + HANDLE hFile; + PWCHAR pchFileTitle; + WCHAR szBuff[MAX_PATH]; + + if (dwMode & STGM_CREATE) + { + hFile = ::CreateFileW(lpFileName, 0, FILE_SHARE_DELETE, 0, CREATE_NEW, + FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + pchFileTitle = PathFindFileNameW(lpFileName); + if (lstrcmpiW(pchFileTitle, L"desktop.ini") == 0) + { + StrCpyNW(szBuff, lpFileName, _countof(szBuff)); + if (PathRemoveFileSpecW(szBuff)) + PathMakeSystemFolderW(szBuff); + } + ::CloseHandle(hFile); + } + } + + *ppvObj = NULL; + + if (!PathFileExistsW(lpFileName)) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + CComPtr<CIniPropertyBag> pIniPB(new CIniPropertyBag(dwMode)); + + HRESULT hr = pIniPB->Init(lpFileName, pszSection); + if (FAILED(hr)) + { + ERR("0x%08X\n", hr); + return hr; + } + + return pIniPB->QueryInterface(riid, ppvObj); +} diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 13cac9b8c7a..434fb246046 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -469,9 +469,9 @@ 469 stub -noname RunRegCommand 470 stub -noname IUnknown_ProfferServiceOld 471 stdcall -noname SHCreatePropertyBagOnRegKey(ptr wstr long ptr ptr) -472 stub -noname SHCreatePropertyBagOnProfileSelection -473 stub -noname SHGetIniStringUTF7W -474 stub -noname SHSetIniStringUTF7W +472 stdcall -noname SHCreatePropertyBagOnProfileSection(wstr wstr long ptr ptr) +473 stdcall -noname SHGetIniStringUTF7W(wstr wstr ptr long wstr) +474 stdcall -noname SHSetIniStringUTF7W(wstr wstr wstr wstr) 475 stdcall -noname GetShellSecurityDescriptor(ptr long) 476 stdcall -noname SHGetObjectCompatFlags(ptr ptr) 477 stdcall -noname SHCreatePropertyBagOnMemory(long ptr ptr) diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 2593cf66c6d..57ec8881006 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -8,6 +8,7 @@ #include <apitest.h> #include <shlwapi.h> #include <shlobj.h> +#include <stdio.h> #include <shlwapi_undoc.h> #include <versionhelpers.h> @@ -687,6 +688,141 @@ static void SHPropertyBag_SHSetIniStringW(void) DeleteFileW(szIniFile); } +void SHPropertyBag_OnIniFile(void) +{ + WCHAR szIniFile[MAX_PATH], szValue[MAX_PATH]; + HRESULT hr; + IPropertyBag *pPropBag; + VARIANT vari; + DWORD dwRet; + + ExpandEnvironmentStringsW(L"%TEMP%\\SHPropertyBag.ini", szIniFile, _countof(szIniFile)); + + DeleteFileW(szIniFile); + fclose(_wfopen(szIniFile, L"w")); + + trace("%ls\n", szIniFile); + + // read-write + hr = SHCreatePropertyBagOnProfileSection( + szIniFile, + L"TestSection", + STGM_READWRITE, + IID_IPropertyBag, + (void**)&pPropBag); + ok_long(hr, S_OK); + ok_int(PathFileExistsW(szIniFile), TRUE); + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Write BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"StrValue"); + hr = pPropBag->Write(L"Name2", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Write BSTR (dirty UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"ABC\x3042\x3044\x3046\x2665"); + hr = pPropBag->Write(L"@Name3", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Write BSTR (clean UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"1234abc"); + hr = pPropBag->Write(L"@Name4", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + pPropBag->Release(); + + // Flush + WritePrivateProfileStringW(NULL, NULL, NULL, szIniFile); + + // Check INI file + dwRet = GetPrivateProfileStringW(L"TestSection", L"Name1", L"BAD", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 10); + ok_wstr(szValue, L"3735943886"); + + dwRet = GetPrivateProfileStringW(L"TestSection", L"Name2", L"BAD", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 8); + ok_wstr(szValue, L"StrValue"); + + GetPrivateProfileStringW(L"TestSection", L"Name3", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_int(memcmp(szValue, L"ABC", 3 * sizeof(WCHAR)), 0); + + GetPrivateProfileStringW(L"TestSection.A", L"Name3", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_int(memcmp(szValue, L"ABC", 3 * sizeof(WCHAR)), 0); + + GetPrivateProfileStringW(L"TestSection.W", L"Name3", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"ABC+MEIwRDBGJmU-"); // UTF-7 + + GetPrivateProfileStringW(L"TestSection", L"Name4", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"1234abc"); + + GetPrivateProfileStringW(L"TestSection.A", L"Name4", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"NotFound"); + + GetPrivateProfileStringW(L"TestSection.W", L"Name4", L"NotFound", szValue, _countof(szValue), szIniFile); + ok_wstr(szValue, L"NotFound"); + + // read-only + hr = SHCreatePropertyBagOnProfileSection( + szIniFile, + NULL, + STGM_READ, + IID_IPropertyBag, + (void**)&pPropBag); + ok_long(hr, S_OK); + + // Read UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + hr = pPropBag->Read(L"TestSection\\Name1", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_UI4(&vari), 0xDEADFACE); + VariantClear(&vari); + + // Read BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"TestSection\\Name2", &vari, NULL); + ok_long(hr, S_OK); + ok_wstr(V_BSTR(&vari), L"StrValue"); + VariantClear(&vari); + + // Read BSTR (dirty UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"TestSection\\@Name3", &vari, NULL); + ok_long(hr, S_OK); + ok_wstr(V_BSTR(&vari), L"ABC\x3042\x3044\x3046\x2665"); + VariantClear(&vari); + + // Read BSTR (clean UTF-7) + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"TestSection\\@Name4", &vari, NULL); + ok_long(hr, S_OK); + ok_wstr(V_BSTR(&vari), L"1234abc"); + VariantClear(&vari); + + pPropBag->Release(); + + DeleteFileW(szIniFile); +} + START_TEST(SHPropertyBag) { SHPropertyBag_ReadTest(); @@ -694,4 +830,5 @@ START_TEST(SHPropertyBag) SHPropertyBag_OnMemory(); SHPropertyBag_OnRegKey(); SHPropertyBag_SHSetIniStringW(); + SHPropertyBag_OnIniFile(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 4e01e7c633f..270bc344291 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -135,6 +135,14 @@ SHCreatePropertyBagOnRegKey( _In_ REFIID riid, _Out_ void **ppvObj); +HRESULT WINAPI +SHCreatePropertyBagOnProfileSection( + _In_z_ LPCWSTR lpFileName, + _In_opt_z_ LPCWSTR pszSection, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj); + HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra); @@ -194,6 +202,21 @@ SHSetIniStringW( _In_opt_z_ LPCWSTR str, _In_z_ LPCWSTR filename); +DWORD WINAPI +SHGetIniStringUTF7W( + _In_opt_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _Out_writes_to_(nSize, return + 1) _Post_z_ LPWSTR lpReturnedString, + _In_ DWORD nSize, + _In_z_ LPCWSTR lpFileName); + +BOOL WINAPI +SHSetIniStringUTF7W( + _In_z_ LPCWSTR lpAppName, + _In_z_ LPCWSTR lpKeyName, + _In_opt_z_ LPCWSTR lpString, + _In_z_ LPCWSTR lpFileName); + int WINAPIV ShellMessageBoxWrapW(

1 year, 1 month

[reactos] 01/01: [CONSRV] Only call CoUninitialize if initialized (#5582)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0e443058ef22c9f559df… commit c0e443058ef22c9f559df6d49b9d5deb8ccbc161 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Aug 18 19:06:20 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 18 19:06:20 2023 +0200 [CONSRV] Only call CoUninitialize if initialized (#5582) --- win32ss/user/winsrv/consrv/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index cc269604ba7..3209e3b4a83 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/winsrv/consrv/console.c * PURPOSE: Console Management Functions - * PROGRAMMERS: G� van Geldorp + * PROGRAMMERS: Gé van Geldorp * Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -465,8 +465,8 @@ LoadShellLinkConsoleInfo(IN OUT PCONSOLE_STATE_INFO ConsoleInfo, } IShellLinkW_Release(pshl); } + CoUninitialize(); } - CoUninitialize(); Finish:

1 year, 1 month

[reactos] 01/01: [ATL_APITEST][SDK] Fix failures of CImage testcase (#5567)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80153fc68669a99ccec67… commit 80153fc68669a99ccec67e2ed759d53d0ea26ddd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 18 20:34:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 18 20:34:33 2023 +0900 [ATL_APITEST][SDK] Fix failures of CImage testcase (#5567) - Improve compatibility of CImage. - Improve CImage testcase of atl_apitest. - Improve CImage::BuildCodecFilterString. CORE-19008 --- modules/rostests/apitests/atl/CImage.cpp | 230 +++++++++++++++++------- modules/rostests/apitests/atl/devenv/.gitignore | 2 + sdk/lib/atl/atlimage.h | 6 - 3 files changed, 167 insertions(+), 71 deletions(-) diff --git a/modules/rostests/apitests/atl/CImage.cpp b/modules/rostests/apitests/atl/CImage.cpp index 269c3fd7686..005cd4d9295 100644 --- a/modules/rostests/apitests/atl/CImage.cpp +++ b/modules/rostests/apitests/atl/CImage.cpp @@ -101,7 +101,6 @@ static void init_gdip() DisposeImage = AddrOf<DISPOSEIMAGE>("GdipDisposeImage"); } - static void determine_file_bpp(TCHAR* tfile, Gdiplus::PixelFormat expect_pf) { using namespace Gdiplus; @@ -135,8 +134,7 @@ static void determine_file_bpp(TCHAR* tfile, Gdiplus::PixelFormat expect_pf) Shutdown(gdiplusToken); } - -START_TEST(CImage) +static void Test_LoadSaveImage(void) { HRESULT hr; TCHAR* file; @@ -147,12 +145,6 @@ START_TEST(CImage) COLORREF color; HDC hDC; -#if 0 - width = image1.GetWidth(); - height = image1.GetHeight(); - bpp = image1.GetBPP(); -#endif - HINSTANCE hInst = GetModuleHandle(NULL); GetTempPath(MAX_PATH, szTempPath); @@ -166,7 +158,6 @@ START_TEST(CImage) bpp = image1.GetBPP(); ok(bpp == 8, "Expected bpp to be 8, was: %d\n", bpp); - image2.LoadFromResource(hInst, IDB_CROSS); ok(!image2.IsNull(), "Expected image2 is not null\n"); image2.SetTransparentColor(RGB(255, 255, 255)); @@ -208,7 +199,7 @@ START_TEST(CImage) height = image2.GetHeight(); ok_int(height, 48); bpp = image2.GetBPP(); - ok_int(bpp, 32); + ok(bpp == 32 || bpp == 8, "bpp was %d\n", bpp); for (n = 0; n < _countof(szFiles); ++n) { @@ -234,12 +225,11 @@ START_TEST(CImage) bpp = image2.GetBPP(); if (n == 3) { - ok(bpp == 32, "Expected bpp to be 32, was: %d (for %i)\n", bpp, n); + ok(bpp == 24 || bpp == 32, "Expected bpp to be 24 or 32, was: %d (for %i)\n", bpp, n); determine_file_bpp(file, PixelFormat24bppRGB); } else { - ok(bpp == 32, "Expected bpp to be 32, was: %d (for %i)\n", bpp, n); determine_file_bpp(file, PixelFormat8bppIndexed); } color = image1.GetPixel(5, 5); @@ -248,67 +238,177 @@ START_TEST(CImage) bOK = DeleteFile(file); ok(bOK, "Expected bOK to be TRUE, was: %d (for %i)\n", bOK, n); } +} + +static INT FindGUID(REFGUID rguid, const CSimpleArray<GUID>& guids) +{ + for (INT i = 0; i < guids.GetSize(); ++i) + { + if (memcmp(&rguid, &guids[i], sizeof(GUID)) == 0) + return i; + } + return -1; +} + +static INT FindFilterItem(const TCHAR *filter, const TCHAR *item) +{ + INT iFilter = 0; + DWORD cbItem = lstrlen(item) * sizeof(TCHAR); + BOOL bSep = TRUE; + + for (; *filter; ++filter) + { + if (bSep && memcmp(item, filter, cbItem) == 0) + return (iFilter + 1) / 2; + + bSep = (*filter == TEXT('|')); + if (bSep) + ++iFilter; + } + return -1; +} + +static void Test_Importer(void) +{ + HRESULT hr; ATL::IAtlStringMgr *mgr = CAtlStringMgr::GetInstance(); CSimpleArray<GUID> aguidFileTypes; -#ifdef UNICODE - CHAR szBuff[512]; - const WCHAR *psz; -#else - const CHAR *psz; -#endif + INT iNULL, iBMP, iJPEG, iGIF, iPNG, iTIFF, iEMF, iWMF; + // Try importer with "All Image Files" CSimpleString strImporters(mgr); aguidFileTypes.RemoveAll(); - hr = CImage::GetImporterFilterString(strImporters, - aguidFileTypes, - TEXT("All Image Files"), 0); + hr = CImage::GetImporterFilterString(strImporters, aguidFileTypes, TEXT("All Image Files"), 0); ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); - ok(aguidFileTypes.GetSize() == 9, "Expected aguidFileTypes.GetSize() to be 8, was %d.", aguidFileTypes.GetSize()); - ok(IsEqualGUID(aguidFileTypes[0], GUID_NULL), "Expected aguidFileTypes[0] to be GUID_NULL.\n"); - ok(IsEqualGUID(aguidFileTypes[1], Gdiplus::ImageFormatBMP), "Expected aguidFileTypes[1] to be Gdiplus::ImageFormatBMP.\n"); - ok(IsEqualGUID(aguidFileTypes[2], Gdiplus::ImageFormatJPEG), "Expected aguidFileTypes[2] to be Gdiplus::ImageFormatJPEG.\n"); - ok(IsEqualGUID(aguidFileTypes[3], Gdiplus::ImageFormatGIF), "Expected aguidFileTypes[3] to be Gdiplus::ImageFormatGIF.\n"); - ok(IsEqualGUID(aguidFileTypes[4], Gdiplus::ImageFormatEMF), "Expected aguidFileTypes[4] to be Gdiplus::ImageFormatEMF.\n"); - ok(IsEqualGUID(aguidFileTypes[5], Gdiplus::ImageFormatWMF), "Expected aguidFileTypes[5] to be Gdiplus::ImageFormatWMF.\n"); - ok(IsEqualGUID(aguidFileTypes[6], Gdiplus::ImageFormatTIFF), "Expected aguidFileTypes[6] to be Gdiplus::ImageFormatTIFF.\n"); - ok(IsEqualGUID(aguidFileTypes[7], Gdiplus::ImageFormatPNG), "Expected aguidFileTypes[7] to be Gdiplus::ImageFormatPNG.\n"); - ok(IsEqualGUID(aguidFileTypes[8], Gdiplus::ImageFormatIcon), "Expected aguidFileTypes[8] to be Gdiplus::ImageFormatIcon.\n"); - - psz = strImporters.GetString(); -#ifdef UNICODE - WideCharToMultiByte(CP_ACP, 0, psz, -1, szBuff, 512, NULL, NULL); - ok(lstrcmpA(szBuff, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The importer filter string is bad, was: %s\n", szBuff); -#else - ok(lstrcmpA(psz, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The importer filter string is bad, was: %s\n", psz); -#endif + ok(aguidFileTypes.GetSize() >= 8, + "Expected aguidFileTypes.GetSize() to be >= 8, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + iEMF = FindGUID(Gdiplus::ImageFormatEMF, aguidFileTypes); + iWMF = FindGUID(Gdiplus::ImageFormatWMF, aguidFileTypes); + + ok_int(iNULL, 0); + ok(iBMP > 0, "iBMP was %d\n", iBMP); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + ok(iEMF > 0, "iEMF was %d\n", iEMF); + ok(iWMF > 0, "iWMF was %d\n", iWMF); + + ok_int(memcmp(strImporters, TEXT("All Image Files|"), sizeof(TEXT("All Image Files|")) - sizeof(TCHAR)), 0); + ok_int(iBMP, FindFilterItem(strImporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strImporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strImporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strImporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strImporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); + + // Try importer without "All Image Files" + aguidFileTypes.RemoveAll(); + strImporters.Empty(); + hr = CImage::GetImporterFilterString(strImporters, aguidFileTypes, NULL, 0); + ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); + ok(aguidFileTypes.GetSize() >= 7, + "Expected aguidFileTypes.GetSize() to be >= 7, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + iEMF = FindGUID(Gdiplus::ImageFormatEMF, aguidFileTypes); + iWMF = FindGUID(Gdiplus::ImageFormatWMF, aguidFileTypes); + + ok_int(iNULL, -1); + ok_int(iBMP, 0); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + ok(iEMF > 0, "iEMF was %d\n", iEMF); + ok(iWMF > 0, "iWMF was %d\n", iWMF); + + ok_int(iBMP, FindFilterItem(strImporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strImporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strImporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strImporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strImporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); +} + +static void Test_Exporter(void) +{ + HRESULT hr; + ATL::IAtlStringMgr *mgr = CAtlStringMgr::GetInstance(); + CSimpleArray<GUID> aguidFileTypes; + INT iNULL, iBMP, iJPEG, iGIF, iPNG, iTIFF; + // Try exporter with "All Image Files" CSimpleString strExporters(mgr); aguidFileTypes.RemoveAll(); - hr = CImage::GetExporterFilterString(strExporters, - aguidFileTypes, - TEXT("All Image Files"), 0); + hr = CImage::GetExporterFilterString(strExporters, aguidFileTypes, TEXT("All Image Files"), 0); ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); - ok(aguidFileTypes.GetSize() == 9, "Expected aguidFileTypes.GetSize() to be 8, was %d.", aguidFileTypes.GetSize()); - ok(IsEqualGUID(aguidFileTypes[0], GUID_NULL), "Expected aguidFileTypes[0] to be GUID_NULL.\n"); - ok(IsEqualGUID(aguidFileTypes[1], Gdiplus::ImageFormatBMP), "Expected aguidFileTypes[1] to be Gdiplus::ImageFormatBMP.\n"); - ok(IsEqualGUID(aguidFileTypes[2], Gdiplus::ImageFormatJPEG), "Expected aguidFileTypes[2] to be Gdiplus::ImageFormatJPEG.\n"); - ok(IsEqualGUID(aguidFileTypes[3], Gdiplus::ImageFormatGIF), "Expected aguidFileTypes[3] to be Gdiplus::ImageFormatGIF.\n"); - ok(IsEqualGUID(aguidFileTypes[4], Gdiplus::ImageFormatEMF), "Expected aguidFileTypes[4] to be Gdiplus::ImageFormatEMF.\n"); - ok(IsEqualGUID(aguidFileTypes[5], Gdiplus::ImageFormatWMF), "Expected aguidFileTypes[5] to be Gdiplus::ImageFormatWMF.\n"); - ok(IsEqualGUID(aguidFileTypes[6], Gdiplus::ImageFormatTIFF), "Expected aguidFileTypes[6] to be Gdiplus::ImageFormatTIFF.\n"); - ok(IsEqualGUID(aguidFileTypes[7], Gdiplus::ImageFormatPNG), "Expected aguidFileTypes[7] to be Gdiplus::ImageFormatPNG.\n"); - ok(IsEqualGUID(aguidFileTypes[8], Gdiplus::ImageFormatIcon), "Expected aguidFileTypes[8] to be Gdiplus::ImageFormatIcon.\n"); - - psz = strExporters.GetString(); -#ifdef UNICODE - WideCharToMultiByte(CP_ACP, 0, psz, -1, szBuff, 512, NULL, NULL); - ok(lstrcmpA(szBuff, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The exporter filter string is bad, was: %s\n", szBuff); -#else - ok(lstrcmpA(psz, "All Image Files|*.BMP;*.DIB;*.RLE;*.JPG;*.JPEG;*.JPE;*.JFIF;*.GIF;*.EMF;*.WMF;*.TIF;*.TIFF;*.PNG;*.ICO|BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|GIF (*.GIF)|*.GIF|EMF (*.EMF)|*.EMF|WMF (*.WMF)|*.WMF|TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|PNG (*.PNG)|*.PNG|ICO (*.ICO)|*.ICO||") == 0, - "The exporter filter string is bad, was: %s\n", psz); -#endif + ok(aguidFileTypes.GetSize() >= 6, + "Expected aguidFileTypes.GetSize() to be >= 6, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + + ok_int(iNULL, 0); + ok(iBMP > 0, "iBMP was %d\n", iBMP); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + + ok_int(iBMP, FindFilterItem(strExporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strExporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strExporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strExporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strExporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); + + // Try exporter without "All Image Files" + strExporters.Empty(); + aguidFileTypes.RemoveAll(); + hr = CImage::GetExporterFilterString(strExporters, aguidFileTypes, NULL, 0); + ok(hr == S_OK, "Expected hr to be S_OK, was: %ld\n", hr); + ok(aguidFileTypes.GetSize() >= 5, + "Expected aguidFileTypes.GetSize() to be >= 5, was %d.", aguidFileTypes.GetSize()); + + iNULL = FindGUID(GUID_NULL, aguidFileTypes); + iBMP = FindGUID(Gdiplus::ImageFormatBMP, aguidFileTypes); + iJPEG = FindGUID(Gdiplus::ImageFormatJPEG, aguidFileTypes); + iGIF = FindGUID(Gdiplus::ImageFormatGIF, aguidFileTypes); + iPNG = FindGUID(Gdiplus::ImageFormatPNG, aguidFileTypes); + iTIFF = FindGUID(Gdiplus::ImageFormatTIFF, aguidFileTypes); + + ok_int(iNULL, -1); + ok_int(iBMP, 0); + ok(iJPEG > 0, "iJPEG was %d\n", iJPEG); + ok(iGIF > 0, "iGIF was %d\n", iGIF); + ok(iPNG > 0, "iPNG was %d\n", iPNG); + ok(iTIFF > 0, "iTIFF was %d\n", iTIFF); + + ok_int(iBMP, FindFilterItem(strExporters, TEXT("BMP (*.BMP;*.DIB;*.RLE)|*.BMP;*.DIB;*.RLE|"))); + ok_int(iJPEG, FindFilterItem(strExporters, TEXT("JPEG (*.JPG;*.JPEG;*.JPE;*.JFIF)|*.JPG;*.JPEG;*.JPE;*.JFIF|"))); + ok_int(iGIF, FindFilterItem(strExporters, TEXT("GIF (*.GIF)|*.GIF|"))); + ok_int(iPNG, FindFilterItem(strExporters, TEXT("PNG (*.PNG)|*.PNG|"))); + ok_int(iTIFF, FindFilterItem(strExporters, TEXT("TIFF (*.TIF;*.TIFF)|*.TIF;*.TIFF|"))); +} + +START_TEST(CImage) +{ + Test_LoadSaveImage(); + Test_Importer(); + Test_Exporter(); } diff --git a/modules/rostests/apitests/atl/devenv/.gitignore b/modules/rostests/apitests/atl/devenv/.gitignore index 442c28bde1d..da889791668 100644 --- a/modules/rostests/apitests/atl/devenv/.gitignore +++ b/modules/rostests/apitests/atl/devenv/.gitignore @@ -18,3 +18,5 @@ CSimpleArray/ CSimpleMap/ CString/ SubclassWindow/ +Debug/ +Release/ diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 09e2d6452c5..6865b38e84d 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -764,13 +764,8 @@ private: CString ext(pCodecs[i].FilenameExtension); extensions += ext; } - extensions.MakeLower(); - strFilter += TEXT(" ("); - strFilter += extensions; - strFilter += TEXT(")"); strFilter += chSeparator; - strFilter += extensions; strFilter += chSeparator; @@ -783,7 +778,6 @@ private: continue; CString extensions(pCodecs[i].FilenameExtension); - extensions.MakeLower(); CString desc(pCodecs[i].FormatDescription); strFilter += desc;

1 year, 1 month

[reactos] 01/01: [MSPAINT] Update Romanian (ro-RO) translation (#5564)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9293388c6178461779b3f… commit 9293388c6178461779b3fddbbe524a147744a69d Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Aug 18 13:04:31 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 18 13:04:31 2023 +0300 [MSPAINT] Update Romanian (ro-RO) translation (#5564) --- base/applications/mspaint/lang/ro-RO.rc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 516d15bc335..134acf54bc1 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -4,7 +4,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> * Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -105,18 +105,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Dec&upează\tCtrl+X", IDM_EDITCUT + MENUITEM "Copia&ză\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lipește\tCtrl+V", IDM_EDITPASTE + MENUITEM "Șt&erge selecția\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selectea&ză tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "C&opiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire &din...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Întindere/În&clinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inversează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -214,7 +214,7 @@ BEGIN END IDD_FONTS DIALOG 0, 0, 225, 25 -CAPTION "Fonts" +CAPTION "Fonturi" STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" @@ -263,7 +263,7 @@ BEGIN IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixeli/cm" IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_SAVEERROR "Eșec în păstrarea imaginii bitmap („hartă de biți”) în fișierul:\n\n%s" + IDS_CANTSENDMAIL "Eșec în trimiterea unei scrisori." + IDS_LOSECOLOR "În această operațiune informațiile legate de culoare vor fi pierdute. Sigur veți continua?" END

1 year, 1 month

[reactos] 01/01: [EXPLORER] Update Romanian (ro-RO) translation (#5558)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7112320424bb40d65dcd… commit e7112320424bb40d65dcd5ff6fba88ddcee2de19 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Aug 18 13:04:03 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 18 13:04:03 2023 +0300 [EXPLORER] Update Romanian (ro-RO) translation (#5558) --- base/shell/explorer/lang/ro-RO.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index 7ad4423780e..c2d0f00b432 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -20,7 +20,7 @@ BEGIN MENUITEM "Aranjări &orizontale", ID_SHELL_CMD_TILE_WND_H MENUITEM "Aranjări &verticale", ID_SHELL_CMD_TILE_WND_V MENUITEM "Afișează &biroul", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "Des&face", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "Desfa&ce", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "&Gestionar de activități", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR @@ -60,7 +60,7 @@ BEGIN MENUITEM "E&xecutare…", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "Sinc&ronizează", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED - MENUITEM "De&autentificare %s…", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Dea&utentificare %s…", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "De&conectare…", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED MENUITEM "D&etașare calculator", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "Î&nchidere calculator…", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED @@ -75,11 +75,11 @@ BEGIN GROUPBOX "Aspectul barei de activități", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Fi&xează bara de activități", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 - AUTOCHECKBOX "&Auto-ascunde bara de activități", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 - AUTOCHECKBOX "&Menține bara de activități deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "Auto-ascun&de bara de activități", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 + AUTOCHECKBOX "Menține &bara de activități deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupează butoanele similare din bara de activități", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Afișează bara „&Lansări rapide”", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "Folos&ește pictograme mici", IDC_TASKBARPROP_SMALLICONS, 13, 110, 240, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -106,11 +106,11 @@ BEGIN LTEXT "Puteți menține ordonată zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13, 48, 223, 16 AUTOCHECKBOX "Asc&unde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 PUSHBUTTON "&Particularizare…", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 - GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + GROUPBOX "Pictograme de sistem", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Selectați ce pictograme de sistem urmează să fie afișate mereu.", IDC_STATIC, 13, 113, 240, 8 AUTOCHECKBOX "Afișează &ceas", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Afișează s&ecunde", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Birou", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 @@ -164,7 +164,7 @@ END IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" +CAPTION "Avansat" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Opțiuni ale meniului „Pornire” ", IDC_STATIC, 7, 7, 238, 42

1 year, 1 month

[reactos] 01/01: [FREELDR] Convert ntfs.c to UTF-8 without BOM

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa2d2139be17a99f9e9c2… commit aa2d2139be17a99f9e9c2387934b4a43e75aa79f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Aug 18 00:51:36 2023 +0200 Commit: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> CommitDate: Fri Aug 18 00:51:36 2023 +0200 [FREELDR] Convert ntfs.c to UTF-8 without BOM Addendum to f0d73e0 (and ab3bd82). --- boot/freeldr/freeldr/lib/fs/ntfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index 9361f526932..fb4db082cd8 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -1,7 +1,7 @@ /* * FreeLoader NTFS support * Copyright (C) 2004 Filip Navara <xnavara(a)volny.cz> - * Copyright (C) 2009-2010 Herv� Poussineau + * Copyright (C) 2009-2010 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

1 year, 1 month

[reactos] 01/01: [MSAFD] Fix non-blocking sockets support for recv() (#5575) CORE-14486

by Julio Carchi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=442f5dfab50da48700a20… commit 442f5dfab50da48700a20d4bdc6917e48105ad86 Author: Julio Carchi <juliocarchi(a)yahoo.com> AuthorDate: Thu Aug 17 16:13:13 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 17 23:13:13 2023 +0200 [MSAFD] Fix non-blocking sockets support for recv() (#5575) CORE-14486 Currently ReactOS' winsock2 implementation lacks of non-blocking sockets support for recv() apicall, this causes that applications that make use of this feature can lead to unexpected behaviors, one of them is Nginx web server, which uses non-blocking sockets when serving pages through Https protocol. CORE-14486 It also brings us significantly closer in master head to running Firefox 52, Mypal 29.3.0 and New Moon 28 browser, where the latter allows to connect to mattermost from within ReactOS. In master head an additional reg file is needed to stop us from exporting specific NT6+ APIs, but in older releases all that should work out of the box with this brilliant patch. Co-authored-by: Julio Carchi Ruiz <julcar(a)informaticos.com> Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/msafd/misc/dllmain.c | 32 ++++++++++++++++++-------------- dll/win32/msafd/misc/sndrcv.c | 7 +++++++ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index a4cded75c00..79623a142c0 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -1495,22 +1495,25 @@ WSPAccept( ListenReceiveData = (PAFD_RECEIVED_ACCEPT_DATA)ReceiveBuffer; /* If this is non-blocking, make sure there's something for us to accept */ - FD_ZERO(&ReadSet); - FD_SET(Socket->Handle, &ReadSet); - Timeout.tv_sec=0; - Timeout.tv_usec=0; - - if (WSPSelect(0, &ReadSet, NULL, NULL, &Timeout, lpErrno) == SOCKET_ERROR) + if (Socket->SharedData->NonBlocking) { - NtClose(SockEvent); - return SOCKET_ERROR; - } + FD_ZERO(&ReadSet); + FD_SET(Socket->Handle, &ReadSet); + Timeout.tv_sec=0; + Timeout.tv_usec=0; - if (ReadSet.fd_array[0] != Socket->Handle) - { - NtClose(SockEvent); - if (lpErrno) *lpErrno = WSAEWOULDBLOCK; - return SOCKET_ERROR; + if (WSPSelect(0, &ReadSet, NULL, NULL, &Timeout, lpErrno) == SOCKET_ERROR) + { + NtClose(SockEvent); + return SOCKET_ERROR; + } + + if (ReadSet.fd_array[0] != Socket->Handle) + { + NtClose(SockEvent); + if (lpErrno) *lpErrno = WSAEWOULDBLOCK; + return SOCKET_ERROR; + } } /* Send IOCTL */ @@ -1782,6 +1785,7 @@ WSPAccept( AcceptSocketInfo->SharedData->State = SocketConnected; AcceptSocketInfo->SharedData->ConnectTime = GetCurrentTimeInSeconds(); + AcceptSocketInfo->SharedData->NonBlocking = Socket->SharedData->NonBlocking; /* Return Address in SOCKADDR FORMAT */ if( SocketAddress ) diff --git a/dll/win32/msafd/misc/sndrcv.c b/dll/win32/msafd/misc/sndrcv.c index 07fe8b1f1c0..06b0afb1d51 100644 --- a/dll/win32/msafd/misc/sndrcv.c +++ b/dll/win32/msafd/misc/sndrcv.c @@ -291,6 +291,13 @@ WSPRecv(SOCKET Handle, NULL, 0); + /* Non-blocking sockets must wait until data is available */ + if (Status == STATUS_PENDING && Socket->SharedData->NonBlocking) + { + if (lpErrno) *lpErrno = WSAEWOULDBLOCK; + return SOCKET_ERROR; + } + /* Wait for completion of not overlapped */ if (Status == STATUS_PENDING && lpOverlapped == NULL) {

1 year, 1 month

[reactos] 01/01: [FREELDR] Convert source files to UTF-8 without BOM

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab3bd82928b29376a57c7… commit ab3bd82928b29376a57c70bfa76c51c737f6bcf0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 17 15:36:54 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 17 15:36:54 2023 +0200 [FREELDR] Convert source files to UTF-8 without BOM --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 2 +- boot/freeldr/freeldr/arch/i386/pc/pchw.c | 2 +- boot/freeldr/freeldr/arch/realmode/pxe.inc | 2 +- boot/freeldr/freeldr/disk/scsiport.c | 2 +- boot/freeldr/freeldr/include/arcemul.h | 2 +- boot/freeldr/freeldr/include/fs/pxe.h | 2 +- boot/freeldr/freeldr/include/ntoskrnl.h | 2 +- boot/freeldr/freeldr/lib/fs/fat.c | 2 +- boot/freeldr/freeldr/lib/fs/iso.c | 2 +- boot/freeldr/freeldr/lib/fs/pxe.c | 2 +- boot/freeldr/freeldr/lib/inifile/ini_init.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index cf23c60ac21..0a7ef8600ae 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -2,7 +2,7 @@ * FreeLoader * * Copyright (C) 2003, 2004 Eric Kohl - * Copyright (C) 2009 Herv� Poussineau + * Copyright (C) 2009 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/boot/freeldr/freeldr/arch/i386/pc/pchw.c b/boot/freeldr/freeldr/arch/i386/pc/pchw.c index 1dfa46bd120..4e8249dd99f 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pchw.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pchw.c @@ -2,7 +2,7 @@ * FreeLoader * * Copyright (C) 2003, 2004 Eric Kohl - * Copyright (C) 2009 Herv� Poussineau + * Copyright (C) 2009 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/boot/freeldr/freeldr/arch/realmode/pxe.inc b/boot/freeldr/freeldr/arch/realmode/pxe.inc index cb56439c980..523c40c6a6a 100644 --- a/boot/freeldr/freeldr/arch/realmode/pxe.inc +++ b/boot/freeldr/freeldr/arch/realmode/pxe.inc @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 2011 Herv� Poussineau + * Copyright (C) 2011 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 63d81c3dab8..633facc496c 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/freeldr/disk/scsiport.c * PURPOSE: Interface for SCSI Emulation - * PROGRAMMERS: Herv� Poussineau <hpoussin(a)reactos.org> + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> */ /* INCLUDES *******************************************************************/ diff --git a/boot/freeldr/freeldr/include/arcemul.h b/boot/freeldr/freeldr/include/arcemul.h index 437fecea28f..2c01ed71a3a 100644 --- a/boot/freeldr/freeldr/include/arcemul.h +++ b/boot/freeldr/freeldr/include/arcemul.h @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 2009 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright (C) 2009 Hervé Poussineau <hpoussin(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/boot/freeldr/freeldr/include/fs/pxe.h b/boot/freeldr/freeldr/include/fs/pxe.h index 5d2cc2abc42..9ac80055505 100644 --- a/boot/freeldr/freeldr/include/fs/pxe.h +++ b/boot/freeldr/freeldr/include/fs/pxe.h @@ -1,6 +1,6 @@ /* * FreeLoader PXE support - * Copyright (C) 2011 Herv� Poussineau + * Copyright (C) 2011 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/boot/freeldr/freeldr/include/ntoskrnl.h b/boot/freeldr/freeldr/include/ntoskrnl.h index c88c5e55eba..393913d2be5 100644 --- a/boot/freeldr/freeldr/include/ntoskrnl.h +++ b/boot/freeldr/freeldr/include/ntoskrnl.h @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/freeldr/include/ntoskrnl.h * PURPOSE: NTOS glue routines for the MINIHAL library - * PROGRAMMERS: Herv� Poussineau <hpoussin(a)reactos.org> + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> */ #include <ntdef.h> diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index a7495f17770..1b5ad239e1f 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: FAT filesystem driver for FreeLoader * COPYRIGHT: Copyright 1998-2003 Brian Palmer (brianp(a)sginet.com) - * Copyright 2009 Herv� Poussineau + * Copyright 2009 Hervé Poussineau * Copyright 2019 Victor Perevertkin (victor.perevertkin(a)reactos.org) */ diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index ba7c57f38d4..54222b2a160 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -1,7 +1,7 @@ /* * FreeLoader * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2009 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright (C) 2009 Hervé Poussineau <hpoussin(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/boot/freeldr/freeldr/lib/fs/pxe.c b/boot/freeldr/freeldr/lib/fs/pxe.c index 87d06b75e2c..66145a3d328 100644 --- a/boot/freeldr/freeldr/lib/fs/pxe.c +++ b/boot/freeldr/freeldr/lib/fs/pxe.c @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 2011 Herv� Poussineau + * Copyright (C) 2011 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/boot/freeldr/freeldr/lib/inifile/ini_init.c b/boot/freeldr/freeldr/lib/inifile/ini_init.c index b63a578085a..9992b0b7151 100644 --- a/boot/freeldr/freeldr/lib/inifile/ini_init.c +++ b/boot/freeldr/freeldr/lib/inifile/ini_init.c @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 2009 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright (C) 2009 Hervé Poussineau <hpoussin(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

1 year, 1 month

[reactos] 01/01: [BOOTSECT][FREELDR] Support booting from NTFS partitions (#3416)

by Sylvain Deverre

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0d73e0f7fa97b17e636c… commit f0d73e0f7fa97b17e636c76653172ff2122f434f Author: Sylvain Deverre <deverre.sylv(a)gmail.com> AuthorDate: Thu Aug 17 15:07:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 17 15:07:59 2023 +0200 [BOOTSECT][FREELDR] Support booting from NTFS partitions (#3416) Implement NTFS boot sector that loads FreeLdr from a NTFS partition. CORE-17474 - Able to find/parse root directory; - Handle fixups in FILE MFT record; - Implement directory tree search; - Implement loading found file from disk; - Handle fixups in INDX records; - Fail if compressed or sparse; - Attempt to support 64-bit disks. Some TO-DOs for later: - Handle "weird" NTFS partition with uncommon sector sizes / sectors per cluster / sectors per index record; - Better implementation for file loading; - 64-bit LCN support. --- boot/freeldr/bootsect/CMakeLists.txt | 2 + boot/freeldr/bootsect/ntfs.S | 893 +++++++++++++++++++++++++++++++++++ boot/freeldr/freeldr/lib/fs/ntfs.c | 2 +- 3 files changed, 896 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/bootsect/CMakeLists.txt b/boot/freeldr/bootsect/CMakeLists.txt index d0c527779d5..a46c9066c6a 100644 --- a/boot/freeldr/bootsect/CMakeLists.txt +++ b/boot/freeldr/bootsect/CMakeLists.txt @@ -8,6 +8,7 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) + CreateBootSectorTarget(ntfsvbr ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.S ${CMAKE_CURRENT_BINARY_DIR}/ntfs.bin 7c00) CreateBootSectorTarget(btrfsvbr ${CMAKE_CURRENT_SOURCE_DIR}/btrfs.S ${CMAKE_CURRENT_BINARY_DIR}/btrfs.bin 7c00) if(SARCH STREQUAL "pc98") @@ -34,6 +35,7 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") add_cd_file(TARGET btrfsvbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/btrfs.bin FOR bootcd regtest) add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR bootcd regtest) add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR bootcd regtest) + add_cd_file(TARGET ntfsvbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ntfs.bin FOR bootcd regtest) add_cd_file(TARGET isoboot DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all hybridcd) add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR bootcd regtest) elseif(ARCH STREQUAL "arm") diff --git a/boot/freeldr/bootsect/ntfs.S b/boot/freeldr/bootsect/ntfs.S new file mode 100644 index 00000000000..85081df464a --- /dev/null +++ b/boot/freeldr/bootsect/ntfs.S @@ -0,0 +1,893 @@ +/* + * PROJECT: ReactOS Bootsector + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * FILE: boot/freeldr/bootsect/fat32.S + * PURPOSE: Implementing boot sector for NTFS + * COPYRIGHT: Copyright 2020 Sylvain Deverre (deverre.sylv(a)gmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> +#include <freeldr/include/arch/pc/x86common.h> + +.code16 + +//ORG HEX(7c00) + +start: + jmp short main + nop +OEMName: + .ASCII "NTFS " // NTFS signature +BytesPerSector: + .word 512 +SectsPerCluster: + .byte 8 +ReservedSectors: + .word 0 // Unused by NTFS +NumberOfFats: + .byte 0 // Unused by NTFS +MaxRootEntries: + .word 0 // Unused by NTFS +TotalSectors: + .word 0 // Unused by NTFS +MediaDescriptor: + .byte HEX(0f8) +SectorsPerFat: + .word 0 // Unused by NTFS +SectorsPerTrack: + .word 0 // Should contain disk geometry +NumberOfHeads: + .word 0 // Should contain disk geometry +HiddenSectors: + .long 0 // Filled by format program +TotalSectorsBig: + .long 0 // Unused by NTFS +// NTFS inserted info +BootDrive: + .byte HEX(80) +CurrentHead: + .byte 0 +BootSignature: + .byte HEX(80) +Unused: + .byte 0 +VolumeSectorCount: + .quad 0 // Must be patched by format program ! +MftLocation: + .quad 0 // Must be patched by format program ! +MftMirrorLocation: + .quad 0 // Must be patched by format program ! +ClustersPerMftRecord: + .long 0 +ClustersPerIndexRecord: + .long 0 +VolumeSerialNumber: + .quad 0 +Checksum: + .long 0 + +main: + xor ax,ax // Setup segment registers + mov ds,ax // Make DS correct + mov es,ax // Make ES correct + mov ss,ax // Make SS correct + mov sp, HEX(7c00) + mov bp, sp // Setup a stack + + cmp byte ptr [BootDrive], HEX(0ff) // If they have specified a boot drive then use it + jne GetDriveParameters + + mov byte ptr [BootDrive], dl // Save the boot drive + +GetDriveParameters: + mov ah, 8 + mov dl, byte ptr [BootDrive] // Get boot drive in dl + int HEX(13) // Request drive parameters from the bios + jnc CalcDriveSize // If the call succeeded then calculate the drive size + + // If we get here then the call to the BIOS failed + // so just set CHS equal to the maximum addressable + // size + mov cx, HEX(0ffff) + mov dh, cl + +CalcDriveSize: + // Now that we have the drive geometry + // lets calculate the drive size + mov bl, ch // Put the low 8-bits of the cylinder count into BL + mov bh, cl // Put the high 2-bits in BH + shr bh, 6 // Shift them into position, now BX contains the cylinder count + and cl, HEX(3f) // Mask off cylinder bits from sector count + // CL now contains sectors per track and DH contains head count + movzx eax, dh // Move the heads into EAX + movzx ebx, bx // Move the cylinders into EBX + movzx ecx, cl // Move the sectors per track into ECX + inc eax // Make it one based because the bios returns it zero based + inc ebx // Make the cylinder count one based also + mul ecx // Multiply heads with the sectors per track, result in edx:eax + mul ebx // Multiply the cylinders with (heads * sectors) [stored in edx:eax already] + + // We now have the total number of sectors as reported + // by the bios in eax, so store it in our variable + mov dword ptr ds:[BiosCHSDriveSize], eax + +LoadExtraBootCode: + // First we have to load our extra boot code at + // next sector into memory at [0000:7e00h] + mov eax, HEX(1) + xor edx, edx + mov cx, 4 + xor bx, bx + mov es, bx // Read sector to [0000:7e00h] + mov bx, HEX(7e00) + call ReadSectors + jmp StartSearch + + +// Reads logical sectors into [ES:BX] +// EDX:EAX has logical sector number to read +// CX has number of sectors to read +ReadSectors: + push es + add eax, dword ptr [HiddenSectors] // Add offset from the disk beginning + test edx, edx + jnz ReadSectorsLBA + cmp eax, dword ptr ds:[BiosCHSDriveSize] // Check if they are reading a sector outside CHS range + jae ReadSectorsLBA // Yes - go to the LBA routine + // If at all possible we want to use LBA routines because + // They are optimized to read more than 1 sector per read + + pushad // Save logical sector number & sector count + +CheckInt13hExtensions: // Now check if this computer supports extended reads + mov ah, HEX(41) // AH = 41h + mov bx, HEX(55aa) // BX = 55AAh + mov dl, byte ptr [BootDrive] // DL = drive (80h-FFh) + int HEX(13) // IBM/MS INT 13 Extensions - INSTALLATION CHECK + jc ReadSectorsCHS // CF set on error (extensions not supported) + cmp bx, HEX(0aa55) // BX = AA55h if installed + jne ReadSectorsCHS + test cl,1 // CX = API subset support bitmap + jz ReadSectorsCHS // Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported + + popad // Restore sector count & logical sector number + +ReadSectorsLBA: + pushad // Save logical sector number & sector count + + cmp cx, 64 // Since the LBA calls only support 0x7F sectors at a time we will limit ourselves to 64 + jbe ReadSectorsSetupDiskAddressPacket // If we are reading less than 65 sectors then just do the read + mov cx, 64 // Otherwise read only 64 sectors on this loop iteration + +ReadSectorsSetupDiskAddressPacket: + mov word ptr ds:[LBASectorsRead],cx + push edx + push eax // Put 64-bit logical block address on stack + push es // Put transfer segment on stack + push bx // Put transfer offset on stack + push cx // Set transfer count + push 16 // Set size of packet to 10h + mov si, sp // Setup disk address packet on stack + + mov dl, byte ptr [BootDrive] // Drive number + mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read + int HEX(13) // Call BIOS + jc PrintDiskError // If the read failed then abort + + add sp, 16 // Remove disk address packet from stack + + popad // Restore sector count & logical sector number + + push bx + mov ebx, dword ptr ds:[LBASectorsRead] + add eax, ebx // Increment sector to read + adc edx, 0 + shl ebx, 5 + mov dx, es + add dx, bx // Setup read buffer for next sector + mov es, dx + pop bx + + sub cx, word ptr ds:[LBASectorsRead] + jnz ReadSectorsLBA // Read next sector + + pop es + ret + +LBASectorsRead: + .long 0 + + +// Reads logical sectors into [ES:BX] +// EAX has logical sector number to read +// CX has number of sectors to read +ReadSectorsCHS: + popad // Get logical sector number & sector count off stack + +ReadSectorsCHSLoop: + pushad + xor edx, edx + movzx ecx, word ptr [SectorsPerTrack] + div ecx // Divide logical by SectorsPerTrack + inc dl // Sectors numbering starts at 1 not 0 + mov cl, dl // Sector in CL + mov edx, eax + shr edx, 16 + div word ptr [NumberOfHeads] // Divide logical by number of heads + mov dh, dl // Head in DH + mov dl, byte ptr [BootDrive] // Drive number in DL + mov ch, al // Cylinder in CX + ror ah, 2 // Low 8 bits of cylinder in CH, high 2 bits + // in CL shifted to bits 6 & 7 + or cl, ah // Or with sector number + mov ax, HEX(0201) + int HEX(13) // DISK - READ SECTORS INTO MEMORY + // AL = number of sectors to read, CH = track, CL = sector + // DH = head, DL = drive, ES:BX -> buffer to fill + // Return: CF set on error, AH = status (see AH=01h), AL = number of sectors read + + jc PrintDiskError // If the read failed then abort + + popad + + inc eax // Increment Sector to Read + + mov dx, es + add dx, 32 // Increment read buffer for next sector + mov es, dx + + loop ReadSectorsCHSLoop // Read next sector + + pop es + ret + +// Displays a disk error message +// And reboots +PrintDiskError: + mov si, offset msgDiskError // Bad boot disk message + call PutChars // Display it + + jmp Reboot + +// Displays a file system error message +// And reboots +PrintFileSystemError: + mov si, offset msgFileSystemError // FreeLdr not found message + call PutChars // Display it + +Reboot: + mov si, offset msgAnyKey // Press any key message + call PutChars // Display it + xor ax, ax + int HEX(16) // Wait for a keypress + int HEX(19) // Reboot + +PutChars: + lodsb + or al, al + jz short Done + mov ah, HEX(0e) + mov bx, 7 + int HEX(10) + jmp short PutChars +Done: + ret + +msgDiskError: + .ascii "Disk error", CR, LF, NUL +msgFileSystemError: + .ascii "File system error", CR, LF, NUL +msgAnyKey: + .ascii "Press any key to restart", CR, LF, NUL + +SectsPerMFT: + .word 0 + +MFTStartSector: + .quad 0 + +BiosCHSDriveSize: + .long 0 + +.org 509 // Pad to 509 bytes +BootPartition: + .byte 1 + +BootFlagSignature: + .word HEX(0aa55) // BootSector signature + +// End of Bootsector +// Next sector starts as sector 2, since boot sector is +// as a file under NTFS ($Boot, which has inode number 7) +// and takes the two first clusters of the volume (which means +// 16 sectors, checked on Windows and mkfs.ntfs from ntfsutils) + +#define ATTRIBUTE_DATA HEX(80) +#define ATTRIBUTE_INDEX_ROOT HEX(90) +#define ATTRIBUTE_INDEX_ALLOCATION HEX(A0) +#define FILE_MAGIC HEX(454c4946) +#define INDX_MAGIC HEX(58444e49) +#define NTFS_FILE_ROOT 5 +StartSearch: + // Compute MFT start sector + mov eax, dword ptr [MftLocation] + mov cl, byte ptr [SectsPerCluster] + movzx ecx, cx + mul ecx + mov dword ptr [MFTStartSector], eax + + // Compute size of MFT entry in sectors + xor ax, ax + mov al, byte ptr [ClustersPerMftRecord] + test al, al + js NegativeOffset + mov cx, word ptr [SectsPerCluster] + mul cx + mov word ptr [SectsPerMFT], cx + jmp SearchNext + NegativeOffset: + // ClustersPerMftRecord is negative, so we need to perform 1 << (-ClustersPerMftRecord) + // to get the number of bytes needed for a MFT entry + not al + inc al + mov cl, al + xor ax, ax + inc ax + shl ax, cl + + // But here want to store sectors, so we need to divide by BytesPerSector + xor dx, dx + mov cx, word ptr [BytesPerSector] + div cx + mov word ptr [SectsPerMFT], ax + + SearchNext: + mov bp, sp + sub sp, HEX(10) + + // Read Root Directory MFT into [2000:0] + mov ax, HEX(2000) + mov es, ax + xor bx, bx + xor edx, edx + mov eax, NTFS_FILE_ROOT + call ReadInode + + // Finds freeldr.sys into index root's B-Tree + // and return its MFT index + xor ax, ax + call ExploreIndexRoot + + // Read the MFT entry of freeldr.sys into [A00:0] + push eax + mov ax, HEX(A00) + mov es, ax + pop eax + call ReadInode + + xor ax, ax + mov ebx, HEX(30) + call FindAttributeHdr + mov si, ax + // Move to the attribute data + add si, word ptr es:[si + HEX(14)] + + // We don't support compressed, sparse or encrypted Freeldr + test dword ptr es:[si + HEX(38)], HEX(4a00) + jnz CompressedFreeldr + + // Compute size in clusters + mov eax, dword ptr es:[si + HEX(28)] + mov cl, byte ptr [SectsPerCluster] + xor edx, edx + div ecx + mov cx, word ptr [BytesPerSector] + movzx ecx, cx + xor edx, edx + div ecx + mov edx, eax + + push ax + mov si, offset msgLoading + call PutChars + pop ax + + xor ax, ax + mov ebx, HEX(80) + call FindAttributeHdr + mov si, ax + add ax, word ptr es:[si + HEX(20)] + xor ecx, ecx + xor bx, bx + push FREELDR_BASE / 16 + pop fs + FreeLdrLoad: + pushad + call ReadNonResidentAttribute + popad + mov bx, fs + add bx, HEX(100) + mov fs, bx + xor bx, bx + inc ecx + cmp ecx, edx + jbe FreeLdrLoad + + mov dl, byte ptr [BootDrive] + mov dh, byte ptr [BootPartition] + ljmp16 0, FREELDR_BASE + +// Error message if Freeldr is compressed, encrypted or sparse +CompressedFreeldr: + mov si, offset msgFreeldrCompressed + call PutChars + jmp Reboot + +// Finds Freeldr.sys into the directory tree and returns the +// inode index +// INPUT: +// - ES:[AX] address of the MFT record +// OUTPUT: +// - EDX:EAX MFT number of the found file +ExploreIndexRoot: + #define fileRecordBase 2 + #define fileRecord 4 + #define indexRootData 6 + #define allocationRunList 8 + + push bp + mov bp, sp + push bx + push si + push di + sub sp, HEX(10) + mov word ptr [bp - fileRecordBase], es + mov word ptr [bp - fileRecord], ax + + mov ebx, ATTRIBUTE_INDEX_ROOT + call FindAttributeHdr + test ax, ax + jz PrintFileSystemError // fail if no INDEX_ROOT + + mov si, ax + cmp byte ptr es:[si + 8], HEX(0) + jnz PrintFileSystemError // fail if attribute is non-resident + + add si, word ptr es:[si + HEX(14)] + cmp dword ptr es:[si], HEX(30) + jnz PrintFileSystemError // fail if FILE_NAME attribute isn't indexed + + mov word ptr [bp - indexRootData], si + mov ax, word ptr [bp - fileRecord] + + test byte ptr es:[si + HEX(0c)], 1 + jz ExploreNext // Skip index allocation lookup if we don't have children + + mov ebx, ATTRIBUTE_INDEX_ALLOCATION + call FindAttributeHdr + test ax, ax + jz PrintFileSystemError // No INDEX_ALLOCATION found + + mov si, ax + cmp byte ptr es:[si + 8], 1 + jnz PrintFileSystemError // Fail if attribute is resident (shouldn't be) + + add si, word ptr es:[si + HEX(20)] + mov word ptr [bp - allocationRunList], si // save run list + + ExploreNext: + mov si, word ptr [bp - indexRootData] + lea si, [si + 32] // get the first INDEX_ENTRY + + // Main search loop. We browse the B-Tree which contains directory entries + // SI contains the current index entry. + NodeCheck: + test word ptr es:[si + HEX(0C)], 2 + jnz NodeCheckLastNode + + mov cl, byte ptr es:[si + HEX(50)] + movzx cx, cl + lea si, [si + HEX(52)] + mov di, offset FreeLdr + call CompareWideStrInsensitive + lea si, [si - HEX(52)] + test ax, ax + jz RootIndexFound + test word ptr es:[si + HEX(0C)], 1 + jz ContinueSearch + + test ax, HEX(f000) + jnz LookupChildNode // if result < 0 then explore child node + + ContinueSearch: + add si, word ptr es:[si + 8] + jmp NodeCheck + + RootIndexFound: + mov eax, dword ptr es:[si] // We found root entry, return with its MFT number + mov dx, word ptr es:[si + 4] // Return high part into edx. + // We take only the first word, the high word contains the + // sequence number + movzx edx, dx + jmp ExitIndexTree + + NodeCheckLastNode: + test word ptr es:[si + HEX(0C)], 1 + jz PrintFreeldrError + + LookupChildNode: + // Take the right LCN at the end of the index record + add si, word ptr es:[si + 8] + mov ecx, dword ptr es:[si - 8] + + // Read the fixed up LCN + mov bx, word ptr [bp - allocationRunList] + mov ax, word ptr [bp - fileRecordBase] + mov es, ax + mov ax, HEX(9000) + mov fs, ax + mov ax, bx + xor bx, bx + call ReadINDX + + // Go again to the loop but with the child node list + mov ax, HEX(9000) + mov es, ax + mov si, 0 + add si, es:[si + HEX(18)] // Go to the first node + lea si, [si + HEX(18)] + jmp NodeCheck + + ExitIndexTree: + pop di + pop si + mov sp, bp + pop bp + ret + +// 64-bit multiplication +// EDX:EAX operand +// ECX operator +Multiply64: + push bp + mov bp, sp + sub sp, 12 + // Save the high part of the multiplication + mov dword ptr [bp - 4], edx + + // Multiply the low part and save the result + mul ecx + mov dword ptr[bp - 8], eax + mov dword ptr[bp - 12], edx + + // Multiply the high part and add the carry + mov eax, dword ptr [bp - 4] + mul ecx + add eax, dword ptr [bp - 12] + + // Format correctly the number + mov edx, eax + mov eax, dword ptr [bp - 8] + mov sp, bp + pop bp + ret + +// Compare case-insensitive strings +// [ES:SI] - the source file name +// [DS:DI] - the destination file name +// CX - compare length +CompareWideStrInsensitive: + push bx + push si + push di + movzx cx, cl + CmpLoop: + mov ax, word ptr es:[si] + cmp ax, 'a' + jl NoUpper + cmp ax, 'z' + jg NoUpper + sub ax, HEX(20) + NoUpper: + mov bx, word ptr ds:[di] + sub bx, ax + test bx, bx + jnz CompareFail + add si, 2 + add di, 2 + dec cx + jnz CmpLoop + CompareFail: + mov ax, bx + pop di + pop si + pop bx + ret + +// Reads a NTFS cluster +// INPUT: +// - EDX:EAX : cluster number to read +// OUTPUT: +// - ES:BX : address to read +ReadCluster: + push ecx + mov cl, byte ptr [SectsPerCluster] // Convert clusters to sectors + movzx ecx, cx + call Multiply64 + call ReadSectors + pop ecx + ret + +// Reads a MFT entry +// INPUT: +// - EDX:EAX : MFT inode +// OUTPUT: +// - ES:[BX] : address to read +ReadInode: + push ecx + push si + push di + + push edx + mov cx, word ptr [SectsPerMFT] // Get the correct number of sectors for the FILE entry + movzx ecx, cx + mul ecx + movzx eax, ax + add eax, dword ptr [MFTStartSector] // Add it to the start of the MFT + mov cx, word ptr [SectsPerMFT] + movzx ecx, cx + pop edx + call ReadSectors + + cmp dword ptr es:[bx], FILE_MAGIC // Ensure we get a valid FILE record + jnz PrintFileSystemError + + call ApplyFixups + + pop di + pop si + pop ecx + ret + +#define UpdateSequenceOffset 4 +#define UpdateSequenceLen 6 +// Apply fixups to INDX and FILE records +// INPUT: +// - ES:[BX] - pointer to the record to fixup +ApplyFixups: + push si + push di + mov si, bx + add si, word ptr es:[bx + UpdateSequenceOffset] + xor cx, cx + inc cx + FixupLoop: + cmp cx, word ptr es:[bx + UpdateSequenceLen] + jz EndFixupLoop + mov si, bx + add si, word ptr es:[bx + UpdateSequenceOffset] + mov ax, word ptr es:[si] // Get first fixup value + + mov di, cx + shl di, 9 + add di, bx + sub di, 2 + cmp ax, word ptr es:[di] // Check fixup value + jnz PrintFileSystemError // Fixup is corrupted, so print error + inc cx + add si, cx + mov ax, word ptr es:[si] // Apply fixup + mov word ptr es:[di], ax + + jmp FixupLoop + EndFixupLoop: + + pop di + pop si + ret + +// Reads a non-resident attribute +// INPUT: +// - ES:[AX] : Address of the data runs +// - ECX : LCN to read +// OUTPUT: +// - FS:[BX] : Address to write to +ReadNonResidentAttribute: + #define currentLCN 4 + #define offsetWrite 8 + #define startReadLCN HEX(0C) + push bp + mov bp, sp + sub sp, HEX(10) + push edx + push si + mov dword ptr [bp - currentLCN], 0 // Store the current LCN + mov word ptr [bp - offsetWrite], bx + mov dword ptr [bp - startReadLCN], ecx + mov si, ax + xor edx, edx + RunLoop: + mov al, byte ptr es:[si] + test al, al + jz NotFound + call UnpackRun + add dword ptr [bp - currentLCN], eax + cmp dword ptr [bp - startReadLCN], ecx + jb FoundRun + sub dword ptr [bp - startReadLCN], ecx // Decrement the cluster + jmp RunLoop + FoundRun: + mov ebx, dword ptr [bp - currentLCN] + mov ecx, dword ptr [bp - startReadLCN] + add ebx, ecx + + push es + mov ax, fs + mov es, ax + mov eax, ebx + mov bx, word ptr [bp - offsetWrite] + call ReadCluster + pop es + jmp RunSearchEnd + NotFound: + xor ax, ax + RunSearchEnd: + pop si + pop edx + mov sp, bp + pop bp + ret + +// Decodes a run in the runlist +// INPUT: +// - ES:[SI] : address of the run +// OUTPUT: +// - EAX : Unpacked LCN +// - ECX : Unpacked run length (in sectors) +// - SI : Next run in the run list +UnpackRun: + push bp + mov bp, sp + sub sp, HEX(10) + push ebx + + // Unpack run header + mov bl, byte ptr es:[si] + inc si + + mov bh, bl + shr bh, 4 + and bl, 7 + mov byte ptr [bp-2], bh // BH contains the LCN length + mov byte ptr [bp-1], bl // BL contains the number of cluster length + + mov al, bl + call UnpackLen + mov dword ptr [bp - 8], ebx + + mov al, byte ptr [bp-2] + call UnpackLen + mov cl, byte ptr es:[si-1] // Fixup sign if last byte is > 255 + test cl, HEX(80) + jz NoSign + not eax + add ebx, eax + + NoSign: + mov eax, ebx + mov ecx, dword ptr [bp - 8] + pop ebx + mov sp, bp + pop bp + ret + + +// Auxiliary function that unpacks n bytes in the memory +// INPUT: +// - AL : size to unpack (max 4 bytes) +// OUTPUT: +// - EAX : the mask used to unpack (for negative number fixup) +// - EBX : the unpacked number +// - SI : Next byte to read +UnpackLen: + push cx + movzx ax, al + + // Read the whole DWORD and then compute a mask to remove + // unneeded bytes to get correct size + xor ebx, ebx + mov ebx, dword ptr es:[si] + add si, ax + + cmp al, 4 + jnz UnpackLen_not4 + xor eax, eax + dec eax + jmp UnpackLen_mask + +UnpackLen_not4: + mov cl, al // Compute mask (2^(8*len) - 1) + shl cl, 3 + xor eax, eax + inc eax + shl eax, cl + dec eax + +UnpackLen_mask: + and ebx, eax // Apply mask + pop cx + ret + +// Reads an INDX sector and applies fixups +// INPUT: +// - ES:[AX] : Address of the data runs +// - ECX : LCN to read +// OUTPUT: +// - FS:[BX] : Address to write to +ReadINDX: + push es + push bx + call ReadNonResidentAttribute + test ax, ax + jz PrintFileSystemError + cmp dword ptr fs:[0], INDX_MAGIC + jnz PrintFileSystemError // jump if not valid + pop bx + + mov ax, fs + mov es, ax + call ApplyFixups + pop es + ret + +// Finds an attribute header into the MFT +// INPUT: +// - ES:[AX] : pointer to the MFT entry +// - EBX : type to find +// OUTPUT: +// - ES:[AX] : Pointer to the attribute header in the MFT entry +FindAttributeHdr: + push cx + push si + push edx + mov si, ax + mov cx, word ptr es:[si+HEX(14)] // Get offset attribute + add si, cx + FindAttributeHdrLoop: + mov edx, dword ptr es:[si] // Get attribute type + cmp edx, ebx + jz AttrFound + cmp edx, HEX(ffffffff) + jz AttrNotFound + add cx, word ptr es:[si + 4] // Add size of the attribute + add si, word ptr es:[si + 4] + jmp FindAttributeHdrLoop + + AttrNotFound: + // Attribute not found, reset the offset + xor cx, cx + AttrFound: + mov ax, cx + pop edx + pop si + pop cx + ret + +PrintFreeldrError: + mov si, offset msgFreeldr + call PutChars + jmp Reboot + +FreeLdr: + .word 'F', 'R', 'E', 'E', 'L', 'D', 'R', '.', 'S', 'Y', 'S' +msgFreeldr: + .ascii "FreeLdr not found, cannot boot", CR, LF, NUL +msgLoading: + .ascii "Loading FreeLoader...", CR, LF, NUL +msgFreeldrCompressed: + .ascii "freeldr.sys is a sparse, compressed or encrypted file, cannot boot", CR, LF, NUL +.endcode16 + +END diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index c7e41c23ef8..9361f526932 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -1,7 +1,7 @@ /* * FreeLoader NTFS support * Copyright (C) 2004 Filip Navara <xnavara(a)volny.cz> - * Copyright (C) 2009-2010 Herv� Poussineau + * Copyright (C) 2009-2010 Herv� Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

1 year, 1 month

[reactos] 01/01: [CMD][TESTS] Fix typo in "height" word (#5580)

by Mustafa Ateş Uzun

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d2f6b65b3bfe2d8597ca… commit 7d2f6b65b3bfe2d8597ca8d499aeb4f831911654 Author: Mustafa Ateş Uzun <mustafauzun0(a)gmail.com> AuthorDate: Thu Aug 17 14:30:26 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 17 14:30:26 2023 +0300 [CMD][TESTS] Fix typo in "height" word (#5580) --- base/shell/cmd/lang/cs-CZ.rc | 4 ++-- base/shell/cmd/lang/el-GR.rc | 4 ++-- base/shell/cmd/lang/es-ES.rc | 2 +- base/shell/cmd/lang/id-ID.rc | 4 ++-- base/shell/cmd/lang/pl-PL.rc | 4 ++-- base/shell/cmd/lang/sk-SK.rc | 4 ++-- base/shell/cmd/lang/sq-AL.rc | 4 ++-- base/shell/cmd/lang/uk-UA.rc | 4 ++-- modules/rostests/tests/combotst/combotst.c | 4 ++-- modules/rostests/tests/edit/edittest.c | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 043cbcfca8a..2005df0a6c5 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -453,14 +453,14 @@ Updates are available at: https://reactos.org" STRING_VOL_HELP3 " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4 "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "change console window aspect\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS specify window placement and dimensions\n\ MIN minimize the window\n\ MAX maximize the window\n\ RESTORE restore the window" STRING_WINDOW_HELP2 "change console window aspect\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index fc811d25dc6..a5fbf33c3fc 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -452,14 +452,14 @@ Updates are available at: https://reactos.org" STRING_VOL_HELP3 " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4 "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "change console window aspect\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS specify window placement and dimensions\n\ MIN minimize the window\n\ MAX maximize the window\n\ RESTORE restore the window" STRING_WINDOW_HELP2 "change console window aspect\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 3bae0a9794e..8d10735703d 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -463,7 +463,7 @@ MIN minimiza la ventana\n\ MAX maximiza la ventana\n\ RESTORE restaura la ventana" STRING_WINDOW_HELP2 "Cambia el aspecto de la ventana de la consola.\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window Título de la ventana en la que realizar las acciónes\n\ /POS Especifica la posición y dimensión de la ventana\n\ diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 7623e6208af..2d129e3fadd 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -447,14 +447,14 @@ Pemutakiran tersedia di: https://reactos.org" STRING_VOL_HELP3 " Nomor Seri Volume adalah %04X-%04X\n" STRING_VOL_HELP4 "Menampilkan label dan nomor seri volume disk, jika ada.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "mengubah aspek jendela konsol\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS menetapkan penempatan dan dimensi jendela\n\ MIN mengecilkan jendela\n\ MAX memaksimalkan jendela\n\ RESTORE mengembalikan jendela" STRING_WINDOW_HELP2 "mengubah aspek jendela konsol\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile jendela yang melakukan aksi\n\ /POS menetapkan penempatan dan dimensi jendela\n\ diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 20361769681..4bbb420d202 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -453,14 +453,14 @@ Uaktualnienia dostępne na stronie: https://reactos.org" STRING_VOL_HELP3 " Numer seryjny woluminu to: %04X-%04X\n" STRING_VOL_HELP4 "Wyświetla etykietę woluminu w danym napędzie (o ile istnieje) i jego numer seryjny.\n\nVOL [napęd:]" STRING_WINDOW_HELP1 "Zmienia wymiar i pozycję danego okna konsoli\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['tytuł']\n\n\ /POS określa położenie i rozmiary okna\n\ MIN minimalizuje okno\n\ MAX maksymalizuje okno\n\ RESTORE odtwarza standardowe ustawienia okna" STRING_WINDOW_HELP2 "Zmienia wymiar i pozycję określonego okna konsoli\n\n\ -ACTIVATE 'tytuł' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'tytuł' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['nowy_tytuł']\n\n\ window tytuł okna, na którym zostaną przeprowadzone zmiany\n\ /POS określa położenie i rozmiary okna\n\ diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index eccaa057f3b..75955a903db 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -454,14 +454,14 @@ Aktualizácie sú dostupné na: https://reactos.org" STRING_VOL_HELP3 " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4 "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "change console window aspect\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS specify window placement and dimensions\n\ MIN minimalizovať okno\n\ MAX maximalizujte okno\n\ RESTORE obnoviť okno" STRING_WINDOW_HELP2 "change console window aspect\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 6149ab9da4a..65a852dac54 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -452,14 +452,14 @@ Updates janë në dispozicion në: https://reactos.org" STRING_VOL_HELP3 " Numri Serial i Volumit është %04X-%04X\n" STRING_VOL_HELP4 "Shfaq etiketa e volumeve të diskut, nëse ekzistojne.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "ndrysho aspektin e dritares se konsolit\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['titulli']\n\n\ /POS specifikojë vendosje e dritares dhe dimensionet\n\ MIN minimizo dritaren\n\ MAX rrit dritaren\n\ RESTORE riktheni dritaren" STRING_WINDOW_HELP2 "ndrysho aspektin e dritares se konsolit\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window dritare ku mund te kryesh veprime\n\ /POS specifikojë vendosje e dritares dhe dimensionet\n\ diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 62eb7db3de0..ece8cafbed2 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -458,14 +458,14 @@ VER [/C][/R][/W]\n\n\ STRING_VOL_HELP3 " Серiйний номер тому: %04X-%04X\n" STRING_VOL_HELP4 "Виводить мiтку тому та серiйний номер, якщо вони iснують.\n\nVOL [диск:]" STRING_WINDOW_HELP1 "змiнює вигляд вiкна консолi\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['заголовок']\n\n\ /POS визначає розміри та розмiщення вiкна\n\ MIN згортає вiкно\n\ MAX розгортає вiкно\n\ RESTORE вiдновлює вiкно" STRING_WINDOW_HELP2 "змiнює вигляд вiкна консолi\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window заголовок вiкна, вигляд якого треба змiнити\n\ /POS визначає розміри та розмiщення вiкна\n\ diff --git a/modules/rostests/tests/combotst/combotst.c b/modules/rostests/tests/combotst/combotst.c index aeed18d159a..592eeb716eb 100644 --- a/modules/rostests/tests/combotst/combotst.c +++ b/modules/rostests/tests/combotst/combotst.c @@ -388,8 +388,8 @@ WndProc ( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) Buttons[i++] = CreatePushButton("Width +",70,100,WS_VISIBLE); Buttons[i++] = CreatePushButton("Width -",70,101,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth +",70,102,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth -",70,103,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height +",70,102,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height -",70,103,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowA",CHECKBUTWIDTH,CREATEWINDOW_ID,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowExA",CHECKBUTWIDTH,CREATEWINDOWEX_ID,WS_VISIBLE); diff --git a/modules/rostests/tests/edit/edittest.c b/modules/rostests/tests/edit/edittest.c index 75a2e676fdd..086578fdab7 100644 --- a/modules/rostests/tests/edit/edittest.c +++ b/modules/rostests/tests/edit/edittest.c @@ -383,8 +383,8 @@ WndProc ( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) Buttons[i++] = CreatePushButton("Width +",70,100,WS_VISIBLE); Buttons[i++] = CreatePushButton("Width -",70,101,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth +",70,102,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth -",70,103,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height +",70,102,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height -",70,103,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowA",140,CREATEWINDOW,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowExA",140,CREATEWINDOWEX,WS_VISIBLE);

1 year, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2023