Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [IMM32] Rewrite ImmSetCandidateWindow (#3884)
by Katayama Hirofumi MZ 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0af58654a37f2bd9123cc… commit 0af58654a37f2bd9123cca6f9ee4845e2aae7a1d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 8 08:34:47 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 8 08:34:47 2021 +0900 [IMM32] Rewrite ImmSetCandidateWindow (#3884) Implementing Japanese input... CORE-11700 --- dll/win32/imm32/imm.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index c1f5db8b1c1..f33211203e4 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3452,29 +3452,34 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - InputContextData *data = get_imc_data(hIMC); +#define MAX_CANDIDATEFORM 4 + DWORD dwImeThreadId, dwThreadId; + HWND hWnd; + LPINPUTCONTEXT pIC; TRACE("(%p, %p)\n", hIMC, lpCandidate); - if (!data || !lpCandidate) + if (lpCandidate->dwIndex >= MAX_CANDIDATEFORM) return FALSE; - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + dwImeThreadId = Imm32QueryInputContext(hIMC, 1); + dwThreadId = GetCurrentThreadId(); + if (dwImeThreadId != dwThreadId) return FALSE; - TRACE("\t%x, %x, %s, %s\n", - lpCandidate->dwIndex, lpCandidate->dwStyle, - wine_dbgstr_point(&lpCandidate->ptCurrentPos), - wine_dbgstr_rect(&lpCandidate->rcArea)); - - if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS); - ImmInternalSendIMENotify(data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex); + hWnd = pIC->hWnd; + pIC->cfCandForm[lpCandidate->dwIndex] = *lpCandidate; + + ImmUnlockIMC(hIMC); + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS, + IMN_SETCANDIDATEPOS, (1 << lpCandidate->dwIndex)); return TRUE; +#undef MAX_CANDIDATEFORM } /***********************************************************************

1 0

[reactos] 01/01: [TRANSLATION] Add/update Hungarian translation of deskmon, notepad, winlogon, mycomput
by Tibor Lajos Füzi 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f26614afffd0f79f3d69d… commit f26614afffd0f79f3d69d7b6052b8931c04bab59 Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Wed Aug 4 17:55:41 2021 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Aug 7 22:57:35 2021 +0200 [TRANSLATION] Add/update Hungarian translation of deskmon, notepad, winlogon, mycomput --- base/applications/notepad/lang/hu-HU.rc | 2 +- base/system/winlogon/lang/hu-HU.rc | 30 +++++++++++++++--------------- dll/shellext/deskmon/deskmon.rc | 3 +++ dll/shellext/deskmon/lang/hu-HU.rc | 25 +++++++++++++++++++++++++ dll/win32/mycomput/lang/hu-HU.rc | 8 ++++++++ dll/win32/mycomput/mycomput.rc | 3 +++ 6 files changed, 55 insertions(+), 16 deletions(-) diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 7f3852255a4..21d995b56e7 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Fájl" BEGIN MENUITEM "Ú&j\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "Új &ablak\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "Meg&nyitás\tCtrl+O", CMD_OPEN MENUITEM "&Mentés\tCtrl+S", CMD_SAVE MENUITEM "Mentés má&sként...", CMD_SAVE_AS diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index 21238085ce7..caaeb15f3a0 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -7,37 +7,37 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "Számítógép kikapcsolása" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Mostmár biztonságos a gép kikapcsolása.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Most már biztonságos a gép kikapcsolása.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Újraindítás", IDC_BTNSHTDOWNCOMPUTER, 60, 32, 44, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Felhasználói felületet érintõ hiba" +CAPTION "Felhasználói felületet érintő hiba" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A Felhasználó beléptetését kezelõ DLL (%s) nem tudott betöltõdni.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Értesítsd a rendszergazdát, hogy javítsa ki a DLL állományt.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "A Felhasználó beléptetését kezelő DLL (%s) nem tudott betöltődni.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Értesítse a rendszergazdát, hogy javítsa ki a DLL állományt.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Újraindítás", 1, 80, 91, 68, 14 END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP -CAPTION "System Shutdown" +CAPTION "A rendszer leállítása" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "A rendszer leállítását kezdeményezték. Kérjük mentse el az összes folyamatban lévő munkáját és jelentkezzen ki a munkamenetből. Minden nem mentett módosítás elvész.", -1, 38, 7, 135, 40 + LTEXT "A rendszer ennyi idő múlva leáll:", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Üzenet:", -1, 38, 65, 135, 8 EDITTEXT IDC_SYSSHUTDOWNMESSAGE, 34, 75, 139, 58, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE END STRINGTABLE BEGIN - IDS_PREPARENETWORKCONNECTIONS "Hálózati kapcsolatok elõkészítése..." + IDS_PREPARENETWORKCONNECTIONS "Hálózati kapcsolatok előkészítése..." IDS_APPLYINGCOMPUTERSETTINGS "Beállítások érvényesítése..." IDS_RUNNINGSTARTUPSCRIPTS "Indító szkriptek futtatása..." IDS_RUNNINGSHUTDOWNSCRIPTS "Leállító szkriptek futtatása..." @@ -46,17 +46,17 @@ BEGIN IDS_RUNNINGLOGONSCRIPTS "Bejelentkezési szkriptek futtatása..." IDS_LOADINGYOURPERSONALSETTINGS "Személyes beállítások betöltése..." IDS_CLOSINGNETWORKCONNECTIONS "Hálózati kapcsolatok lezárása..." - IDS_REACTOSISRESTARTING "Restarting..." - IDS_REACTOSISSHUTTINGDOWN "Shutting down..." - IDS_PREPARETOSTANDBY "Készenléti üzemmód elõkészítése..." - IDS_PREPARETOHIBERNATE "Hibernálás elõkészítése..." + IDS_REACTOSISRESTARTING "Újraindítás..." + IDS_REACTOSISSHUTTINGDOWN "Leállítás..." + IDS_PREPARETOSTANDBY "Készenléti üzemmód előkészítése..." + IDS_PREPARETOHIBERNATE "Hibernálás előkészítése..." IDS_SAVEYOURSETTINGS "Beállítások mentése..." IDS_REACTOSISSTARTINGUP "A ReactOS indul..." IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" - IDS_TIMEOUTLONGFORMAT "%d days" + IDS_TIMEOUTLONGFORMAT "%d nap" END STRINGTABLE BEGIN - IDS_FAILEDACTIVATEUSERSHELL "A Winlogon nemtudta elindítani a felhasználói felületet!" + IDS_FAILEDACTIVATEUSERSHELL "A Winlogon nem tudta elindítani a felhasználói felületet!" END diff --git a/dll/shellext/deskmon/deskmon.rc b/dll/shellext/deskmon/deskmon.rc index 8d39e819f97..580cf49ce9e 100644 --- a/dll/shellext/deskmon/deskmon.rc +++ b/dll/shellext/deskmon/deskmon.rc @@ -46,6 +46,9 @@ IDC_MONITORICO ICON "resources/monitor.ico" #ifdef LANGUAGE_HI_IN #include "lang/hi-IN.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/shellext/deskmon/lang/hu-HU.rc b/dll/shellext/deskmon/lang/hu-HU.rc new file mode 100644 index 00000000000..6239e59044e --- /dev/null +++ b/dll/shellext/deskmon/lang/hu-HU.rc @@ -0,0 +1,25 @@ +/* Hungarian translation by Tibor Lajos Füzi (tibor.fuzi(a)gmail.com) 2021 */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Monitor típus", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&Tulajdonságok", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Monitor beállítások", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&Képfrissítési frekvencia:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "A &monitor által nem támogatott módok elrejtése", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "A hardver alapértelmezett beállításainak használata" + IDS_FREQFMT "%u Hertz" +END diff --git a/dll/win32/mycomput/lang/hu-HU.rc b/dll/win32/mycomput/lang/hu-HU.rc new file mode 100644 index 00000000000..07124b8de29 --- /dev/null +++ b/dll/win32/mycomput/lang/hu-HU.rc @@ -0,0 +1,8 @@ +/* Hungarian translation by Tibor Lajos Füzi (tibor.fuzi(a)gmail.com) 2021 */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_MANAGE "Kezelés" +END diff --git a/dll/win32/mycomput/mycomput.rc b/dll/win32/mycomput/mycomput.rc index 7bf9c6af80b..c6803d41e82 100644 --- a/dll/win32/mycomput/mycomput.rc +++ b/dll/win32/mycomput/mycomput.rc @@ -24,6 +24,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif

1 0

[reactos] 01/01: [NTOS:MM] Implement MmFlushImageSection(MmFlushForWrite)
by Jérôme Gardou 07 Aug '21

07 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=589016ddb9b818345f8a1… commit 589016ddb9b818345f8a1e730685957f2d137a98 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Aug 6 18:14:10 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Aug 7 09:34:58 2021 +0200 [NTOS:MM] Implement MmFlushImageSection(MmFlushForWrite) --- ntoskrnl/mm/section.c | 155 +++++++++++++++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 60 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index c4b89125f06..e106e0a66d1 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1011,11 +1011,11 @@ MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) } *Segment->Flags |= MM_SEGMENT_INDELETE; - MiReleasePfnLock(OldIrql); /* Flush the segment */ if (*Segment->Flags & MM_DATAFILE_SEGMENT) { + MiReleasePfnLock(OldIrql); /* Free the page table. This will flush any remaining dirty data */ MmFreePageTablesSectionSegment(Segment, FreeSegmentPage); @@ -1036,7 +1036,6 @@ MmDereferenceSegmentWithLock(PMM_SECTION_SEGMENT Segment, KIRQL OldIrql) ULONG NrSegments; ULONG i; - OldIrql = MiAcquirePfnLock(); /* Delete the pointer on the file */ ASSERT(ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject == ImageSectionObject); ImageSectionObject->FileObject->SectionObjectPointer->ImageSectionObject = NULL; @@ -1098,6 +1097,7 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, ULONG_PTR Entry = InEntry ? *InEntry : MmGetPageEntrySectionSegment(Segment, Offset); PFN_NUMBER Page = PFN_FROM_SSE(Entry); BOOLEAN IsDataMap = BooleanFlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT); + SWAPENTRY SwapEntry; if (Entry == 0) { @@ -1134,12 +1134,12 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, return FALSE; } - if (!BooleanFlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)) + if (!FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)) { - /* So this must have been a read-only page. Keep it ! */ ASSERT(Segment->WriteCopy); ASSERT(!IS_DIRTY_SSE(Entry)); ASSERT(MmGetSavedSwapEntryPage(Page) == 0); + /* So this must have been a read-only page. Keep it ! */ MmSetPageEntrySectionSegment(Segment, Offset, Entry); return FALSE; } @@ -1148,7 +1148,7 @@ MmUnsharePageEntrySectionSegment(PMEMORY_AREA MemoryArea, * So this is a page for a shared section of a DLL. * We can keep it if it is not dirty. */ - SWAPENTRY SwapEntry = MmGetSavedSwapEntryPage(Page); + SwapEntry = MmGetSavedSwapEntryPage(Page); if ((SwapEntry == 0) && !IS_DIRTY_SSE(Entry)) { MmSetPageEntrySectionSegment(Segment, Offset, Entry); @@ -1194,7 +1194,8 @@ MmMakeSegmentResident( _In_ PMM_SECTION_SEGMENT Segment, _In_ LONGLONG Offset, _In_ ULONG Length, - _In_opt_ PLARGE_INTEGER ValidDataLength) + _In_opt_ PLARGE_INTEGER ValidDataLength, + _In_ BOOLEAN SetDirty) { /* Let's use a 64K granularity. */ LONGLONG RangeStart, RangeEnd; @@ -1261,7 +1262,9 @@ MmMakeSegmentResident( if (Entry != 0) { - /* There is a page here. Or a swap entry. Or whatever... */ + /* Dirtify it if it's a resident page and we're asked to */ + if (SetDirty && !IS_SWAP_FROM_SSE(Entry)) + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, DIRTY_SSE(Entry)); continue; } @@ -1409,12 +1412,16 @@ AssignPagesToSegment: for (UINT i = 0; i < BYTES_TO_PAGES(ReadLength); i++) { + ULONG_PTR Entry = MAKE_SSE(Pages[i] << PAGE_SHIFT, 0); LARGE_INTEGER CurrentOffset; CurrentOffset.QuadPart = ChunkOffset + (i * PAGE_SIZE); ASSERT(MM_IS_WAIT_PTE(MmGetPageEntrySectionSegment(Segment, &CurrentOffset))); - MmSetPageEntrySectionSegment(Segment, &CurrentOffset, MAKE_SSE(Pages[i] << PAGE_SHIFT, 0)); + if (SetDirty) + Entry = DIRTY_SSE(Entry); + + MmSetPageEntrySectionSegment(Segment, &CurrentOffset, Entry); } MmUnlockSectionSegment(Segment); @@ -1755,7 +1762,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, PFSRTL_COMMON_FCB_HEADER FcbHeader = Segment->FileObject->FsContext; - Status = MmMakeSegmentResident(Segment, Offset.QuadPart, PAGE_SIZE, &FcbHeader->ValidDataLength); + Status = MmMakeSegmentResident(Segment, Offset.QuadPart, PAGE_SIZE, &FcbHeader->ValidDataLength, FALSE); FsRtlReleaseFile(Segment->FileObject); @@ -3621,6 +3628,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, ASSERT(NT_SUCCESS(Status)); } } + DPRINT("One mapping less for %p\n", ImageSectionObject->FileObject->SectionObjectPointer); InterlockedDecrement(&ImageSectionObject->MapCount); } else @@ -4046,6 +4054,8 @@ MmMapViewOfSection(IN PVOID SectionObject, *BaseAddress = (PVOID)ImageBase; *ViewSize = ImageSize; + DPRINT("Mapped %p for section pointer %p\n", ImageSectionObject, ImageSectionObject->FileObject->SectionObjectPointer); + /* One more map */ InterlockedIncrement(&ImageSectionObject->MapCount); } @@ -4184,6 +4194,50 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, return Ret; } +static +BOOLEAN +MiPurgeImageSegment(PMM_SECTION_SEGMENT Segment) +{ + PCACHE_SECTION_PAGE_TABLE PageTable; + + MmLockSectionSegment(Segment); + + /* Loop over all entries */ + for (PageTable = RtlEnumerateGenericTable(&Segment->PageTable, TRUE); + PageTable != NULL; + PageTable = RtlEnumerateGenericTable(&Segment->PageTable, FALSE)) + { + for (ULONG i = 0; i < _countof(PageTable->PageEntries); i++) + { + ULONG_PTR Entry = PageTable->PageEntries[i]; + LARGE_INTEGER Offset; + + if (!Entry) + continue; + + if (IS_SWAP_FROM_SSE(Entry) || (SHARE_COUNT_FROM_SSE(Entry) > 0)) + { + /* I/O ongoing or swap entry. Someone mapped this file as we were not looking */ + MmUnlockSectionSegment(Segment); + return FALSE; + } + + /* Regular entry */ + ASSERT(!IS_WRITE_SSE(Entry)); + ASSERT(MmGetSavedSwapEntryPage(PFN_FROM_SSE(Entry)) == 0); + + /* Properly remove using the used API */ + Offset.QuadPart = PageTable->FileOffset.QuadPart + (i << PAGE_SHIFT); + MmSetPageEntrySectionSegment(Segment, &Offset, 0); + MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); + } + } + + MmUnlockSectionSegment(Segment); + + return TRUE; +} + /* * @implemented */ @@ -4194,12 +4248,34 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, switch(FlushType) { case MmFlushForDelete: + { + /* + * FIXME: Check for outstanding write probes on Data section. + * How do we do that ? + */ + } + /* Fall-through */ + case MmFlushForWrite: { KIRQL OldIrql = MiAcquirePfnLock(); PMM_IMAGE_SECTION_OBJECT ImageSectionObject = SectionObjectPointer->ImageSectionObject; - if (!ImageSectionObject || (ImageSectionObject->SegFlags & MM_SEGMENT_INDELETE)) + DPRINT("Deleting or modifying %p\n", SectionObjectPointer); + + /* Wait for concurrent creation or deletion of image to be done */ + ImageSectionObject = SectionObjectPointer->ImageSectionObject; + while (ImageSectionObject && (ImageSectionObject->SegFlags & (MM_SEGMENT_INCREATE | MM_SEGMENT_INDELETE))) { + MiReleasePfnLock(OldIrql); + KeDelayExecutionThread(KernelMode, FALSE, &TinyTime); + OldIrql = MiAcquirePfnLock(); + ImageSectionObject = SectionObjectPointer->ImageSectionObject; + } + + if (!ImageSectionObject) + { + DPRINT("No image section object. Accepting\n"); + /* Nothing to do */ MiReleasePfnLock(OldIrql); return TRUE; } @@ -4209,6 +4285,7 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, { /* We do. No way to delete it */ MiReleasePfnLock(OldIrql); + DPRINT("Denying. There are mappings open\n"); return FALSE; } @@ -4217,39 +4294,12 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, InterlockedIncrement64(&ImageSectionObject->RefCount); MiReleasePfnLock(OldIrql); + DPRINT("Purging\n"); + for (ULONG i = 0; i < ImageSectionObject->NrSegments; i++) { - PMM_SECTION_SEGMENT Segment = &ImageSectionObject->Segments[i]; - LONGLONG Length; - - MmLockSectionSegment(Segment); - /* Loop over all entries */ - LARGE_INTEGER Offset; - Offset.QuadPart = 0; - - Length = Segment->Length.QuadPart; - if (Length < Segment->RawLength.QuadPart) - Length = Segment->RawLength.QuadPart; - - while (Offset.QuadPart < Length) - { - ULONG_PTR Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - - /* Shared data must already be discarded, and nobody should be reading it. */ - ASSERT(!IS_SWAP_FROM_SSE(Entry)); - if (Entry != 0) - { - DPRINT1("Freeing page %lx for image section %p\n", PFN_FROM_SSE(Entry), ImageSectionObject); - /* Release the page */ - ASSERT(SHARE_COUNT_FROM_SSE(Entry) == 0); - ASSERT(!IS_WRITE_SSE(Entry)); - ASSERT(MmGetSavedSwapEntryPage(PFN_FROM_SSE(Entry)) == 0); - MmSetPageEntrySectionSegment(Segment, &Offset, 0); - MmReleasePageMemoryConsumer(MC_USER, PFN_FROM_SSE(Entry)); - } - Offset.QuadPart += PAGE_SIZE; - } - MmUnlockSectionSegment(Segment); + if (!MiPurgeImageSegment(&ImageSectionObject->Segments[i])) + break; } /* Grab lock again */ @@ -4274,21 +4324,6 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, MmDereferenceSegmentWithLock(&ImageSectionObject->Segments[0], OldIrql); return TRUE; } - case MmFlushForWrite: - { - BOOLEAN Ret = TRUE; - KIRQL OldIrql = MiAcquirePfnLock(); - - if (SectionObjectPointer->ImageSectionObject) - { - PMM_IMAGE_SECTION_OBJECT ImageSectionObject = SectionObjectPointer->ImageSectionObject; - if (!(ImageSectionObject->SegFlags & MM_SEGMENT_INDELETE)) - Ret = FALSE; - } - - MiReleasePfnLock(OldIrql); - return Ret; - } } return FALSE; } @@ -4782,7 +4817,7 @@ MmMakeDataSectionResident( /* There must be a segment for this call */ ASSERT(Segment); - NTSTATUS Status = MmMakeSegmentResident(Segment, Offset, Length, ValidDataLength); + NTSTATUS Status = MmMakeSegmentResident(Segment, Offset, Length, ValidDataLength, FALSE); MmDereferenceSegment(Segment); @@ -4906,8 +4941,8 @@ MmCheckDirtySegment( * We got a dirty entry. This path is for the shared data, * be-it regular file maps or shared sections of DLLs */ - ASSERT(!Segment->WriteCopy); - ASSERT(FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT) || FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)); + ASSERT(FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT) || + FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)); /* Insert the cleaned entry back. Mark it as write in progress, and clear the dirty bit. */ Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) + 1); @@ -4936,7 +4971,7 @@ MmCheckDirtySegment( ASSERT(PageOut); /* And this must be for a shared section in a DLL */ - ASSERT(Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED); + ASSERT(FlagOn(Segment->Image.Characteristics, IMAGE_SCN_MEM_SHARED)); SWAPENTRY SwapEntry = MmGetSavedSwapEntryPage(Page); if (!SwapEntry)

1 0

[reactos] 01/01: [LDR] Disable Logging when images overlap CORE-17635
by Joachim Henze 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cc2c350ef208d417a7e0… commit 4cc2c350ef208d417a7e0124c44b6c521bd3a917 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Aug 6 19:25:14 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Aug 6 19:25:14 2021 +0200 [LDR] Disable Logging when images overlap CORE-17635 We found out what we wanted to find out: the remaining TODOs for the Python script. So we can silence the DPRINTs again for the time being to reduce spam from 3rd party dlls. Paying tribute to Mark Jansen ;) --- dll/ntdll/ldr/ldrutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 27fa42b929f..5b1ec30e525 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -1335,7 +1335,7 @@ SkipCheck: ImageBase = (ULONG_PTR)NtHeaders->OptionalHeader.ImageBase; ImageEnd = ImageBase + ViewSize; - DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); + DPRINT("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); /* Scan all the modules */ ListHead = &Peb->Ldr->InLoadOrderModuleList; @@ -1374,7 +1374,7 @@ SkipCheck: RtlInitUnicodeString(&OverlapDll, L"Dynamically Allocated Memory"); } - DPRINT1("Overlapping DLL: %wZ\n", &OverlapDll); + DPRINT("Overlapping DLL: %wZ\n", &OverlapDll); /* Are we dealing with a DLL? */ if (LdrEntry->Flags & LDRP_IMAGE_DLL)

1 0

[reactos] 02/02: [WIN32K] Do not release twice the lock on error path
by Jérôme Gardou 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4801ab696d9fb2dfdd38… commit c4801ab696d9fb2dfdd383741af3b34a73aa9a17 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Aug 6 15:18:21 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Aug 6 15:18:21 2021 +0200 [WIN32K] Do not release twice the lock on error path --- win32ss/user/ntuser/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 8f593d02fff..00a683af61c 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -995,7 +995,6 @@ DriverEntry( if (!gpsi) { DPRINT1("Failed allocate server info structure!\n"); - UserLeave(); return STATUS_UNSUCCESSFUL; }

1 0

[reactos] 01/02: [CMAKE] Do not disable optimisations on ntoskrnl build
by Jérôme Gardou 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6618d978cd23d30bda559… commit 6618d978cd23d30bda5594f6ce79d68daac0c435 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Aug 6 09:51:57 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Aug 6 15:17:49 2021 +0200 [CMAKE] Do not disable optimisations on ntoskrnl build --- ntoskrnl/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index a359482aad8..b0cf73eec86 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -46,13 +46,6 @@ set_module_type(ntoskrnl kernel) source_group(TREE ${REACTOS_SOURCE_DIR}/ntoskrnl PREFIX "Source Files" FILES ${NTOSKRNL_SOURCE}) -if(GDB AND NOT CLANG) - # Completely disable optimizations when debugging the kernel - # Not for CLang, which fails as following in _SEH2_EXCEPT macro: - # error: inline assembly requires more registers than available - target_compile_options(ntoskrnl PRIVATE -O0) -endif() - target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) if(STACK_PROTECTOR)

1 0

[reactos] 01/01: [WIN32K] Init User part after GDI one.
by Jérôme Gardou 06 Aug '21

06 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bc00267df2f644d329a5… commit 0bc00267df2f644d329a5b0823052293c0108384 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Aug 4 09:49:18 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Aug 6 10:15:02 2021 +0200 [WIN32K] Init User part after GDI one. But Initialize user lock first thing to avoid hitting newly introduced ASSERTS This partly reverts commit 515d83a883ae01c8ccaca6d56e47d0ae4bdb0305. --- win32ss/user/ntuser/main.c | 35 ++++++++++++++++++++++++++++++++++- win32ss/user/ntuser/ntuser.c | 18 ------------------ win32ss/user/ntuser/ntuser.h | 1 + 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 1c8e0c53337..8f593d02fff 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -896,6 +896,21 @@ DriverUnload(IN PDRIVER_OBJECT DriverObject) } \ } +// Lock & return on failure +#define USERLOCK_AND_ROF(x) \ +{ \ + UserEnterExclusive(); \ + Status = (x); \ + UserLeave(); \ + if (!NT_SUCCESS(Status)) \ + { \ + DPRINT1("Failed '%s' (0x%lx)\n", #x, Status); \ + return Status; \ + } \ +} + + + /* * This definition doesn't work */ @@ -968,7 +983,24 @@ DriverEntry( return STATUS_UNSUCCESSFUL; } - NT_ROF(InitUserImpl()); + /* Init the global user lock */ + ExInitializeResourceLite(&UserLock); + + /* Lock while we use the heap (UserHeapAlloc asserts on this) */ + UserEnterExclusive(); + + /* Allocate global server info structure */ + gpsi = UserHeapAlloc(sizeof(*gpsi)); + UserLeave(); + if (!gpsi) + { + DPRINT1("Failed allocate server info structure!\n"); + UserLeave(); + return STATUS_UNSUCCESSFUL; + } + + RtlZeroMemory(gpsi, sizeof(*gpsi)); + DPRINT("Global Server Data -> %p\n", gpsi); NT_ROF(InitGdiHandleTable()); NT_ROF(InitPaletteImpl()); @@ -983,6 +1015,7 @@ DriverEntry( NT_ROF(InitLDEVImpl()); NT_ROF(InitDeviceImpl()); NT_ROF(InitDcImpl()); + USERLOCK_AND_ROF(InitUserImpl()); NT_ROF(InitWindowStationImpl()); NT_ROF(InitDesktopImpl()); NT_ROF(InitInputImpl()); diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index 9ada594c363..32805901b33 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -79,22 +79,6 @@ InitUserImpl(VOID) NTSTATUS Status; HKEY hKey; - ExInitializeResourceLite(&UserLock); - - /* Hold global resource to make sanity checks happy. */ - UserEnterExclusive(); - - /* Allocate global server info structure */ - gpsi = UserHeapAlloc(sizeof(*gpsi)); - if (!gpsi) - { - ERR("Failed allocate server info structure!\n"); - return STATUS_UNSUCCESSFUL; - } - - RtlZeroMemory(gpsi, sizeof(*gpsi)); - TRACE("Global Server Data -> %p\n", gpsi); - if (!UserCreateHandleTable()) { ERR("Failed creating handle table\n"); @@ -122,8 +106,6 @@ InitUserImpl(VOID) InitSysParams(); - UserLeave(); - return STATUS_SUCCESS; } diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 78b6bacd965..d456564b159 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -18,6 +18,7 @@ extern BOOL g_AlwaysDisplayVersion; extern ATOM gaGuiConsoleWndClass; extern ATOM AtomDDETrack; extern ATOM AtomQOS; +extern ERESOURCE UserLock; CODE_SEG("INIT") NTSTATUS NTAPI InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID);

