Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [NEWDEV] Update Romanian (ro-RO) translation (#5989)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=444cff7b10368335426cc… commit 444cff7b10368335426cce623b7f6750f41cb2c3 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Nov 18 23:37:56 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 18 22:37:56 2023 +0100 [NEWDEV] Update Romanian (ro-RO) translation (#5989) --- dll/win32/newdev/lang/ro-RO.rc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/newdev/lang/ro-RO.rc b/dll/win32/newdev/lang/ro-RO.rc index adee0696203..fa875361cd7 100644 --- a/dll/win32/newdev/lang/ro-RO.rc +++ b/dll/win32/newdev/lang/ro-RO.rc @@ -1,10 +1,10 @@ /* - * PROJECT: New device installer (newdev.dll) - * FILE: dll/win32/newdev/lang/ro-RO.rc - * PURPOSE: Romanian Language File for new device installer - * TRANSLATORS: - * Petru Dimitriu (petrimetri at gmail dot com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: New device installer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011 Petru Dimitriu <petrimetri(a)gmail.com> + * Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -15,12 +15,12 @@ CAPTION "Asistent de instalare dispozitiv" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bun venit!", IDC_WELCOMETITLE, 120, 8, 195, 16 - LTEXT "Acest asistent va instala module-pilot pentru dispozitivul:", IDC_STATIC, 120, 21, 195, 16 + LTEXT "Acest asistent va instala un nou driver de dispozitiv pentru:", IDC_STATIC, 120, 21, 195, 16 LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 120, 169, 195, 16 LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 36, 147, 17 LTEXT "AVERTISMENT: INSTALAREA UNUI DISPOZITIV NEOBIȘNUIT VĂ POATE SCOATE DIN FUNCȚIUNE CALCULATORUL!", IDC_STATIC, 120, 59, 195, 16 - CONTROL "Instalează modulele-pilot a&utomat", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 - CONTROL "Instalează modulele-pilot din lo&cație specificată", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 + CONTROL "Instalează driverele a&utomat", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 + CONTROL "Instalează driverele dintr-o lo&cație specificată", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 END IDD_NODRIVER DIALOGEX 0, 0, 317, 193 @@ -29,9 +29,9 @@ CAPTION "Asistent de instalare dispozitiv" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Instalarea a eșuat", IDC_FINISHTITLE, 120, 8, 195, 16 - LTEXT "Dispozitivul nu a putut fi instalat pentru că modulele-pilot nu au fost găsite.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "Apăsați „Înapoi” dacă dețineți un disc sau cunoașteți calea către modulele-pilot.", IDC_STATIC, 120, 98, 195, 16 - CONTROL "N&u doresc recurența acestui dialog", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 + LTEXT "Dispozitivul nu a putut fi instalat pentru că driverele nu au fost găsite.", IDC_STATIC, 120, 32, 195, 16 + LTEXT "Apăsați „Înapoi” dacă dețineți un disc sau cunoașteți calea către driverele.", IDC_STATIC, 120, 98, 195, 16 + CONTROL "N&u mai arăta această fereastră de dialog", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 END IDD_INSTALLFAILED DIALOGEX 0, 0, 317, 193 @@ -50,7 +50,7 @@ CAPTION "Asistent de instalare dispozitiv" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Specific locații de căutare", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 27, 11, 239, 12 - CONTROL "Specific manual modulele-pilot", IDC_RADIO_CHOOSE, "Button", BS_AUTORADIOBUTTON, 27, 98, 171, 12 + CONTROL "Specific manual driverele", IDC_RADIO_CHOOSE, "Button", BS_AUTORADIOBUTTON, 27, 98, 171, 12 CONTROL "Caută pe unitățile detașabile", IDC_CHECK_MEDIA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 33, 163, 12 CONTROL "Caută acest dosar", IDC_CHECK_PATH, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 54, 162, 12 PUSHBUTTON "Spe&cificare…", IDC_BROWSE, 248, 70, 60, 14

1 year, 1 month

[reactos] 01/01: [KERNEL32_VISTA] Sync GetFileInformationByHandleEx with wine head

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=455f33077599729c27f1f… commit 455f33077599729c27f1f1347ad2f6329d50d1f3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 16 16:11:58 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 18 17:53:42 2023 +0200 [KERNEL32_VISTA] Sync GetFileInformationByHandleEx with wine head --- .../kernel32_vista/GetFileInformationByHandleEx.c | 88 ++++++++---- sdk/include/ndk/iotypes.h | 149 +++++++++++++-------- sdk/include/psdk/winbase.h | 15 ++- 3 files changed, 171 insertions(+), 81 deletions(-) diff --git a/dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c b/dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c index e515d30952e..1f671595eb0 100644 --- a/dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c +++ b/dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c @@ -4,51 +4,86 @@ #include <ndk/rtlfuncs.h> #include <ndk/iofuncs.h> +#define NDEBUG +#include <debug.h> + +#undef FIXME +#define FIXME DPRINT1 + /* Taken from Wine kernel32/file.c */ /*********************************************************************** -* GetFileInformationByHandleEx (KERNEL32.@) -*/ -BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLASS class, - LPVOID info, DWORD size ) + * GetFileInformationByHandleEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx(HANDLE handle, FILE_INFO_BY_HANDLE_CLASS class, + LPVOID info, DWORD size) { NTSTATUS status; IO_STATUS_BLOCK io; switch (class) { - case FileStreamInfo: - case FileCompressionInfo: - case FileAttributeTagInfo: case FileRemoteProtocolInfo: - case FileFullDirectoryInfo: - case FileFullDirectoryRestartInfo: case FileStorageInfo: - case FileAlignmentInfo: - case FileIdInfo: - case FileIdExtdDirectoryInfo: - case FileIdExtdDirectoryRestartInfo: - //FIXME( "%p, %u, %p, %u\n", handle, class, info, size ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + case FileDispositionInfoEx: + case FileRenameInfoEx: + case FileCaseSensitiveInfo: + case FileNormalizedNameInfo: + FIXME("%p, %u, %p, %lu\n", handle, class, info, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; + case FileStreamInfo: + status = NtQueryInformationFile(handle, &io, info, size, FileStreamInformation); + break; + + case FileCompressionInfo: + status = NtQueryInformationFile(handle, &io, info, size, FileCompressionInformation); + break; + + case FileAlignmentInfo: + status = NtQueryInformationFile(handle, &io, info, size, FileAlignmentInformation); + break; + + case FileAttributeTagInfo: + status = NtQueryInformationFile(handle, &io, info, size, FileAttributeTagInformation); + break; + case FileBasicInfo: - status = NtQueryInformationFile( handle, &io, info, size, FileBasicInformation ); + status = NtQueryInformationFile(handle, &io, info, size, FileBasicInformation); break; case FileStandardInfo: - status = NtQueryInformationFile( handle, &io, info, size, FileStandardInformation ); + status = NtQueryInformationFile(handle, &io, info, size, FileStandardInformation); break; case FileNameInfo: - status = NtQueryInformationFile( handle, &io, info, size, FileNameInformation ); + status = NtQueryInformationFile(handle, &io, info, size, FileNameInformation); + break; + + case FileIdInfo: + status = NtQueryInformationFile(handle, &io, info, size, FileIdInformation); break; case FileIdBothDirectoryRestartInfo: case FileIdBothDirectoryInfo: - status = NtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, info, size, - FileIdBothDirectoryInformation, FALSE, NULL, - (class == FileIdBothDirectoryRestartInfo) ); + status = NtQueryDirectoryFile(handle, NULL, NULL, NULL, &io, info, size, + FileIdBothDirectoryInformation, FALSE, NULL, + (class == FileIdBothDirectoryRestartInfo)); + break; + + case FileFullDirectoryInfo: + case FileFullDirectoryRestartInfo: + status = NtQueryDirectoryFile(handle, NULL, NULL, NULL, &io, info, size, + FileFullDirectoryInformation, FALSE, NULL, + (class == FileFullDirectoryRestartInfo)); + break; + + case FileIdExtdDirectoryInfo: + case FileIdExtdDirectoryRestartInfo: + status = NtQueryDirectoryFile(handle, NULL, NULL, NULL, &io, info, size, + FileIdExtdDirectoryInformation, FALSE, NULL, + (class == FileIdExtdDirectoryRestartInfo)); break; case FileRenameInfo: @@ -57,14 +92,19 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA case FileIoPriorityHintInfo: case FileEndOfFileInfo: default: - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (status != STATUS_SUCCESS) +#ifdef __REACTOS__ + if (!NT_SUCCESS(status)) { - SetLastError( RtlNtStatusToDosError( status ) ); + SetLastError(RtlNtStatusToDosError(status)); return FALSE; } + return TRUE; +#else + return set_ntstatus(status); +#endif } diff --git a/sdk/include/ndk/iotypes.h b/sdk/include/ndk/iotypes.h index 36914d364a3..6f5ef0bbaea 100644 --- a/sdk/include/ndk/iotypes.h +++ b/sdk/include/ndk/iotypes.h @@ -284,63 +284,100 @@ typedef enum _BUS_DATA_TYPE typedef enum _FILE_INFORMATION_CLASS { FileDirectoryInformation = 1, - FileFullDirectoryInformation, - FileBothDirectoryInformation, - FileBasicInformation, - FileStandardInformation, - FileInternalInformation, - FileEaInformation, - FileAccessInformation, - FileNameInformation, - FileRenameInformation, - FileLinkInformation, - FileNamesInformation, - FileDispositionInformation, - FilePositionInformation, - FileFullEaInformation, - FileModeInformation, - FileAlignmentInformation, - FileAllInformation, - FileAllocationInformation, - FileEndOfFileInformation, - FileAlternateNameInformation, - FileStreamInformation, - FilePipeInformation, - FilePipeLocalInformation, - FilePipeRemoteInformation, - FileMailslotQueryInformation, - FileMailslotSetInformation, - FileCompressionInformation, - FileObjectIdInformation, - FileCompletionInformation, - FileMoveClusterInformation, - FileQuotaInformation, - FileReparsePointInformation, - FileNetworkOpenInformation, - FileAttributeTagInformation, - FileTrackingInformation, - FileIdBothDirectoryInformation, - FileIdFullDirectoryInformation, - FileValidDataLengthInformation, - FileShortNameInformation, - FileIoCompletionNotificationInformation, -#if (NTDDI_VERSION >= NTDDI_VISTA) - FileIoStatusBlockRangeInformation, - FileIoPriorityHintInformation, - FileSfioReserveInformation, - FileSfioVolumeInformation, - FileHardLinkInformation, - FileProcessIdsUsingFileInformation, - FileNormalizedNameInformation, - FileNetworkPhysicalNameInformation, + FileFullDirectoryInformation = 2, + FileBothDirectoryInformation = 3, + FileBasicInformation = 4, + FileStandardInformation = 5, + FileInternalInformation = 6, + FileEaInformation = 7, + FileAccessInformation = 8, + FileNameInformation = 9, + FileRenameInformation = 10, + FileLinkInformation = 11, + FileNamesInformation = 12, + FileDispositionInformation = 13, + FilePositionInformation = 14, + FileFullEaInformation = 15, + FileModeInformation = 16, + FileAlignmentInformation = 17, + FileAllInformation = 18, + FileAllocationInformation = 19, + FileEndOfFileInformation = 20, + FileAlternateNameInformation = 21, + FileStreamInformation = 22, + FilePipeInformation = 23, + FilePipeLocalInformation = 24, + FilePipeRemoteInformation = 25, + FileMailslotQueryInformation = 26, + FileMailslotSetInformation = 27, + FileCompressionInformation = 28, + FileObjectIdInformation = 29, + FileCompletionInformation = 30, + FileMoveClusterInformation = 31, + FileQuotaInformation = 32, + FileReparsePointInformation = 33, + FileNetworkOpenInformation = 34, + FileAttributeTagInformation = 35, + FileTrackingInformation = 36, + FileIdBothDirectoryInformation = 37, + FileIdFullDirectoryInformation = 38, + FileValidDataLengthInformation = 39, + FileShortNameInformation = 40, + FileIoCompletionNotificationInformation = 41, +#if (NTDDI_VERSION >= NTDDI_VISTA) || defined(__REACTOS__) + FileIoStatusBlockRangeInformation = 42, + FileIoPriorityHintInformation = 43, + FileSfioReserveInformation = 44, + FileSfioVolumeInformation = 45, + FileHardLinkInformation = 46, + FileProcessIdsUsingFileInformation = 47, + FileNormalizedNameInformation = 48, + FileNetworkPhysicalNameInformation = 49, #endif -#if (NTDDI_VERSION >= NTDDI_WIN7) - FileIdGlobalTxDirectoryInformation, - FileIsRemoteDeviceInformation, - FileUnusedInformation, - FileNumaNodeInformation, - FileStandardLinkInformation, - FileRemoteProtocolInformation, +#if (NTDDI_VERSION >= NTDDI_WIN7) || defined(__REACTOS__) + FileIdGlobalTxDirectoryInformation = 50, + FileIsRemoteDeviceInformation = 51, + FileAttributeCacheInformation = 52, // FileUnusedInformation since Windows 8.1 + FileNumaNodeInformation = 53, + FileStandardLinkInformation = 54, + FileRemoteProtocolInformation = 55, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN8) || defined(__REACTOS__) + FileRenameInformationBypassAccessCheck = 56, + FileLinkInformationBypassAccessCheck = 57, + FileVolumeNameInformation = 58, + FileIdInformation = 59, + FileIdExtdDirectoryInformation = 60, +#endif +#if (NTDDI_VERSION >= NTDDI_WINBLUE) || defined(__REACTOS__) + FileReplaceCompletionInformation = 61, + FileHardLinkFullIdInformation = 62, + FileIdExtdBothDirectoryInformation = 63, // Update 1 +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) || defined(__REACTOS__) + FileDispositionInformationEx = 64, + FileRenameInformationEx = 65, + FileRenameInformationExBypassAccessCheck = 66, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS2) || defined(__REACTOS__) + FileDesiredStorageClassInformation = 67, + FileStatInformation = 68, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS3) || defined(__REACTOS__) + FileMemoryPartitionInformation = 69, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS4) || defined(__REACTOS__) + FileStatLxInformation = 70, + FileCaseSensitiveInformation = 71, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS5) || defined(__REACTOS__) + FileLinkInformationEx = 72, + FileLinkInformationExBypassAccessCheck = 73, + FileStorageReserveIdInformation = 74, + FileCaseSensitiveInformationForceAccessCheck = 75, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN11) || defined(__REACTOS__) // 10.0.20150.1000 + FileKnownFolderInformation = 76, #endif FileMaximumInformation } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 397ad4d92cc..fa634127695 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -985,6 +985,7 @@ typedef struct _FILE_ID_DESCRIPTOR { } DUMMYUNIONNAME; } FILE_ID_DESCRIPTOR, *LPFILE_ID_DESCRIPTOR; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) || defined(__REACTOS__) typedef enum _FILE_INFO_BY_HANDLE_CLASS { FileBasicInfo, FileStandardInfo, @@ -1002,13 +1003,25 @@ typedef enum _FILE_INFO_BY_HANDLE_CLASS { FileRemoteProtocolInfo, FileFullDirectoryInfo, FileFullDirectoryRestartInfo, +#if (NTDDI_VERSION >= NTDDI_WIN8) || defined(__REACTOS__) FileStorageInfo, FileAlignmentInfo, FileIdInfo, FileIdExtdDirectoryInfo, FileIdExtdDirectoryRestartInfo, - MaximumFileInfoByHandlesClass +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) || defined(__REACTOS__) + FileDispositionInfoEx, + FileRenameInfoEx, +#endif +#if (NTDDI_VERSION >= NTDDI_WIN10_19H1) || defined(__REACTOS__) + FileCaseSensitiveInfo, + FileNormalizedNameInfo, +#endif + MaximumFileInfoByHandleClass, + MaximumFileInfoByHandlesClass = MaximumFileInfoByHandleClass // Old name } FILE_INFO_BY_HANDLE_CLASS, *PFILE_INFO_BY_HANDLE_CLASS; +#endif typedef struct _FILE_ID_BOTH_DIR_INFO { DWORD NextEntryOffset;

1 year, 1 month

[reactos] 01/01: [KMTEST] Fix duplicated test names to stop testman from blowing up

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=908cda5ee496cd4be6dfc… commit 908cda5ee496cd4be6dfcbdb4ece949fe192df29 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 18 10:43:50 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 18 15:01:06 2023 +0200 [KMTEST] Fix duplicated test names to stop testman from blowing up --- modules/rostests/kmtests/kmtest/testlist.c | 2 +- modules/rostests/kmtests/kmtest_drv/testlist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 9f9197e3bff..60ab4bb4534 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -71,7 +71,7 @@ const KMT_TEST TestList[] = { "TcpIpTdi", Test_TcpIpTdi }, { "TcpIpConnect", Test_TcpIpConnect }, #ifdef _M_AMD64 - { "RtlCaptureContext", Test_RtlCaptureContext }, + { "RtlCaptureContextUM", Test_RtlCaptureContext }, #endif { NULL, NULL }, }; diff --git a/modules/rostests/kmtests/kmtest_drv/testlist.c b/modules/rostests/kmtests/kmtest_drv/testlist.c index 1bc9fd00336..9ef992257ee 100644 --- a/modules/rostests/kmtests/kmtest_drv/testlist.c +++ b/modules/rostests/kmtests/kmtest_drv/testlist.c @@ -169,7 +169,7 @@ const KMT_TEST TestList[] = { "ZwMapViewOfSection", Test_ZwMapViewOfSection }, { "ZwWaitForMultipleObjects", Test_ZwWaitForMultipleObjects}, #ifdef _M_AMD64 - { "RtlCaptureContext", Test_RtlCaptureContext }, + { "RtlCaptureContextKM", Test_RtlCaptureContext }, #endif { NULL, NULL } };

1 year, 1 month

[reactos] 01/01: [MSPAINT] Add get/putSubImage in dib.cpp and use them

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=764e5505a7d4fc36df8c6… commit 764e5505a7d4fc36df8c631037ca8eb9ee67294a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 14:25:19 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 18 14:25:19 2023 +0900 [MSPAINT] Add get/putSubImage in dib.cpp and use them CORE-19094 --- base/applications/mspaint/dib.cpp | 33 ++++++++++++++++++++++++++++ base/applications/mspaint/dib.h | 2 ++ base/applications/mspaint/fullscreen.cpp | 2 +- base/applications/mspaint/history.cpp | 29 ++++++++---------------- base/applications/mspaint/selectionmodel.cpp | 12 ++++------ 5 files changed, 49 insertions(+), 29 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index d6ea224de79..6ff4f200a5b 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -406,6 +406,39 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) return hbmNew; } +HBITMAP getSubImage(HBITMAP hbmWhole, const RECT& rcPartial) +{ + CRect rc = rcPartial; + HBITMAP hbmPart = CreateDIBWithProperties(rc.Width(), rc.Height()); + if (!hbmPart) + return NULL; + + HDC hDC1 = ::CreateCompatibleDC(NULL); + HDC hDC2 = ::CreateCompatibleDC(NULL); + HGDIOBJ hbm1Old = ::SelectObject(hDC1, hbmWhole); + HGDIOBJ hbm2Old = ::SelectObject(hDC2, hbmPart); + ::BitBlt(hDC2, 0, 0, rc.Width(), rc.Height(), hDC1, rc.left, rc.top, SRCCOPY); + ::SelectObject(hDC1, hbm1Old); + ::SelectObject(hDC2, hbm2Old); + ::DeleteDC(hDC1); + ::DeleteDC(hDC2); + return hbmPart; +} + +void putSubImage(HBITMAP hbmWhole, const RECT& rcPartial, HBITMAP hbmPart) +{ + CRect rc = rcPartial; + HDC hDC1 = ::CreateCompatibleDC(NULL); + HDC hDC2 = ::CreateCompatibleDC(NULL); + HGDIOBJ hbm1Old = ::SelectObject(hDC1, hbmWhole); + HGDIOBJ hbm2Old = ::SelectObject(hDC2, hbmPart); + ::BitBlt(hDC1, rc.left, rc.top, rc.Width(), rc.Height(), hDC2, 0, 0, SRCCOPY); + ::SelectObject(hDC1, hbm1Old); + ::SelectObject(hDC2, hbm2Old); + ::DeleteDC(hDC1); + ::DeleteDC(hDC2); +} + struct BITMAPINFODX : BITMAPINFO { RGBQUAD bmiColorsAdditional[256 - 1]; diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index bb9d933a14a..9d5ab00c47c 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -44,3 +44,5 @@ float PpcmFromDpi(float dpi); HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap); HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal); HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF); +HBITMAP getSubImage(HBITMAP hbmWhole, const RECT& rcPartial); +void putSubImage(HBITMAP hbmWhole, const RECT& rcPartial, HBITMAP hbmPart); diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index 8443cedeb6c..d7ab33b0ca5 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -44,7 +44,7 @@ LRESULT CFullscreenWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL INT cyDest = imageModel.GetHeight(); INT xDest = (rcWnd.right - rcWnd.left - cxDest) / 2; INT yDest = (rcWnd.bottom - rcWnd.top - cyDest) / 2; - BitBlt(hDC, xDest, yDest, cxDest, cyDest, imageModel.GetDC(), 0, 0, SRCCOPY); + ::BitBlt(hDC, xDest, yDest, cxDest, cyDest, imageModel.GetDC(), 0, 0, SRCCOPY); EndPaint(&ps); return 0; } diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index f56981a2bb6..c0f347d0aa9 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -152,33 +152,22 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) if (nHeight <= 0) nHeight = 1; - // Create an HBITMAP - HBITMAP hbmCropped = CreateDIBWithProperties(nWidth, nHeight); - if (!hbmCropped) + // Create a white HBITMAP + HBITMAP hbmNew = CreateColorDIB(nWidth, nHeight, RGB(255, 255, 255)); + if (!hbmNew) { ShowOutOfMemory(); return; } - // Select the HBITMAP by memory DC - HDC hdcMem = ::CreateCompatibleDC(m_hDrawingDC); - HGDIOBJ hbmOld = ::SelectObject(hdcMem, hbmCropped); - - // Fill background of the HBITMAP - RECT rcBack = { 0, 0, nWidth, nHeight }; - HBRUSH hbrBack = ::CreateSolidBrush(paletteModel.GetBgColor()); - ::FillRect(hdcMem, &rcBack, hbrBack); - ::DeleteObject(hbrBack); - - // Copy the old content - ::BitBlt(hdcMem, -nOffsetX, -nOffsetY, GetWidth(), GetHeight(), m_hDrawingDC, 0, 0, SRCCOPY); - - // Clean up - ::SelectObject(hdcMem, hbmOld); - ::DeleteDC(hdcMem); + // Put the master image as a sub-image + RECT rcPart = { -nOffsetX, -nOffsetY, GetWidth() - nOffsetX, GetHeight() - nOffsetY }; + HBITMAP hbmOld = imageModel.LockBitmap(); + putSubImage(hbmNew, rcPart, hbmOld); + imageModel.UnlockBitmap(hbmOld); // Push it - PushImageForUndo(hbmCropped); + PushImageForUndo(hbmNew); NotifyImageChanged(); } diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index a9744ba2d61..76333de6f45 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -157,14 +157,10 @@ HBITMAP SelectionModel::GetSelectionContents() if (m_hbmColor) return CopyDIBImage(m_hbmColor, m_rc.Width(), m_rc.Height()); - HDC hMemDC = ::CreateCompatibleDC(NULL); - HBITMAP hBitmap = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); - HGDIOBJ hbmOld = ::SelectObject(hMemDC, hBitmap); - ::BitBlt(hMemDC, 0, 0, m_rc.Width(), m_rc.Height(), imageModel.GetDC(), m_rc.left, m_rc.top, SRCCOPY); - ::SelectObject(hMemDC, hbmOld); - ::DeleteDC(hMemDC); - - return hBitmap; + HBITMAP hbmWhole = imageModel.LockBitmap(); + HBITMAP hbmPart = getSubImage(hbmWhole, m_rc); + imageModel.UnlockBitmap(hbmWhole); + return hbmPart; } BOOL SelectionModel::IsLanded() const

