From d38cdcd310cc02d39f0968d477f826edf577cc22 Mon Sep 17 00:00:00 2001 From: Julen Urizar Compains Date: Tue, 6 Feb 2024 14:40:16 +0100 Subject: [PATCH] Revert "[TRANSLATION] Shell32 minimal changes." This reverts commit 546a422739c47b6fbf9e3ec02601b7da298b775c. --- Non-sticky1.patch | 20 -------------------- dll/win32/shell32/lang/es-ES.rc | 6 +++--- parcheSimoneIntelGMA.patch | 16 ---------------- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 Non-sticky1.patch delete mode 100644 parcheSimoneIntelGMA.patch diff --git a/Non-sticky1.patch b/Non-sticky1.patch deleted file mode 100644 index 66b5a916dae61..0000000000000 --- a/Non-sticky1.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git "a/win32ss/user/ntuser/nonclient.c" "b/win32ss/user/ntuser/nonclient.c" -index a3852066b69..c3be76119b3 100644 ---- "a/win32ss/user/ntuser/nonclient.c" -+++ "b/win32ss/user/ntuser/nonclient.c" -@@ -394,11 +394,13 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) - if (msg.message == WM_KEYDOWN && (msg.wParam == VK_RETURN || msg.wParam == VK_ESCAPE)) - break; // Exit on Return or Esc - -- if (!g_bWindowSnapEnabled && (msg.message == WM_LBUTTONUP)) -+ if (!g_bWindowSnapEnabled && (msg.message == WM_LBUTTONUP || -+ (msg.message == WM_MOUSEMOVE && (msg.wParam & MK_LBUTTON) != MK_LBUTTON))) - { // If no WindowSnapEnabled: Exit on button-up immediately - break; - } -- else if (g_bWindowSnapEnabled && msg.message == WM_LBUTTONUP) -+ else if (g_bWindowSnapEnabled && (msg.message == WM_LBUTTONUP || -+ (msg.message == WM_MOUSEMOVE && (msg.wParam & MK_LBUTTON) != MK_LBUTTON))) - { // If WindowSnapEnabled: Decide whether to snap before exiting - DWORD ExStyleTB, StyleTB; - BOOL IsTaskBar; diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 297a2e1c2dbf3..3ec51e5dc7fed 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -4,7 +4,7 @@ * PURPOSE: Spanish resource file * TRANSLATORS: Copyright 2014-2015 Ismael Ferreras Morezuelas * Copyright 2018 Julio Carchi Ruiz - * Copyright 2024 Julen Urizar Compains + * Copyright 2020 Julen Urizar Compains */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -898,7 +898,7 @@ BEGIN IDS_NETWORKPLACE "Mis sitios de red" IDS_NEWFOLDER "Nueva carpeta" - IDS_NEWITEMFORMAT "Nuevo %s" + IDS_NEWITEMFORMAT "New %s" IDS_DRIVE_FIXED "Disco local" IDS_DRIVE_CDROM "Unidad de CD" @@ -915,7 +915,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autores" IDS_SHELL_ABOUT_BACK "< A&trĂ¡s" - FCIDM_SHVIEW_NEW "N&uevo" /* A menu item with an ampersand */ + FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" FCIDM_SHVIEW_NEWLINK "Nuevo &acceso directo" IDS_FOLDER_OPTIONS "Opciones de carpeta" diff --git a/parcheSimoneIntelGMA.patch b/parcheSimoneIntelGMA.patch deleted file mode 100644 index 48db85894fafa..0000000000000 --- a/parcheSimoneIntelGMA.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/ntoskrnl/mm/ARM3/syspte.c b/ntoskrnl/mm/ARM3/syspte.c -index 87b862c265f..059aebd3a8d 100644 ---- a/ntoskrnl/mm/ARM3/syspte.c -+++ b/ntoskrnl/mm/ARM3/syspte.c -@@ -247,7 +247,10 @@ MiReserveSystemPtes(IN ULONG NumberOfPtes, - IN MMSYSTEM_PTE_POOL_TYPE SystemPtePoolType) - { - PMMPTE PointerPte; -- -+ if( NumberOfPtes > 32768 ) -+ { -+ return NULL; -+ } - // - // Use the extended function - //