Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/02: [COMCTL32] rebar: Remove some hacks and fix checking for transparent background

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8062bde5d9f4e5272278… commit b8062bde5d9f4e5272278d7dff155e9085538fc2 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Jan 12 18:49:09 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 15 12:57:06 2018 +0200 [COMCTL32] rebar: Remove some hacks and fix checking for transparent background --- dll/win32/comctl32/rebar.c | 49 +--------------------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/dll/win32/comctl32/rebar.c b/dll/win32/comctl32/rebar.c index 525c4cc524..d4896142bd 100644 --- a/dll/win32/comctl32/rebar.c +++ b/dll/win32/comctl32/rebar.c @@ -1826,43 +1826,28 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) RECT cr; COLORREF old = CLR_NONE, new; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); -#ifdef __REACTOS__ - HRGN hrgn; -#endif GetClientRect (infoPtr->hwndSelf, &cr); #ifdef __REACTOS__ - if (theme) { - if (IsThemeBackgroundPartiallyTransparent(theme, RP_BACKGROUND, 0)) + if (IsThemeBackgroundPartiallyTransparent(theme, 0, 0)) { DrawThemeParentBackground (infoPtr->hwndSelf, hdc, &cr); } DrawThemeBackground (theme, hdc, 0, 0, &cr, NULL); } - - hrgn = CreateRectRgn(cr.left, cr.top, cr.right, cr.bottom); - #endif oldrow = -1; for(i=0; i<infoPtr->uNumBands; i++) { RECT rcBand; -#ifdef __REACTOS__ - RECT rcBandReal; - HRGN hrgnBand; -#endif lpBand = REBAR_GetBand(infoPtr, i); if (HIDDENBAND(lpBand)) continue; translate_rect(infoPtr, &rcBand, &lpBand->rcBand); -#ifdef __REACTOS__ - rcBandReal = rcBand; -#endif - /* draw band separator between rows */ if (lpBand->iRow != oldrow) { oldrow = lpBand->iRow; @@ -1887,9 +1872,6 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) } TRACE ("drawing band separator bottom (%s)\n", wine_dbgstr_rect(&rcRowSep)); -#ifdef __REACTOS__ - rcBandReal = rcRowSep; -#endif } } @@ -1900,9 +1882,6 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) if (infoPtr->dwStyle & CCS_VERT) { rcSep.bottom = rcSep.top; rcSep.top -= SEP_WIDTH_SIZE; -#ifdef __REACTOS__ - rcBandReal.top -= SEP_WIDTH_SIZE; -#endif if (theme) DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_BOTTOM, NULL); else @@ -1911,9 +1890,6 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) else { rcSep.right = rcSep.left; rcSep.left -= SEP_WIDTH_SIZE; -#ifdef __REACTOS__ - rcBandReal.left -= SEP_WIDTH_SIZE; -#endif if (theme) DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_RIGHT, NULL); else @@ -1944,9 +1920,6 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) #endif } -#ifdef __REACTOS__ - if (!theme) -#else if (theme) { /* When themed, the background color is ignored (but not a @@ -1954,7 +1927,6 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) DrawThemeBackground (theme, hdc, 0, 0, &cr, &rcBand); } else -#endif { old = SetBkColor (hdc, new); TRACE("%s background color=0x%06x, band %s\n", @@ -1965,26 +1937,7 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) if (lpBand->clrBack != CLR_NONE) SetBkColor (hdc, old); } - -#ifdef __REACTOS__ - hrgnBand = CreateRectRgn(rcBandReal.left, rcBandReal.top, rcBandReal.right, rcBandReal.bottom); - CombineRgn(hrgn, hrgn, hrgnBand, RGN_DIFF); - DeleteObject(hrgnBand); -#endif } - -#if 1 -#ifdef __REACTOS__ - if (!theme) -#endif - { - //FIXME: Apparently painting the remaining area is a v6 feature - HBRUSH hbrush = CreateSolidBrush(new); - FillRgn(hdc, hrgn, hbrush); - DeleteObject(hbrush); - } - DeleteObject(hrgn); -#endif return TRUE; }

6 years, 11 months