1 year, 1 month

[reactos] 01/01: [MSPAINT] Fix PushImageForUndo (follow-up of 7c0615f)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a65ebc8a71569a5c3da32… commit a65ebc8a71569a5c3da32fa046cea83902cec91f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 11:37:34 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 18 11:37:43 2023 +0900 [MSPAINT] Fix PushImageForUndo (follow-up of 7c0615f) CORE-19226, CORE-19237 --- base/applications/mspaint/history.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 6077b7c5c43..f56981a2bb6 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -130,11 +130,10 @@ void ImageModel::PushImageForUndo(HBITMAP hbm) return; } - INT iNextItem = (m_currInd + 1) % HISTORYSIZE; - ::DeleteObject(m_hBms[iNextItem]); + ::DeleteObject(m_hBms[m_currInd]); m_hBms[m_currInd] = m_hbmMaster; m_hbmMaster = hbm; - m_currInd = iNextItem; + m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select if (m_undoSteps < HISTORYSIZE - 1)

1 year, 1 month

[reactos] 01/01: [MSPAINT] Use Swap in RegistrySettings::SetMostRecentFile

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a58aee5f5b673e5e44985… commit a58aee5f5b673e5e44985df30d9ed892a216edf4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 11:23:13 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 18 11:23:13 2023 +0900 [MSPAINT] Use Swap in RegistrySettings::SetMostRecentFile CORE-19237 --- base/applications/mspaint/common.h | 2 +- base/applications/mspaint/registry.cpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index e15297e115b..7f640110806 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -51,7 +51,7 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); #define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) template <typename T> -void Swap(T& a, T& b) +inline void Swap(T& a, T& b) { T tmp = a; a = b; diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index 68c54f5201c..6302555c41b 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -264,11 +264,7 @@ void RegistrySettings::SetMostRecentFile(LPCWSTR szPathName) iFound = i; if (iFound >= 0) - { - CStringW tmp = strFiles[i]; - strFiles[i] = strFiles[i - 1]; - strFiles[i - 1] = tmp; - } + Swap(strFiles[i], strFiles[i - 1]); } // If szPathName is not the first item in strFiles, insert it at the top of the list

