Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [BROWSEUI] Fix CAutoComplete use after free
by Mark Jansen 27 Oct '22

27 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a06f10d0c0f0c95f2416f… commit a06f10d0c0f0c95f2416fba2b73ba578ceb85af7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 20 19:51:47 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Oct 27 23:45:18 2022 +0200 [BROWSEUI] Fix CAutoComplete use after free CORE-18395 --- dll/win32/browseui/CAutoComplete.cpp | 16 ++++++++++++---- dll/win32/browseui/CAutoComplete.h | 6 ++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index f9929870085..6bb970c87f8 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -1,7 +1,7 @@ /* * AutoComplete interfaces implementation. * - * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> + * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> * Copyright 2009 Andrew Hill * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * @@ -1549,7 +1549,7 @@ LRESULT CAutoComplete::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b m_hFont = reinterpret_cast<HFONT>(::GetStockObject(DEFAULT_GUI_FONT)); m_hwndList.SetFont(m_hFont); - // add reference to CAutoComplete::m_hWnd + // add reference so we won't be deleted during message processing AddRef(); return 0; // success } @@ -1575,11 +1575,19 @@ LRESULT CAutoComplete::OnNCDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL // clean up m_hwndCombo = NULL; - // remove reference to CAutoComplete::m_hWnd - Release(); + + // Tell ATL to clean up + bHandled = 0; + return 0; } +VOID CAutoComplete::OnFinalMessage(HWND) +{ + // The message loop is finished, now we can safely destruct! + Release(); +} + // WM_EXITSIZEMOVE // This message is sent once to a window after it has exited the moving or sizing mode. LRESULT CAutoComplete::OnExitSizeMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h index 97d633c5db2..b8370f899a0 100644 --- a/dll/win32/browseui/CAutoComplete.h +++ b/dll/win32/browseui/CAutoComplete.h @@ -1,7 +1,7 @@ /* * AutoComplete interfaces implementation. * - * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> + * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> * Copyright 2009 Andrew Hill * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * @@ -156,9 +156,9 @@ public: // public methods CAutoComplete(); - HWND CreateDropDown(); virtual ~CAutoComplete(); + HWND CreateDropDown(); BOOL CanAutoSuggest() const; BOOL CanAutoAppend() const; BOOL UseTab() const; @@ -284,6 +284,8 @@ protected: LRESULT OnAutoCompStart(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnAutoCompFinish(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + virtual VOID OnFinalMessage(HWND) override; + DECLARE_REGISTRY_RESOURCEID(IDR_AUTOCOMPLETE) DECLARE_NOT_AGGREGATABLE(CAutoComplete) DECLARE_PROTECT_FINAL_CONSTRUCT()

1 0

[reactos] 01/01: [DBGHELP] Add ARM64 definitions into compat.h (#4810)
by Justin Miller 27 Oct '22

27 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98b90e73944dd9f2fb04c… commit 98b90e73944dd9f2fb04cf2efec7a2e94351ef80 Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Thu Oct 27 08:14:10 2022 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 27 18:14:10 2022 +0300 [DBGHELP] Add ARM64 definitions into compat.h (#4810) This fixes ARM64 build in preparation for PR #4809. CORE-18200 --- dll/win32/dbghelp/compat.h | 143 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index f7bef66bc91..02e693f62a5 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -450,7 +450,7 @@ typedef struct _CONTEXT { DWORD64 LastExceptionFromRip; } CONTEXT; -#elif defined TARGET_arm /* ARM? */ +#elif defined TARGET_arm /* The following flags control the contents of the CONTEXT structure. */ @@ -549,6 +549,147 @@ typedef struct _CONTEXT { BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); + +#elif defined TARGET_arm64 + +#define CONTEXT_ARM64 0x00400000L +#define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x1L) +#define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x2L) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x4L) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x8L) +#define CONTEXT_X18 (CONTEXT_ARM64 | 0x10L) +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + +typedef union NEON128 { + struct { + ULONGLONG Low; + LONGLONG High; + } DUMMYSTRUCTNAME; + double D[2]; + float S[4]; + WORD H[8]; + BYTE B[16]; +} NEON128, *PNEON128; + +#define ARM64_MAX_BREAKPOINTS 8 +#define ARM64_MAX_WATCHPOINTS 2 + +typedef struct _CONTEXT { + + // + // Control flags. + // + + DWORD ContextFlags; + + // + // Integer registers + // + + DWORD Cpsr; + union { + struct { + DWORD64 X0; + DWORD64 X1; + DWORD64 X2; + DWORD64 X3; + DWORD64 X4; + DWORD64 X5; + DWORD64 X6; + DWORD64 X7; + DWORD64 X8; + DWORD64 X9; + DWORD64 X10; + DWORD64 X11; + DWORD64 X12; + DWORD64 X13; + DWORD64 X14; + DWORD64 X15; + DWORD64 X16; + DWORD64 X17; + DWORD64 X18; + DWORD64 X19; + DWORD64 X20; + DWORD64 X21; + DWORD64 X22; + DWORD64 X23; + DWORD64 X24; + DWORD64 X25; + DWORD64 X26; + DWORD64 X27; + DWORD64 X28; + DWORD64 Fp; + DWORD64 Lr; + } DUMMYSTRUCTNAME; + DWORD64 X[31]; + } DUMMYUNIONNAME; + + DWORD64 Sp; + DWORD64 Pc; + + // + // Floating Point/NEON Registers + // + + NEON128 V[32]; + DWORD Fpcr; + DWORD Fpsr; + + // + // Debug registers + // + + DWORD Bcr[ARM64_MAX_BREAKPOINTS]; + DWORD64 Bvr[ARM64_MAX_BREAKPOINTS]; + DWORD Wcr[ARM64_MAX_WATCHPOINTS]; + DWORD64 Wvr[ARM64_MAX_WATCHPOINTS]; + +} _CONTEXT, *P_CONTEXT; +typedef _CONTEXT CONTEXT, *PCONTEXT; + +typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY { + DWORD BeginAddress; + union { + DWORD UnwindData; + struct { + DWORD Flag : 2; + DWORD FunctionLength : 11; + DWORD RegF : 3; + DWORD RegI : 4; + DWORD H : 1; + DWORD CR : 2; + DWORD FrameSize : 9; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY, * PIMAGE_ARM64_RUNTIME_FUNCTION_ENTRY; +typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; + +#define UNWIND_HISTORY_TABLE_SIZE 12 + +typedef struct _UNWIND_HISTORY_TABLE_ENTRY { + ULONG_PTR ImageBase; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +typedef struct _UNWIND_HISTORY_TABLE { + DWORD Count; + BYTE LocalHint; + BYTE GlobalHint; + BYTE Search; + BYTE Once; + ULONG_PTR LowAddress; + ULONG_PTR HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); + #else #error "Unknown target platform"