01/01: [USER32] InternalGetWindowText: Write to caller's buffer only when one was provided. CORE-13614

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6318e47bb9a7598eec633… commit 6318e47bb9a7598eec633ff26b31b237b4b414bc Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Jan 15 12:45:41 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 15 12:45:41 2018 +0200 [USER32] InternalGetWindowText: Write to caller's buffer only when one was provided. CORE-13614 --- win32ss/user/user32/windows/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index fd006481d1..388ef25bb1 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1799,7 +1799,7 @@ int WINAPI InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount) { INT Ret = NtUserInternalGetWindowText(hWnd, lpString, nMaxCount); - if (Ret == 0) + if (Ret == 0 && lpString) *lpString = L'\0'; return Ret; }

6 years, 11 months

01/01: [USER32] Stop hiding exceptions left and right

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd193c45347b8f2fa602c… commit bd193c45347b8f2fa602ce2802c09b9e91db16a5 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Jan 15 12:36:45 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 15 12:36:45 2018 +0200 [USER32] Stop hiding exceptions left and right --- win32ss/user/user32/controls/listbox.c | 2 +- win32ss/user/user32/controls/scrollbar.c | 3 +++ win32ss/user/user32/misc/desktop.c | 3 +++ win32ss/user/user32/misc/usrapihk.c | 1 + win32ss/user/user32/windows/class.c | 1 + win32ss/user/user32/windows/defwnd.c | 2 ++ win32ss/user/user32/windows/draw.c | 1 + win32ss/user/user32/windows/message.c | 15 +++++++++------ 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/win32ss/user/user32/controls/listbox.c b/win32ss/user/user32/controls/listbox.c index d149688d71..4e1b48a3a7 100644 --- a/win32ss/user/user32/controls/listbox.c +++ b/win32ss/user/user32/controls/listbox.c @@ -806,7 +806,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - WARN( "got an invalid buffer (Delphi bug?)\n" ); + ERR( "got an invalid buffer (Delphi bug?)\n" ); SetLastError( ERROR_INVALID_PARAMETER ); len = LB_ERR; } diff --git a/win32ss/user/user32/controls/scrollbar.c b/win32ss/user/user32/controls/scrollbar.c index dac106bb70..0a4913353c 100644 --- a/win32ss/user/user32/controls/scrollbar.c +++ b/win32ss/user/user32/controls/scrollbar.c @@ -1459,6 +1459,7 @@ EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked EnableScrollBar!\n"); } _SEH2_END; @@ -1533,6 +1534,7 @@ GetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked GetScrollInfo!\n"); } _SEH2_END; @@ -1656,6 +1658,7 @@ SetScrollInfo(HWND Wnd, int SBType, LPCSCROLLINFO Info, BOOL bRedraw) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked SetScrollInfo!\n"); } _SEH2_END; diff --git a/win32ss/user/user32/misc/desktop.c b/win32ss/user/user32/misc/desktop.c index 2f78f7b189..edf17e8199 100644 --- a/win32ss/user/user32/misc/desktop.c +++ b/win32ss/user/user32/misc/desktop.c @@ -159,6 +159,7 @@ GetSystemMetrics(int nIndex) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked GetSystemMetrics!\n"); } _SEH2_END; @@ -381,6 +382,7 @@ SystemParametersInfoA(UINT uiAction, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked SystemParametersInfoA!\n"); } _SEH2_END; @@ -413,6 +415,7 @@ SystemParametersInfoW(UINT uiAction, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked SystemParametersInfoW!\n"); } _SEH2_END; diff --git a/win32ss/user/user32/misc/usrapihk.c b/win32ss/user/user32/misc/usrapihk.c index 7e856d4324..8b5d264ee8 100644 --- a/win32ss/user/user32/misc/usrapihk.c +++ b/win32ss/user/user32/misc/usrapihk.c @@ -332,6 +332,7 @@ MDIRedrawFrame(HWND hWnd, DWORD flags) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked MDIRedrawFrame!\n"); } _SEH2_END; diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index f12788fd22..cf9d88dbbb 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -234,6 +234,7 @@ VersionRegisterClass( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception while trying to call RegisterClassNameW!\n"); } _SEH2_END diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index 7098c34446..ac9fd93526 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -1216,6 +1216,7 @@ DefWindowProcA(HWND hWnd, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked DefWindowProcA!\n"); } _SEH2_END; @@ -1255,6 +1256,7 @@ DefWindowProcW(HWND hWnd, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked DefWindowProcW!\n"); } _SEH2_END; diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c index dd1d6dd752..40e65db6e7 100644 --- a/win32ss/user/user32/windows/draw.c +++ b/win32ss/user/user32/windows/draw.c @@ -1454,6 +1454,7 @@ DrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked DrawFrameControl!\n"); } _SEH2_END; diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index 44345e7c54..d9b32d2626 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -1455,6 +1455,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1487,6 +1488,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1509,6 +1511,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1541,6 +1544,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1601,6 +1605,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1633,6 +1638,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1662,6 +1668,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1694,6 +1701,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1870,7 +1878,6 @@ DispatchMessageA(CONST MSG *lpmsg) LRESULT Ret = 0; MSG UnicodeMsg; PWND Wnd; - BOOL Hit = FALSE; if ( lpmsg->message & ~WM_MAXIMUM ) { @@ -1914,7 +1921,7 @@ DispatchMessageA(CONST MSG *lpmsg) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + ERR("Exception in Timer Callback!\n"); } _SEH2_END; } @@ -1945,10 +1952,6 @@ DispatchMessageA(CONST MSG *lpmsg) } } - if (Hit) - { - WARN("Exception in Timer Callback WndProcA!\n"); - } return Ret; }

6 years, 11 months

01/01: [SYSDM] Fix text truncation for ru-RU CORE-13845

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0498ca00afe12380e975… commit e0498ca00afe12380e975a0707d30675b720cde8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 14 13:54:30 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 14 13:55:43 2018 +0100 [SYSDM] Fix text truncation for ru-RU CORE-13845 --- dll/cpl/sysdm/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index f546534cb7..76e467cde2 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -56,7 +56,7 @@ BEGIN LTEXT "Загрузка и восстановление системы, отладочная информация", IDC_STATIC, 16, 144, 210, 20 PUSHBUTTON "&Параметры", IDC_STAREC, 194, 162, 50, 15 PUSHBUTTON "Настройки системы", IDC_SYSSETTINGS, 6, 192, 80, 15 - PUSHBUTTON "П&еременные среды...", IDC_ENVVAR, 88, 192, 80, 15 + PUSHBUTTON "П&еременные среды", IDC_ENVVAR, 88, 192, 80, 15 PUSHBUTTON "Отчет об ошибках", IDC_ERRORREPORT, 170, 192, 80, 15 END

6 years, 11 months

01/01: [NTOS] Fix 64 bit warnings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dade10d543589e1f5f76… commit 2dade10d543589e1f5f762bbc1695f2917341171 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 1 15:24:05 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 14 13:54:14 2018 +0100 [NTOS] Fix 64 bit warnings --- ntoskrnl/cache/section/swapout.c | 2 +- ntoskrnl/ex/interlocked.c | 8 ++++---- ntoskrnl/fstub/translate.c | 2 +- ntoskrnl/io/pnpmgr/pnpinit.c | 2 +- ntoskrnl/mm/ARM3/contmem.c | 2 +- ntoskrnl/mm/ARM3/mdlsup.c | 4 ++-- ntoskrnl/mm/ARM3/procsup.c | 6 +++--- ntoskrnl/mm/ARM3/section.c | 2 +- ntoskrnl/mm/ARM3/vadnode.c | 8 ++++---- ntoskrnl/mm/ARM3/virtual.c | 2 +- ntoskrnl/mm/marea.c | 2 ++ ntoskrnl/ob/oblife.c | 10 +++++----- 12 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ntoskrnl/cache/section/swapout.c b/ntoskrnl/cache/section/swapout.c index 35805a1462..4c6f100f5d 100644 --- a/ntoskrnl/cache/section/swapout.c +++ b/ntoskrnl/cache/section/swapout.c @@ -254,7 +254,7 @@ MmFinalizeSectionPageOut(PMM_SECTION_SEGMENT Segment, } /* Note: Writing may evict the segment... Nothing is guaranteed from here down */ - MiSetPageEvent(Segment, FileOffset->LowPart); + MiSetPageEvent(Segment, (ULONG_PTR)FileOffset->QuadPart); DPRINT("Status %x\n", Status); return Status; diff --git a/ntoskrnl/ex/interlocked.c b/ntoskrnl/ex/interlocked.c index 80a123b7d6..17f20cbc07 100644 --- a/ntoskrnl/ex/interlocked.c +++ b/ntoskrnl/ex/interlocked.c @@ -184,8 +184,8 @@ ExInterlockedRemoveHeadList( /* Remove the first entry from the list head */ ListEntry = RemoveHeadList(ListHead); #if DBG - ListEntry->Flink = (PLIST_ENTRY)0xBADDD0FF; - ListEntry->Blink = (PLIST_ENTRY)0xBADDD0FF; + ListEntry->Flink = (PLIST_ENTRY)(ULONG_PTR)0xBADDD0FFBADDD0FFULL; + ListEntry->Blink = (PLIST_ENTRY)(ULONG_PTR)0xBADDD0FFBADDD0FFULL; #endif } @@ -212,7 +212,7 @@ ExInterlockedPopEntryList( ListEntry = PopEntryList(ListHead); #if DBG if (ListEntry) - ListEntry->Next = (PSINGLE_LIST_ENTRY)0xBADDD0FF; + ListEntry->Next = (PSINGLE_LIST_ENTRY)(ULONG_PTR)0xBADDD0FFBADDD0FFULL; #endif /* Release the spinlock and restore interrupts */ @@ -418,7 +418,7 @@ ExfInterlockedPopEntryList( ListEntry = PopEntryList(ListHead); #if DBG if (ListEntry) - ListEntry->Next = (PSINGLE_LIST_ENTRY)0xBADDD0FF; + ListEntry->Next = (PSINGLE_LIST_ENTRY)(ULONG_PTR)0xBADDD0FFBADDD0FFULL; #endif /* Release the spinlock and restore interrupts */ diff --git a/ntoskrnl/fstub/translate.c b/ntoskrnl/fstub/translate.c index 3fa15e0c09..fdb27be1bf 100644 --- a/ntoskrnl/fstub/translate.c +++ b/ntoskrnl/fstub/translate.c @@ -176,7 +176,7 @@ xHalGetInterruptTranslator(IN INTERFACE_TYPE ParentInterfaceType, Translator->Size = sizeof(TRANSLATOR_INTERFACE); Translator->Version = HAL_IRQ_TRANSLATOR_VERSION; /* In case caller set interface to undefined, faulty it to ISA */ - Translator->Context = (PVOID)((BridgeInterfaceType == InterfaceTypeUndefined) ? Isa : BridgeInterfaceType); + Translator->Context = UlongToPtr((BridgeInterfaceType == InterfaceTypeUndefined) ? Isa : BridgeInterfaceType); Translator->InterfaceReference = FstubTranslatorNull; Translator->InterfaceDereference = FstubTranslatorNull; Translator->TranslateResources = FstubTranslateResource; diff --git a/ntoskrnl/io/pnpmgr/pnpinit.c b/ntoskrnl/io/pnpmgr/pnpinit.c index 7153cd2d73..7545f84851 100644 --- a/ntoskrnl/io/pnpmgr/pnpinit.c +++ b/ntoskrnl/io/pnpmgr/pnpinit.c @@ -63,7 +63,7 @@ PiInitCacheGroupInformation(VOID) /* Bogus data */ PiInitGroupOrderTableCount = 0; - PiInitGroupOrderTable = (PVOID)0xBABEB00B; + PiInitGroupOrderTable = (PVOID)(ULONG_PTR)0xBABEB00BBABEB00BULL; return STATUS_SUCCESS; } diff --git a/ntoskrnl/mm/ARM3/contmem.c b/ntoskrnl/mm/ARM3/contmem.c index 6a7fe01cbd..506f988b81 100644 --- a/ntoskrnl/mm/ARM3/contmem.c +++ b/ntoskrnl/mm/ARM3/contmem.c @@ -146,7 +146,7 @@ MiFindContiguousPages(IN PFN_NUMBER LowestPfn, Pfn1->u3.e1.EndOfAllocation = 0; Pfn1->u3.e1.PrototypePte = 0; Pfn1->u4.VerifierAllocation = 0; - Pfn1->PteAddress = (PVOID)0xBAADF00D; + Pfn1->PteAddress = (PVOID)(ULONG_PTR)0xBAADF00DBAADF00DULL; // // Check if this is the last PFN, otherwise go on diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 7317a9a30f..4675fe2c58 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -1194,7 +1194,7 @@ MmProbeAndLockPages(IN PMDL Mdl, Address = MiPteToAddress(PointerPte); //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked - Status = MmAccessFault(FALSE, Address, KernelMode, (PVOID)0xBADBADA3); + Status = MmAccessFault(FALSE, Address, KernelMode, (PVOID)(ULONG_PTR)0xBADBADA3BADBADA3ULL); if (!NT_SUCCESS(Status)) { // @@ -1263,7 +1263,7 @@ MmProbeAndLockPages(IN PMDL Mdl, // //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked - Status = MmAccessFault(TRUE, Address, KernelMode, (PVOID)0xBADBADA3); + Status = MmAccessFault(TRUE, Address, KernelMode, (PVOID)(ULONG_PTR)0xBADBADA3BADBADA3ULL); if (!NT_SUCCESS(Status)) { // diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 7522e35497..95e760a2ec 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -855,10 +855,10 @@ MiInitializeWorkingSetList(IN PEPROCESS CurrentProcess) MmWorkingSetList->HashTable = NULL; MmWorkingSetList->HashTableSize = 0; MmWorkingSetList->NumberOfImageWaiters = 0; - MmWorkingSetList->Wsle = (PVOID)0xDEADBABE; + MmWorkingSetList->Wsle = (PVOID)(ULONG_PTR)0xDEADBABEDEADBABEULL; MmWorkingSetList->VadBitMapHint = 1; - MmWorkingSetList->HashTableStart = (PVOID)0xBADAB00B; - MmWorkingSetList->HighestPermittedHashAddress = (PVOID)0xCAFEBABE; + MmWorkingSetList->HashTableStart = (PVOID)(ULONG_PTR)0xBADAB00BBADAB00BULL; + MmWorkingSetList->HighestPermittedHashAddress = (PVOID)(ULONG_PTR)0xCAFEBABECAFEBABEULL; MmWorkingSetList->FirstFree = 1; MmWorkingSetList->FirstDynamic = 2; MmWorkingSetList->NextSlot = 3; diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 6a2710e0be..689f6cd86f 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -1370,7 +1370,7 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, } RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); - Vad->u4.Banked = (PVOID)0xDEADBABE; + Vad->u4.Banked = (PVOID)(ULONG_PTR)0xDEADBABEDEADBABEULL; /* Write all the data required in the VAD for handling a fault */ Vad->ControlArea = ControlArea; diff --git a/ntoskrnl/mm/ARM3/vadnode.c b/ntoskrnl/mm/ARM3/vadnode.c index b20839ab62..5464e9f009 100644 --- a/ntoskrnl/mm/ARM3/vadnode.c +++ b/ntoskrnl/mm/ARM3/vadnode.c @@ -172,7 +172,7 @@ MiInsertNode(IN PMM_AVL_TABLE Table, else { /* This is a section VAD. Store the MAREA here for now */ - ASSERT(Vad->u4.Banked == (PVOID)0xDEADBABE); + ASSERT(Vad->u4.Banked == (PVOID)(ULONG_PTR)0xDEADBABEDEADBABEULL); Vad->u4.Banked = (PVOID)MemoryArea; } } @@ -399,7 +399,7 @@ MiRemoveNode(IN PMMADDRESS_NODE Node, if (MemoryArea) { /* Make sure we have not already freed it */ - ASSERT(MemoryArea != (PVOID)0xDEADBAB1); + ASSERT(MemoryArea != (PVOID)(ULONG_PTR)0xDEADBAB1DEADBAB1ULL); /* Get the process */ Process = CONTAINING_RECORD(Table, EPROCESS, VadRoot); @@ -415,12 +415,12 @@ MiRemoveNode(IN PMMADDRESS_NODE Node, if (Vad->ControlArea == NULL) { /* Delete the pointer to it */ - Vad->FirstPrototypePte = (PVOID)0xDEADBAB1; + Vad->FirstPrototypePte = (PVOID)(ULONG_PTR)0xDEADBAB1DEADBAB1ULL; } else { /* Delete the pointer to it */ - Vad->u4.Banked = (PVOID)0xDEADBAB1; + Vad->u4.Banked = (PVOID)(ULONG_PTR)0xDEADBAB1DEADBAB1ULL; } } } diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index fc4ea2e6d2..bbc773a919 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -3350,7 +3350,7 @@ MiLockVirtualMemory( CurrentVa = MiPteToAddress(PointerPte); //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked - TempStatus = MmAccessFault(TRUE, CurrentVa, KernelMode, (PVOID)0xBADBADA3); + TempStatus = MmAccessFault(TRUE, CurrentVa, KernelMode, (PVOID)(ULONG_PTR)0xBADBADA3BADBADA3ULL); if (!NT_SUCCESS(TempStatus)) { // This should only happen, when remote backing storage is not accessible diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 1dc4d612d4..9cf006f804 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -570,8 +570,10 @@ NTSTATUS NTAPI MmDeleteProcessAddressSpace(PEPROCESS Process) { +#ifndef _M_AMD64 KIRQL OldIrql; PVOID Address; +#endif DPRINT("MmDeleteProcessAddressSpace(Process %p (%s))\n", Process, Process->ImageFileName); diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index d3c95996da..2bfc35a089 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -137,7 +137,7 @@ ObpDeallocateObject(IN PVOID Object) } /* Catch invalid access */ - Header->Type = (POBJECT_TYPE)0xBAADB0B0; + Header->Type = (POBJECT_TYPE)(ULONG_PTR)0xBAADB0B0BAADB0B0ULL; /* Free the object using the same allocation tag */ ExFreePoolWithTag(HeaderLocation, ObjectType->Key); @@ -1215,14 +1215,14 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName, else if ((TypeName->Length == 8) && !(wcscmp(TypeName->Buffer, L"File"))) { /* Wait on the File Object's event directly */ - LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, - Event); + LocalObjectType->DefaultObject = UlongToPtr(FIELD_OFFSET(FILE_OBJECT, + Event)); } else if ((TypeName->Length == 24) && !(wcscmp(TypeName->Buffer, L"WaitablePort"))) { /* Wait on the LPC Port's object directly */ - LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(LPCP_PORT_OBJECT, - WaitEvent); + LocalObjectType->DefaultObject = UlongToPtr(FIELD_OFFSET(LPCP_PORT_OBJECT, + WaitEvent)); } else {

6 years, 11 months

01/01: [DESK] Fix text truncation for ru-RU CORE-13845

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9078c335f7bac103dbe81… commit 9078c335f7bac103dbe81a4ed8b1080eef361657 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 14 13:52:34 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 14 13:52:34 2018 +0100 [DESK] Fix text truncation for ru-RU CORE-13845 --- dll/cpl/desk/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index 90acdc6d66..78c9b5bbc7 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -52,8 +52,8 @@ BEGIN LTEXT "&Размер шрифта:", IDC_STATIC, 7, 190, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Эффекты...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "&Дополнительно", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "&Эффекты...", IDC_APPEARANCE_EFFECTS, 168, 150, 70, 15 + PUSHBUTTON "&Дополнительно", IDC_APPEARANCE_ADVANCED, 168, 170, 70, 15 END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239

6 years, 11 months

01/01: [PSDK][ACTXPROXY] Add IExplorerCommand and related classes (Vista+)

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d4d88b062c5df08ba8dd… commit 1d4d88b062c5df08ba8dd082f2c92862db3d0de4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Dec 28 23:19:52 2017 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 13 23:49:58 2018 +0100 [PSDK][ACTXPROXY] Add IExplorerCommand and related classes (Vista+) --- dll/win32/actxprxy/usrmarshal.c | 30 ++++++++ sdk/include/psdk/shobjidl.idl | 150 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+) diff --git a/dll/win32/actxprxy/usrmarshal.c b/dll/win32/actxprxy/usrmarshal.c index 850a1e6904..d61a37ec9c 100644 --- a/dll/win32/actxprxy/usrmarshal.c +++ b/dll/win32/actxprxy/usrmarshal.c @@ -200,6 +200,36 @@ HRESULT __RPC_STUB IEnumShellItems_Next_Stub( return hr; } +#ifdef __REACTOS__ + +HRESULT CALLBACK IEnumExplorerCommand_Next_Proxy( + IEnumExplorerCommand *This, + ULONG celt, + IExplorerCommand **pUICommand, + ULONG *pceltFetched) +{ + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, pUICommand, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumExplorerCommand_RemoteNext_Proxy(This, celt, pUICommand, pceltFetched); +} + +HRESULT __RPC_STUB IEnumExplorerCommand_Next_Stub( + IEnumExplorerCommand *This, + ULONG celt, + IExplorerCommand **pUICommand, + ULONG *pceltFetched) +{ + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, pUICommand, pceltFetched); + *pceltFetched = 0; + hr = IEnumExplorerCommand_Next(This, celt, pUICommand, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; +} + +#endif // __REACTOS__ + HRESULT CALLBACK IModalWindow_Show_Proxy( IModalWindow *This, HWND hwndOwner) diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index efcf9a362b..a7bbf3d756 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -2196,6 +2196,156 @@ interface IDefaultExtractIconInit : IUnknown [in] int iIcon); } + +#ifdef __REACTOS__ +/***************************************************************************** + * IExplorerCommand interface (Vista+) + */ + +interface IEnumExplorerCommand; + +[ + uuid(A08CE4D0-FA25-44AB-B57C-C7B1C323E0B9), + pointer_default(unique) +] +interface IExplorerCommand : IUnknown +{ + cpp_quote("// GetIcon(ppszIcon) Receives resource string that identifies icon source") + typedef [v1_enum] enum _EXPCMDSTATE + { + ECS_ENABLED = 0x000, + ECS_DISABLED = 0x001, + ECS_HIDDEN = 0x002, + ECS_CHECKBOX = 0x004, + ECS_CHECKED = 0x008, + ECS_RADIOCHECK = 0x010, // Windows 7 + } EXPCMDSTATE; + + typedef [v1_enum] enum _EXPCMDFLAGS + { + ECF_DEFAULT = 0x000, + ECF_HASSUBCOMMANDS = 0x001, + ECF_HASSPLITBUTTON = 0x002, + ECF_HIDELABEL = 0x004, + ECF_ISSEPARATOR = 0x008, + ECF_HASLUASHIELD = 0x010, + ECF_SEPARATORBEFORE = 0x020, // Windows 7 + ECF_SEPARATORAFTER = 0x040, // Windows 7 + ECF_ISDROPDOWN = 0x080, // Windows 7 + ECF_TOGGLEABLE = 0x100, // Windows 8 + ECF_AUTOMENUICONS = 0x200, // Windows 8 + } EXPCMDFLAGS; + + HRESULT GetTitle( + [in, unique] IShellItemArray *psiItemArray, + [out, string] LPWSTR *ppszName); + HRESULT GetIcon( + [in, unique] IShellItemArray *psiItemArray, + [out, string] LPWSTR *ppszIcon); + HRESULT GetToolTip( + [in, unique] IShellItemArray *psiItemArray, + [out, string] LPWSTR *ppszInfotip); + HRESULT GetCanonicalName( + [out] GUID* pguidCommandName); + HRESULT GetState( + [in] IShellItemArray *psiItemArray, + [in] BOOL fOkToBeSlow, + [out] EXPCMDSTATE *pCmdState); + HRESULT Invoke( + [in] IShellItemArray *psiItemArray, + [in, unique] IBindCtx *pbc); + HRESULT GetFlags( + [out] EXPCMDFLAGS *pFlags); + HRESULT EnumSubCommands( + [out] IEnumExplorerCommand **ppEnum); +}; + + +/***************************************************************************** + * IExplorerCommandState interface (Vista+) + */ +[ + object, + uuid(BDDACB60-7657-47AE-8445-D23E1ACF82AE), + pointer_default(unique) +] +interface IExplorerCommandState : IUnknown +{ + HRESULT GetState( + [in] IShellItemArray *psiItemArray, + [in] BOOL fOkToBeSlow, + [out] EXPCMDSTATE *pCmdState); +} + + +/***************************************************************************** + * IInitializeCommand interface (Vista+) + */ +[ + object, + uuid(85075ACF-231F-40EA-9610-D26B7B58F638), + pointer_default(unique) +] +interface IInitializeCommand : IUnknown +{ + HRESULT Initialize( + [in, string] LPCWSTR pszCommandName, + [in] IPropertyBag *ppb); +} + + +/***************************************************************************** + * IEnumExplorerCommand interface (Vista+) + */ +[ + object, + uuid(A88826F8-186F-4987-AADE-EA0CEF8FBFE8), + pointer_default(unique) +] +interface IEnumExplorerCommand : IUnknown +{ + [local] + HRESULT Next( + [in] ULONG celt, + [out] IExplorerCommand** pUICommand, + [out, optional] ULONG *pceltFetched); + [call_as(Next)] + HRESULT RemoteNext( + [in] ULONG celt, + [out] IExplorerCommand** pUICommand, + [out, optional] ULONG *pceltFetched); + HRESULT Skip( + [in] ULONG celt); + HRESULT Reset(); + HRESULT Clone( + [out] IEnumExplorerCommand **ppenum); +}; + + +/***************************************************************************** + * IExplorerCommandProvider interface (Vista+) + */ +[ + uuid(64961751-0835-43C0-8FFE-D57686530E64), + pointer_default(unique) +] +interface IExplorerCommandProvider : IUnknown +{ + cpp_quote("// GetCommands usually creates an IEnumExplorerCommand") + cpp_quote("// GetCommand usually creates an IExplorerCommand") + + HRESULT GetCommands( + [in] IUnknown *punkSite, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + HRESULT GetCommand( + [in] REFGUID rguidCommandId, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); +}; + +#endif // __REACTOS__ + /***************************************************************************** * IDeskBand interface */