1 year, 1 month

[reactos] 01/01: [MSPAINT] Split master image from history items

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c0615fa05762fa03600a… commit 7c0615fa05762fa03600a214b775d5adeb703e38 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 11:19:38 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 18 11:19:38 2023 +0900 [MSPAINT] Split master image from history items CORE-19237 --- base/applications/mspaint/common.h | 8 +++++ base/applications/mspaint/history.cpp | 65 +++++++++++++++++++---------------- base/applications/mspaint/history.h | 1 + 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 125a9cb53a6..e15297e115b 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -49,3 +49,11 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); #define DEG2RAD(degree) (((degree) * M_PI) / 180) #define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) + +template <typename T> +void Swap(T& a, T& b) +{ + T tmp = a; + a = b; + b = tmp; +} diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 9c0d18f5878..6077b7c5c43 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -32,21 +32,18 @@ ImageModel::ImageModel() { ZeroMemory(m_hBms, sizeof(m_hBms)); - m_hBms[0] = CreateColorDIB(1, 1, RGB(255, 255, 255)); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[0]); + m_hbmMaster = CreateColorDIB(1, 1, RGB(255, 255, 255)); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster); g_imageSaved = TRUE; } ImageModel::~ImageModel() { + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select ::DeleteDC(m_hDrawingDC); - - for (size_t i = 0; i < HISTORYSIZE; ++i) - { - if (m_hBms[i]) - ::DeleteObject(m_hBms[i]); - } + ::DeleteObject(m_hbmMaster); + ClearHistory(); } void ImageModel::Undo(BOOL bClearRedo) @@ -57,9 +54,13 @@ void ImageModel::Undo(BOOL bClearRedo) selectionModel.HideSelection(); - // Select previous item - m_currInd = (m_currInd + HISTORYSIZE - 1) % HISTORYSIZE; - ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); + m_currInd = (m_currInd + HISTORYSIZE - 1) % HISTORYSIZE; // Go previous + + ATLASSERT(m_hbmMaster != NULL); + ATLASSERT(m_hBms[m_currInd] != NULL); + + Swap(m_hbmMaster, m_hBms[m_currInd]); + ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select m_undoSteps--; if (bClearRedo) @@ -78,9 +79,12 @@ void ImageModel::Redo() selectionModel.HideSelection(); - // Select next item - m_currInd = (m_currInd + 1) % HISTORYSIZE; - ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); + ATLASSERT(m_hbmMaster != NULL); + ATLASSERT(m_hBms[m_currInd] != NULL); + + Swap(m_hbmMaster, m_hBms[m_currInd]); + m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next + ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select m_redoSteps--; if (m_undoSteps < HISTORYSIZE - 1) @@ -93,7 +97,7 @@ void ImageModel::ClearHistory() { for (int i = 0; i < HISTORYSIZE; ++i) { - if (m_hBms[i] && i != m_currInd) + if (m_hBms[i]) { ::DeleteObject(m_hBms[i]); m_hBms[i] = NULL; @@ -126,11 +130,12 @@ void ImageModel::PushImageForUndo(HBITMAP hbm) return; } - // Go to the next item with an HBITMAP or current item - ::DeleteObject(m_hBms[(m_currInd + 1) % HISTORYSIZE]); - m_hBms[(m_currInd + 1) % HISTORYSIZE] = hbm; - m_currInd = (m_currInd + 1) % HISTORYSIZE; - ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); + INT iNextItem = (m_currInd + 1) % HISTORYSIZE; + ::DeleteObject(m_hBms[iNextItem]); + m_hBms[m_currInd] = m_hbmMaster; + m_hbmMaster = hbm; + m_currInd = iNextItem; + ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select if (m_undoSteps < HISTORYSIZE - 1) m_undoSteps++; @@ -181,7 +186,7 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) void ImageModel::SaveImage(LPCWSTR lpFileName) { - SaveDIBToFile(m_hBms[m_currInd], lpFileName, TRUE); + SaveDIBToFile(m_hbmMaster, lpFileName, TRUE); } BOOL ImageModel::IsImageSaved() const @@ -197,17 +202,17 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk INT newHeight = oldHeight * nStretchPercentY / 100; if (oldWidth != newWidth || oldHeight != newHeight) { - HBITMAP hbm0 = CopyDIBImage(m_hBms[m_currInd], newWidth, newHeight); + HBITMAP hbm0 = CopyDIBImage(m_hbmMaster, newWidth, newHeight); PushImageForUndo(hbm0); } if (nSkewDegX) { - HBITMAP hbm1 = SkewDIB(m_hDrawingDC, m_hBms[m_currInd], nSkewDegX, FALSE); + HBITMAP hbm1 = SkewDIB(m_hDrawingDC, m_hbmMaster, nSkewDegX, FALSE); PushImageForUndo(hbm1); } if (nSkewDegY) { - HBITMAP hbm2 = SkewDIB(m_hDrawingDC, m_hBms[m_currInd], nSkewDegY, TRUE); + HBITMAP hbm2 = SkewDIB(m_hDrawingDC, m_hbmMaster, nSkewDegY, TRUE); PushImageForUndo(hbm2); } NotifyImageChanged(); @@ -215,12 +220,12 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk int ImageModel::GetWidth() const { - return GetDIBWidth(m_hBms[m_currInd]); + return GetDIBWidth(m_hbmMaster); } int ImageModel::GetHeight() const { - return GetDIBHeight(m_hBms[m_currInd]); + return GetDIBHeight(m_hbmMaster); } void ImageModel::InvertColors() @@ -309,15 +314,15 @@ HBITMAP ImageModel::LockBitmap() { // NOTE: An app cannot select a bitmap into more than one device context at a time. ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP hbmLocked = m_hBms[m_currInd]; - m_hBms[m_currInd] = NULL; + HBITMAP hbmLocked = m_hbmMaster; + m_hbmMaster = NULL; return hbmLocked; } void ImageModel::UnlockBitmap(HBITMAP hbmLocked) { - m_hBms[m_currInd] = hbmLocked; - m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select + m_hbmMaster = hbmLocked; + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select } void ImageModel::SelectionClone(BOOL bUndoable) diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 14b5e38a582..e827a430b35 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -45,6 +45,7 @@ public: protected: HDC m_hDrawingDC; // The device context for this class + HBITMAP m_hbmMaster; // The master bitmap int m_currInd; // The current index in m_hBms int m_undoSteps; // The undo-able count int m_redoSteps; // The redo-able count