1 0

[reactos] 01/01: [CONTRIBUTING] Fix broken hash links. (#4816)
by Tuur Martens 27 Oct '22

27 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df77f88f0ddc9c337a374… commit df77f88f0ddc9c337a3743eb549a518459cc6615 Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Thu Oct 27 16:37:16 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 27 16:37:16 2022 +0200 [CONTRIBUTING] Fix broken hash links. (#4816) These links did not actually work, as GitHub expected no question mark, but we did provide one. --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 73ea943e487..2792d14bdcb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,9 +2,9 @@ There are several ways to contribute to the development of ReactOS. The most often encountered problem is not knowing where to begin or what to do. If you are able to program or understand the technical information that is pertinent to this project, helping the development can be easy. -- [What To Do?](#what-to-do?) -- [How To Contribute?](#how-to-contribute?) -- [Where To Start?](#where-to-start?) +- [What To Do?](#what-to-do) +- [How To Contribute?](#how-to-contribute) +- [Where To Start?](#where-to-start) **Legal notice:** If you have seen Microsoft Windows source code, your contribution won't be accepted because of potential copyright violation. Before contributing, you must affirm that the following is true: >I hereby swear that I have not used nor seen the source code to any version of the Windows operating system

1 0

[reactos] 01/01: [NTUSER] Support SM_DBCSENABLED and SM_IMMENABLED (#4806)
by Katayama Hirofumi MZ 27 Oct '22

27 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a8ddbf1479f67f93225a… commit 7a8ddbf1479f67f93225abf6c2a57a8aef6efcf5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 27 21:53:58 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 27 21:53:58 2022 +0900 [NTUSER] Support SM_DBCSENABLED and SM_IMMENABLED (#4806) - Don't set SRVINFO_CICERO_ENABLED flag because we don't have Cicero support. - Improve UserGetSystemMetrics for SM_DBCSENABLED and SM_IMMENABLED. - Delete useless UserIsDBCSEnabled function. CORE-11700 --- win32ss/user/ntuser/metric.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index a50d10df4c8..b9801486024 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -14,20 +14,6 @@ static BOOL Setup = FALSE; /* FUNCTIONS *****************************************************************/ -BOOL APIENTRY UserIsDBCSEnabled(VOID) -{ - switch (PRIMARYLANGID(gusLanguageID)) - { - case LANG_CHINESE: - case LANG_JAPANESE: - case LANG_KOREAN: - return TRUE; - - default: - return FALSE; - } -} - BOOL NTAPI InitMetrics(VOID) @@ -164,12 +150,12 @@ InitMetrics(VOID) piSysMet[SM_NETWORK] = 3; piSysMet[SM_SLOWMACHINE] = 0; piSysMet[SM_SECURE] = 0; - piSysMet[SM_DBCSENABLED] = UserIsDBCSEnabled(); + piSysMet[SM_DBCSENABLED] = NLS_MB_CODE_PAGE_TAG; piSysMet[SM_SHOWSOUNDS] = gspv.bShowSounds; piSysMet[SM_MIDEASTENABLED] = 0; piSysMet[SM_CMONITORS] = 1; piSysMet[SM_SAMEDISPLAYFORMAT] = 1; - piSysMet[SM_IMMENABLED] = 0; + piSysMet[SM_IMMENABLED] = NLS_MB_CODE_PAGE_TAG; /* Reserved */ piSysMet[SM_RESERVED1] = 0; @@ -183,7 +169,13 @@ InitMetrics(VOID) piSysMet[90] = 0; #endif - gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED; + /*gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED;*/ /* Cicero is not supported yet */ + + if (NLS_MB_CODE_PAGE_TAG) /* Is the system multi-byte codepage? */ + { + gpsi->dwSRVIFlags |= (SRVINFO_DBCSENABLED | SRVINFO_IMM32); /* DBCS+IME Support */ + } + Setup = TRUE; return TRUE; @@ -198,7 +190,10 @@ UserGetSystemMetrics(ULONG Index) TRACE("UserGetSystemMetrics(%lu)\n", Index); if (Index == SM_DBCSENABLED) - return UserIsDBCSEnabled(); + return !!(gpsi->dwSRVIFlags & SRVINFO_DBCSENABLED); + + if (Index == SM_IMMENABLED) + return !!(gpsi->dwSRVIFlags & SRVINFO_IMM32); /* Get metrics from array */ if (Index < SM_CMETRICS)

1 0

[reactos] 01/01: [NTOS:MM] Remove residual hack from commit 864a1bc6a (r55323).
by Hermès Bélusca-Maïto 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58983061e95bc12a55b34… commit 58983061e95bc12a55b340735a927606697df600 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 27 01:05:57 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Oct 27 01:08:07 2022 +0200 [NTOS:MM] Remove residual hack from commit 864a1bc6a (r55323). --- ntoskrnl/mm/ARM3/section.c | 27 +++++++-------------------- ntoskrnl/mm/section.c | 3 +-- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index ad20d01e093..fed3fa0f685 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -135,24 +135,6 @@ MiIsProtectionCompatible(IN ULONG SectionPageProtection, return ((CompatibleMask | NewSectionPageProtection) == CompatibleMask); } -ACCESS_MASK -NTAPI -MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection) -{ - ULONG ProtectionMask; - - /* Calculate the protection mask and make sure it's valid */ - ProtectionMask = MiMakeProtectionMask(SectionPageProtection); - if (ProtectionMask == MM_INVALID_PROTECTION) - { - DPRINT1("Invalid protection mask\n"); - return STATUS_INVALID_PAGE_PROTECTION; - } - - /* Now convert it to the required file access */ - return MmMakeFileAccess[ProtectionMask & 0x7]; -} - ULONG NTAPI MiMakeProtectionMask(IN ULONG Protect) @@ -2521,11 +2503,16 @@ MmCreateArm3Section(OUT PVOID *SectionObject, (SectionPageProtection & PAGE_NOACCESS))); /* Convert section flag to page flag */ - if (AllocationAttributes & SEC_NOCACHE) SectionPageProtection |= PAGE_NOCACHE; + if (AllocationAttributes & SEC_NOCACHE) + SectionPageProtection |= PAGE_NOCACHE; /* Check to make sure the protection is correct. Nt* does this already */ ProtectionMask = MiMakeProtectionMask(SectionPageProtection); - if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid protection mask\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } /* Check if this is going to be a data or image backed file section */ if ((FileHandle) || (FileObject)) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 1859d5ea6f1..21a9fc75560 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -220,8 +220,7 @@ static ULONG SectionCharacteristicsToProtect[16] = PAGE_EXECUTE_READWRITE, /* 15 = WRITABLE, READABLE, EXECUTABLE, SHARED */ }; -extern ULONG MmMakeFileAccess []; -ACCESS_MASK NTAPI MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection); +extern ACCESS_MASK MmMakeFileAccess[8]; static GENERIC_MAPPING MmpSectionMapping = { STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY,

1 0

[reactos] 02/02: [MSI] Add jira ticket to debug logging
by Mark Jansen 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0b1a01c592426db7640f… commit a0b1a01c592426db7640f1d9a14c33f617138ae2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 20 19:18:55 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 26 20:19:31 2022 +0200 [MSI] Add jira ticket to debug logging --- dll/win32/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index b87132494bd..c2c3eb496fb 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1366,7 +1366,7 @@ AppHelpCheckPackage(LPCWSTR szPackage) if (hsdb) { BOOL bShim = SE_DynamicShim(szPackage, hsdb, QueryResult, "msi.dll", &dwToken); - ERR("ReactOS HACK: Used SE_DynamicShim %d!\n", bShim); + ERR("ReactOS HACK(CORE-13283): Used SE_DynamicShim %d!\n", bShim); SdbReleaseDatabase(hsdb); }

1 0

[reactos] 01/02: [APPHELP] Stop shimeng being initialized multiple times
by Mark Jansen 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d284c8149417e55a026c2… commit d284c8149417e55a026c2876eddcb0b435c7b38e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 20 19:17:33 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 26 20:19:31 2022 +0200 [APPHELP] Stop shimeng being initialized multiple times This is a hack, but is required when MSI is loaded in a process that is already shimmed. It should be removed when the MSI shim integration is fixed. CORE-18532 CORE-13283 --- dll/appcompat/apphelp/shimeng.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index c470ff3d8d6..1e351e8a37d 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -32,6 +32,7 @@ static UNICODE_STRING g_LoadingShimDll; ULONG g_ShimEngDebugLevel = 0xffffffff; BOOL g_bComPlusImage = FALSE; BOOL g_bShimDuringInit = FALSE; +BOOL g_bShimEngInitialized = FALSE; BOOL g_bInternalHooksUsed = FALSE; static ARRAY g_pShimInfo; /* PSHIMMODULE */ static ARRAY g_pHookArray; /* HOOKMODULEINFO */ @@ -1358,6 +1359,7 @@ VOID SeiInit(LPCWSTR ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery, BOOLEAN Pr /* Remove the 'LDRP_ENTRY_PROCESSED' flag from entries we modified, so that the loader can continue to process them */ SeiResetEntryProcessed(Peb); } + g_bShimEngInitialized = TRUE; } @@ -1484,6 +1486,12 @@ LdrInitShimEngineDynamic(IN PVOID BaseAddress); BOOL WINAPI SE_DynamicShim(LPCWSTR ProcessImage, HSDB hsdb, PVOID pQueryResult, LPCSTR Module, LPDWORD lpdwDynamicToken) { + if (g_bShimEngInitialized) + { + SHIMENG_MSG("ReactOS HACK(CORE-13283): ShimEng already initialized!\n"); + return TRUE; + } + g_bShimDuringInit = TRUE; SeiInit(ProcessImage, hsdb, pQueryResult, FALSE); g_bShimDuringInit = FALSE;

1 0

[reactos] 01/01: [SHELL32] Fix empty 'Send to' menu
by Mark Jansen 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21e68b0dba6f413523804… commit 21e68b0dba6f413523804934ec15f272159dc34b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 20 19:12:33 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 26 20:18:40 2022 +0200 [SHELL32] Fix empty 'Send to' menu CORE-18517 --- dll/win32/shell32/CSendToMenu.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/shell32/CSendToMenu.cpp b/dll/win32/shell32/CSendToMenu.cpp index 9e9fbe8afeb..1f8c42ef144 100644 --- a/dll/win32/shell32/CSendToMenu.cpp +++ b/dll/win32/shell32/CSendToMenu.cpp @@ -244,6 +244,7 @@ UINT CSendToMenu::InsertSendToItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) { CStringW strNone(MAKEINTRESOURCEW(IDS_NONE)); AppendMenuW(hMenu, MF_GRAYED | MF_DISABLED | MF_STRING, idCmd, strNone); + ++idCmd; } return idCmd - idCmdFirst;

