Ros-diffs November 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [CMAKE] Remove "/Gy" option from ML

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3f204e2282f25d9556d9… commit e3f204e2282f25d9556d9d83f43f31b6578eaa84 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 11 21:38:59 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 19 09:19:33 2023 +0200 [CMAKE] Remove "/Gy" option from ML Reason: VS solution builds pass the compiler options to the assembler. These are usually ignored and result in a warning only, but ML of the latest VS supports /Gy (function level linking), but that requires all functions to be declared with "PROC" and otherwise results in an error. --- sdk/cmake/msvc.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index dd3df55021d..8357316a112 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -22,8 +22,9 @@ endif() # helper macros. Note also that GCC builds use string pooling by default. add_compile_options(/GF) -# Enable function level linking and comdat folding -add_compile_options(/Gy) +# Enable function level linking and comdat folding (only C/C++, not ASM!) +add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/Gy>) +add_compile_options($<$<COMPILE_LANGUAGE:C>:/Gy>) add_link_options(/OPT:REF /OPT:ICF) if(ARCH STREQUAL "i386")

11 months, 3 weeks

[reactos] 01/01: [MSPAINT] Introduce partial image history (#5994)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72081168fb0f8e279ba24… commit 72081168fb0f8e279ba24eaab601fee4525a71d7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 12:59:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 12:59:39 2023 +0900 [MSPAINT] Introduce partial image history (#5994) - Add IMAGE_PART structure and use as history items. - Overload ImageModel::PushImageForUndo(const RECT& rcPartial). - Add ToolsModel::GetToolSize. - Implement partial image history on TwoPointDrawTool. CORE-19094 --- base/applications/mspaint/history.cpp | 71 +++++++++++++++++++++++++------- base/applications/mspaint/history.h | 15 ++++++- base/applications/mspaint/mouse.cpp | 7 +++- base/applications/mspaint/toolsmodel.cpp | 41 ++++++++++++++++++ base/applications/mspaint/toolsmodel.h | 2 + 5 files changed, 118 insertions(+), 18 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index c0f347d0aa9..2f7480b5f45 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -12,6 +12,14 @@ ImageModel imageModel; /* FUNCTIONS ********************************************************/ +void IMAGE_PART::clear() +{ + ::DeleteObject(m_hbmImage); + m_hbmImage = NULL; + m_rcPart.SetRectEmpty(); + m_bPartial = FALSE; +} + void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) @@ -30,7 +38,7 @@ ImageModel::ImageModel() , m_undoSteps(0) , m_redoSteps(0) { - ZeroMemory(m_hBms, sizeof(m_hBms)); + ZeroMemory(m_historyItems, sizeof(m_historyItems)); m_hbmMaster = CreateColorDIB(1, 1, RGB(255, 255, 255)); m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster); @@ -46,6 +54,23 @@ ImageModel::~ImageModel() ClearHistory(); } +void ImageModel::SwapPart() +{ + IMAGE_PART& part = m_historyItems[m_currInd]; + if (!part.m_bPartial) + { + Swap(m_hbmMaster, part.m_hbmImage); + return; + } + + HBITMAP hbmMaster = LockBitmap(); + HBITMAP hbmPart = getSubImage(hbmMaster, part.m_rcPart); + putSubImage(hbmMaster, part.m_rcPart, part.m_hbmImage); + ::DeleteObject(part.m_hbmImage); + part.m_hbmImage = hbmPart; + UnlockBitmap(hbmMaster); +} + void ImageModel::Undo(BOOL bClearRedo) { ATLTRACE("%s: %d\n", __FUNCTION__, m_undoSteps); @@ -55,11 +80,8 @@ void ImageModel::Undo(BOOL bClearRedo) selectionModel.HideSelection(); 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]); + SwapPart(); ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select m_undoSteps--; @@ -80,9 +102,7 @@ void ImageModel::Redo() selectionModel.HideSelection(); ATLASSERT(m_hbmMaster != NULL); - ATLASSERT(m_hBms[m_currInd] != NULL); - - Swap(m_hbmMaster, m_hBms[m_currInd]); + SwapPart(); m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select @@ -97,11 +117,7 @@ void ImageModel::ClearHistory() { for (int i = 0; i < HISTORYSIZE; ++i) { - if (m_hBms[i]) - { - ::DeleteObject(m_hBms[i]); - m_hBms[i] = NULL; - } + m_historyItems[i].clear(); } m_undoSteps = 0; @@ -130,12 +146,35 @@ void ImageModel::PushImageForUndo(HBITMAP hbm) return; } - ::DeleteObject(m_hBms[m_currInd]); - m_hBms[m_currInd] = m_hbmMaster; + IMAGE_PART& part = m_historyItems[m_currInd]; + part.clear(); + part.m_hbmImage = m_hbmMaster; m_hbmMaster = hbm; - m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select + PushDone(); +} + +void ImageModel::PushImageForUndo(const RECT& rcPartial) +{ + ATLTRACE("%s: %d\n", __FUNCTION__, m_currInd); + + IMAGE_PART& part = m_historyItems[m_currInd]; + part.clear(); + part.m_bPartial = TRUE; + part.m_rcPart = rcPartial; + + HBITMAP hbmMaster = LockBitmap(); + part.m_hbmImage = getSubImage(hbmMaster, rcPartial); + UnlockBitmap(hbmMaster); + + PushDone(); +} + +void ImageModel::PushDone() +{ + m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next + if (m_undoSteps < HISTORYSIZE - 1) m_undoSteps++; m_redoSteps = 0; diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index e827a430b35..87c98515136 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -10,6 +10,15 @@ /* HISTORYSIZE = number of possible undo-steps + 1 */ #define HISTORYSIZE 11 +struct IMAGE_PART +{ + CRect m_rcPart; + HBITMAP m_hbmImage; + BOOL m_bPartial; + + void clear(); +}; + class ImageModel { public: @@ -21,6 +30,7 @@ public: BOOL CanRedo() const { return m_redoSteps > 0; } void PushImageForUndo(); void PushImageForUndo(HBITMAP hbm); + void PushImageForUndo(const RECT& rcPartial); void Undo(BOOL bClearRedo = FALSE); void Redo(void); void ClearHistory(void); @@ -49,6 +59,9 @@ protected: int m_currInd; // The current index in m_hBms int m_undoSteps; // The undo-able count int m_redoSteps; // The redo-able count - HBITMAP m_hBms[HISTORYSIZE]; // A rotation buffer of HBITMAPs + IMAGE_PART m_historyItems[HISTORYSIZE]; // A ring buffer of IMAGE_PARTs HGDIOBJ m_hbmOld; + + void SwapPart(); + void PushDone(); }; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index d650259f6cb..2aa17872c81 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -291,7 +291,12 @@ struct TwoPointDrawTool : ToolBase BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - imageModel.PushImageForUndo(); + CRect rcPartial(g_ptStart, g_ptEnd); + rcPartial.NormalizeRect(); + SIZE size = toolsModel.GetToolSize(); + rcPartial.InflateRect((size.cx + 1) / 2, (size.cy + 1) / 2); + imageModel.PushImageForUndo(rcPartial); + OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 42ee980c2b3..c19a1152c24 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -202,6 +202,47 @@ void ToolsModel::SetRubberRadius(int nRubberRadius) NotifyToolSettingsChanged(); } +SIZE ToolsModel::GetToolSize() const +{ + SIZE size; + switch (m_activeTool) + { + case TOOL_FREESEL: + case TOOL_RECTSEL: + case TOOL_COLOR: + case TOOL_ZOOM: + case TOOL_TEXT: + case TOOL_FILL: + size.cx = size.cy = 1; + break; + case TOOL_LINE: + case TOOL_BEZIER: + case TOOL_RECT: + case TOOL_RRECT: + case TOOL_SHAPE: + case TOOL_ELLIPSE: + size.cx = size.cy = GetLineWidth(); + break; + case TOOL_AIRBRUSH: + size.cx = size.cy = GetAirBrushRadius() * 2; + break; + case TOOL_RUBBER: + size.cx = size.cy = GetRubberRadius() * 2; + break; + case TOOL_BRUSH: + size.cx = size.cy = GetBrushWidth(); + break; + case TOOL_PEN: + size.cx = size.cy = GetPenWidth(); + break; + } + if (size.cx < 1) + size.cx = 1; + if (size.cy < 1) + size.cy = 1; + return size; +} + BOOL ToolsModel::IsBackgroundTransparent() const { return m_transpBg; diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index a5737010d9b..1bc5ee256c0 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -124,6 +124,8 @@ public: void SetRubberRadius(int nRubberRadius); void MakeRubberThickerOrThinner(BOOL bThinner); + SIZE GetToolSize() const; + BOOL IsBackgroundTransparent() const; void SetBackgroundTransparent(BOOL bTransparent);

11 months, 3 weeks

[reactos] 01/01: [ACCESS] Improve IDC_RESET_COMBO selection (#5893)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=416d63026eaba0aa8e2fe… commit 416d63026eaba0aa8e2fe05c028fc0b1b4e2b0ab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 10:33:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 10:33:18 2023 +0900 [ACCESS] Improve IDC_RESET_COMBO selection (#5893) Based on KRosUser's access.patch. CORE-19303 --- dll/cpl/access/general.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/cpl/access/general.c b/dll/cpl/access/general.c index 414b93016a5..8069fd0e965 100644 --- a/dll/cpl/access/general.c +++ b/dll/cpl/access/general.c @@ -12,6 +12,7 @@ #define BAUDTICKS 6 static UINT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200}; +#define FIVE_MINS_IN_MS (5 * 60 * 1000) INT_PTR CALLBACK SerialKeysDlgProc(HWND hwndDlg, @@ -177,6 +178,7 @@ GeneralPageProc(HWND hwndDlg, { PGLOBAL_DATA pGlobalData; LPPSHNOTIFY lppsn; + INT iCurSel; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -194,8 +196,9 @@ GeneralPageProc(HWND hwndDlg, IDC_RESET_BOX, pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? BST_CHECKED : BST_UNCHECKED); FillResetComboBox(GetDlgItem(hwndDlg, IDC_RESET_COMBO)); - SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_SETCURSEL, - (pGlobalData->accessTimeout.iTimeOutMSec / 300000) - 1, 0); + pGlobalData->accessTimeout.iTimeOutMSec = max(FIVE_MINS_IN_MS, pGlobalData->accessTimeout.iTimeOutMSec); + iCurSel = (pGlobalData->accessTimeout.iTimeOutMSec / FIVE_MINS_IN_MS) - 1; + SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_SETCURSEL, iCurSel, 0); EnableWindow(GetDlgItem(hwndDlg, IDC_RESET_COMBO), pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? TRUE : FALSE); @@ -233,7 +236,7 @@ GeneralPageProc(HWND hwndDlg, { INT nSel; nSel = SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_GETCURSEL, 0, 0); - pGlobalData->accessTimeout.iTimeOutMSec = (ULONG)((nSel + 1) * 300000); + pGlobalData->accessTimeout.iTimeOutMSec = (DWORD)((nSel + 1) * FIVE_MINS_IN_MS); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break;

11 months, 3 weeks

[reactos] 01/01: [WININET] Update Romanian (ro-RO) translation (#5992)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a7a2824cfafe877e151b… commit 0a7a2824cfafe877e151be8bfac8a3eff44c2295 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Nov 18 23:41:25 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 18 22:41:25 2023 +0100 [WININET] Update Romanian (ro-RO) translation (#5992) --- dll/win32/wininet/lang/wininet_Ro.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/wininet/lang/wininet_Ro.rc b/dll/win32/wininet/lang/wininet_Ro.rc index aa7973d8690..5532f394704 100644 --- a/dll/win32/wininet/lang/wininet_Ro.rc +++ b/dll/win32/wininet/lang/wininet_Ro.rc @@ -29,17 +29,17 @@ STRINGTABLE IDS_CERT_DATE_INVALID "Data din certificat nu este validă." IDS_CERT_CN_INVALID "Numele din certificat nu corespunde cu cel al sitului." IDS_CERT_ERRORS "Există cel puțin o problemă nespecificată de securitate cu acest certificat." - IDS_CERT_SUBJECT "Subject" - IDS_CERT_ISSUER "Issuer" - IDS_CERT_EFFECTIVE "Effective Date" - IDS_CERT_EXPIRATION "Expiration Date" - IDS_CERT_PROTOCOL "Security Protocol" - IDS_CERT_SIGNATURE "Signature Type" - IDS_CERT_ENCRYPTION "Encryption Type" - IDS_CERT_PRIVACY "Privacy Strength" - IDS_CERT_HIGH "High" - IDS_CERT_LOW "Low" - IDS_CERT_BITS "bits" + IDS_CERT_SUBJECT "Subiect" + IDS_CERT_ISSUER "Emitent" + IDS_CERT_EFFECTIVE "Data efectivă" + IDS_CERT_EXPIRATION "Data expirării" + IDS_CERT_PROTOCOL "Protocolul de securitate" + IDS_CERT_SIGNATURE "Tipul semnăturii" + IDS_CERT_ENCRYPTION "Tipul de criptare" + IDS_CERT_PRIVACY "Puterea de confidențialitate" + IDS_CERT_HIGH "Înaltă" + IDS_CERT_LOW "Joasă" + IDS_CERT_BITS "octeți" } IDD_PROXYDLG DIALOGEX 36, 24, 220, 146 @@ -76,7 +76,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDC_REALM, 60, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 60, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 60, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Păstreată această parolă (nerecomandat)", IDC_SAVEPASSWORD, + CHECKBOX "Sal&vează această parolă (nerecomandat)", IDC_SAVEPASSWORD, 60, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Con&firmă", IDOK, 90, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "A&nulează", IDCANCEL, 154, 126, 56, 14, WS_GROUP | WS_TABSTOP

11 months, 3 weeks

[reactos] 01/01: [VGAFONTEDIT] Update Romanian (ro-RO) translation (#5991)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6a617f96cf5ff7d9648e… commit a6a617f96cf5ff7d9648ee20cb0e94967708ff93 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Nov 18 23:40:18 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 18 22:40:18 2023 +0100 [VGAFONTEDIT] Update Romanian (ro-RO) translation (#5991) --- .../rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc b/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc index f221c59383f..8c18c22973f 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc +++ b/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc @@ -2,8 +2,8 @@ * PROJECT: ReactOS VGA Font Editor * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Romanian resource file - * COPYRIGHT: Copyright 2008 Colin Finck (colin(a)reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * TRANSLATORS: Copyright 2008 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -40,8 +40,8 @@ BEGIN MENUITEM "&Deschidere…\tCtrl+O", ID_FILE_OPEN MENUITEM "În&chide", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "Pă&strează\tCtrl+S", ID_FILE_SAVE - MENUITEM "&Păstrare în…", ID_FILE_SAVE_AS + MENUITEM "Sal&vează\tCtrl+S", ID_FILE_SAVE + MENUITEM "Salvea&ză ca…", ID_FILE_SAVE_AS MENUITEM SEPARATOR MENUITEM "I&eșire\tAlt+F4", ID_FILE_EXIT END @@ -80,13 +80,13 @@ BEGIN IDS_UNSUPPORTEDFORMAT, "Format de fișier incompatibil!" IDS_UNSUPPORTEDPSF, "Format incompatibil de font PSF! Posibilitățile editorului se limitează la fonturile 8x8 fără moduri speciale." IDS_DOCNAME, "Font %1!u!" - IDS_SAVEPROMPT, "Modificările în fișierul „%1” încă nu au fost păstrate.\n\nDoriți păstrarea lor?" + IDS_SAVEPROMPT, "Modificările în fișierul „%1” încă nu au fost salvate.\n\nDoriți salvarea lor?" IDS_APPTITLE, "Editor de font VGA ReactOS" IDS_CLOSEEDIT, "Închideți mai întâi toate ferestrele de editare!" IDS_TOOLTIP_NEW, "Nou" IDS_TOOLTIP_OPEN, "Deschide" - IDS_TOOLTIP_SAVE, "Păstrează" + IDS_TOOLTIP_SAVE, "Salvează" IDS_TOOLTIP_EDIT_GLYPH, "Editează glifă" IDS_TOOLTIP_COPY, "Copiază" IDS_TOOLTIP_PASTE, "Lipește"

11 months, 3 weeks

[reactos] 01/01: [MPR] Update Romanian (ro-RO) translation (#5990)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9445f5ff6043aa28b017… commit a9445f5ff6043aa28b017200dbe3449e55126643 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Nov 18 23:39:02 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 18 22:39:02 2023 +0100 [MPR] Update Romanian (ro-RO) translation (#5990) --- dll/win32/mpr/lang/mpr_Ro.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/mpr/lang/mpr_Ro.rc b/dll/win32/mpr/lang/mpr_Ro.rc index 1a3acf6c523..e28d71f3263 100644 --- a/dll/win32/mpr/lang/mpr_Ro.rc +++ b/dll/win32/mpr/lang/mpr_Ro.rc @@ -41,7 +41,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Păstrează această parolă (nerecomandat)", IDC_SAVEPASSWORD, + CHECKBOX "Sal&vează această parolă (nerecomandat)", IDC_SAVEPASSWORD, 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Con&firmă", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nulează", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP

11 months, 3 weeks

[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

11 months, 3 weeks

[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;

11 months, 3 weeks

[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 } };

11 months, 3 weeks

[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

11 months, 3 weeks

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2023