1 0

[reactos] 01/01: [IMM32] Rewrite ImmSetConversionStatus (#3879)
by Katayama Hirofumi MZ 05 Aug '21

05 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0c9b1445dc7d1eea7ab2… commit c0c9b1445dc7d1eea7ab2f9f0b77ae38d3ff308f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 6 07:15:19 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 6 07:15:19 2021 +0900 [IMM32] Rewrite ImmSetConversionStatus (#3879) CORE-11700 --- dll/win32/imm32/imm.c | 62 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 84ab597c381..c1f5db8b1c1 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3678,33 +3678,61 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - DWORD oldConversion, oldSentence; - InputContextData *data = get_imc_data(hIMC); + HKL hKL; + LPINPUTCONTEXT pIC; + DWORD dwImeThreadId, dwThreadId, dwOldConversion, dwOldSentence; + BOOL fConversionChange = FALSE, fSentenceChange = FALSE; + HWND hWnd; - TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); + TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence); - if (!data) + hKL = GetKeyboardLayout(0); + if (!IS_IME_HKL(hKL)) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + { + FIXME("Cicero\n"); + return FALSE; + } } - if (IMM_IsCrossThreadAccess(NULL, hIMC)) + dwImeThreadId = Imm32QueryInputContext(hIMC, 1); + dwThreadId = GetCurrentThreadId(); + if (dwImeThreadId != dwThreadId) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) return FALSE; - if ( fdwConversion != data->IMC.fdwConversion ) + if (pIC->fdwConversion != fdwConversion) + { + dwOldConversion = pIC->fdwConversion; + pIC->fdwConversion = fdwConversion; + fConversionChange = TRUE; + } + + if (pIC->fdwSentence != fdwSentence) { - oldConversion = data->IMC.fdwConversion; - data->IMC.fdwConversion = fdwConversion; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); - ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); + dwOldSentence = pIC->fdwSentence; + pIC->fdwSentence = fdwSentence; + fSentenceChange = TRUE; } - if ( fdwSentence != data->IMC.fdwSentence ) + + hWnd = pIC->hWnd; + ImmUnlockIMC(hIMC); + + if (fConversionChange) + { + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldConversion, + IMC_SETCONVERSIONMODE, IMN_SETCONVERSIONMODE, 0); + Imm32NotifyIMEStatus(hWnd, hIMC, fdwConversion); + } + + if (fSentenceChange) { - oldSentence = data->IMC.fdwSentence; - data->IMC.fdwSentence = fdwSentence; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); - ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldSentence, + IMC_SETSENTENCEMODE, IMN_SETSENTENCEMODE, 0); } return TRUE;

1 0

[reactos] 02/02: [SETUPAPI] Add stubs for SetupDiSetDriverInstallParamsA/W
by Hervé Poussineau 05 Aug '21

05 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=528fede0341ad0d669003… commit 528fede0341ad0d6690031054f07b0c29afbb09d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 18 15:34:03 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Aug 5 23:45:23 2021 +0200 [SETUPAPI] Add stubs for SetupDiSetDriverInstallParamsA/W --- dll/win32/setupapi/setupapi.spec | 4 ++-- dll/win32/setupapi/stubs.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index 2af90d61106..1d96d8bcb16 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -382,8 +382,8 @@ @ stub SetupDiSetDeviceInterfaceDefault @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long) -@ stub SetupDiSetDriverInstallParamsA -@ stub SetupDiSetDriverInstallParamsW +@ stdcall SetupDiSetDriverInstallParamsA(ptr ptr ptr ptr) +@ stdcall SetupDiSetDriverInstallParamsW(ptr ptr ptr ptr) @ stdcall SetupDiSetSelectedDevice(ptr ptr) @ stdcall SetupDiSetSelectedDriverA(ptr ptr ptr) @ stdcall SetupDiSetSelectedDriverW(ptr ptr ptr) diff --git a/dll/win32/setupapi/stubs.c b/dll/win32/setupapi/stubs.c index f132a8a0fc4..17ded50eeb3 100644 --- a/dll/win32/setupapi/stubs.c +++ b/dll/win32/setupapi/stubs.c @@ -149,3 +149,26 @@ SetupVerifyInfFileW( return FALSE; } +BOOL WINAPI +SetupDiSetDriverInstallParamsA( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ PSP_DRVINFO_DATA_A DriverInfoData, + _In_ PSP_DRVINSTALL_PARAMS DriverInstallParams) +{ + FIXME("Stub %p %p %p %p\n", DeviceInfoSet, DeviceInfoData, DriverInfoData, DriverInstallParams); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI +SetupDiSetDriverInstallParamsW( + _In_ HDEVINFO DeviceInfoSet, + _In_opt_ PSP_DEVINFO_DATA DeviceInfoData, + _In_ PSP_DRVINFO_DATA_W DriverInfoData, + _In_ PSP_DRVINSTALL_PARAMS DriverInstallParams) +{ + FIXME("Stub %p %p %p %p\n", DeviceInfoSet, DeviceInfoData, DriverInfoData, DriverInstallParams); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

[reactos] 01/02: [PSDK] Add DRIVER_UNTRUSTED_RANK define
by Hervé Poussineau 05 Aug '21

05 Aug '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e763bec6cdb0fa73fae2f… commit e763bec6cdb0fa73fae2f74d7e029a2cf73f6903 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 18 15:36:30 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Aug 5 23:45:20 2021 +0200 [PSDK] Add DRIVER_UNTRUSTED_RANK define --- sdk/include/psdk/setupapi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/psdk/setupapi.h b/sdk/include/psdk/setupapi.h index d11e36a464a..efe15a7b0bf 100644 --- a/sdk/include/psdk/setupapi.h +++ b/sdk/include/psdk/setupapi.h @@ -272,6 +272,11 @@ extern "C" { #define DPROMPT_BUFFERTOOSMALL 3 #define DPROMPT_OUTOFMEMORY 4 #define DRIVER_HARDWAREID_RANK 0x00000FFF +#if (_SETUPAPI_VER >= 0x0600) +#define DRIVER_UNTRUSTED_RANK 0x80000000 +#else +#define DRIVER_UNTRUSTED_RANK 0x00008000 +#endif #define DYNAWIZ_FLAG_PAGESADDED 0x00000001 #define DYNAWIZ_FLAG_INSTALLDET_NEXT 0x00000002 #define DYNAWIZ_FLAG_INSTALLDET_PREV 0x00000004

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