1 0

[reactos] 01/01: [NTDLL] Implement LdrInitShimEngineDynamic.
by Mark Jansen 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15d491fb29257de873390… commit 15d491fb29257de8733909182ebe9c802e77e984 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 25 13:33:15 2017 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 26 20:12:21 2022 +0200 [NTDLL] Implement LdrInitShimEngineDynamic. This is the final step required to properly support SE_DynamicShim CORE-13283 --- dll/ntdll/def/ntdll.spec | 2 +- dll/ntdll/ldr/ldrapi.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 30f9a4c7a1e..617933ca710 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -156,7 +156,7 @@ @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) @ stdcall -stub -version=0x600+ LdrGetProcedureAddressEx(ptr ptr long ptr long) @ stdcall -stub LdrHotPatchRoutine(ptr) -@ stdcall -stub LdrInitShimEngineDynamic(ptr) +@ stdcall LdrInitShimEngineDynamic(ptr) @ stdcall LdrInitializeThunk(long long long long) @ stdcall LdrLoadAlternateResourceModule(ptr ptr) @ stub -version=0x600+ LdrLoadAlternateResourceModuleEx diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index 8c968160f30..de7c68d8053 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1672,4 +1672,23 @@ LdrSetAppCompatDllRedirectionCallback( return STATUS_NOT_IMPLEMENTED; } +BOOLEAN +NTAPI +LdrInitShimEngineDynamic(IN PVOID BaseAddress) +{ + ULONG_PTR Cookie; + NTSTATUS Status = LdrLockLoaderLock(0, NULL, &Cookie); + if (NT_SUCCESS(Status)) + { + if (!g_pShimEngineModule) + { + g_pShimEngineModule = BaseAddress; + LdrpGetShimEngineInterface(); + } + LdrUnlockLoaderLock(0, Cookie); + return TRUE; + } + return FALSE; +} + /* EOF */

1 0

[reactos] 01/01: [SHELL32] Update German (de-DE) translation (#4808)
by Robert Naumann 26 Oct '22

26 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b544640c29c8458a7a695… commit b544640c29c8458a7a6955af2b1725f43628046c Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Wed Oct 26 18:48:27 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 26 19:48:27 2022 +0300 [SHELL32] Update German (de-DE) translation (#4808) Reviewed-by: Joachim Henze <joachim.henze(a)reactos.org> --- dll/win32/shell32/lang/de-DE.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 78044d0dad4..7c00c22c6ae 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -498,11 +498,11 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 - PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Benutzer wechseln", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP PUSHBUTTON "&Abmelden", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW PUSHBUTTON "Abbrechen", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT LTEXT "Abmelden", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 - CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Benutzer wechseln", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 CTEXT "Abmelden", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 END @@ -806,8 +806,8 @@ BEGIN IDS_COPYERRORSAME "'%s' kann nicht kopiert werden: Quell- und Zieldatei sind identisch." IDS_MOVEERRORSUBFOLDER "'%s' kann nicht verschoben werden: Der Zielorder ist ein Unterordner des Quellordners." IDS_COPYERRORSUBFOLDER "'%s' kann nicht kopiert werden: Der Zielorder ist ein Unterordner des Quellordners." - IDS_MOVEERROR "Cannot move '%s': %s" - IDS_COPYERROR "Cannot copy '%s': %s" + IDS_MOVEERROR "'%s' kann nicht verschoben werden: %s" + IDS_COPYERROR "'%s' kann nicht kopiert werden: %s" IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." @@ -829,7 +829,7 @@ BEGIN IDS_FILEOOP_DELETING "Löschen" IDS_FILEOOP_FROM_TO "von %1 nach %2" IDS_FILEOOP_FROM "von %1" - IDS_FILEOOP_PREFLIGHT "Preflight" + IDS_FILEOOP_PREFLIGHT "Vorbereiten" /* message box strings */ IDS_RESTART_TITLE "Neu starten" @@ -843,8 +843,8 @@ BEGIN IDS_FORMAT_COMPLETE "Formatieren abgeschlossen." /* Warning format system drive dialog strings */ - IDS_NO_FORMAT_TITLE "Cannot format this volume" - IDS_NO_FORMAT "This volume cannot be formatted! It contains important system files in order for ReactOS to run." + IDS_NO_FORMAT_TITLE "Formatieren des Laufwerks nicht möglich" + IDS_NO_FORMAT "Dieses Laufwerk kann nicht formatiert werden!\nEs enthält wichtige Systemdateien, welche zur Ausführung von ReactOS benötigt werden." /* Run File dialog */ IDS_RUNDLG_ERROR "Anzeigen der Datei Ausführen Dialogbox nicht möglich (interner Fehler)" @@ -952,7 +952,7 @@ BEGIN IDS_EDIT_VERB "Bearbeiten" IDS_FIND_VERB "Finden" IDS_PRINT_VERB "Drucken" - IDS_CMD_VERB "Command Prompt hier" + IDS_CMD_VERB "Cmd hier" IDS_FILE_FOLDER "%u Dateien, %u Ordner" IDS_PRINTERS "Drucker" @@ -1035,8 +1035,8 @@ BEGIN IDS_SYSTEMFOLDER "Systemordner" /* For IDD_LOG_OFF_FANCY */ - IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." - IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_DESC "Schließt Ihre Programme und beendet Ihre ReactOS-Sitzung." + IDS_SWITCH_USER_DESC "Ermöglicht es einem anderen Benutzer sich anzumelden, während Ihre Programme und Dateien geöffnet bleiben.\r\n\r\n(Sie können Benutzer auch mittels des Drückens von Windows + L wechseln.)" IDS_LOG_OFF_TITLE "Abmelden" - IDS_SWITCH_USER_TITLE "Switch User" + IDS_SWITCH_USER_TITLE "Benutzer wechseln" END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs