Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NOTEPAD] Use StringCchPrintf instead (#5654)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f921d1119b295de31ee0… commit 3f921d1119b295de31ee095dceaa62d6ce54ae69 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 5 22:36:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 5 22:36:18 2023 +0900 [NOTEPAD] Use StringCchPrintf instead (#5654) Use preferred string functions. CORE-18837 --- base/applications/notepad/dialog.c | 4 ++-- base/applications/notepad/main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 78dbd467f37..846a9abac57 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -164,7 +164,7 @@ int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCTSTR szString, DWORD dwFl /* Load and format szMessage */ LoadString(Globals.hInstance, formatId, szResource, _countof(szResource)); - _sntprintf(szMessage, _countof(szMessage), szResource, szString); + StringCchPrintf(szMessage, _countof(szMessage), szResource, szString); /* Load szCaption */ if ((dwFlags & MB_ICONMASK) == MB_ICONEXCLAMATION) @@ -880,7 +880,7 @@ VOID DIALOG_StatusBarUpdateCaretPos(VOID) line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)dwStart, 0); col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); - _stprintf(buff, Globals.szStatusBarLineCol, line + 1, col + 1); + StringCchPrintf(buff, _countof(buff), Globals.szStatusBarLineCol, line + 1, col + 1); SendMessage(Globals.hStatusBar, SB_SETTEXT, SBPART_CURPOS, (LPARAM)buff); } diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index c232bfbf3e7..a6477bfefd6 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -202,7 +202,7 @@ BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert) if (bShowAlert) { LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, _countof(szResource)); - _sntprintf(szText, _countof(szText), szResource, pFindReplace->lpstrFindWhat); + StringCchPrintf(szText, _countof(szText), szResource, pFindReplace->lpstrFindWhat); LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, _countof(szResource)); MessageBox(Globals.hFindReplaceDlg, szText, szResource, MB_OK); }

1 year, 9 months

[reactos] 01/01: [ATL] atlimage.h: Replace throw() with noexcept

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb6561bbc703a883c0a59… commit eb6561bbc703a883c0a59abf3407992fc2fb3e1f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 5 09:12:01 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 5 09:12:01 2023 +0900 [ATL] atlimage.h: Replace throw() with noexcept throw() is deprecated in C++17. CORE-19008 --- sdk/lib/atl/atlimage.h | 148 ++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index c77c4dbc67b..a8546b085c0 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -37,7 +37,7 @@ public: DIBOR_TOPDOWN // top-down DIB }; - CImage() throw() + CImage() noexcept { m_hBitmap = NULL; m_hOldBitmap = NULL; @@ -52,13 +52,13 @@ public: s_gdiplus.IncreaseCImageCount(); } - virtual ~CImage() throw() + virtual ~CImage() noexcept { Destroy(); s_gdiplus.DecreaseCImageCount(); } - operator HBITMAP() throw() + operator HBITMAP() noexcept { return m_hBitmap; } @@ -68,12 +68,12 @@ public: s_gdiplus.ReleaseGDIPlus(); } - void Attach(HBITMAP hBitmap, DIBOrientation eOrientation = DIBOR_DEFAULT) throw() + void Attach(HBITMAP hBitmap, DIBOrientation eOrientation = DIBOR_DEFAULT) noexcept { AttachInternal(hBitmap, eOrientation, -1); } - HBITMAP Detach() throw() + HBITMAP Detach() noexcept { m_eOrientation = DIBOR_DEFAULT; m_bHasAlphaChannel = false; @@ -85,7 +85,7 @@ public: return hBitmap; } - HDC GetDC() const throw() + HDC GetDC() const noexcept { ATLASSERT(m_nDCRefCount >= 0); if (::InterlockedIncrement(&m_nDCRefCount) == 1) @@ -103,7 +103,7 @@ public: return m_hDC; } - void ReleaseDC() const throw() + void ReleaseDC() const noexcept { ATLASSERT(m_nDCRefCount > 0); @@ -170,7 +170,7 @@ public: BOOL BitBlt(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, - int xSrc, int ySrc, DWORD dwROP = SRCCOPY) const throw() + int xSrc, int ySrc, DWORD dwROP = SRCCOPY) const noexcept { GetDC(); BOOL ret = ::BitBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, @@ -179,18 +179,18 @@ public: return ret; } BOOL BitBlt(HDC hDestDC, int xDest, int yDest, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { return BitBlt(hDestDC, xDest, yDest, GetWidth(), GetHeight(), 0, 0, dwROP); } BOOL BitBlt(HDC hDestDC, const POINT& pointDest, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { return BitBlt(hDestDC, pointDest.x, pointDest.y, dwROP); } BOOL BitBlt(HDC hDestDC, const RECT& rectDest, const POINT& pointSrc, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { return BitBlt(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, @@ -198,18 +198,18 @@ public: pointSrc.x, pointSrc.y, dwROP); } - BOOL Create(int nWidth, int nHeight, int nBPP, DWORD dwFlags = 0) throw() + BOOL Create(int nWidth, int nHeight, int nBPP, DWORD dwFlags = 0) noexcept { return CreateEx(nWidth, nHeight, nBPP, BI_RGB, NULL, dwFlags); } BOOL CreateEx(int nWidth, int nHeight, int nBPP, DWORD eCompression, - const DWORD* pdwBitmasks = NULL, DWORD dwFlags = 0) throw() + const DWORD* pdwBitmasks = NULL, DWORD dwFlags = 0) noexcept { return CreateInternal(nWidth, nHeight, nBPP, eCompression, pdwBitmasks, dwFlags); } - void Destroy() throw() + void Destroy() noexcept { if (m_hBitmap) { @@ -218,7 +218,7 @@ public: } BOOL Draw(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, - int xSrc, int ySrc, int nSrcWidth, int nSrcHeight) const throw() + int xSrc, int ySrc, int nSrcWidth, int nSrcHeight) const noexcept { ATLASSERT(IsTransparencySupported()); if (m_bHasAlphaChannel) @@ -242,7 +242,7 @@ public: xSrc, ySrc, nSrcWidth, nSrcHeight); } } - BOOL Draw(HDC hDestDC, const RECT& rectDest, const RECT& rectSrc) const throw() + BOOL Draw(HDC hDestDC, const RECT& rectDest, const RECT& rectSrc) const noexcept { return Draw(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, @@ -251,28 +251,28 @@ public: rectSrc.right - rectSrc.left, rectSrc.bottom - rectSrc.top); } - BOOL Draw(HDC hDestDC, int xDest, int yDest) const throw() + BOOL Draw(HDC hDestDC, int xDest, int yDest) const noexcept { return Draw(hDestDC, xDest, yDest, GetWidth(), GetHeight()); } - BOOL Draw(HDC hDestDC, const POINT& pointDest) const throw() + BOOL Draw(HDC hDestDC, const POINT& pointDest) const noexcept { return Draw(hDestDC, pointDest.x, pointDest.y); } BOOL Draw(HDC hDestDC, int xDest, int yDest, - int nDestWidth, int nDestHeight) const throw() + int nDestWidth, int nDestHeight) const noexcept { return Draw(hDestDC, xDest, yDest, nDestWidth, nDestHeight, 0, 0, GetWidth(), GetHeight()); } - BOOL Draw(HDC hDestDC, const RECT& rectDest) const throw() + BOOL Draw(HDC hDestDC, const RECT& rectDest) const noexcept { return Draw(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, rectDest.bottom - rectDest.top); } - void *GetBits() throw() + void *GetBits() noexcept { ATLASSERT(IsDIBSection()); BYTE *pb = (BYTE *)m_bm.bmBits; @@ -283,14 +283,14 @@ public: return pb; } - int GetBPP() const throw() + int GetBPP() const noexcept { ATLASSERT(m_hBitmap); return m_bm.bmBitsPixel; } void GetColorTable(UINT iFirstColor, UINT nColors, - RGBQUAD* prgbColors) const throw() + RGBQUAD* prgbColors) const noexcept { ATLASSERT(IsDIBSection()); GetDC(); @@ -298,13 +298,13 @@ public: ReleaseDC(); } - int GetHeight() const throw() + int GetHeight() const noexcept { ATLASSERT(m_hBitmap); return m_bm.bmHeight; } - int GetMaxColorTableEntries() const throw() + int GetMaxColorTableEntries() const noexcept { ATLASSERT(IsDIBSection()); if (m_ds.dsBmih.biClrUsed && m_ds.dsBmih.biBitCount < 16) @@ -324,7 +324,7 @@ public: } } - int GetPitch() const throw() + int GetPitch() const noexcept { ATLASSERT(IsDIBSection()); if (m_eOrientation == DIBOR_BOTTOMUP) @@ -333,7 +333,7 @@ public: return m_bm.bmWidthBytes; } - COLORREF GetPixel(int x, int y) const throw() + COLORREF GetPixel(int x, int y) const noexcept { GetDC(); COLORREF ret = ::GetPixel(m_hDC, x, y); @@ -341,7 +341,7 @@ public: return ret; } - void* GetPixelAddress(int x, int y) throw() + void* GetPixelAddress(int x, int y) noexcept { ATLASSERT(IsDIBSection()); BYTE *pb = (BYTE *)GetBits(); @@ -350,35 +350,35 @@ public: return pb; } - COLORREF GetTransparentColor() const throw() + COLORREF GetTransparentColor() const noexcept { return m_clrTransparentColor; } - int GetWidth() const throw() + int GetWidth() const noexcept { ATLASSERT(m_hBitmap); return m_bm.bmWidth; } - bool IsDIBSection() const throw() + bool IsDIBSection() const noexcept { ATLASSERT(m_hBitmap); return m_bIsDIBSection; } - bool IsIndexed() const throw() + bool IsIndexed() const noexcept { ATLASSERT(IsDIBSection()); return GetBPP() <= 8; } - bool IsNull() const throw() + bool IsNull() const noexcept { return m_hBitmap == NULL; } - HRESULT Load(LPCTSTR pszFileName) throw() + HRESULT Load(LPCTSTR pszFileName) noexcept { if (!InitGDIPlus()) return E_FAIL; @@ -407,7 +407,7 @@ public: Attach(hbm); return (status == Ok ? S_OK : E_FAIL); } - HRESULT Load(IStream* pStream) throw() + HRESULT Load(IStream* pStream) noexcept { if (!InitGDIPlus()) return E_FAIL; @@ -435,13 +435,13 @@ public: } // NOTE: LoadFromResource loads BITMAP resource only - void LoadFromResource(HINSTANCE hInstance, LPCTSTR pszResourceName) throw() + void LoadFromResource(HINSTANCE hInstance, LPCTSTR pszResourceName) noexcept { HANDLE hHandle = ::LoadImage(hInstance, pszResourceName, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); Attach(reinterpret_cast<HBITMAP>(hHandle)); } - void LoadFromResource(HINSTANCE hInstance, UINT nIDResource) throw() + void LoadFromResource(HINSTANCE hInstance, UINT nIDResource) noexcept { LoadFromResource(hInstance, MAKEINTRESOURCE(nIDResource)); } @@ -449,7 +449,7 @@ public: BOOL MaskBlt(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, int xSrc, int ySrc, HBITMAP hbmMask, int xMask, int yMask, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { ATLASSERT(IsTransparencySupported()); GetDC(); @@ -461,20 +461,20 @@ public: } BOOL MaskBlt(HDC hDestDC, const RECT& rectDest, const POINT& pointSrc, HBITMAP hbmMask, const POINT& pointMask, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { return MaskBlt(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, rectDest.bottom - rectDest.top, pointSrc.x, pointSrc.y, hbmMask, pointMask.x, pointMask.y, dwROP); } BOOL MaskBlt(HDC hDestDC, int xDest, int yDest, - HBITMAP hbmMask, DWORD dwROP = SRCCOPY) const throw() + HBITMAP hbmMask, DWORD dwROP = SRCCOPY) const noexcept { return MaskBlt(hDestDC, xDest, yDest, GetWidth(), GetHeight(), 0, 0, hbmMask, 0, 0, dwROP); } BOOL MaskBlt(HDC hDestDC, const POINT& pointDest, - HBITMAP hbmMask, DWORD dwROP = SRCCOPY) const throw() + HBITMAP hbmMask, DWORD dwROP = SRCCOPY) const noexcept { return MaskBlt(hDestDC, pointDest.x, pointDest.y, hbmMask, dwROP); } @@ -482,7 +482,7 @@ public: BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, HBITMAP hbmMask = NULL, - int xMask = 0, int yMask = 0) const throw() + int xMask = 0, int yMask = 0) const noexcept { ATLASSERT(IsTransparencySupported()); GetDC(); @@ -493,26 +493,26 @@ public: return ret; } BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, - HBITMAP hbmMask = NULL) const throw() + HBITMAP hbmMask = NULL) const noexcept { return PlgBlt(hDestDC, pPoints, 0, 0, GetWidth(), GetHeight(), hbmMask); } BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, const RECT& rectSrc, - HBITMAP hbmMask, const POINT& pointMask) const throw() + HBITMAP hbmMask, const POINT& pointMask) const noexcept { return PlgBlt(hDestDC, pPoints, rectSrc.left, rectSrc.top, rectSrc.right - rectSrc.left, rectSrc.bottom - rectSrc.top, hbmMask, pointMask.x, pointMask.y); } BOOL PlgBlt(HDC hDestDC, const POINT* pPoints, const RECT& rectSrc, - HBITMAP hbmMask = NULL) const throw() + HBITMAP hbmMask = NULL) const noexcept { POINT pointMask = {0, 0}; return PlgBlt(hDestDC, pPoints, rectSrc, hbmMask, pointMask); } - HRESULT Save(IStream* pStream, GUID *guidFileType) const throw() + HRESULT Save(IStream* pStream, GUID *guidFileType) const noexcept { if (!InitGDIPlus()) return E_FAIL; @@ -543,7 +543,7 @@ public: } HRESULT Save(LPCTSTR pszFileName, - REFGUID guidFileType = GUID_NULL) const throw() + REFGUID guidFileType = GUID_NULL) const noexcept { if (!InitGDIPlus()) return E_FAIL; @@ -585,7 +585,7 @@ public: } void SetColorTable(UINT iFirstColor, UINT nColors, - const RGBQUAD* prgbColors) throw() + const RGBQUAD* prgbColors) noexcept { ATLASSERT(IsDIBSection()); GetDC(); @@ -593,14 +593,14 @@ public: ReleaseDC(); } - void SetPixel(int x, int y, COLORREF color) throw() + void SetPixel(int x, int y, COLORREF color) noexcept { GetDC(); ::SetPixelV(m_hDC, x, y, color); ReleaseDC(); } - void SetPixelIndexed(int x, int y, int iIndex) throw() + void SetPixelIndexed(int x, int y, int iIndex) noexcept { ATLASSERT(IsIndexed()); GetDC(); @@ -608,12 +608,12 @@ public: ReleaseDC(); } - void SetPixelRGB(int x, int y, BYTE r, BYTE g, BYTE b) throw() + void SetPixelRGB(int x, int y, BYTE r, BYTE g, BYTE b) noexcept { SetPixel(x, y, RGB(r, g, b)); } - COLORREF SetTransparentColor(COLORREF rgbTransparent) throw() + COLORREF SetTransparentColor(COLORREF rgbTransparent) noexcept { ATLASSERT(m_hBitmap); COLORREF rgbOldColor = m_clrTransparentColor; @@ -624,7 +624,7 @@ public: BOOL StretchBlt(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { GetDC(); BOOL ret = ::StretchBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, @@ -634,20 +634,20 @@ public: } BOOL StretchBlt(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { return StretchBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, 0, 0, GetWidth(), GetHeight(), dwROP); } BOOL StretchBlt(HDC hDestDC, const RECT& rectDest, - DWORD dwROP = SRCCOPY) const throw() + DWORD dwROP = SRCCOPY) const noexcept { return StretchBlt(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, rectDest.bottom - rectDest.top, dwROP); } BOOL StretchBlt(HDC hDestDC, const RECT& rectDest, - const RECT& rectSrc, DWORD dwROP = SRCCOPY) const throw() + const RECT& rectSrc, DWORD dwROP = SRCCOPY) const noexcept { return StretchBlt(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, @@ -660,7 +660,7 @@ public: BOOL TransparentBlt(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, int xSrc, int ySrc, int nSrcWidth, int nSrcHeight, - UINT crTransparent = CLR_INVALID) const throw() + UINT crTransparent = CLR_INVALID) const noexcept { ATLASSERT(IsTransparencySupported()); GetDC(); @@ -673,13 +673,13 @@ public: } BOOL TransparentBlt(HDC hDestDC, int xDest, int yDest, int nDestWidth, int nDestHeight, - UINT crTransparent = CLR_INVALID) const throw() + UINT crTransparent = CLR_INVALID) const noexcept { return TransparentBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, 0, 0, GetWidth(), GetHeight(), crTransparent); } BOOL TransparentBlt(HDC hDestDC, const RECT& rectDest, - UINT crTransparent = CLR_INVALID) const throw() + UINT crTransparent = CLR_INVALID) const noexcept { return TransparentBlt(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, @@ -687,7 +687,7 @@ public: } BOOL TransparentBlt( HDC hDestDC, const RECT& rectDest, - const RECT& rectSrc, UINT crTransparent = CLR_INVALID) const throw() + const RECT& rectSrc, UINT crTransparent = CLR_INVALID) const noexcept { return TransparentBlt(hDestDC, rectDest.left, rectDest.top, rectDest.right - rectDest.left, rectDest.bottom - rectDest.left, @@ -695,7 +695,7 @@ public: rectSrc.bottom - rectSrc.top, crTransparent); } - static BOOL IsTransparencySupported() throw() + static BOOL IsTransparencySupported() noexcept { return TRUE; } @@ -881,7 +881,7 @@ private: LONG m_nCImageObjects; DWORD m_dwLastError; - void _clear_funs() throw() + void _clear_funs() noexcept { Startup = NULL; Shutdown = NULL; @@ -899,7 +899,7 @@ private: } template <typename T_FUN> - T_FUN _get_fun(T_FUN& fun, LPCSTR name) throw() + T_FUN _get_fun(T_FUN& fun, LPCSTR name) noexcept { if (!fun) fun = reinterpret_cast<T_FUN>(::GetProcAddress(m_hInst, name)); @@ -922,7 +922,7 @@ private: FUN_SaveImageToFile SaveImageToFile; FUN_SaveImageToStream SaveImageToStream; - CInitGDIPlus() throw() + CInitGDIPlus() noexcept : m_hInst(NULL) , m_dwToken(0) , m_nCImageObjects(0) @@ -932,13 +932,13 @@ private: ::InitializeCriticalSection(&m_sect); } - ~CInitGDIPlus() throw() + ~CInitGDIPlus() noexcept { ReleaseGDIPlus(); ::DeleteCriticalSection(&m_sect); } - bool Init() throw() + bool Init() noexcept { ::EnterCriticalSection(&m_sect); @@ -975,7 +975,7 @@ private: return ret; } - void ReleaseGDIPlus() throw() + void ReleaseGDIPlus() noexcept { ::EnterCriticalSection(&m_sect); if (m_dwToken) @@ -994,14 +994,14 @@ private: ::LeaveCriticalSection(&m_sect); } - void IncreaseCImageCount() throw() + void IncreaseCImageCount() noexcept { ::EnterCriticalSection(&m_sect); ++m_nCImageObjects; ::LeaveCriticalSection(&m_sect); } - void DecreaseCImageCount() throw() + void DecreaseCImageCount() noexcept { ::EnterCriticalSection(&m_sect); if (--m_nCImageObjects == 0) @@ -1014,7 +1014,7 @@ private: static CInitGDIPlus s_gdiplus; - static bool InitGDIPlus() throw() + static bool InitGDIPlus() noexcept { return s_gdiplus.Init(); } @@ -1134,7 +1134,7 @@ private: } void AttachInternal(HBITMAP hBitmap, DIBOrientation eOrientation, - LONG iTransColor) throw() + LONG iTransColor) noexcept { Destroy(); @@ -1154,7 +1154,7 @@ private: BOOL CreateInternal(int nWidth, int nHeight, int nBPP, DWORD eCompression, const DWORD* pdwBitmasks = NULL, - DWORD dwFlags = 0) throw() + DWORD dwFlags = 0) noexcept { ATLASSERT(nWidth != 0); ATLASSERT(nHeight != 0); @@ -1234,12 +1234,12 @@ public: { } - virtual ~CImageDC() throw() + virtual ~CImageDC() noexcept { m_image.ReleaseDC(); } - operator HDC() const throw() + operator HDC() const noexcept { return m_hDC; }

1 year, 9 months

[reactos] 01/01: [ATL][ATL_APITEST] Implement CImageDC class (#5643)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b68a3f329c2f9cb8daad6… commit b68a3f329c2f9cb8daad63431ca1b92ce6ac4ab9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 5 09:03:32 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 5 09:03:32 2023 +0900 [ATL][ATL_APITEST] Implement CImageDC class (#5643) - Use reference count for CImage::GetDC / CImage::ReleaseDC. - Add CImageDC class. - Delete modules/rostests/apitests/atl/CImage_WIP.txt. CORE-19008 --- modules/rostests/apitests/atl/CImage.cpp | 20 +++++++ modules/rostests/apitests/atl/CImage_WIP.txt | 86 ---------------------------- sdk/lib/atl/atlimage.h | 65 ++++++++++++++++----- 3 files changed, 70 insertions(+), 101 deletions(-) diff --git a/modules/rostests/apitests/atl/CImage.cpp b/modules/rostests/apitests/atl/CImage.cpp index 005cd4d9295..3ee98304da8 100644 --- a/modules/rostests/apitests/atl/CImage.cpp +++ b/modules/rostests/apitests/atl/CImage.cpp @@ -235,6 +235,26 @@ static void Test_LoadSaveImage(void) color = image1.GetPixel(5, 5); ok(color == RGB(255, 0,0), "Expected color to be 255, 0, 0; was: %i, %i, %i (for %i)\n", GetRValue(color), GetGValue(color), GetBValue(color), n); + { + CImageDC dc1(image1); + ::SetPixel(dc1, 5, 5, RGB(0, 255, 0)); + { + CImageDC dc2(image1); + ::SetPixel(dc2, 5, 5, RGB(0, 0, 255)); + } + } + + { + HDC hdcImage = image1.GetDC(); + color = ::GetPixel(hdcImage, 5, 5); + ok_long(color, RGB(0, 0, 255)); + + ::SetPixel(hdcImage, 5, 5, RGB(255, 0, 0)); + color = ::GetPixel(hdcImage, 5, 5); + ok_long(color, RGB(255, 0, 0)); + image1.ReleaseDC(); + } + bOK = DeleteFile(file); ok(bOK, "Expected bOK to be TRUE, was: %d (for %i)\n", bOK, n); } diff --git a/modules/rostests/apitests/atl/CImage_WIP.txt b/modules/rostests/apitests/atl/CImage_WIP.txt deleted file mode 100644 index 7cc02b77afe..00000000000 --- a/modules/rostests/apitests/atl/CImage_WIP.txt +++ /dev/null @@ -1,86 +0,0 @@ -Test files: - -atl_apitest: CImage class from reactos -CImage.exe : CImage class from microsoft - -================================================================================================================ -Windows Server 2003 SP2: -================================================================================================================ ->atl_apitest.exe CImage -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(234): Test failed: Expected bpp to be 8, was: 32 -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 0) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 1) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 2) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(260): Test failed: Expected bpp to be 24, was: 32 (for 3) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 4) - -CImage: 79 tests executed (0 marked as todo, 6 failures), 0 skipped. -================================================================================================================ ->CImage.exe -CImage: 79 tests executed (0 marked as todo, 0 failures), 0 skipped. -================================================================================================================ -================================================================================================================ -Windows 10: -================================================================================================================ ->atl_apitest.exe CImage -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(234): Test failed: Expected bpp to be 8, was: 32 -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 0) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 1) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 2) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(260): Test failed: Expected bpp to be 24, was: 32 (for 3) -R:\src\trunk\reactos\modules\rostests\apitests\atl\CImage.cpp(265): Test failed: Expected bpp to be 8, was: 32 (for 4) - -CImage: 79 tests executed (0 marked as todo, 6 failures), 0 skipped. -================================================================================================================ ->CImage.exe -CImage: 79 tests executed (0 marked as todo, 0 failures), 0 skipped. -================================================================================================================ -================================================================================================================ -ReactOS: -================================================================================================================ ->atl_apitest.exe CImage -CImage.cpp:234: Test failed: Expected bpp to be 8, was: 32 -CImage.cpp:265: Test failed: Expected bpp to be 8, was: 32 (for 0) -CImage.cpp:245: Test failed: Expected hr to be S_OK, was: 80004005 (for 1) -CImage.cpp:251: Test failed: Expected hr to be S_OK, was: 80004005 (for 1) -CImage.cpp:254: Test failed: Expected width to be 48, was: 0 (for 1) -CImage.cpp:256: Test failed: Expected height to be 48, was: 0 (for 1) -CImage.cpp:265: Test failed: Expected bpp to be 8, was: 0 (for 1) -CImage.cpp:148: Test failed: Expected status to be 0, was: 1 -CImage.cpp:149: Test failed: Expected a valid bitmap -CImage.cpp:245: Test failed: Expected hr to be S_OK, was: 80004005 (for 2) -CImage.cpp:251: Test failed: Expected hr to be S_OK, was: 80004005 (for 2) -CImage.cpp:254: Test failed: Expected width to be 48, was: 0 (for 2) -CImage.cpp:256: Test failed: Expected height to be 48, was: 0 (for 2) -CImage.cpp:265: Test failed: Expected bpp to be 8, was: 0 (for 2) -CImage.cpp:148: Test failed: Expected status to be 0, was: 1 -CImage.cpp:149: Test failed: Expected a valid bitmap -CImage.cpp:260: Test failed: Expected bpp to be 24, was: 32 (for 3) -CImage.cpp:154: Test failed: Expected PixelFormat to be 0x21808, was: 0x30803 -CImage.cpp:265: Test failed: Expected bpp to be 8, was: 32 (for 4) -CImage.cpp:154: Test failed: Expected PixelFormat to be 0x30803, was: 0x21808 - -CImage: 77 tests executed (0 marked as todo, 20 failures), 0 skipped. -================================================================================================================ ->CImage.exe -../CImage.cpp (245): Expected hr to be S_OK, was: 80004005 (for 1) -../CImage.cpp (251): Expected hr to be S_OK, was: 80004005 (for 1) -../CImage.cpp (254): Expected width to be 48, was: 0 (for 1) -../CImage.cpp (256): Expected height to be 48, was: 0 (for 1) -../CImage.cpp (265): Expected bpp to be 8, was: 0 (for 1) -../CImage.cpp (148): Expected status to be 0, was: 1 -../CImage.cpp (149): Expected a valid bitmap -../CImage.cpp (245): Expected hr to be S_OK, was: 80004005 (for 2) -../CImage.cpp (251): Expected hr to be S_OK, was: 80004005 (for 2) -../CImage.cpp (254): Expected width to be 48, was: 0 (for 2) -../CImage.cpp (256): Expected height to be 48, was: 0 (for 2) -../CImage.cpp (265): Expected bpp to be 8, was: 0 (for 2) -../CImage.cpp (148): Expected status to be 0, was: 1 -../CImage.cpp (149): Expected a valid bitmap -../CImage.cpp (260): Expected bpp to be 24, was: 8 (for 3) -../CImage.cpp (154): Expected PixelFormat to be 0x21808, was: 0x30803 -../CImage.cpp (265): Expected bpp to be 8, was: 24 (for 4) -../CImage.cpp (154): Expected PixelFormat to be 0x30803, was: 0x21808 -CImage: 77 tests executed (0 marked as todo, 18 failures), 0 skipped. -================================================================================================================ - diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 31cceac8c76..c77c4dbc67b 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -6,12 +6,6 @@ #ifndef __ATLIMAGE_H__ #define __ATLIMAGE_H__ -// !!!! -// TODO: The backend (gdi+) that this class relies on is not yet complete! -// Before that is finished, this class will not be a perfect replacement. -// See rostest/apitests/atl/CImage_WIP.txt for test results. -// !!!! - #pragma once #include <atlcore.h> // for ATL Core @@ -93,28 +87,41 @@ public: HDC GetDC() const throw() { - if (m_hDC) - return m_hDC; + ATLASSERT(m_nDCRefCount >= 0); + if (::InterlockedIncrement(&m_nDCRefCount) == 1) + { + ATLASSERT(m_hDC == NULL); + ATLASSERT(m_hOldBitmap == NULL); + + m_hDC = ::CreateCompatibleDC(NULL); + ATLASSERT(m_hDC != NULL); + + m_hOldBitmap = (HBITMAP)::SelectObject(m_hDC, m_hBitmap); + ATLASSERT(m_hOldBitmap != NULL); + } - m_hDC = ::CreateCompatibleDC(NULL); - m_hOldBitmap = (HBITMAP)::SelectObject(m_hDC, m_hBitmap); return m_hDC; } void ReleaseDC() const throw() { - ATLASSERT(m_hDC); + ATLASSERT(m_nDCRefCount > 0); - if (m_hDC == NULL) + if (::InterlockedDecrement(&m_nDCRefCount) != 0) return; if (m_hOldBitmap) { + ATLASSERT(m_hDC != NULL); ::SelectObject(m_hDC, m_hOldBitmap); m_hOldBitmap = NULL; } - ::DeleteDC(m_hDC); - m_hDC = NULL; + + if (m_hDC) + { + ::DeleteDC(m_hDC); + m_hDC = NULL; + } } BOOL AlphaBlend(HDC hDestDC, @@ -1016,6 +1023,7 @@ private: HBITMAP m_hBitmap; mutable HBITMAP m_hOldBitmap; mutable HDC m_hDC; + mutable LONG m_nDCRefCount = 0; DIBOrientation m_eOrientation; bool m_bHasAlphaChannel; bool m_bIsDIBSection; @@ -1213,7 +1221,34 @@ private: DECLSPEC_SELECTANY CImage::CInitGDIPlus CImage::s_gdiplus; -} +class CImageDC +{ +private: + const CImage& m_image; + HDC m_hDC; + +public: + CImageDC(const CImage& image) + : m_image(image) + , m_hDC(image.GetDC()) + { + } + + virtual ~CImageDC() throw() + { + m_image.ReleaseDC(); + } + + operator HDC() const throw() + { + return m_hDC; + } + + CImageDC(const CImageDC&) = delete; + CImageDC& operator=(const CImageDC&) = delete; +}; + +} // namespace ATL #endif

1 year, 9 months

[reactos] 01/01: [COMDLG32] GetOpen/GetSaveFileName: Improve extension handling (#5640)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d55e33d0f3cf7ca8a1b08… commit d55e33d0f3cf7ca8a1b087a677ef5726834130aa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 4 21:11:24 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 4 21:11:24 2023 +0900 [COMDLG32] GetOpen/GetSaveFileName: Improve extension handling (#5640) - Improve GetOpenFileName and GetSaveFileName functions. - Add FILEDLG95_GetFallbackExtension and FILEDLG95_AddDotExtIfNeeded helper functions. - Modify FILEDLG95_ValidatePathAction and FILEDLG95_OnOpen functions. CORE-19148, CORE-15020 --- dll/win32/comdlg32/cdlg.h | 6 ++ dll/win32/comdlg32/filedlg.c | 202 +++++++++++++++++++----------------- dll/win32/comdlg32/filedlgbrowser.h | 5 +- 3 files changed, 118 insertions(+), 95 deletions(-) diff --git a/dll/win32/comdlg32/cdlg.h b/dll/win32/comdlg32/cdlg.h index 7570acebb9e..4c8be081e84 100644 --- a/dll/win32/comdlg32/cdlg.h +++ b/dll/win32/comdlg32/cdlg.h @@ -199,8 +199,14 @@ HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) /* Shared helper functions */ void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile) DECLSPEC_HIDDEN; +#ifdef __REACTOS__ +struct FileOpenDlgInfos; +int FILEDLG95_ValidatePathAction(struct FileOpenDlgInfos *fodInfos, LPWSTR lpstrPathAndFile, IShellFolder **ppsf, + HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction) DECLSPEC_HIDDEN; +#else int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction) DECLSPEC_HIDDEN; +#endif int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed) DECLSPEC_HIDDEN; void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) DECLSPEC_HIDDEN; diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 54bbc544aab..8aa8eae3987 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -2826,8 +2826,98 @@ void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); } +#ifdef __REACTOS__ +/* The return value needs LocalFree */ +static LPWSTR FILEDLG95_GetFallbackExtension(FileOpenDlgInfos *fodInfos, LPWSTR lpstrPathAndFile) +{ + LPWSTR lpstrFilter, the_ext = NULL, pchDot = NULL; + + /* Without lpstrDefExt, append no extension */ + if (!fodInfos->defext) + return NULL; + + /* Get filter extensions */ + lpstrFilter = (LPWSTR)CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, + fodInfos->ofnInfos->nFilterIndex - 1); + if (lpstrFilter != (LPWSTR)CB_ERR && lpstrFilter && *lpstrFilter) + { + LPWSTR pchSemicolon = wcschr(lpstrFilter, L';'); + + if (pchSemicolon) + *pchSemicolon = UNICODE_NULL; + + pchDot = wcschr(lpstrFilter, L'.'); + + if (pchDot && pchDot[1] && !wcschr(pchDot, L'*') && !wcschr(pchDot, L'?')) + the_ext = StrDupW(pchDot + 1); + + if (pchSemicolon) + *pchSemicolon = L';'; + } + + if (!the_ext && (!pchDot || pchDot[1])) + { + /* use default extension if no extension in filter */ + the_ext = StrDupW(fodInfos->defext); + } + + return the_ext; +} + +static BOOL +FILEDLG95_AddDotExtIfNeeded(FileOpenDlgInfos *fodInfos, LPWSTR lpstrPathAndFile) +{ + BOOL ret = FALSE; + LPWSTR ext = PathFindExtensionW(lpstrPathAndFile); + int PathLength = lstrlenW(lpstrPathAndFile); + LPWSTR the_ext = FILEDLG95_GetFallbackExtension(fodInfos, lpstrPathAndFile); + + if (the_ext && *the_ext && + (*ext == UNICODE_NULL || lstrcmpiW(ext + 1, the_ext) != 0)) + { + if (strlenW(lpstrPathAndFile) + 1 + strlenW(the_ext) + 1 <= + fodInfos->ofnInfos->nMaxFile) + { + /* Make the extension lowercase */ + CharLowerW(the_ext); + /* Append it (with dot) to the file */ + lstrcatW(lpstrPathAndFile, L"."); + lstrcatW(lpstrPathAndFile, the_ext); + /* update ext */ + ext = PathFindExtensionW(lpstrPathAndFile); + ret = TRUE; + } + } + + LocalFree(the_ext); + + /* In Open dialog: if file does not exist try without extension */ + if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) + { + lpstrPathAndFile[PathLength] = UNICODE_NULL; + ret = FALSE; + } + + /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ + if (*ext) + ext++; + if (!lstrcmpiW(fodInfos->defext, ext)) + fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; + else + fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; + + return ret; +} +#endif + +#ifdef __REACTOS__ +int FILEDLG95_ValidatePathAction(struct FileOpenDlgInfos *fodInfos, LPWSTR lpstrPathAndFile, + IShellFolder **ppsf, HWND hwnd, DWORD flags, BOOL isSaveDlg, + int defAction) +#else int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction) +#endif { int nOpenAction = defAction; LPWSTR lpszTemp, lpszTemp1; @@ -2924,8 +3014,17 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, { if( (flags & OFN_FILEMUSTEXIST) && !isSaveDlg ) { +#ifdef __REACTOS__ + FILEDLG95_AddDotExtIfNeeded(fodInfos, lpstrPathAndFile); + if (!PathFileExistsW(lpstrPathAndFile)) + { + FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING); + break; + } +#else FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING); break; +#endif } } /* change to the current folder */ @@ -3011,7 +3110,11 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else nOpenAction = ONOPEN_BROWSE; +#ifdef __REACTOS__ + nOpenAction = FILEDLG95_ValidatePathAction(fodInfos, lpstrPathAndFile, &lpsf, hwnd, +#else nOpenAction = FILEDLG95_ValidatePathAction(lpstrPathAndFile, &lpsf, hwnd, +#endif fodInfos->ofnInfos->Flags, fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG, nOpenAction); @@ -3088,7 +3191,9 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) case ONOPEN_OPEN: /* fill in the return struct and close the dialog */ TRACE("ONOPEN_OPEN %s\n", debugstr_w(lpstrPathAndFile)); { +#ifndef __REACTOS__ WCHAR *ext = NULL; +#endif /* update READONLY check box flag */ if ((SendMessageW(GetDlgItem(hwnd,IDC_OPENREADONLY),BM_GETCHECK,0,0) & 0x03) == BST_CHECKED) @@ -3097,104 +3202,13 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) fodInfos->ofnInfos->Flags &= ~OFN_READONLY; /* Attach the file extension with file name*/ - ext = PathFindExtensionW(lpstrPathAndFile); #ifdef __REACTOS__ - if (*ext == UNICODE_NULL && fodInfos->defext) - { - LPWSTR filterExt = NULL, lpstrFilter = NULL, pch, pchNext; - LPCWSTR the_ext = NULL; - static const WCHAR szwDot[] = {'.',0}; - int PathLength = lstrlenW(lpstrPathAndFile); - - /* get filter extensions */ - lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, - fodInfos->ofnInfos->nFilterIndex - 1); - if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ - { - LPWSTR filterSearchIndex, pchFirst = NULL; - filterExt = heap_alloc((lstrlenW(lpstrFilter) + 1) * sizeof(WCHAR)); - if (filterExt) - { - strcpyW(filterExt, lpstrFilter); - - if (ext && *ext) - { - /* find ext in filter */ - for (pch = filterExt; pch && *pch; pch = pchNext) - { - filterSearchIndex = strchrW(pch, ';'); - if (filterSearchIndex) - { - filterSearchIndex[0] = 0; - pchNext = filterSearchIndex + 1; - } - else - { - pchNext = NULL; - } - - while (*pch == '*' || *pch == '.' || *pch == '?') - { - ++pch; - } - - if (!pchFirst) - pchFirst = pch; - - if (lstrcmpiW(pch, &ext[1]) == 0) - { - the_ext = pch; - break; - } - } - - /* use first one if not found */ - if (!the_ext && pchFirst && *pchFirst) - { - the_ext = pchFirst; - } - } - } - } - - if (!the_ext) - { - /* use default extension if no extension in filter */ - the_ext = fodInfos->defext; - } - - if (the_ext && *the_ext && lstrcmpiW(&ext[1], the_ext) != 0) - { - if (strlenW(lpstrPathAndFile) + 1 + strlenW(the_ext) + 1 <= - fodInfos->ofnInfos->nMaxFile) - { - /* append the dot */ - lstrcatW(lpstrPathAndFile, szwDot); - /* append the extension */ - lstrcatW(lpstrPathAndFile, the_ext); - /* update ext */ - ext = PathFindExtensionW(lpstrPathAndFile); - } - } - - heap_free(filterExt); - - /* In Open dialog: if file does not exist try without extension */ - if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) - lpstrPathAndFile[PathLength] = 0; - - /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ - if (*ext) - ext++; - if (!lstrcmpiW(fodInfos->defext, ext)) - fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; - else - fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; - } - + /* Add extension if necessary */ + FILEDLG95_AddDotExtIfNeeded(fodInfos, lpstrPathAndFile); /* update dialog data */ SetWindowTextW(fodInfos->DlgInfos.hwndFileName, PathFindFileNameW(lpstrPathAndFile)); #else /* __REACTOS__ */ + ext = PathFindExtensionW(lpstrPathAndFile); if (! *ext && fodInfos->defext) { /* if no extension is specified with file name, then */ diff --git a/dll/win32/comdlg32/filedlgbrowser.h b/dll/win32/comdlg32/filedlgbrowser.h index 67c07a8793c..ee7fbdc79d8 100644 --- a/dll/win32/comdlg32/filedlgbrowser.h +++ b/dll/win32/comdlg32/filedlgbrowser.h @@ -47,8 +47,11 @@ * Data structure */ - +#ifdef __REACTOS__ +typedef struct FileOpenDlgInfos +#else typedef struct +#endif { LPOPENFILENAMEW ofnInfos; BOOL unicode;

1 year, 10 months

[reactos] 01/01: [LOGON] Several improvements for screensaver (#5641)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0995dac581f7db5c70c8… commit f0995dac581f7db5c70c8e6ae054b266f53a68e9 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Sun Sep 3 13:18:23 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 3 21:18:23 2023 +0200 [LOGON] Several improvements for screensaver (#5641) - Currently the logo moves around every two seconds. This is not consistent with Windows Server 2003 (and other versions) and is very distracting. Increase the interval to every ten seconds, which matches Win2003. - There are currently two identical copies of the logo bitmap in the screensaver. Use only one copy of the logo bitmap. - Shrink the space around the logo bitmap. This should save some disk space but more importantly allow the logo to reach closer to the edges of the screen, similar to Win2003. - Remove unneeded includes. --- base/applications/screensavers/logon/logon.c | 164 ++++++++++--------------- base/applications/screensavers/logon/logon.rc | 5 +- base/applications/screensavers/logon/res/0.bmp | Bin 230454 -> 101078 bytes base/applications/screensavers/logon/res/1.bmp | Bin 230454 -> 0 bytes 4 files changed, 71 insertions(+), 98 deletions(-) diff --git a/base/applications/screensavers/logon/logon.c b/base/applications/screensavers/logon/logon.c index 20e66f2fb70..bf84b782723 100644 --- a/base/applications/screensavers/logon/logon.c +++ b/base/applications/screensavers/logon/logon.c @@ -18,127 +18,95 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <stdarg.h> +#include <stdlib.h> #include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> #include <scrnsave.h> -#include <stdlib.h> -#include <tchar.h> #include "resource.h" -#define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) +#define RANDOM(min, max) ((rand() % (int)(((max)+1) - (min))) + (min)) -#define APPNAME _T("Logon") #define APP_TIMER 1 -#define APP_TIMER_INTERVAL 2000 +#define APP_TIMER_INTERVAL 10000 +static HBITMAP GetScreenSaverBitmap(VOID) { - OSVERSIONINFOEX osvi; - - ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx ((OSVERSIONINFO *) &osvi); - - switch(osvi.wProductType) - { - case VER_NT_WORKSTATION: - return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); - break; - default: - return LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_SERVER), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); - break; - } + OSVERSIONINFOEX osvi = {0}; + osvi.dwOSVersionInfoSize = sizeof(osvi); + GetVersionEx((POSVERSIONINFO)&osvi); + + return LoadImageW(GetModuleHandle(NULL), + osvi.wProductType == VER_NT_WORKSTATION ? + MAKEINTRESOURCEW(IDB_WORKSTATION) : MAKEINTRESOURCEW(IDB_SERVER), + IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); } LRESULT CALLBACK -ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +ScreenSaverProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - static RECT rect; static HBITMAP bitmap; - switch (message) + switch (uMsg) { case WM_CREATE: { - bitmap = GetScreenSaverBitmap (); + bitmap = GetScreenSaverBitmap(); if (bitmap == NULL) { - MessageBox(hWnd, - _T("Fatal Error: Could not load bitmap"), - _T("Error"), - MB_OK | MB_ICONEXCLAMATION); + /* Extremely unlikely, message not localized. */ + MessageBoxW(hWnd, + L"Fatal Error: Could not load bitmap", + L"Error", + MB_OK | MB_ICONEXCLAMATION); } - SetTimer(hWnd, - APP_TIMER, - APP_TIMER_INTERVAL, - NULL); - - break; + SetTimer(hWnd, APP_TIMER, APP_TIMER_INTERVAL, NULL); + break; } case WM_PAINT: { - BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ - PAINTSTRUCT ps; - HDC hdc; - HDC hdcMem; - HBITMAP hbmOld; - - // Obtain window coordinates. - GetClientRect (hWnd, &rect); - - hdc = BeginPaint(hWnd, &ps); - hdcMem = CreateCompatibleDC(hdc); - hbmOld = SelectObject(hdcMem, bitmap); - - GetObject(bitmap, sizeof(bm), &bm); - - if (rect.right < bm.bmWidth || - rect.bottom < bm.bmHeight) - { - StretchBlt( - hdc, - RANDOM (0, rect.right - (bm.bmWidth /5)), - RANDOM (0, rect.bottom - (bm.bmHeight /5)), - bm.bmWidth /5, - bm.bmHeight /5, - hdcMem, - 0, - 0, - bm.bmWidth, - bm.bmHeight, - SRCCOPY); - } - else - { - BitBlt( - hdc, - RANDOM (0, rect.right - bm.bmWidth), - RANDOM (0, rect.bottom - bm.bmHeight), - bm.bmWidth, - bm.bmHeight, - hdcMem, - 0, - 0, - SRCCOPY); - } - - SelectObject(hdcMem, hbmOld); - DeleteDC(hdcMem); - - EndPaint(hWnd, &ps); - break; + BITMAP bm; + PAINTSTRUCT ps; + HDC hdc; + HDC hdcMem; + HBITMAP hbmOld; + RECT rect; + + hdc = BeginPaint(hWnd, &ps); + hdcMem = CreateCompatibleDC(hdc); + hbmOld = SelectObject(hdcMem, bitmap); + GetObjectW(bitmap, sizeof(bm), &bm); + + GetClientRect(hWnd, &rect); + if (rect.right < bm.bmWidth || rect.bottom < bm.bmHeight) + { + StretchBlt(hdc, RANDOM(0, rect.right - (bm.bmWidth / 5)), + RANDOM(0, rect.bottom - (bm.bmHeight / 5)), + bm.bmWidth / 5, bm.bmHeight / 5, hdcMem, 0, 0, + bm.bmWidth, bm.bmHeight, SRCCOPY); + } + else + { + BitBlt(hdc, RANDOM(0, rect.right - bm.bmWidth), + RANDOM(0, rect.bottom - bm.bmHeight), + bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY); + } + + SelectObject(hdcMem, hbmOld); + DeleteDC(hdcMem); + EndPaint(hWnd, &ps); + break; } case WM_TIMER: { - InvalidateRect(hWnd, NULL, 1); - break; + InvalidateRect(hWnd, NULL, TRUE); + break; } case WM_DESTROY: { @@ -147,10 +115,11 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) PostQuitMessage(0); break; } - default: - // Pass Windows Messages to the default screensaver window procedure - return DefScreenSaverProc(hWnd, message, wParam, lParam); + { + /* Pass window messages to the default screensaver window procedure */ + return DefScreenSaverProc(hWnd, uMsg, wParam, lParam); + } } return 0; @@ -163,19 +132,20 @@ ScreenSaverConfigureDialog(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) return FALSE; } -// This function is only called one time before opening the configuration dialog. -// Use it to show a message that no configuration is necessary and return FALSE to indicate that no configuration dialog shall be opened. +/* This function is only called once before opening the configuration dialog. + * Use it to show a message that no configuration is necessary and return FALSE to indicate that no configuration dialog shall be opened. + */ BOOL WINAPI RegisterDialogClasses(HANDLE hInst) { - TCHAR szMessage[256]; - TCHAR szTitle[25]; + WCHAR szMessage[256]; + WCHAR szTitle[25]; - LoadString(hInst, IDS_TEXT, szMessage, sizeof(szMessage) / sizeof(TCHAR)); - LoadString(hInst, IDS_DESCRIPTION, szTitle, sizeof(szTitle) / sizeof(TCHAR)); + LoadStringW(hInst, IDS_TEXT, szMessage, _countof(szMessage)); + LoadStringW(hInst, IDS_DESCRIPTION, szTitle, _countof(szTitle)); - MessageBox(NULL, szMessage, szTitle, MB_OK | MB_ICONEXCLAMATION); + MessageBoxW(NULL, szMessage, szTitle, MB_OK | MB_ICONEXCLAMATION); return FALSE; } diff --git a/base/applications/screensavers/logon/logon.rc b/base/applications/screensavers/logon/logon.rc index 329adc901a1..710bb93ec0a 100644 --- a/base/applications/screensavers/logon/logon.rc +++ b/base/applications/screensavers/logon/logon.rc @@ -15,8 +15,11 @@ IDI_ICON ICON DISCARDABLE "res/icon_logon.ico" #include <reactos/version.rc> +/* To change the bitmap used for Workstation or Server + * versions, add the new bitmap and update the path below. + */ IDB_WORKSTATION BITMAP "res/0.bmp" -IDB_SERVER BITMAP "res/1.bmp" +IDB_SERVER BITMAP "res/0.bmp" #include <reactos/manifest_exe.rc> diff --git a/base/applications/screensavers/logon/res/0.bmp b/base/applications/screensavers/logon/res/0.bmp index 3f99e1d56ea..d692ced1ca5 100644 Binary files a/base/applications/screensavers/logon/res/0.bmp and b/base/applications/screensavers/logon/res/0.bmp differ diff --git a/base/applications/screensavers/logon/res/1.bmp b/base/applications/screensavers/logon/res/1.bmp deleted file mode 100644 index 3f99e1d56ea..00000000000 Binary files a/base/applications/screensavers/logon/res/1.bmp and /dev/null differ

1 year, 10 months

[reactos] 01/01: [TRANSLATION] Update hungarian translation for mspaint, notepad, taskmgr, explorer, appwiz, browseui, msgina, shell32 (#5645)

by Tibor Lajos Füzi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3068422d5131d55dcd74f… commit 3068422d5131d55dcd74fc82d36a2025e37f1faa Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Sun Sep 3 17:46:38 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 3 17:46:38 2023 +0200 [TRANSLATION] Update hungarian translation for mspaint, notepad, taskmgr, explorer, appwiz, browseui, msgina, shell32 (#5645) --- base/applications/mspaint/lang/hu-HU.rc | 18 +++++++++--------- base/applications/notepad/lang/hu-HU.rc | 18 +++++++++--------- base/applications/taskmgr/lang/hu-HU.rc | 8 ++++---- base/shell/explorer/lang/hu-HU.rc | 14 +++++++------- dll/cpl/appwiz/lang/hu-HU.rc | 2 +- dll/win32/browseui/lang/hu-HU.rc | 2 +- dll/win32/msgina/lang/hu-HU.rc | 8 ++++---- dll/win32/shell32/lang/hu-HU.rc | 12 ++++++------ 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 1d97acb2681..ded0865a4d2 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -213,7 +213,7 @@ BEGIN END IDD_FONTS DIALOG 0, 0, 225, 25 -CAPTION "Fonts" +CAPTION "Betűtípusok" STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" @@ -256,13 +256,13 @@ BEGIN IDS_ANGLE "A szögnek -89 és 89 között kell lennie." IDS_LOADERRORTEXT "A(z) %s fájlt nem sikerült betölteni." IDS_ENLARGEPROMPTTEXT "A vágólapon lévő kép nagyobb mint a bitkép.\nSzeretné a bitkép méretét megnövelni?" - IDS_BOLD "Bold" - IDS_ITALIC "Italic" - IDS_UNDERLINE "Underline" - IDS_VERTICAL "Vertical" + IDS_BOLD "Félkövér" + IDS_ITALIC "Dőlt" + IDS_UNDERLINE "Aláhúzott" + IDS_VERTICAL "Függőleges" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - 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_CANTPASTE "Nem sikerült a beillesztés a vágólapról. Hibás, vagy nem támogatott adatformátum." + IDS_SAVEERROR "Nem sikerült a bitkép mentése az alábbi fájlba:\n\n%s" + IDS_CANTSENDMAIL "Nem sikerült az email küldése." + IDS_LOSECOLOR "A színinformációk el fognak veszni a művelet során. Biztosan folytatja?" END diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 18e368941c7..1f419e614c7 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -131,12 +131,12 @@ BEGIN END DIALOG_PRINTING DIALOG 0, 0, 160, 100 -CAPTION "Now printing" +CAPTION "Nyomtatás folyamatban" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 - CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "A nyomtatási feladat indul...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Fájlnév)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 CTEXT "Oldalszám: %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 PUSHBUTTON "Mégse", IDCANCEL, 50, 75, 60, 20 END @@ -176,12 +176,12 @@ Szeretné menteni a változásokat?" STRING_LINE_COLUMN "Sor: %d, oszlop: %d" STRING_PRINTERROR "Nem sikerült kinyomtatni a következő fájlt: '%s'.\n\nEllenőrizze hogy a nyomtató be van-e kapcsolva és megfelelően van-e konfigurálva." STRING_DEFAULTFONT "Lucida Console" - STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." - STRING_NOWPRINTING "Now printing page..." - STRING_PRINTCANCELING "The print job is being canceled..." - STRING_PRINTCOMPLETE "Printing is successfully done." - STRING_PRINTCANCELED "Printing has been canceled." - STRING_PRINTFAILED "Printing is failed." + STRING_LINE_NUMBER_OUT_OF_RANGE "A megadott sorszám kívül esik az elérhető tartományon." + STRING_NOWPRINTING "Oldal nyomtatása folyamatban..." + STRING_PRINTCANCELING "A nyomtatási feladat megszakítása folyamatban..." + STRING_PRINTCOMPLETE "A nyomtatás sikeresen befejeződött." + STRING_PRINTCANCELED "A nyomtatást megszakították." + STRING_PRINTFAILED "A nyomtatás nem sikerült." STRING_TEXT_DOCUMENT "Szöveges dokumentum" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 84a04f5b22b..f4968d5432a 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -138,8 +138,8 @@ BEGIN END MENUITEM "&Processzorok használata...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION + MENUITEM "&Tulajdonságok", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "Fájl &helyének megnyitása", ID_PROCESS_PAGE_OPENFILELOCATION END END @@ -381,8 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Normál prioritásra állítja a folyamatot" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Normál alatti prioritásra állítja a folyamatot" ID_PROCESS_PAGE_SETPRIORITY_LOW "Alacsony prioritásra állítja a folyamatot" - ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" - ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" + ID_PROCESS_PAGE_PROPERTIES "Megjeleníti a folyamat fájl tulajdonságait" + ID_PROCESS_PAGE_OPENFILELOCATION "Megnyitja a folyamat fájl helyét" END STRINGTABLE diff --git a/base/shell/explorer/lang/hu-HU.rc b/base/shell/explorer/lang/hu-HU.rc index d5c5aa5560b..0c4829ee569 100644 --- a/base/shell/explorer/lang/hu-HU.rc +++ b/base/shell/explorer/lang/hu-HU.rc @@ -78,7 +78,7 @@ BEGIN AUTOCHECKBOX "A tálca mindig legyen &látható a többi ablak előtt", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Hasonló tálca gombok &csoportosítása", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Gyorsindító megjelenítése", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "&Kis ikonok használata", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,15 +101,15 @@ CAPTION "Értesítési terület" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 - GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + GROUPBOX "Ikonok", IDC_STATIC, 6, 36, 240, 56 LTEXT "Rendezettebbé teheti az értesítési területet, ha elrejti azokat az ikonokat, amelyekre már régen nem kattintott rá.", IDC_STATIC, 13, 48, 223, 16 AUTOCHECKBOX "A nem aktív &ikonok elrejtése", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 PUSHBUTTON "&Testreszabás...", IDC_TASKBARPROP_ICONCUST, 188, 67, 53, 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 "Rendszerikonok", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Jelölje ki a mindig megjelenítendő rendszerikonokat.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Az óra &megjelenítése", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Má&sodpercek megjelenítése", IDC_TASKBARPROP_SECONDS, 120, 127, 100, 10, WS_DISABLED - AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Asztal", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 @@ -213,6 +213,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Tálca és Start menü" IDS_RESTORE_ALL "&Megnyitott ablakok megjelenítése" - IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" - IDS_TRAYWND_UNDO_TILE "&Undo Tile" + IDS_TRAYWND_UNDO_CASCADE "Lépcsőzetes elre&ndezés visszavonása" + IDS_TRAYWND_UNDO_TILE "Mozaik elre&ndezés visszavonása" END diff --git a/dll/cpl/appwiz/lang/hu-HU.rc b/dll/cpl/appwiz/lang/hu-HU.rc index ed58f785006..665869289d0 100644 --- a/dll/cpl/appwiz/lang/hu-HU.rc +++ b/dll/cpl/appwiz/lang/hu-HU.rc @@ -90,5 +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:" + IDS_BROWSE_FOR_TARGET "Kérem válassza ki a parancsikon hivatkozását:" END diff --git a/dll/win32/browseui/lang/hu-HU.rc b/dll/win32/browseui/lang/hu-HU.rc index cf7a915449f..43d26737ca3 100644 --- a/dll/win32/browseui/lang/hu-HU.rc +++ b/dll/win32/browseui/lang/hu-HU.rc @@ -316,7 +316,7 @@ END STRINGTABLE BEGIN - IDS_ADDRESSMENUTEXT "&Address" + IDS_ADDRESSMENUTEXT "&Cím" IDS_HISTORYTEXT "&Előzmények\tCtrl+H" END diff --git a/dll/win32/msgina/lang/hu-HU.rc b/dll/win32/msgina/lang/hu-HU.rc index 4d7024a20d8..9e86c71769d 100644 --- a/dll/win32/msgina/lang/hu-HU.rc +++ b/dll/win32/msgina/lang/hu-HU.rc @@ -235,10 +235,10 @@ BEGIN IDS_INVALIDLOGONHOURS "A fiókján olyan időkorlátozás van, amely miatt jelenleg nem tud belépni. Kérjük próbálja újra később." IDS_INVALIDWORKSTATION "A fiókja úgy van beállítva hogy nem használhatja ezt a számítógépet. Kérjük próbálkozzon egy másik számítógéppel." IDS_ACCOUNTRESTRICTION "Fiókkorlátozás miatt nem sikerült a bejelentkezés." - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYLOGOFFTITLE "Kijelentkezés a ReactOS-ből" + IDS_EMERGENCYLOGOFF "Kattintson az OK-ra az azonnali kijelentkezéshez. Minden nem mentett adat el fog veszni. Csak végső megoldásként használja ezt." + IDS_EMERGENCYRESTARTTITLE "Vészhelyzeti újraindítás" + IDS_EMERGENCYRESTART "Kattintson az OK-ra az azonnali újraindításhoz. Minden nem mentett adat el fog veszni. Csak végső megoldásként használja ezt." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 4fc189f36ad..e7837a056b8 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -804,11 +804,11 @@ BEGIN IDS_COPYERRORSAME "'%s' nem másolható: a forrás- és célfájl ugyanaz." IDS_MOVEERRORSUBFOLDER "'%s' nem mozgatható: a célmappa a forrásmappa egyik almappája." IDS_COPYERRORSUBFOLDER "'%s' nem másolható: a célmappa a forrásmappa egyik almappája." - IDS_MOVEERROR "Cannot move '%s': %s" - IDS_COPYERROR "Cannot copy '%s': %s" + IDS_MOVEERROR "'%s' nem mozgatható: %s" + IDS_COPYERROR "'%s' nem másolható: %s" - IDS_CREATEFILE_DENIED "Could not create file %1" - IDS_CREATEFILE_CAPTION "Error creating file" + IDS_CREATEFILE_DENIED "Nem sikerült a(z) %1 fájl létrehozása" + IDS_CREATEFILE_CAPTION "Hiba a fájl létrehozásakor" IDS_CREATEFOLDER_DENIED "Nem sikerült a(z) '%1' mappa létrehozása." IDS_CREATEFOLDER_CAPTION "Nem sikerült létrehozni a mappát" IDS_DELETEITEM_CAPTION "Állomány törlés megerősítése" @@ -888,7 +888,7 @@ BEGIN IDS_NETWORKPLACE "Hálózati helyek" IDS_NEWFOLDER "Új mappa" - IDS_NEWITEMFORMAT "New %s" + IDS_NEWITEMFORMAT "Új %s" IDS_DRIVE_FIXED "Helyi lemez" IDS_DRIVE_CDROM "CD-meghajtó" @@ -905,7 +905,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Készítők" IDS_SHELL_ABOUT_BACK "< &Vissza" - FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ + FCIDM_SHVIEW_NEW "Ú&j" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Mappa" FCIDM_SHVIEW_NEWLINK "&Parancsikon" IDS_FOLDER_OPTIONS "Mappabeállítások"

1 year, 10 months

[reactos] 01/01: [NTOS:EX] Add some missing PoNotifySystemTimeSet() calls. Stub out NtSetSystemTime() with NULL parameter.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c66a1582aca1ca1ed98d1… commit c66a1582aca1ca1ed98d142276b16bb4db71e0e2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 3 16:44:12 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 3 17:39:39 2023 +0200 [NTOS:EX] Add some missing PoNotifySystemTimeSet() calls. Stub out NtSetSystemTime() with NULL parameter. - They notify, via the "\\Callback\\SetSystemTime" callback, components of a change of system time (for example, Win32k). Note, that our Win32k currently does not handle power callouts, so it isn't affected by these changes (yet). - NtSetSystemTime(NULL, ...) means "update system time using the current time-zone information", which is something we don't implement yet. (And, nothing was previously protecting this call from a NULL parameter...) --- ntoskrnl/ex/init.c | 7 +++---- ntoskrnl/ex/time.c | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 2953a442e35..517661dfd4c 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1549,10 +1549,8 @@ Phase1InitializationDiscard(IN PVOID Context) ExpTimeZoneBias.QuadPart; } - /* Update the system time */ + /* Update the system time and notify the system */ KeSetSystemTime(&UniversalBootTime, &OldTime, FALSE, NULL); - - /* Do system callback */ PoNotifySystemTimeSet(); /* Remember this as the boot time */ @@ -1681,7 +1679,8 @@ Phase1InitializationDiscard(IN PVOID Context) else { /* Check if the timezone switched and update the time */ - if (LastTzBias != ExpLastTimeZoneBias) ZwSetSystemTime(NULL, NULL); + if (LastTzBias != ExpLastTimeZoneBias) + ZwSetSystemTime(NULL, NULL); } /* Initialize the File System Runtime Library */ diff --git a/ntoskrnl/ex/time.c b/ntoskrnl/ex/time.c index ad971773a8d..a2de0591178 100644 --- a/ntoskrnl/ex/time.c +++ b/ntoskrnl/ex/time.c @@ -372,8 +372,9 @@ ExpSetTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation) /* Calculate the new system time */ ExLocalTimeToSystemTime(&LocalTime, &SystemTime); - /* Set the new system time */ + /* Set the new system time and notify the system */ KeSetSystemTime(&SystemTime, &OldTime, FALSE, NULL); + PoNotifySystemTimeSet(); /* Return success */ DPRINT("ExpSetTimeZoneInformation() done\n"); @@ -400,8 +401,17 @@ NtSetSystemTime(IN PLARGE_INTEGER SystemTime, TIME_FIELDS TimeFields; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + // TODO: Handle the case when SystemTime == NULL, which means: + // "update system time using the current time-zone information". + if (!SystemTime) + { + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + /* Check if we were called from user-mode */ if (PreviousMode != KernelMode) { @@ -409,7 +419,7 @@ NtSetSystemTime(IN PLARGE_INTEGER SystemTime, { /* Verify the time pointers */ NewSystemTime = ProbeForReadLargeInteger(SystemTime); - if(PreviousTime) ProbeForWriteLargeInteger(PreviousTime); + if (PreviousTime) ProbeForWriteLargeInteger(PreviousTime); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -437,8 +447,9 @@ NtSetSystemTime(IN PLARGE_INTEGER SystemTime, RtlTimeToTimeFields(&LocalTime, &TimeFields); HalSetRealTimeClock(&TimeFields); - /* Now set system time */ + /* Now set the system time and notify the system */ KeSetSystemTime(&NewSystemTime, &OldSystemTime, FALSE, NULL); + PoNotifySystemTimeSet(); /* Check if caller wanted previous time */ if (PreviousTime)

1 year, 10 months

[reactos] 01/01: [BROWSEUI][SDK] Half-implement CShellBrowser::GetPropertyBag (#5635)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4814dfea01b4651a58d8d… commit 4814dfea01b4651a58d8d8951c02ec4fcf1ee8ea Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 3 12:09:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 3 12:09:55 2023 +0900 [BROWSEUI][SDK] Half-implement CShellBrowser::GetPropertyBag (#5635) - Implement CShellBrowser::GetPropertyBag a little by using SHGetViewStatePropertyBag. - Add SHGetPathFromIDListWrapW prototype to <shlwapi_undoc.h>. CORE-9283 --- dll/win32/browseui/shellbrowser.cpp | 23 ++++++++++++++++++++++- sdk/include/reactos/shlwapi_undoc.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index f6cb992dbb6..9c8edff1822 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -2387,12 +2387,33 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::QueryService(REFGUID guidService, REFII return E_NOINTERFACE; } +static BOOL _ILIsNetworkPlace(LPCITEMIDLIST pidl) +{ + WCHAR szPath[MAX_PATH]; + return SHGetPathFromIDListWrapW(pidl, szPath) && PathIsUNCW(szPath); +} + HRESULT STDMETHODCALLTYPE CShellBrowser::GetPropertyBag(long flags, REFIID riid, void **ppvObject) { if (ppvObject == NULL) return E_POINTER; + *ppvObject = NULL; - return E_NOTIMPL; + + LPITEMIDLIST pidl; + HRESULT hr = GetPidl(&pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return E_FAIL; + + // FIXME: pidl for Internet etc. + + if (_ILIsNetworkPlace(pidl)) + flags |= SHGVSPB_ROAM; + + hr = SHGetViewStatePropertyBag(pidl, L"Shell", flags, riid, ppvObject); + + ILFree(pidl); + return hr; } HRESULT STDMETHODCALLTYPE CShellBrowser::GetTypeInfoCount(UINT *pctinfo) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index cd427170815..1cb5a064631 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -276,6 +276,7 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath, DWORD dwWhich); BOOL WINAPI PathFindOnPathExW(LPWSTR lpszFile, LPCWSTR *lppszOtherDirs, DWORD dwWhich); VOID WINAPI FixSlashesAndColonW(LPWSTR); BOOL WINAPI PathIsValidCharW(WCHAR c, DWORD dwClass); +BOOL WINAPI SHGetPathFromIDListWrapW(LPCITEMIDLIST pidl, LPWSTR pszPath); #ifdef __cplusplus } /* extern "C" */

1 year, 10 months

[reactos] 01/01: [SHDOCVW][SDK] Implement MRU List for Shell Bag, Part 2 (#5634)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dbb800358c5714e88848… commit 8dbb800358c5714e88848b80d76910a32b90c8d7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 3 09:42:10 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 3 09:42:10 2023 +0900 [SHDOCVW][SDK] Implement MRU List for Shell Bag, Part 2 (#5634) Follow-up to #5626. - Implement CMruBase class. - Add delay import of shell32. - Add RegCreateKeyExWrapW prototype to <shlobj_undoc.h>. CORE-9283 --- dll/win32/shdocvw/CMakeLists.txt | 2 +- dll/win32/shdocvw/mrulist.cpp | 289 +++++++++++++++++++++++++++++++----- sdk/include/reactos/shlobj_undoc.h | 6 +- sdk/include/reactos/shlwapi_undoc.h | 13 ++ 4 files changed, 268 insertions(+), 42 deletions(-) diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 307fee5ad6e..5d25b402784 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(shdocvw MODULE set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) -add_delay_importlibs(shdocvw ole32 oleaut32 ieframe) +add_delay_importlibs(shdocvw shell32 ole32 oleaut32 ieframe) add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll) add_dependencies(shdocvw stdole2) add_pch(shdocvw precomp.h SOURCE) diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp index 564c3d9e9be..b140779cb9c 100644 --- a/dll/win32/shdocvw/mrulist.cpp +++ b/dll/win32/shdocvw/mrulist.cpp @@ -16,6 +16,7 @@ #include <shlobj_undoc.h> #include <shlguid_undoc.h> #include <shlwapi.h> +#include <shlwapi_undoc.h> #include "shdocvw.h" #include <wine/debug.h> @@ -27,20 +28,49 @@ extern "C" void __cxa_pure_virtual(void) ::DebugBreak(); } +BOOL IEILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, BOOL bUnknown) +{ + UINT cb1 = ILGetSize(pidl1), cb2 = ILGetSize(pidl2); + if (cb1 == cb2 && memcmp(pidl1, pidl2, cb1) == 0) + return TRUE; + + FIXME("%p, %p\n", pidl1, pidl2); + return FALSE; +} + +// The flags for SLOTITEMDATA.dwFlags +#define SLOT_LOADED 0x1 +#define SLOT_UNKNOWN_FLAG 0x2 + +// The flags for CMruBase.m_dwFlags +#define COMPARE_BY_MEMCMP 0x0 +#define COMPARE_BY_STRCMPIW 0x1 +#define COMPARE_BY_STRCMPW 0x2 +#define COMPARE_BY_IEILISEQUAL 0x3 +#define COMPARE_BY_MASK 0xF + class CMruBase : public IMruDataList { protected: LONG m_cRefs = 1; // Reference count - DWORD m_dwFlags = 0; // The flags + DWORD m_dwFlags = 0; // The COMPARE_BY_... flags BOOL m_bFlag1 = FALSE; // ??? - BOOL m_bChecked = FALSE; // ??? + BOOL m_bChecked = FALSE; // The checked flag HKEY m_hKey = NULL; // A registry key DWORD m_cSlotRooms = 0; // Rooms for slots DWORD m_cSlots = 0; // The # of slots SLOTCOMPARE m_fnCompare = NULL; // The comparison function SLOTITEMDATA * m_pSlots = NULL; // Slot data + HRESULT _LoadItem(UINT iSlot); + HRESULT _AddItem(UINT iSlot, const BYTE *pbData, DWORD cbData); + HRESULT _GetItem(UINT iSlot, SLOTITEMDATA **ppItem); + void _DeleteItem(UINT iSlot); + + HRESULT _GetSlotItem(UINT iSlot, SLOTITEMDATA **ppItem); + void _CheckUsedSlots(); + public: CMruBase() { @@ -53,19 +83,12 @@ public: { return ::InterlockedIncrement(&m_cRefs); } - STDMETHODIMP_(ULONG) Release() override - { - if (::InterlockedDecrement(&m_cRefs) == 0) - { - delete this; - return 0; - } - return m_cRefs; - } + STDMETHODIMP_(ULONG) Release() override; // IMruDataList methods - STDMETHODIMP InitData(UINT cCapacity, UINT flags, HKEY hKey, LPCWSTR pszSubKey, - SLOTCOMPARE fnCompare) override; + STDMETHODIMP InitData(UINT cCapacity, UINT flags, HKEY hKey, + LPCWSTR pszSubKey OPTIONAL, + SLOTCOMPARE fnCompare OPTIONAL) override; STDMETHODIMP AddData(const BYTE *pbData, DWORD cbData, UINT *piSlot) override; STDMETHODIMP FindData(const BYTE *pbData, DWORD cbData, UINT *piSlot) override; STDMETHODIMP GetData(UINT iSlot, BYTE *pbData, DWORD cbData) override; @@ -73,7 +96,7 @@ public: STDMETHODIMP Delete(UINT iSlot) override; // Non-standard methods - virtual HRESULT _IsEqual(const SLOTITEMDATA *pSlot, LPCITEMIDLIST pidl, UINT cbPidl) const; + virtual BOOL _IsEqual(const SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData) const; virtual HRESULT _DeleteValue(LPCWSTR pszValue); virtual HRESULT _InitSlots() = 0; virtual void _SaveSlots() = 0; @@ -104,11 +127,7 @@ CMruBase::~CMruBase() { for (UINT iSlot = 0; iSlot < m_cSlots; ++iSlot) { - if (m_pSlots[iSlot].pidl) - { - ::LocalFree(m_pSlots[iSlot].pidl); - m_pSlots[iSlot].pidl = NULL; - } + m_pSlots[iSlot].pvData = ::LocalFree(m_pSlots[iSlot].pvData); } ::LocalFree(m_pSlots); @@ -130,58 +149,252 @@ STDMETHODIMP CMruBase::QueryInterface(REFIID riid, void **ppvObj) return E_NOINTERFACE; } +STDMETHODIMP_(ULONG) CMruBase::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + _SaveSlots(); + delete this; + return 0; + } + return m_cRefs; +} + +HRESULT CMruBase::_LoadItem(UINT iSlot) +{ + DWORD cbData; + WCHAR szValue[12]; + + SLOTITEMDATA *pItem = &m_pSlots[iSlot]; + _SlotString(iSlot, szValue, _countof(szValue)); + + if (SHGetValueW(m_hKey, NULL, szValue, NULL, NULL, &cbData) == ERROR_SUCCESS && + cbData > 0) + { + pItem->pvData = ::LocalAlloc(LPTR, cbData); + if (pItem->pvData) + { + pItem->cbData = cbData; + if (SHGetValueW(m_hKey, NULL, szValue, NULL, pItem->pvData, &cbData) != ERROR_SUCCESS) + pItem->pvData = ::LocalFree(pItem->pvData); + } + } + + pItem->dwFlags |= SLOT_LOADED; + if (!pItem->pvData) + return E_FAIL; + + return S_OK; +} + +HRESULT CMruBase::_GetSlotItem(UINT iSlot, SLOTITEMDATA **ppItem) +{ + if (!(m_pSlots[iSlot].dwFlags & SLOT_LOADED)) + _LoadItem(iSlot); + + SLOTITEMDATA *pItem = &m_pSlots[iSlot]; + if (!pItem->pvData) + return E_OUTOFMEMORY; + + *ppItem = pItem; + return S_OK; +} + +HRESULT CMruBase::_GetItem(UINT iSlot, SLOTITEMDATA **ppItem) +{ + HRESULT hr = _GetSlot(iSlot, &iSlot); + if (FAILED(hr)) + return hr; + return _GetSlotItem(iSlot, ppItem); +} + +void CMruBase::_DeleteItem(UINT iSlot) +{ + WCHAR szBuff[12]; + + _SlotString(iSlot, szBuff, _countof(szBuff)); + _DeleteValue(szBuff); + + m_pSlots[iSlot].pvData = ::LocalFree(m_pSlots[iSlot].pvData); +} + +void CMruBase::_CheckUsedSlots() +{ + UINT iGotSlot; + for (UINT iSlot = 0; iSlot < m_cSlots; ++iSlot) + _GetSlot(iSlot, &iGotSlot); + + m_bChecked = TRUE; +} + +HRESULT CMruBase::_AddItem(UINT iSlot, const BYTE *pbData, DWORD cbData) +{ + SLOTITEMDATA *pItem = &m_pSlots[iSlot]; + + WCHAR szBuff[12]; + _SlotString(iSlot, szBuff, _countof(szBuff)); + + if (SHSetValueW(m_hKey, NULL, szBuff, REG_BINARY, pbData, cbData) != ERROR_SUCCESS) + return E_OUTOFMEMORY; + + if (cbData >= pItem->cbData || !pItem->pvData) + { + ::LocalFree(pItem->pvData); + pItem->pvData = ::LocalAlloc(LPTR, cbData); + } + + if (!pItem->pvData) + return E_FAIL; + + pItem->cbData = cbData; + pItem->dwFlags = (SLOT_LOADED | SLOT_UNKNOWN_FLAG); + CopyMemory(pItem->pvData, pbData, cbData); + return S_OK; +} + STDMETHODIMP CMruBase::InitData( UINT cCapacity, UINT flags, HKEY hKey, - LPCWSTR pszSubKey, - SLOTCOMPARE fnCompare) + LPCWSTR pszSubKey OPTIONAL, + SLOTCOMPARE fnCompare OPTIONAL) { - FIXME("Stub\n"); - return E_NOTIMPL; + m_dwFlags = flags; + m_fnCompare = fnCompare; + m_cSlotRooms = cCapacity; + + if (pszSubKey) + ::RegCreateKeyExWrapW(hKey, pszSubKey, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &m_hKey, NULL); + else + m_hKey = SHRegDuplicateHKey(hKey); + + if (!m_hKey) + return E_FAIL; + + m_pSlots = (SLOTITEMDATA*)::LocalAlloc(LPTR, m_cSlotRooms * sizeof(SLOTITEMDATA)); + if (!m_pSlots) + return E_OUTOFMEMORY; + + return _InitSlots(); } STDMETHODIMP CMruBase::AddData(const BYTE *pbData, DWORD cbData, UINT *piSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + UINT iSlot; + HRESULT hr = FindData(pbData, cbData, &iSlot); + if (FAILED(hr)) + { + iSlot = _UpdateSlots(m_cSlots); + hr = _AddItem(iSlot, pbData, cbData); + if (FAILED(hr)) + return hr; + } + else + { + iSlot = _UpdateSlots(iSlot); + hr = S_OK; + } + + if (piSlot) + *piSlot = iSlot; + + return hr; } STDMETHODIMP CMruBase::FindData(const BYTE *pbData, DWORD cbData, UINT *piSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + if (m_cSlots <= 0) + return E_FAIL; + + UINT iSlot = 0; + SLOTITEMDATA *pItem; + while (FAILED(_GetItem(iSlot, &pItem)) || !_IsEqual(pItem, pbData, cbData)) + { + if (++iSlot >= m_cSlots) + return E_FAIL; + } + + *piSlot = iSlot; + return S_OK; } STDMETHODIMP CMruBase::GetData(UINT iSlot, BYTE *pbData, DWORD cbData) { - FIXME("Stub\n"); - return E_NOTIMPL; + SLOTITEMDATA *pItem; + HRESULT hr = _GetItem(iSlot, &pItem); + if (FAILED(hr)) + return hr; + + if (cbData < pItem->cbData) + return 0x8007007A; // FIXME: Magic number + + CopyMemory(pbData, pItem->pvData, pItem->cbData); + return hr; } STDMETHODIMP CMruBase::QueryInfo(UINT iSlot, UINT *puSlot, DWORD *pcbData) { - FIXME("Stub\n"); - return E_NOTIMPL; + UINT iGotSlot; + HRESULT hr = _GetSlot(iSlot, &iGotSlot); + if (FAILED(hr)) + return hr; + + if (puSlot) + *puSlot = iGotSlot; + + if (pcbData) + { + SLOTITEMDATA *pItem; + hr = _GetSlotItem(iGotSlot, &pItem); + if (SUCCEEDED(hr)) + *pcbData = pItem->cbData; + } + + return hr; } STDMETHODIMP CMruBase::Delete(UINT iSlot) { - FIXME("Stub\n"); - return E_NOTIMPL; + UINT uSlot; + HRESULT hr = _RemoveSlot(iSlot, &uSlot); + if (FAILED(hr)) + return hr; + + _DeleteItem(uSlot); + return hr; } -HRESULT CMruBase::_IsEqual(const SLOTITEMDATA *pSlot, LPCITEMIDLIST pidl, UINT cbPidl) const +BOOL CMruBase::_IsEqual(const SLOTITEMDATA *pItem, LPCVOID pvData, UINT cbData) const { - FIXME("Stub\n"); - return E_NOTIMPL; + if (m_fnCompare) + return m_fnCompare(pvData, pItem->pvData, cbData) == 0; + + switch (m_dwFlags & COMPARE_BY_MASK) + { + case COMPARE_BY_MEMCMP: + if (pItem->cbData != cbData) + return FALSE; + return memcmp(pvData, pItem->pvData, cbData) == 0; + + case COMPARE_BY_STRCMPIW: + return StrCmpIW((LPCWSTR)pvData, (LPCWSTR)pItem->pvData) == 0; + + case COMPARE_BY_STRCMPW: + return StrCmpW((LPCWSTR)pvData, (LPCWSTR)pItem->pvData) == 0; + + case COMPARE_BY_IEILISEQUAL: + return IEILIsEqual((LPCITEMIDLIST)pvData, (LPCITEMIDLIST)pItem->pvData, FALSE); + + default: + ERR("0x%08X\n", m_dwFlags); + return FALSE; + } } HRESULT CMruBase::_DeleteValue(LPCWSTR pszValue) { - FIXME("Stub\n"); - return E_NOTIMPL; + return SHDeleteValueW(m_hKey, NULL, pszValue); } class CMruLongList diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index 33f911e05c7..0601d6fbd7b 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -29,11 +29,11 @@ extern "C" { typedef struct tagSLOTITEMDATA { DWORD dwFlags; - UINT cbPidl; - LPITEMIDLIST pidl; + UINT cbData; + LPVOID pvData; } SLOTITEMDATA, *PSLOTITEMDATA; -typedef INT (CALLBACK *SLOTCOMPARE)(LPCITEMIDLIST, LPCITEMIDLIST, UINT); +typedef INT (CALLBACK *SLOTCOMPARE)(LPCVOID pvData1, LPCVOID pvData2, UINT cbData); /***************************************************************************** * New shellstate structure diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index d7f3790d897..cd427170815 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -69,6 +69,19 @@ HRESULT WINAPI SHWriteDataBlockList(IStream* lpStream, LPDBLIST lpList); HRESULT WINAPI SHReadDataBlockList(IStream* lpStream, LPDBLIST* lppList); VOID WINAPI SHFreeDataBlockList(LPDBLIST lpList); +LONG +WINAPI +RegCreateKeyExWrapW( + _In_ HKEY hKey, + _In_ LPCWSTR lpSubKey, + _In_ DWORD Reserved, + _In_opt_ LPWSTR lpClass, + _In_ DWORD dwOptions, + _In_ REGSAM samDesired, + _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, + _Out_ PHKEY phkResult, + _Out_opt_ LPDWORD lpdwDisposition); + /* Redirected to kernel32.ExpandEnvironmentStringsA/W */ DWORD WINAPI SHExpandEnvironmentStringsA(LPCSTR,LPSTR,DWORD); DWORD WINAPI SHExpandEnvironmentStringsW(LPCWSTR,LPWSTR,DWORD);

1 year, 10 months

[reactos] 01/01: [SHELL32] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67645ab7a8998d7c62f19… commit 67645ab7a8998d7c62f19e24035d20a5f6fc6ba5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Sep 2 22:56:38 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 2 22:56:38 2023 +0300 [SHELL32] Update Russian (ru-RU) translation --- dll/win32/shell32/lang/ru-RU.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 77ed73f9445..ab5a7e3d928 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -861,9 +861,9 @@ BEGIN IDS_RUNDLG_BROWSE_FILTER "Исполняемые файлы (*.exe)\0*.exe\0Все файлы (*.*)\0*.*\0" /* Shortcut property sheet */ - IDS_SHORTCUT_RUN_NORMAL "Normal window" - IDS_SHORTCUT_RUN_MIN "Minimized" - IDS_SHORTCUT_RUN_MAX "Maximized" + IDS_SHORTCUT_RUN_NORMAL "Обычный размер окна" + IDS_SHORTCUT_RUN_MIN "Свёрнутое в значок" + IDS_SHORTCUT_RUN_MAX "Развёрнутое на весь экран" /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Главное меню\\Программы"

1 year, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs