Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NTOS:MM] Fix broken ASSERT. CID 701285
by Thomas Faber 16 Jan '18

16 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ae756a4e5a70fc4cff60… commit 2ae756a4e5a70fc4cff60c935fcb90f3d9ebede2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jan 16 22:10:22 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jan 16 22:29:19 2018 +0100 [NTOS:MM] Fix broken ASSERT. CID 701285 --- ntoskrnl/mm/ARM3/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index bbc773a919..97f017f326 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -5490,8 +5490,8 @@ FinalPath: AlreadyDecommitted; ASSERT(CommitReduction >= 0); + ASSERT(Vad->u.VadFlags.CommitCharge >= CommitReduction); Vad->u.VadFlags.CommitCharge -= CommitReduction; - ASSERT(Vad->u.VadFlags.CommitCharge >= 0); // // We are done, go to the exit path without freeing the VAD as it remains

1 0

02/02: [EXPLORER] CTrayBandSite: Call DBID_SETWINDOWTHEME on new bands to make them use the theme of the taskbar. CORE-14176
by Giannis Adamopoulos 16 Jan '18

16 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71e66c69c1fe53c9cec35… commit 71e66c69c1fe53c9cec35e5fbf62b64a67f73f3a Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Jan 16 11:43:28 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Jan 16 11:50:52 2018 +0200 [EXPLORER] CTrayBandSite: Call DBID_SETWINDOWTHEME on new bands to make them use the theme of the taskbar. CORE-14176 --- base/shell/explorer/tbsite.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/base/shell/explorer/tbsite.cpp b/base/shell/explorer/tbsite.cpp index 1cb3ab5a66..aa2f4e6985 100644 --- a/base/shell/explorer/tbsite.cpp +++ b/base/shell/explorer/tbsite.cpp @@ -355,7 +355,23 @@ public: /* FIXME: Should be delayed */ IUnknown_Exec(punk, IID_IDeskBand, DBID_DELAYINIT, 0, NULL, NULL); - return m_BandSite->AddBand(punk); + HRESULT hr = m_BandSite->AddBand(punk); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + VARIANT vThemeName; + V_VT(&vThemeName) = VT_BSTR; + V_BSTR(&vThemeName) = SysAllocString(L"TaskBar"); + IUnknown_Exec(punk, + IID_IDeskBand, + DBID_SETWINDOWTHEME, + 0, + &vThemeName, + NULL); + + SysFreeString(V_BSTR(&vThemeName)); + + return S_OK; } virtual HRESULT STDMETHODCALLTYPE EnumBands(

1 0

01/02: [BROWSEUI] CISFBand: Handle DBID_SETWINDOWTHEME. CORE-14176
by Giannis Adamopoulos 16 Jan '18

16 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c23b78b5e71913a1a660… commit 4c23b78b5e71913a1a6604bf55615b0475f22ff6 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Jan 16 11:36:34 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Jan 16 11:50:51 2018 +0200 [BROWSEUI] CISFBand: Handle DBID_SETWINDOWTHEME. CORE-14176 --- dll/win32/browseui/CMakeLists.txt | 2 +- dll/win32/browseui/shellbars/CISFBand.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 161c45fb59..85b269fb1f 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -45,7 +45,7 @@ add_library(browseui SHARED set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui shellbars atlnew uuid wine) -add_importlibs(browseui shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/shellbars/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp index 670e647a23..8d538c21ac 100644 --- a/dll/win32/browseui/shellbars/CISFBand.cpp +++ b/dll/win32/browseui/shellbars/CISFBand.cpp @@ -10,6 +10,8 @@ #include <commoncontrols.h> #include <shellapi.h> +#include <wingdi.h> +#include <uxtheme.h> /* TODO: @@ -431,6 +433,13 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) { + if (nCmdID == DBID_SETWINDOWTHEME) + { + if (pvaIn && V_VT(pvaIn) == VT_BSTR && V_BSTR(pvaIn)) + { + SetWindowTheme(m_hWnd, V_BSTR(pvaIn), NULL); + } + } return S_OK; }

1 0

01/01: [NTOSKRNL] Implement CcIsThereDirtyData()
by Pierre Schweitzer 15 Jan '18

15 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c779dbd4c5779cfddfd40… commit c779dbd4c5779cfddfd4054601d996c15ae22ff4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Jan 15 23:20:53 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Jan 15 23:20:53 2018 +0100 [NTOSKRNL] Implement CcIsThereDirtyData() --- ntoskrnl/cc/fs.c | 40 +++++++++++++++++++++++++++++++++++++--- ntoskrnl/cc/view.c | 2 +- ntoskrnl/include/internal/cc.h | 1 + 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index fb5f99aab2..d62e18dee0 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -111,17 +111,51 @@ CcInitializeCacheMap ( } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI CcIsThereDirtyData ( IN PVPB Vpb) { + PROS_VACB Vacb; + PLIST_ENTRY Entry; + /* Assume no dirty data */ + BOOLEAN Dirty = FALSE; + CCTRACE(CC_API_DEBUG, "Vpb=%p\n", Vpb); - UNIMPLEMENTED; - return FALSE; + KeAcquireGuardedMutex(&ViewLock); + + /* Browse dirty VACBs */ + for (Entry = DirtyVacbListHead.Flink; Entry != &DirtyVacbListHead; Entry = Entry->Flink) + { + Vacb = CONTAINING_RECORD(Entry, ROS_VACB, DirtyVacbListEntry); + /* Look for these associated with our volume */ + if (Vacb->SharedCacheMap->FileObject->Vpb != Vpb) + { + continue; + } + + /* From now on, we are associated with our VPB */ + + /* Temporary files are not counted as dirty */ + if (BooleanFlagOn(Vacb->SharedCacheMap->FileObject->Flags, FO_TEMPORARY_FILE)) + { + continue; + } + + /* A single dirty VACB is enough to have dirty data */ + if (Vacb->Dirty) + { + Dirty = TRUE; + break; + } + } + + KeReleaseGuardedMutex(&ViewLock); + + return Dirty; } /* diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index f38a028d9b..0e37b77efc 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -41,7 +41,7 @@ /* GLOBALS *******************************************************************/ -static LIST_ENTRY DirtyVacbListHead; +LIST_ENTRY DirtyVacbListHead; static LIST_ENTRY VacbLruListHead; ULONG DirtyPageCount = 0; diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 4f7c4823af..58d2b15a50 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -40,6 +40,7 @@ // Global Cc Data // extern ULONG CcRosTraceLevel; +extern LIST_ENTRY DirtyVacbListHead; typedef struct _PF_SCENARIO_ID {

1 0

01/01: [KERNEL32] Add version info to VerifyVersionInfo mismatch print.
by Mark Jansen 15 Jan '18

15 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a2ad113e59e8998dcf30… commit 4a2ad113e59e8998dcf30ec490e76008bedb6a1e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 14 00:57:56 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jan 15 19:47:58 2018 +0100 [KERNEL32] Add version info to VerifyVersionInfo mismatch print. --- dll/win32/kernel32/client/version.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/version.c b/dll/win32/kernel32/client/version.c index 0ae917392b..b335210510 100644 --- a/dll/win32/kernel32/client/version.c +++ b/dll/win32/kernel32/client/version.c @@ -131,7 +131,18 @@ VerifyVersionInfoW(IN LPOSVERSIONINFOEXW lpVersionInformation, return FALSE; case STATUS_REVISION_MISMATCH: - DPRINT1("VerifyVersionInfo -- Version mismatch\n"); + if (lpVersionInformation) + { + DPRINT1("VerifyVersionInfo -- Version mismatch(%d.%d.%d:%d)\n", + (dwTypeMask & VER_MAJORVERSION) ? lpVersionInformation->dwMajorVersion : -1, + (dwTypeMask & VER_MINORVERSION) ? lpVersionInformation->dwMinorVersion : -1, + (dwTypeMask & VER_BUILDNUMBER) ? lpVersionInformation->dwBuildNumber : -1, + (dwTypeMask & VER_PLATFORMID) ? lpVersionInformation->dwPlatformId : -1); + } + else + { + DPRINT1("VerifyVersionInfo -- Version mismatch(NULL)\n"); + } SetLastError(ERROR_OLD_WIN_VERSION); return FALSE;

1 0

02/02: [UXTHEME] -Pass a non 0 wParam when themes get enabled and 0 when they get disabled
by Giannis Adamopoulos 15 Jan '18

15 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e9f56229f8287f597c4a… commit 7e9f56229f8287f597c4a78fd215d3e3e359a873 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Jan 12 18:52:08 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Jan 15 12:57:08 2018 +0200 [UXTHEME] -Pass a non 0 wParam when themes get enabled and 0 when they get disabled --- dll/win32/uxtheme/system.c | 20 ++++++++++---------- dll/win32/uxtheme/themehooks.c | 4 ++-- dll/win32/uxtheme/uxthemep.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dll/win32/uxtheme/system.c b/dll/win32/uxtheme/system.c index 84d703d157..2fb1ac8b5a 100644 --- a/dll/win32/uxtheme/system.c +++ b/dll/win32/uxtheme/system.c @@ -58,23 +58,23 @@ int g_cHandles; /***********************************************************************/ -static BOOL CALLBACK UXTHEME_broadcast_msg_enumchild (HWND hWnd, LPARAM msg) +static BOOL CALLBACK UXTHEME_send_theme_changed (HWND hWnd, LPARAM enable) { - SendMessageW(hWnd, msg, 0, 0); + SendMessageW(hWnd, WM_THEMECHANGED, enable, 0); return TRUE; } -/* Broadcast a message to *all* windows, including children */ -BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) +/* Broadcast WM_THEMECHANGED to *all* windows, including children */ +BOOL CALLBACK UXTHEME_broadcast_theme_changed (HWND hWnd, LPARAM enable) { if (hWnd == NULL) { - EnumWindows (UXTHEME_broadcast_msg, msg); + EnumWindows (UXTHEME_broadcast_theme_changed, enable); } else { - SendMessageW(hWnd, msg, 0, 0); - EnumChildWindows (hWnd, UXTHEME_broadcast_msg_enumchild, msg); + UXTHEME_send_theme_changed(hWnd, enable); + EnumChildWindows (hWnd, UXTHEME_send_theme_changed, enable); } return TRUE; } @@ -658,7 +658,7 @@ HRESULT WINAPI EnableTheming(BOOL fEnable) RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (LPBYTE)szEnabled, sizeof(WCHAR)); RegCloseKey(hKey); } - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, fEnable); } return S_OK; } @@ -884,7 +884,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, if (!SUCCEEDED(hr)) return hr; - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (hwnd, TRUE); return hr; } @@ -1160,7 +1160,7 @@ HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd) HRESULT hr; TRACE("(%p,%s,%p)\n", hThemeFile, unknown, hWnd); hr = UXTHEME_ApplyTheme(hThemeFile); - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, (g_ActiveThemeFile != NULL)); return hr; } diff --git a/dll/win32/uxtheme/themehooks.c b/dll/win32/uxtheme/themehooks.c index e87b6d0abe..99811808f7 100644 --- a/dll/win32/uxtheme/themehooks.c +++ b/dll/win32/uxtheme/themehooks.c @@ -697,7 +697,7 @@ ThemeHooksInstall() ret = FALSE; } - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, TRUE); return ret; } @@ -709,7 +709,7 @@ ThemeHooksRemove() ret = UnregisterUserApiHook(); - UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + UXTHEME_broadcast_theme_changed (NULL, FALSE); return ret; } diff --git a/dll/win32/uxtheme/uxthemep.h b/dll/win32/uxtheme/uxthemep.h index 8aeb65d98a..2708cdd48f 100644 --- a/dll/win32/uxtheme/uxthemep.h +++ b/dll/win32/uxtheme/uxthemep.h @@ -256,7 +256,7 @@ extern BOOL g_bThemeHooksActive; void UXTHEME_InitSystem(HINSTANCE hInst); void UXTHEME_LoadTheme(BOOL bLoad); -BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg); +BOOL CALLBACK UXTHEME_broadcast_theme_changed (HWND hWnd, LPARAM enable); /* No alpha blending */ #define ALPHABLEND_NONE 0

1 0

01/02: [COMCTL32] rebar: Remove some hacks and fix checking for transparent background
by Giannis Adamopoulos 15 Jan '18

15 Jan '18

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

1 0

01/01: [USER32] InternalGetWindowText: Write to caller's buffer only when one was provided. CORE-13614
by Giannis Adamopoulos 15 Jan '18

15 Jan '18

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

1 0

01/01: [USER32] Stop hiding exceptions left and right
by Giannis Adamopoulos 15 Jan '18

15 Jan '18

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

1 0

01/01: [SYSDM] Fix text truncation for ru-RU CORE-13845
by Joachim Henze 14 Jan '18

14 Jan '18

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

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