Ros-diffs

ros-diffs@reactos.org

10 participants
81009 discussions

[reactos] 01/01: [NTUSER] Address memory leak in co_WinPosSetWindowPos(). (#7284)

by Marek Benc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=633d2e6d0cd4938dc6227… commit 633d2e6d0cd4938dc6227c22f30cc2fd81c673aa Author: Marek Benc <benc.marek.elektro98(a)proton.me> AuthorDate: Sat Aug 31 22:07:33 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 15:07:33 2024 -0500 [NTUSER] Address memory leak in co_WinPosSetWindowPos(). (#7284) CORE-19723 --- win32ss/user/ntuser/winpos.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 7256f59ad56..d06730112be 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2071,11 +2071,6 @@ co_WinPosSetWindowPos( RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND); } - if (VisBeforeJustClient != NULL) - { - REGION_Delete(VisBeforeJustClient); - } - /* Now use in copying bits which are in the update region. */ if (Window->hrgnUpdate != NULL) { @@ -2223,11 +2218,6 @@ co_WinPosSetWindowPos( } } - if (CopyRgn != NULL) - { - REGION_Delete(CopyRgn); - } - /* Expose what was covered before but not covered anymore */ if (VisBefore != NULL) { @@ -2248,12 +2238,6 @@ co_WinPosSetWindowPos( } REGION_Delete(ExposedRgn); } - REGION_Delete(VisBefore); - } - - if (VisAfter != NULL) - { - REGION_Delete(VisAfter); } } @@ -2301,6 +2285,27 @@ co_WinPosSetWindowPos( WinPos.flags |= SWP_NOZORDER|SWP_NOREDRAW; } + if (VisBefore != NULL) + { + REGION_Delete(VisBefore); + VisBefore = NULL; + } + if (VisBeforeJustClient != NULL) + { + REGION_Delete(VisBeforeJustClient); + VisBeforeJustClient = NULL; + } + if (VisAfter != NULL) + { + REGION_Delete(VisAfter); + VisAfter = NULL; + } + if (CopyRgn != NULL) + { + REGION_Delete(CopyRgn); + CopyRgn = NULL; + } + if(!(flags & SWP_DEFERERASE)) { /* erase parent when hiding or resizing child */

4 months, 1 week

[reactos] 01/01: [RAPPS] Show listview context menu when the keyboard menu button/Shift+F10 is pressed (#5620)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=163f3407c8fa93ce06773… commit 163f3407c8fa93ce06773fdf9fc53064506bd05e Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Aug 31 18:30:45 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 18:30:45 2024 +0200 [RAPPS] Show listview context menu when the keyboard menu button/Shift+F10 is pressed (#5620) --- base/applications/rapps/appview.cpp | 33 ++++++++++++++++++++++++--------- base/applications/rapps/include/misc.h | 2 +- base/applications/rapps/misc.cpp | 9 ++++++--- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index e2af2ab6c5c..a173d9530ac 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1569,15 +1569,6 @@ CApplicationView::ProcessWindowMessage( } } break; - - case NM_RCLICK: - { - if (((LPNMLISTVIEW)lParam)->iItem != -1) - { - ShowPopupMenuEx(m_hWnd, m_hWnd, 0, ID_INSTALL); - } - } - break; } } else if (pNotifyHeader->hwndFrom == m_Toolbar->GetWindow()) @@ -1613,6 +1604,30 @@ CApplicationView::ProcessWindowMessage( OnCommand(wParam, lParam); } break; + + case WM_CONTEXTMENU: + { + bool kbd = -1 == (int)(INT_PTR)lParam; + if ((HWND)wParam == m_ListView->m_hWnd) + { + int item = m_ListView->GetNextItem(-1, LVNI_FOCUSED | LVNI_SELECTED); + if (item != -1) + { + POINT *ppt = NULL, pt; + if (kbd) + { + RECT r; + ListView_GetItemRect((HWND)wParam, item, &r, LVIR_LABEL); + pt.x = r.left + (r.right - r.left) / 2; + pt.y = r.top + (r.bottom - r.top) / 2; + ::ClientToScreen((HWND)wParam, ppt = &pt); + } + ShowPopupMenuEx(m_hWnd, m_hWnd, 0, ID_INSTALL, ppt); + return TRUE; + } + } + } + break; } return FALSE; } diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index b43585d748a..91ede797f08 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -29,7 +29,7 @@ ErrorFromHResult(HRESULT hr) VOID CopyTextToClipboard(LPCWSTR lpszText); VOID -ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem); +ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem, POINT *Point = NULL); BOOL StartProcess(const CStringW &Path, BOOL Wait); BOOL diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index f2b15d5c645..400f0b588e6 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -40,7 +40,7 @@ CopyTextToClipboard(LPCWSTR lpszText) } VOID -ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem) +ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem, POINT *Point) { HMENU hMenu = NULL; HMENU hPopupMenu; @@ -68,10 +68,13 @@ ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem) SetMenuDefaultItem(hPopupMenu, DefaultItem, FALSE); } - GetCursorPos(&pt); + if (!Point) + { + GetCursorPos(Point = &pt); + } SetForegroundWindow(hwnd); - TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwndOwner, NULL); + TrackPopupMenu(hPopupMenu, 0, Point->x, Point->y, 0, hwndOwner, NULL); if (hMenu) {

4 months, 1 week

[reactos] 01/01: [XMLLITE_WINETEST] Fully mark Wine diff

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0197a5bcae9ac32541285… commit 0197a5bcae9ac325412850a83aa66c49d132864a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:30:16 2024 +0300 [XMLLITE_WINETEST] Fully mark Wine diff Addendum to 3d1ca45 (0.4.15-dev-5553). --- modules/rostests/winetests/xmllite/reader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/xmllite/reader.c b/modules/rostests/winetests/xmllite/reader.c index c44fed4c8c0..f9b67a37835 100644 --- a/modules/rostests/winetests/xmllite/reader.c +++ b/modules/rostests/winetests/xmllite/reader.c @@ -538,7 +538,7 @@ static void test_reader_create(void) IUnknown *input, *unk; IXmlReader *reader; #ifdef __REACTOS__ - ULONG_PTR dtd; + LONG_PTR dtd; #else DtdProcessing dtd; #endif @@ -607,7 +607,11 @@ static void test_reader_create(void) dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); +#ifdef __REACTOS__ ok(dtd == DtdProcessing_Prohibit, "got %Id\n", dtd); +#else + ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); +#endif dtd = 2; hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd);

4 months, 1 week

[reactos] 03/03: [VFD] Properly mark ReactOS's diffs

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ff08b6404534535415d9… commit 3ff08b6404534535415d9f6f84c4efeebf678eeb Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:23:01 2024 +0300 [VFD] Properly mark ReactOS's diffs Addendum to 25c7e1a (0.4.7-dev-1106) and follow-ups. --- .../rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc | 7 +++++++ modules/rosapps/drivers/vfd/imports.h | 8 ++++---- modules/rosapps/drivers/vfd/vfddbg.c | 4 +++- modules/rosapps/drivers/vfd/vfdimg.c | 2 +- modules/rosapps/drivers/vfd/vfdmnt.c | 2 +- modules/rosapps/drivers/vfd/vfdpnp.c | 2 +- modules/rosapps/include/vfd/vfdio.h | 4 ++-- modules/rosapps/lib/vfdlib/vfdctl.c | 4 ++-- modules/rosapps/lib/vfdlib/vfdguiopen.c | 8 ++++++-- modules/rosapps/lib/vfdlib/vfdguisave.c | 20 ++++++++++++++++++-- modules/rosapps/lib/vfdlib/vfdguitip.c | 13 +++++++++++++ modules/rosapps/lib/vfdlib/vfdmsg_lib.mc | 6 ++++++ modules/rosapps/lib/vfdlib/vfdshext.h | 2 +- modules/rosapps/lib/vfdlib/vfdshmenu.cpp | 3 ++- modules/rosapps/lib/vfdlib/vfdshutil.cpp | 4 ++-- 15 files changed, 69 insertions(+), 20 deletions(-) diff --git a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc index 33ee9145c2c..8c428cf944a 100644 --- a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc +++ b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc @@ -11,6 +11,11 @@ ;#ifndef _VFDMSG_H_ ;#define _VFDMSG_H_ ; +;/* +; __REACTOS__: +; - Removed Japanese language. +; + Added a second blank line between some entries. +;*/ MessageIdTypedef=DWORD LanguageNames=(English=0x409:MSG0409) @@ -1161,6 +1166,7 @@ of the shell extension. . +;// __REACTOS__: s/read only/read-only/. MessageId= SymbolicName=MSG_HELP_OPEN Language=English @@ -1360,6 +1366,7 @@ The SAVE command always fails if the target is a ZIP compressed file. . +;// __REACTOS__: s/read only/read-only/. MessageId= SymbolicName=MSG_HELP_PROTECT Language=English diff --git a/modules/rosapps/drivers/vfd/imports.h b/modules/rosapps/drivers/vfd/imports.h index 8a9ca901be7..f88c03c0a9d 100644 --- a/modules/rosapps/drivers/vfd/imports.h +++ b/modules/rosapps/drivers/vfd/imports.h @@ -27,17 +27,15 @@ extern "C" { #endif // __cplusplus -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push,3) #endif #include <ntddk.h> #include <ntdddisk.h> #include <ntverp.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) -#endif -#ifdef _MSC_VER // disable unwanted (and trivial) warnings : // 4054 - type cast from a function pointer to a data pointer // 4201 - anonymous structure @@ -179,6 +177,8 @@ typedef struct _MOUNTMGR_MOUNT_POINTS { #endif // (VER_PRODUCTBUILD < 2195) +// __REACTOS__: NTAPI added on some functions in this file, vfddrv.h and some *.c. + #if (VER_PRODUCTBUILD < 2600) // // Imports from Windows XP DDK <ntdddisk.h> diff --git a/modules/rosapps/drivers/vfd/vfddbg.c b/modules/rosapps/drivers/vfd/vfddbg.c index 829f25b07a4..286dae101fa 100644 --- a/modules/rosapps/drivers/vfd/vfddbg.c +++ b/modules/rosapps/drivers/vfd/vfddbg.c @@ -9,9 +9,11 @@ #if !DBG +#if !defined(__REACTOS__) || defined(_MSC_VER) // suppress empty compile unit warning #pragma warning (disable: 4206) #pragma message ("Debug feature is disabled.") +#endif #else // DBG @@ -514,7 +516,7 @@ GetIoControlName( CASE_RETURN_STR(IOCTL_DISK_GROW_PARTITION); CASE_RETURN_STR(IOCTL_DISK_GET_CACHE_INFORMATION); CASE_RETURN_STR(IOCTL_DISK_SET_CACHE_INFORMATION); -#if (NTDDI_VERSION < NTDDI_WS03) +#if !defined(__REACTOS__) || (NTDDI_VERSION < NTDDI_WS03) CASE_RETURN_STR(IOCTL_DISK_GET_WRITE_CACHE_STATE); #else CASE_RETURN_STR(OBSOLETE_DISK_GET_WRITE_CACHE_STATE); diff --git a/modules/rosapps/drivers/vfd/vfdimg.c b/modules/rosapps/drivers/vfd/vfdimg.c index c04d1978ffb..d20be32ee1e 100644 --- a/modules/rosapps/drivers/vfd/vfdimg.c +++ b/modules/rosapps/drivers/vfd/vfdimg.c @@ -284,7 +284,7 @@ VfdOpenImage ( #ifndef __REACTOS__ &file_object, #else - (PVOID *)&file_object, + (PVOID *)&file_object, #endif NULL); diff --git a/modules/rosapps/drivers/vfd/vfdmnt.c b/modules/rosapps/drivers/vfd/vfdmnt.c index 7d84180adac..2bcda2c75f8 100644 --- a/modules/rosapps/drivers/vfd/vfdmnt.c +++ b/modules/rosapps/drivers/vfd/vfdmnt.c @@ -13,7 +13,7 @@ so DO NOT define VFD_MOUNT_MANAGER macro unless you know exactly what you are doing... */ -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) // suppress empty compile unit warning #pragma warning (disable: 4206) #pragma message ("Mount Manager support feature is disabled.") diff --git a/modules/rosapps/drivers/vfd/vfdpnp.c b/modules/rosapps/drivers/vfd/vfdpnp.c index e0885e7ada0..9c943e25f6b 100644 --- a/modules/rosapps/drivers/vfd/vfdpnp.c +++ b/modules/rosapps/drivers/vfd/vfdpnp.c @@ -13,8 +13,8 @@ so DO NOT define VFD_PNP macro unless you know exactly what you are doing... */ +#if !defined(__REACTOS__) || defined(_MSC_VER) // suppress empty compile unit warning -#ifdef _MSC_VER #pragma warning (disable: 4206) #pragma message ("Plug and play support feature is disabled.") #endif diff --git a/modules/rosapps/include/vfd/vfdio.h b/modules/rosapps/include/vfd/vfdio.h index b3f4a56e4a9..6df7b76fd22 100644 --- a/modules/rosapps/include/vfd/vfdio.h +++ b/modules/rosapps/include/vfd/vfdio.h @@ -55,7 +55,7 @@ // Used for IOCTL_VFD_OPEN_IMAGE and IOCTL_VFD_QUERY_IMAGE // #pragma pack (push,2) -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (push) #pragma warning (disable: 4200) // Zero sized struct member warning #endif @@ -70,7 +70,7 @@ typedef struct _VFD_IMAGE_INFO { CHAR FileName[0]; // variable length file name string } VFD_IMAGE_INFO, *PVFD_IMAGE_INFO; -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (pop) #endif #pragma pack (pop) diff --git a/modules/rosapps/lib/vfdlib/vfdctl.c b/modules/rosapps/lib/vfdlib/vfdctl.c index 21672b96621..d3952dcedc2 100644 --- a/modules/rosapps/lib/vfdlib/vfdctl.c +++ b/modules/rosapps/lib/vfdlib/vfdctl.c @@ -15,12 +15,12 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <dbt.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (push, 3) #endif #include <shlobj.h> #include <winioctl.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning (pop) #endif #include <stdio.h> diff --git a/modules/rosapps/lib/vfdlib/vfdguiopen.c b/modules/rosapps/lib/vfdlib/vfdguiopen.c index e7fb6262b59..35103a5954f 100644 --- a/modules/rosapps/lib/vfdlib/vfdguiopen.c +++ b/modules/rosapps/lib/vfdlib/vfdguiopen.c @@ -14,11 +14,11 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push,3) #endif #include <commdlg.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) #endif @@ -404,7 +404,11 @@ void OnBrowse( ofn.nMaxFile = sizeof(file); ofn.lpstrInitialDir = dir; ofn.lpstrTitle = title ? title : FALLBACK_IMAGE_TITLE; +#ifndef __REACTOS__ + ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#else ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#endif // show the open file dialog box diff --git a/modules/rosapps/lib/vfdlib/vfdguisave.c b/modules/rosapps/lib/vfdlib/vfdguisave.c index b0ea780d450..31f57ce73c2 100644 --- a/modules/rosapps/lib/vfdlib/vfdguisave.c +++ b/modules/rosapps/lib/vfdlib/vfdguisave.c @@ -14,11 +14,11 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(push,3) #endif #include <commdlg.h> -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma warning(pop) #endif @@ -195,7 +195,11 @@ void OnInit( { // Store parameters +#ifndef __REACTOS__ + SetWindowLong(hDlg, GWL_USERDATA, (ULONG)pParam); +#else SetWindowLongPtr(hDlg, GWLP_USERDATA, (ULONG_PTR)pParam); +#endif // clear the target existence flag @@ -293,7 +297,11 @@ void OnTarget( // // get the current image info // +#ifndef __REACTOS__ + param = (PCSAVE_PARAM)GetWindowLong(hDlg, GWL_USERDATA); +#else param = (PCSAVE_PARAM)GetWindowLongPtr(hDlg, GWLP_USERDATA); +#endif if (_stricmp(param->ImageName, buf) == 0) { @@ -422,7 +430,11 @@ void OnBrowse( ofn.lpstrInitialDir = dir; ofn.lpstrTitle = title ? title : "Save Image"; ofn.lpstrFilter = "*.*\0*.*\0"; +#ifndef __REACTOS__ + ofn.Flags = OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#else ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; +#endif if (GetSaveFileName(&ofn)) { SetDlgItemText(hDlg, IDC_TARGETFILE, file); @@ -469,7 +481,11 @@ DWORD OnOK( BOOL truncate; DWORD ret; +#ifndef __REACTOS__ + param = (PCSAVE_PARAM)GetWindowLong(hDlg, GWL_USERDATA); +#else param = (PCSAVE_PARAM)GetWindowLongPtr(hDlg, GWLP_USERDATA); +#endif if (!param) { return ERROR_INVALID_FUNCTION; diff --git a/modules/rosapps/lib/vfdlib/vfdguitip.c b/modules/rosapps/lib/vfdlib/vfdguitip.c index c3fcc3a7696..390233efea5 100644 --- a/modules/rosapps/lib/vfdlib/vfdguitip.c +++ b/modules/rosapps/lib/vfdlib/vfdguitip.c @@ -41,8 +41,13 @@ static LRESULT CALLBACK ToolTipProc( switch (uMsg) { case WM_CREATE: // Store Font handle +#ifndef __REACTOS__ + SetWindowLong(hWnd, GWL_USERDATA, + (LONG)((LPCREATESTRUCT)lParam)->lpCreateParams); +#else SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)((LPCREATESTRUCT)lParam)->lpCreateParams); +#endif return 0; case WM_PAINT: @@ -56,7 +61,11 @@ static LRESULT CALLBACK ToolTipProc( RECT rc; +#ifndef __REACTOS__ + SelectObject(hDC, (HFONT)GetWindowLong(hWnd, GWL_USERDATA)); +#else SelectObject(hDC, (HFONT)GetWindowLongPtr(hWnd, GWLP_USERDATA)); +#endif SetTextColor(hDC, GetSysColor(COLOR_INFOTEXT)); SetBkMode(hDC, TRANSPARENT); @@ -121,7 +130,11 @@ static LRESULT CALLBACK ToolTipProc( case WM_DESTROY: // delete font +#ifndef __REACTOS__ + DeleteObject((HFONT)GetWindowLong(hWnd, GWL_USERDATA)); +#else DeleteObject((HFONT)GetWindowLongPtr(hWnd, GWLP_USERDATA)); +#endif return 0; } diff --git a/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc b/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc index cffa15b93d3..5292bef5b20 100644 --- a/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc +++ b/modules/rosapps/lib/vfdlib/vfdmsg_lib.mc @@ -11,6 +11,12 @@ ;#ifndef _VFDMSG_H_ ;#define _VFDMSG_H_ ; +;/* +; __REACTOS__: +; * Renamed file from vfdmsg.mc. +; - Removed Japanese language. +; + Added a second blank line between some entries. +;*/ MessageIdTypedef=DWORD LanguageNames=(English=0x409:msg0409) diff --git a/modules/rosapps/lib/vfdlib/vfdshext.h b/modules/rosapps/lib/vfdlib/vfdshext.h index 728aaec6dcb..5d45b2287ee 100644 --- a/modules/rosapps/lib/vfdlib/vfdshext.h +++ b/modules/rosapps/lib/vfdlib/vfdshext.h @@ -70,7 +70,7 @@ public: #ifndef __REACTOS__ UINT idCmd, #else - UINT_PTR idCmd, + UINT_PTR idCmd, #endif UINT uFlags, UINT *reserved, diff --git a/modules/rosapps/lib/vfdlib/vfdshmenu.cpp b/modules/rosapps/lib/vfdlib/vfdshmenu.cpp index 35a67142659..cda760a870e 100644 --- a/modules/rosapps/lib/vfdlib/vfdshmenu.cpp +++ b/modules/rosapps/lib/vfdlib/vfdshmenu.cpp @@ -270,7 +270,7 @@ STDMETHODIMP CVfdShExt::GetCommandString( #ifndef __REACTOS__ UINT idCmd, #else - UINT_PTR idCmd, + UINT_PTR idCmd, #endif UINT uFlags, UINT *reserved, @@ -350,6 +350,7 @@ STDMETHODIMP CVfdShExt::InvokeCommand( } #endif + if (!unicode && HIWORD(lpcmi->lpVerb)) { VFDTRACE(0, ("ANSI: %s\n", lpcmi->lpVerb)); diff --git a/modules/rosapps/lib/vfdlib/vfdshutil.cpp b/modules/rosapps/lib/vfdlib/vfdshutil.cpp index be9b8f47c83..a3a6e965a7a 100644 --- a/modules/rosapps/lib/vfdlib/vfdshutil.cpp +++ b/modules/rosapps/lib/vfdlib/vfdshutil.cpp @@ -22,14 +22,14 @@ // Initialize the GUID instance //===================================== -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma data_seg(".text") #endif #define INITGUID #include <initguid.h> #include <shlguid.h> #include "vfdshguid.h" -#ifdef _MSC_VER +#if !defined(__REACTOS__) || defined(_MSC_VER) #pragma data_seg() #endif

4 months, 1 week

[reactos] 02/03: [VFD] Remove 2 useless CMakeLists.txt

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1abac8f6db4ee13334b16… commit 1abac8f6db4ee13334b16d718d14b22028d28436 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:23:01 2024 +0300 [VFD] Remove 2 useless CMakeLists.txt Addendum to 25c7e1a (0.4.7-dev-1106). --- modules/rosapps/CMakeLists.txt | 1 - modules/rosapps/include/CMakeLists.txt | 1 - modules/rosapps/include/vfd/CMakeLists.txt | 0 3 files changed, 2 deletions(-) diff --git a/modules/rosapps/CMakeLists.txt b/modules/rosapps/CMakeLists.txt index 649429e3dad..0849142464e 100644 --- a/modules/rosapps/CMakeLists.txt +++ b/modules/rosapps/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(applications) add_subdirectory(demos) add_subdirectory(drivers) -add_subdirectory(include) add_subdirectory(lib) if(ENABLE_ROSAPPS_TEMPLATES) diff --git a/modules/rosapps/include/CMakeLists.txt b/modules/rosapps/include/CMakeLists.txt deleted file mode 100644 index 2c82e7c2ed5..00000000000 --- a/modules/rosapps/include/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(vfd) diff --git a/modules/rosapps/include/vfd/CMakeLists.txt b/modules/rosapps/include/vfd/CMakeLists.txt deleted file mode 100644 index e69de29bb2d..00000000000

4 months, 1 week

[reactos] 01/03: [DOC] 3rd Party Files.txt: Add 'Virtual Floppy Drive'

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=520ed9548689eeb967686… commit 520ed9548689eeb967686e93b471537b9c600117 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 31 18:23:01 2024 +0300 [DOC] 3rd Party Files.txt: Add 'Virtual Floppy Drive' Addendum to 25c7e1a (0.4.7-dev-1106). --- media/doc/3rd Party Files.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 3852ec1cd30..bd86c57550f 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -287,3 +287,11 @@ Path: sdk/lib/crt/math/libm_sse2 Used Version: git commit 6121d02 License: MIT (https://spdx.org/licenses/MIT.html) URL: https://github.com/amd/win-libm + +Title: Virtual Floppy Drive +Path: modules/rosapps/applications/cmdutils/vfdcmd +Path: modules/rosapps/drivers/vfd +Path: modules/rosapps/lib/vfdlib +Used Version: 2.1.2008.206 +License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) +URL: https://vfd.sourceforge.net/

4 months, 1 week

[reactos] 01/01: [COMDLG32] Improve Portuguese (pt-PT) translation (#7236)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ed149d7da63f03979ebe… commit 7ed149d7da63f03979ebea9588a68b61790a31c8 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Aug 31 06:56:57 2024 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 13:56:57 2024 +0300 [COMDLG32] Improve Portuguese (pt-PT) translation (#7236) - Remove accel key from Ok buttons that are DEFPUSHBUTTON. - Fix accelerator key collisions. --- dll/win32/comdlg32/lang/cdlg_Pt.rc | 61 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Pt.rc b/dll/win32/comdlg32/lang/cdlg_Pt.rc index 7cbead92601..704c6de898c 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pt.rc @@ -156,12 +156,12 @@ FONT 8, "MS Shell Dlg" LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Listar ficheiros do &Tipo:", stc2, 6, 104, 90, 9 COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Con&troladores:", stc4, 110, 104, 92, 9 + LTEXT "&Controladores:", stc4, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP //FIXME: accelerator collision &A, I guess this should be &j - CHECKBOX "&Apenas de leitura", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP //FIXME: accelerator collision &A + PUSHBUTTON "A&juda", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Apenas de leitura", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } SAVE_FILE DIALOG 36, 24, 275, 134 @@ -177,7 +177,7 @@ FONT 8, "MS Shell Dlg" LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Listar ficheiros do &tipo:", stc2, 6, 104, 90, 9 COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Con&troladores:", stc4, 110, 104, 92, 9 + LTEXT "&Controladores:", stc4, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Guardar Como", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -198,7 +198,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "&Páginas", rad3, 16, 75, 60, 12 DEFPUSHBUTTON "&Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Con&figurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Configurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "De:", stc3, 60, 80, 30, 9 LTEXT "Até:", stc4, 120, 80, 30, 9 LTEXT "Qualidade de impressão:", stc5, 6, 100, 76, 9 @@ -217,9 +217,9 @@ FONT 8, "MS Shell Dlg" LTEXT "[none]", stc1, 35, 30, 120, 9 RADIOBUTTON "Impressora &específica", rad2, 16, 44, 150, 12 COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Con&figurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Configurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Orientação", grp2, 6, 82, 100, 50, BS_GROUPBOX RADIOBUTTON "&Retrato", rad3, 50, 95, 50, 12 RADIOBUTTON "&Paisagem", rad4, 50, 110, 50, 12 @@ -246,7 +246,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Tamanho:", stc3, 179, 3, 32, 9 COMBOBOX cmb3, 179, 13, 32, 76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "&OK", IDOK, 218, 6, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "OK", IDOK, 218, 6, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 218, 23, 50, 14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Aplicar", psh3, 218, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&juda" , pshHelp, 218, 57, 50, 14, WS_GROUP | WS_TABSTOP @@ -270,7 +270,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "Cores &básicas:", stc1, 4, 4, 140, 10 LTEXT "&Cores do utilizador:", stc2, 4, 106, 140, 10 - LTEXT "Colorido|sólid&o", stc3, 150, 151, 48, 10 //FIXME: accelerator collision &O + LTEXT "Colorido|sólid&o", stc3, 150, 151, 48, 10 LTEXT "Ver&melho:", IDC_COLOR_RL /*1094*/, 247, 126, 27, 10 EDITTEXT IDC_COLOR_EDIT_R, 275, 124, 21, 12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Verde:", IDC_COLOR_GL /*1095*/, 247, 140, 27, 10 @@ -288,7 +288,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_COLOR_GRAPH, "STATIC", WS_BORDER | SS_SIMPLE | WS_TABSTOP | WS_GROUP, 152, 4, 118, 116 CONTROL "", IDC_COLOR_LUMBAR, "STATIC", SS_SIMPLE | WS_TABSTOP | WS_GROUP, 278, 4, 8, 116 CONTROL "", IDC_COLOR_RESULT, "STATIC", SS_SIMPLE | WS_TABSTOP | WS_GROUP, 152, 124, 40, 26 - DEFPUSHBUTTON "&OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP //FIXME:accelerator collision &O + DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&juda", pshHelp, 100, 166, 44, 14 PUSHBUTTON "&Adicionar cor personalizada", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP @@ -301,16 +301,16 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Procurar" FONT 8, "MS Shell Dlg" { - LTEXT "&Procurar:", -1, 4, 8, 52, 8 //FIXME: accelerator collision &P + LTEXT "&Procurar:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Palavra &inteira", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Maiúsculas/minúsculas", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direcção", grp1, 147, 21, 58, 38 - AUTORADIOBUTTON "&Acima", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP//FIXME: accelerator collision &A + AUTORADIOBUTTON "&Acima", rad1, 151, 30, 48, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "A&baixo", rad2, 151, 44, 48, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON //FIXME: accelerator collision &P + DEFPUSHBUTTON "Pr&ocurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda", pshHelp, 212, 42, 60, 14, WS_GROUP | WS_TABSTOP //FIXME: accelerator collision &A + PUSHBUTTON "A&juda", pshHelp, 212, 42, 60, 14, WS_GROUP | WS_TABSTOP } REPLACEDLGORD DIALOG 36, 24, 276, 94 @@ -318,17 +318,17 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Substituir" FONT 8, "MS Shell Dlg" { - LTEXT "&Procurar:", -1, 4, 8, 52, 8 //FIXME: accelerator collision &P + LTEXT "&Procurar:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "Substituir po&r:", -1, 4, 26, 52, 8 EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Palavra &inteira", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Maiúsculas/minúsculas", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON //FIXME: accelerator collision &P + DEFPUSHBUTTON "Pr&ocurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&Substituir", psh1, 212, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Substituir &tudo", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 212, 60, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ajuda", pshHelp, 212, 78, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&juda", pshHelp, 212, 78, 60, 14, WS_GROUP | WS_TABSTOP } PRINT32 DIALOG 32, 32, 288, 186 @@ -338,7 +338,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 176, 164, 50, 14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 230, 164, 50, 14, WS_GROUP - PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 50,14, WS_GROUP //FIXME: accelerator collision &A. Should this be &j? + PUSHBUTTON "A&juda", pshHelp, 50, 161, 50,14, WS_GROUP GROUPBOX "Impressora", grp4, 8, 4, 272, 84, WS_GROUP CONTROL "Para &ficheiro", chx1, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 185, 36, 90, 16 PUSHBUTTON "&Propriedades", psh2, 212, 17, 60,14, WS_GROUP @@ -355,16 +355,16 @@ FONT 8, "MS Shell Dlg" GROUPBOX "Cópias", grp2, 160, 92, 120, 64, WS_GROUP LTEXT "Número de &cópias:", stc5, 168, 105, 68, 8 ICON "", ico3, 210, 131, 76, 24, WS_GROUP - CONTROL "&Agrupar", chx2, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 168, 118, 100, 12 //FIXME: accelerator collision &A + CONTROL "A&grupar", chx2, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 168, 118, 100, 12 EDITTEXT edt3, 240, 103, 32, 12, WS_GROUP | ES_NUMBER GROUPBOX "Faixa de impressão", grp1, 8, 92, 144, 64, WS_GROUP AUTORADIOBUTTON "&Todos", rad1, 16, 106, 64, 12, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Páginas", rad3, 16, 122, 36, 12 - AUTORADIOBUTTON "Selecção", rad2, 16, 138, 64, 12 + AUTORADIOBUTTON "Pág&inas", rad3, 16, 122, 36, 12 + AUTORADIOBUTTON "&Selecção", rad2, 16, 138, 64, 12 EDITTEXT edt1, 73, 122, 26, 12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120, 122, 26, 12, WS_GROUP | ES_NUMBER RTEXT "&de:", stc2, 52, 124, 20, 8 - RTEXT "&até", stc3, 99, 124, 20, 8 //FIXME: accelerator collision &A + RTEXT "&até", stc3, 99, 124, 20, 8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -376,7 +376,7 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 230, 156, 50, 14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ GROUPBOX "Impressora", grp4, 8, 4, 272, 84, WS_GROUP - PUSHBUTTON "&Propriedades", psh2, 212, 17, 60, 14, WS_GROUP //FIXME: accelerator collision &P + PUSHBUTTON "&Propriedades", psh2, 212, 17, 60, 14, WS_GROUP LTEXT "&Nome:", stc6, 16, 20, 36, 8 COMBOBOX cmb1, 52, 18, 152, 152, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Status:", stc8, 16, 36, 47, 10, SS_NOPREFIX @@ -395,7 +395,7 @@ BEGIN GROUPBOX "Orientação", grp1, 180, 92, 100, 56, WS_GROUP ICON "", ico1, 195, 112, 18, 20, WS_GROUP AUTORADIOBUTTON "&Retrato", rad1, 224, 106, 52, 12, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "&Paisagem", rad2, 224, 126, 52, 12//FIXME: accelerator collision &P + AUTORADIOBUTTON "Pai&sagem", rad2, 224, 126, 52, 12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 @@ -413,7 +413,7 @@ BEGIN COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL GROUPBOX "Orientação", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12 - AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12 + AUTORADIOBUTTON "P&aisagem", rad2, 16, 190, 52, 12 GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Esquerda:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP | WS_BORDER @@ -442,10 +442,10 @@ FONT 8, "MS Shell Dlg" CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63, 110, 150, 150 LTEXT "Ficheiros do &tipo:", IDC_FILETYPESTATIC, 5, 130, 56, 16, SS_NOTIFY COMBOBOX IDC_FILETYPE, 63, 128, 150, 53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Abrir como &apenas-leitura", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 63, 148, 150, 10 //FIXME: accelerator collision &A - DEFPUSHBUTTON "&Abrir", IDOK, 222, 110, 54, 14 //FIXME: accelerator collision &A + CONTROL "Abrir como apenas-&leitura", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 63, 148, 150, 10 + DEFPUSHBUTTON "&Abrir", IDOK, 222, 110, 54, 14 PUSHBUTTON "Cancelar", IDCANCEL, 222, 128, 54, 14 - PUSHBUTTON "&Ajuda", pshHelp, 222, 145, 54, 14 //FIXME: accelerator collision &A, I do guess this one should have &j + PUSHBUTTON "A&juda", pshHelp, 222, 145, 54, 14 } NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 @@ -463,7 +463,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 LTEXT "Ficheiros &tipo:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Abrir como só leitura", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + CONTROL "Abrir como só &leitura", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 DEFPUSHBUTTON "&Abrir", IDOK, 310, 180, 54, 14 PUSHBUTTON "Cancelar", IDCANCEL, 310, 198, 54, 14 PUSHBUTTON "A&juda", pshHelp, 310, 215, 54, 14 @@ -483,6 +483,5 @@ FONT 8, "MS Shell Dlg" /* drop-down menu for open button */ CONTROL "6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP | BS_CHECKBOX | BS_PUSHLIKE, 342, 240, 8, 14 PUSHBUTTON "Cancelar", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS - PUSHBUTTON "&Ajuda", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS //FIXME: accelerator collision &A, I do guess this one should have &j + PUSHBUTTON "A&juda", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS } -

4 months, 1 week

[reactos] 01/01: [BROWSEUI] Improve Portuguese (pt-PT) translation (#7232)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=824b190a5b88c26f226b9… commit 824b190a5b88c26f226b94b02b5acda8c203c057 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Aug 31 06:50:19 2024 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 31 13:50:19 2024 +0300 [BROWSEUI] Improve Portuguese (pt-PT) translation (#7232) - Fix typos and improve pt-PT translation. - Add file header. --- dll/win32/browseui/lang/pt-PT.rc | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 961b84e66a9..2e1cd2c708a 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -1,4 +1,10 @@ -/* Brazilian Portuguese translation by Edison Henrique Andreassy (ehasis(a)hotmail.com) */ +/* + * PROJECT: ReactOS Win32 BrowseUI + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATORS: Copyright 2019-2024 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> + * Copyright 2021 Gabriel Aguiar <fgsoftwarestudio(a)gmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL @@ -10,7 +16,7 @@ BEGIN BEGIN MENUITEM "&Botões padrão", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED MENUITEM "Barra de &endereços", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED - MENUITEM "&Links", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "&Hiperligações", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Bloquear barra de &ferramentas", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED MENUITEM "Per&sonalizar...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED @@ -68,7 +74,7 @@ BEGIN BEGIN MENUITEM "&Mapear unidades de rede...", IDM_TOOLS_MAPNETWORKDRIVE MENUITEM "&Desligar unidade de rede...", IDM_TOOLS_DISCONNECTNETWORKDRIVE - MENUITEM "&Sincrinizar...", IDM_TOOLS_SYNCHRONIZE + MENUITEM "&Sincronizar...", IDM_TOOLS_SYNCHRONIZE MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Opções de pasta...", IDM_TOOLS_FOLDEROPTIONS END @@ -101,8 +107,8 @@ BEGIN BEGIN POPUP "&Vista", IDM_VIEW_MENU BEGIN - MENUITEM "Icones &grandes", IDM_LARGE_ICONS - MENUITEM "Icones &pequenos", IDM_SMALL_ICONS + MENUITEM "Ícones &grandes", IDM_LARGE_ICONS + MENUITEM "Ícones &pequenos", IDM_SMALL_ICONS END MENUITEM "&Abrir pasta", IDM_OPEN_FOLDER MENUITEM "&Mostrar texto", IDM_SHOW_TEXT @@ -140,7 +146,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Procurar por um dos seguintes critérios.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "A totalidade &ou parte do nome de ficheiro:", -1, 10, 25, 500, 10 + LTEXT "A totalidade &ou parte do nome do ficheiro:", -1, 10, 25, 500, 10 EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP LTEXT "&Uma palavra ou frase no ficheiro:", -1, 10, 50, 500, 10 @@ -226,7 +232,7 @@ END STRINGTABLE BEGIN 9250 "Mostra informações sobre o programa, o número da versão e os direitos autorais." - 9252 "Mostra infomrações para depuração." + 9252 "Mostra informações para depuração." END STRINGTABLE @@ -245,12 +251,12 @@ END STRINGTABLE BEGIN - 9505 "Mostra ou oculta barras de ferramentas." - 9506 "Mostra ou oculta barra de status." + 9505 "Mostra ou oculta as barras de ferramentas." + 9506 "Mostra ou oculta a barra de estado." 9508 "Mostra os botões padrão da barra de ferramentas." 9509 "Mostra a barra de endereços." - 9510 "Mostra a barra de ferramentas 'Links rápidos'." - 9516 "Bloqueia tamanhos e posições de barras das ferramentas." + 9510 "Mostra a barra de ferramentas 'Hiperligações'." + 9516 "Bloqueia tamanhos e posições das barras de ferramentas." END STRINGTABLE @@ -260,12 +266,12 @@ END STRINGTABLE BEGIN - 9552 "Mostra ou oculta uma barra do Explorer." + 9552 "Mostra ou oculta uma barra do Explorador." 9553 "Mostra a barra de pesquisa." 9554 "Mostra a barra 'Favoritos'." 9555 "Mostra a barra do histórico." 9557 "Mostra a barra de pastas." - 9559 "Mostra a barra de media." + 9559 "Mostra a barra de média." END STRINGTABLE @@ -295,7 +301,7 @@ END STRINGTABLE BEGIN - IDS_ADDRESSMENUTEXT "&Address" + IDS_ADDRESSMENUTEXT "E&ndereço" IDS_HISTORYTEXT "&Histórico\tCtrl+H" END @@ -313,7 +319,7 @@ END STRINGTABLE BEGIN - IDS_STANDARD_TOOLBAR, "|Voltar|Avançar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Desfazer|Modos de exibição|Parar|Actualizar|Página inicial|Mapear unidade|Desconectar|Favoritos|Histórico|Ecrã inteiro|Propriedades|Recortar|Copiar|Colar|Opções de pasta||" + IDS_STANDARD_TOOLBAR, "|Voltar|Avançar|Acima|Pesquisar|Pastas|Mover para|Copiar para|Excluir|Retroceder|Modos de exibição|Parar|Actualizar|Página inicial|Mapear unidade|Desconectar|Favoritos|Histórico|Ecrã inteiro|Propriedades|Recortar|Copiar|Colar|Opções de pasta||" END STRINGTABLE

4 months, 1 week

[reactos] 01/01: [WIN32NT_APITEST] Update NtUserSetTimer API tests (#7278)

by Tomáš Veselý

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1def09c08c70a89905dc… commit f1def09c08c70a89905dc518c1d51ed2533d2b53 Author: Tomáš Veselý <turican0(a)gmail.com> AuthorDate: Sat Aug 31 01:26:15 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 30 18:26:15 2024 -0500 [WIN32NT_APITEST] Update NtUserSetTimer API tests (#7278) JIRA issue: [CORE-9141](https://jira.reactos.org/browse/CORE-9141) --- modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c index ccdc6da4602..797dc292659 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c @@ -9,7 +9,8 @@ #include "../win32nt.h" #define SLEEP_TIME 500 -#define TIME_TOLERANCE 0.5 +#define MIN_MESSAGES_TIME 1 +#define MAX_MESSAGES_TIME 1000 #define TEST1_COUNT 20 #define TEST1_INTERVAL 10 @@ -71,9 +72,6 @@ static BOOL test1(void) ULONGLONG startTime; MSG msg = { NULL }; - int minMessages = ((float)SLEEP_TIME / (float)TEST1_INTERVAL) * (1 - TIME_TOLERANCE); - int maxMessages = ((float)SLEEP_TIME / (float)TEST1_INTERVAL) * (1 + TIME_TOLERANCE); - ZeroMemory(timerId1, sizeof(timerId1)); for (i = 0; i < TEST1_COUNT; i++) @@ -96,7 +94,7 @@ static BOOL test1(void) for (i = 0; i < TEST1_COUNT; i++) { - if ((timerId1[i].counter < minMessages) || (timerId1[i].counter > maxMessages)) + if ((timerId1[i].counter < MIN_MESSAGES_TIME) || (timerId1[i].counter > MAX_MESSAGES_TIME)) countErrors++; } @@ -162,9 +160,6 @@ static BOOL testW1(HWND hwnd) if (hwnd == NULL) return FALSE; - int minMessages = ((float)SLEEP_TIME / (float)TESTW1_INTERVAL) * (1 - TIME_TOLERANCE); - int maxMessages = ((float)SLEEP_TIME / (float)TESTW1_INTERVAL) * (1 + TIME_TOLERANCE); - ZeroMemory(timerIdW1, sizeof(timerIdW1)); for (i = 0; i < TESTW1_COUNT; i++) @@ -187,7 +182,7 @@ static BOOL testW1(HWND hwnd) for (i = 0; i < TESTW1_COUNT; i++) { - if ((timerIdW1[i].counter < minMessages) || (timerIdW1[i].counter > maxMessages)) + if ((timerIdW1[i].counter < MIN_MESSAGES_TIME) || (timerIdW1[i].counter > MAX_MESSAGES_TIME)) countErrors++; }

4 months, 1 week

[reactos] 01/01: [GDI32][NTUSER] Demote noisy debug prints

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34586814ab70bc2e5d5cc… commit 34586814ab70bc2e5d5ccfe43a948a5e6f23a45b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 27 10:33:40 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 30 16:06:41 2024 +0300 [GDI32][NTUSER] Demote noisy debug prints --- win32ss/gdi/gdi32/objects/text.c | 2 +- win32ss/user/ntuser/painting.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 4ba8c9a5d4d..0f5ac46630e 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -573,7 +573,7 @@ ExtTextOutW( } else // Do nothing, old explorer pops this off. { - DPRINT1("GdiBCExtTextOut nothing\n"); + DPRINT("GdiBCExtTextOut nothing\n"); return TRUE; } } // Max 580 wchars, if offset 0 diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index 58be0b75e8f..e813d25185d 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -155,7 +155,7 @@ IntSendSyncPaint(PWND Wnd, ULONG Flags) Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); do { - ERR("LOOP it\n"); + TRACE("LOOP it\n"); if (Message->Msg.message == WM_SYNCPAINT && Message->Msg.hwnd == UserHMGetHandle(Wnd)) { // Already received so exit out.

4 months, 1 week

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