1 year, 1 month

[reactos] 01/01: [NTOS:CC] Do not access VACB after decrementing it's reference count

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf95b7e8e5e7544a5048e… commit bf95b7e8e5e7544a5048ed700fced44ba238d553 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Nov 7 00:58:15 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 17 20:07:55 2023 +0200 [NTOS:CC] Do not access VACB after decrementing it's reference count It might already be deleted by a different thread. --- ntoskrnl/cc/view.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index efa4c8523d4..2a0590dba49 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -75,13 +75,16 @@ ULONG CcRosVacbIncRefCount_(PROS_VACB vacb, PCSTR file, INT line) ULONG CcRosVacbDecRefCount_(PROS_VACB vacb, PCSTR file, INT line) { ULONG Refs; + BOOLEAN VacbDirty = vacb->Dirty; + BOOLEAN VacbTrace = vacb->SharedCacheMap->Trace; + BOOLEAN VacbPageOut = vacb->PageOut; Refs = InterlockedDecrement((PLONG)&vacb->ReferenceCount); - ASSERT(!(Refs == 0 && vacb->Dirty)); - if (vacb->SharedCacheMap->Trace) + ASSERT(!(Refs == 0 && VacbDirty)); + if (VacbTrace) { DbgPrint("(%s:%i) VACB %p --RefCount=%lu, Dirty %u, PageOut %lu\n", - file, line, vacb, Refs, vacb->Dirty, vacb->PageOut); + file, line, vacb, Refs, VacbDirty, VacbPageOut); } if (Refs == 0)