6 years, 11 months

01/01: [NTOSKRNL] When mapping data in CcMapData(), don't truncate offset to ULONG. This would affect reads/writes on large volumes where offset is higher than what a ULONG can hold.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=371aba1abee3f872ee9f1… commit 371aba1abee3f872ee9f146015f9db59ec6297df Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 13 21:27:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 13 21:30:37 2018 +0100 [NTOSKRNL] When mapping data in CcMapData(), don't truncate offset to ULONG. This would affect reads/writes on large volumes where offset is higher than what a ULONG can hold. This really nasty bug was hitting CcMapData() but also CcPinRead() (due to the nature of its implementation) and both were returning garbage data under certain circumstances with Ext2Fsd. This should (I hope!) help some other FSDs to work better in ROS. CORE-12456 --- ntoskrnl/cc/pin.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 6a0d6758ca..0241927f95 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -33,19 +33,19 @@ CcMapData ( OUT PVOID *pBcb, OUT PVOID *pBuffer) { - ULONG ReadOffset; + LONGLONG ReadOffset; BOOLEAN Valid; PROS_SHARED_CACHE_MAP SharedCacheMap; PROS_VACB Vacb; NTSTATUS Status; PINTERNAL_BCB iBcb; - ULONG ROffset; + LONGLONG ROffset; DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %lu, Flags 0x%lx," " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Flags, pBcb, pBuffer); - ReadOffset = (ULONG)FileOffset->QuadPart; + ReadOffset = FileOffset->QuadPart; ASSERT(FileObject); ASSERT(FileObject->SectionObjectPointer); @@ -101,7 +101,7 @@ CcMapData ( } } - *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + ReadOffset % VACB_MAPPING_GRANULARITY); + *pBuffer = (PUCHAR)*pBuffer + ReadOffset % VACB_MAPPING_GRANULARITY; iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); if (iBcb == NULL) {

6 years, 11 months

01/01: [BROWSEUI] Do not clear a CComPtr with memset.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5f90298267bca3551cb9… commit e5f90298267bca3551cb95a67592647b0a26c833 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jan 13 20:57:04 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 13 20:57:04 2018 +0100 [BROWSEUI] Do not clear a CComPtr with memset. --- dll/win32/browseui/shellbrowser.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 8126cefe3d..ada76502b3 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -273,6 +273,12 @@ private: class barInfo { public: + barInfo() + { + memset(&borderSpace, 0, sizeof(borderSpace)); + hwnd = NULL; + } + RECT borderSpace; CComPtr<IUnknown> clientBar; HWND hwnd; @@ -703,7 +709,6 @@ CShellBrowser::CShellBrowser() fCurrentDirectoryPIDL = NULL; fStatusBar = NULL; fStatusBarVisible = true; - memset(fClientBars, 0, sizeof(fClientBars)); fCurrentMenuBar = NULL; fHistoryObject = NULL; fHistoryStream = NULL;

6 years, 11 months

01/01: [SHELL32] CDrivesFolder: Fix showing the drive capacity. CORE-14201

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d9a0d0fd46214b6268b3… commit 6d9a0d0fd46214b6268b3f6a738e3b1ce2297468 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Jan 13 21:27:57 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Jan 13 21:27:57 2018 +0200 [SHELL32] CDrivesFolder: Fix showing the drive capacity. CORE-14201 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 196165597f..91ffc4d506 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -952,7 +952,7 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S if (GetVolumeInformationA(pszDrive, NULL, 0, NULL, NULL, NULL, NULL, 0)) { GetDiskFreeSpaceExA(pszDrive, &ulFreeBytes, &ulTotalBytes, NULL); - if (iColumn == 2) + if (iColumn == 3) StrFormatByteSize64A(ulTotalBytes.QuadPart, psd->str.cStr, MAX_PATH); else StrFormatByteSize64A(ulFreeBytes.QuadPart, psd->str.cStr, MAX_PATH);

6 years, 11 months

← Newer
1
...
26
27
28
29
30
31
32
...
38
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 January 2018