1 year, 1 month

[reactos] 01/01: [INETCPL] Let image list be automatically deleted (#5892)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a063a2823f74b3e7511… commit a2a063a2823f74b3e751160c75049ca879c6bf22 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 17 10:11:41 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 17 10:11:41 2023 +0900 [INETCPL] Let image list be automatically deleted (#5892) Based on KRosUser's inetsec.patch. Don't delete the image list because the image list will be automatically deleted by the list view. CORE-19301 --- dll/cpl/inetcpl/security.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/cpl/inetcpl/security.c b/dll/cpl/inetcpl/security.c index e11caf1fc3e..91c10765c76 100644 --- a/dll/cpl/inetcpl/security.c +++ b/dll/cpl/inetcpl/security.c @@ -275,10 +275,12 @@ static INT_PTR security_on_destroy(secdlg_data * sd) heap_free(sd->zone_attr); heap_free(sd->zones); +#ifndef __REACTOS__ if (sd->himages) { SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); ImageList_Destroy(sd->himages); } +#endif security_cleanup_zones(sd); SetWindowLongPtrW(sd->hsec, DWLP_USER, 0);

1 year, 1 month

[reactos] 01/01: [BOOTDATA] LiveCD: Enable Toggle key (Alt+Shift etc.) (#5985)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8860dc5393ffffb1d2c9e… commit 8860dc5393ffffb1d2c9ebf2c0b33a12aeee1e48 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 17 07:23:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 22:23:11 2023 +0000 [BOOTDATA] LiveCD: Enable Toggle key (Alt+Shift etc.) (#5985) --- boot/bootdata/livecd.inf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 67ae5850138..a9202d068ce 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -10,6 +10,11 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" ; Default locale for the keyboard layout HKU,".DEFAULT\Keyboard Layout\Preload","1",0x00000000,"00000409" +; Toggle keys (Alt+Shift etc.) +HKU,".DEFAULT\Keyboard Layout\Toggle","Hotkey",0x00000000,"1" +HKU,".DEFAULT\Keyboard Layout\Toggle","Language Hotkey",0x00000000,"1" +HKU,".DEFAULT\Keyboard Layout\Toggle","Layout Hotkey",0x00000000,"2" + ; Cdrom class driver HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000000

1 year, 1 month

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