Ros-diffs

ros-diffs@reactos.org

81390 discussions

[bfreisen] 73903: [MSPAINT] - fix error in dynamic menu: most recently used files were showing up in zoom menu, too CORE-12829 #resolve
by bfreisen＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: bfreisen Date: Sat Feb 25 11:24:15 2017 New Revision: 73903 URL: http://svn.reactos.org/svn/reactos?rev=73903&view=rev Log: [MSPAINT] - fix error in dynamic menu: most recently used files were showing up in zoom menu, too CORE-12829 #resolve Modified: trunk/reactos/base/applications/mspaint/winproc.cpp Modified: trunk/reactos/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] Sat Feb 25 11:24:15 2017 @@ -222,6 +222,8 @@ switch (lParam) { case 0: /* File menu */ + if ((HMENU)wParam != GetSubMenu(menu, 0)) + break; EnableMenuItem(menu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(isAFile)); EnableMenuItem(menu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(isAFile)); EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile));

1 0

[gadamopoulos] 73902: [COMCTL32] -Add helper functions for setting and retrieving the button bitmap.
by gadamopoulos＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: gadamopoulos Date: Sat Feb 25 11:05:19 2017 New Revision: 73902 URL: http://svn.reactos.org/svn/reactos?rev=73902&view=rev Log: [COMCTL32] -Add helper functions for setting and retrieving the button bitmap. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sat Feb 25 11:05:19 2017 @@ -207,6 +207,16 @@ BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag); +static inline LONG_PTR get_button_image(HWND hwnd) +{ + return GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); +} + +static inline LONG_PTR set_button_image(HWND hwnd, LONG_PTR image) +{ + return SetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET, image ); +} + #endif static inline HFONT get_button_font( HWND hwnd ) @@ -697,12 +707,20 @@ default: return 0; } +#ifdef _USER32_ oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam ); +#else + oldHbitmap = (HBITMAP)set_button_image(hWnd, lParam ); +#endif InvalidateRect( hWnd, NULL, FALSE ); return (LRESULT)oldHbitmap; case BM_GETIMAGE: +#ifdef _USER32_ return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); +#else + return get_button_image(hWnd); +#endif case BM_GETCHECK: return get_button_state( hWnd ) & 3; @@ -886,7 +904,11 @@ } case BS_ICON: +#ifdef _USER32_ if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo)) +#else + if (!GetIconInfo((HICON)get_button_image(hwnd), &iconInfo)) +#endif goto empty_rect; GetObjectW (iconInfo.hbmColor, sizeof(BITMAP), &bm); @@ -899,7 +921,11 @@ break; case BS_BITMAP: +#ifdef _USER32_ if (!GetObjectW( (HANDLE)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), sizeof(BITMAP), &bm)) +#else + if (!GetObjectW( (HANDLE)get_button_image(hwnd), sizeof(BITMAP), &bm)) +#endif goto empty_rect; r.right = r.left + bm.bmWidth; @@ -1006,12 +1032,20 @@ case BS_ICON: flags |= DST_ICON; +#ifdef _USER32_ lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); +#else + lp = get_button_image(hwnd); +#endif break; case BS_BITMAP: flags |= DST_BITMAP; +#ifdef _USER32_ lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); +#else + lp = get_button_image(hwnd); +#endif break; default:

1 0

[pschweitzer] 73901: [REISERFS] When compiling the driver with GCC, define __GCC__. Fix defines accordingly. CORE-12826
by pschweitzer＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: pschweitzer Date: Sat Feb 25 10:16:33 2017 New Revision: 73901 URL: http://svn.reactos.org/svn/reactos?rev=73901&view=rev Log: [REISERFS] When compiling the driver with GCC, define __GCC__. Fix defines accordingly. CORE-12826 Modified: trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h Modified: trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser… ============================================================================== --- trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/reiserfs/CMakeLists.txt [iso-8859-1] Sat Feb 25 10:16:33 2017 @@ -81,7 +81,7 @@ if(NOT MSVC) add_target_compile_flags(reiserfs "-Wno-pointer-sign -Wno-unused-function") if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(reiserfs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces") + add_target_compile_flags(reiserfs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces -D__GCC__") endif() else() #disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" Modified: trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser… ============================================================================== --- trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/reiserfs/inc/linux/reiserfs_fs.h [iso-8859-1] Sat Feb 25 10:16:33 2017 @@ -3,7 +3,11 @@ */ #ifdef __GCC__ +#ifndef __REACTOS__ #define __PACKED __PACKED +#else + #define __PACKED __attribute__((packed)) +#endif #else #define __PACKED #endif Modified: trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser… ============================================================================== --- trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/reiserfs/inc/reiserfs.h [iso-8859-1] Sat Feb 25 10:16:33 2017 @@ -4,7 +4,11 @@ #include <linux/types.h> #ifdef __GCC__ +#ifndef __REACTOS__ #define __PACKED __PACKED +#else + #define __PACKED __attribute__((packed)) +#endif #else #define __PACKED #endif

1 0

[mjansen] 73900: [WIN32SS] Rewrite font selection code. Patch by Katayama Hirofumi MZ. CORE-6621 - Adding support for multiple font formats (including collections) - Choosing a font based on weight...
by mjansen＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: mjansen Date: Sat Feb 25 10:10:25 2017 New Revision: 73900 URL: http://svn.reactos.org/svn/reactos?rev=73900&view=rev Log: [WIN32SS] Rewrite font selection code. Patch by Katayama Hirofumi MZ. CORE-6621 - Adding support for multiple font formats (including collections) - Choosing a font based on weights as documented - Adding support for loading fonts from memory - Share font faces - Emulation of Italic and Bold - Support for Underline and Strike-out - Localized font names - Fix GetFontResourceInfoW - Fix Registry settings - Fix multiple font properties Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h trunk/reactos/win32ss/gdi/gdi32/objects/font.c trunk/reactos/win32ss/gdi/gdi32/objects/text.c trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/text.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engobjects… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r…

1 0

[gadamopoulos] 73899: [COMCTL32] -Redraw the button when we get a WM_THEMECHANGED.
by gadamopoulos＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: gadamopoulos Date: Sat Feb 25 09:24:40 2017 New Revision: 73899 URL: http://svn.reactos.org/svn/reactos?rev=73899&view=rev Log: [COMCTL32] -Redraw the button when we get a WM_THEMECHANGED. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sat Feb 25 09:24:40 2017 @@ -380,6 +380,7 @@ case WM_THEMECHANGED: CloseThemeData (GetWindowTheme(hWnd)); OpenThemeData(hWnd, WC_BUTTONW); + InvalidateRect(hWnd, NULL, FALSE); break; case WM_MOUSEHOVER:

1 0

[gadamopoulos] 73898: [UXTHEME] - When we set the desired app name and class name in SetWindowTheme we need to support empty strings meaning no themes for this window. Sort of support empty strings...
by gadamopoulos＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: gadamopoulos Date: Sat Feb 25 09:23:37 2017 New Revision: 73898 URL: http://svn.reactos.org/svn/reactos?rev=73898&view=rev Log: [UXTHEME] - When we set the desired app name and class name in SetWindowTheme we need to support empty strings meaning no themes for this window. Sort of support empty strings by replacing them with a string containing a single "0". This works since there is no app name or class name with this name. Also add some error messages. Modified: trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sat Feb 25 09:23:37 2017 @@ -667,14 +667,31 @@ { ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp)); if(oldValue) + { DeleteAtom(oldValue); - if(pszValue) { - ATOM atValue = AddAtomW(pszValue); - if(!atValue - || !SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp), (LPWSTR)MAKEINTATOM(atValue))) { - HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); + } + + if(pszValue) + { + ATOM atValue; + + /* A string with zero lenght is not acceptatble in AddAtomW but we want to support + users passing an empty string meaning they want no theme for the specified window */ + if(!pszValue[0]) + pszValue = L"0"; + + atValue = AddAtomW(pszValue); + if (!atValue) + { + ERR("AddAtomW for %S failed with last error %d!\n", pszValue, GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (!SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp), (LPWSTR)MAKEINTATOM(atValue))) + { + ERR("SetPropW for atom %d failed with last error %d\n", aProp, GetLastError()); if(atValue) DeleteAtom(atValue); - return hr; + return HRESULT_FROM_WIN32(GetLastError()); } } return S_OK;

1 0

[gadamopoulos] 73897: [COMCTL32] -Draw button with classic style if BM_SETIMAGE was used.
by gadamopoulos＠svn.reactos.org 24 Feb '17

24 Feb '17

Author: gadamopoulos Date: Fri Feb 24 22:47:59 2017 New Revision: 73897 URL: http://svn.reactos.org/svn/reactos?rev=73897&view=rev Log: [COMCTL32] -Draw button with classic style if BM_SETIMAGE was used. Modified: trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Fri Feb 24 22:47:59 2017 @@ -38,6 +38,7 @@ #define STATE_GWL_OFFSET 0 #define HFONT_GWL_OFFSET (sizeof(LONG)) +#define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET+sizeof(HFONT)) static inline LONG get_button_state( HWND hwnd ) { @@ -320,14 +321,24 @@ BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag) { - DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); - UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - int state = get_button_state(hwnd); + DWORD dwStyle; + DWORD dwStyleEx; + UINT dtFlags; + int state; ButtonState drawState; - pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; + pfThemedPaint paint; + + dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; if (!paint) return FALSE; + + if (GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET) != 0) + return FALSE; + + dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); + dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); + state = get_button_state(hwnd); if(IsWindowEnabled(hwnd)) {

1 0

[hbelusca] 73896: [GDI32]: Don't break/crash (if no debugger attached) each time an unimplemented GDI function is called. This is hit a lot by Word 2010 (e.g. when using drawing features), PowerPoi...
by hbelusca＠svn.reactos.org 24 Feb '17

24 Feb '17

Author: hbelusca Date: Fri Feb 24 02:17:45 2017 New Revision: 73896 URL: http://svn.reactos.org/svn/reactos?rev=73896&view=rev Log: [GDI32]: Don't break/crash (if no debugger attached) each time an unimplemented GDI function is called. This is hit a lot by Word 2010 (e.g. when using drawing features), PowerPoint, etc... i.e. all applications that perform "serious" GDI manipulations. A nice addition would be to know exactly which unimplemented function was called. Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Fri Feb 24 02:17:45 2017 @@ -10,7 +10,8 @@ INT_PTR NULL_Unused() { - __debugbreak(); + DPRINT1("NULL_Unused\n"); + // __debugbreak(); return 0; }

1 0

[hbelusca] 73895: [NTGDI]: Few fixes & hacks for NtGdiGetGlyphIndicesW, see CORE-12825: - (Fix) Check for integer count overflow (per Thomas suggestion), - (Hack#1) Signal the particular calling ca...
by hbelusca＠svn.reactos.org 24 Feb '17

24 Feb '17

Author: hbelusca Date: Fri Feb 24 01:52:25 2017 New Revision: 73895 URL: http://svn.reactos.org/svn/reactos?rev=73895&view=rev Log: [NTGDI]: Few fixes & hacks for NtGdiGetGlyphIndicesW, see CORE-12825: - (Fix) Check for integer count overflow (per Thomas suggestion), - (Hack#1) Signal the particular calling case (where pwc == NULL == pgi and cwc == 0), as discovered by the testcase of r73894, - (Hack#2) Return error when cwc == 0 alone (triggered by e.g. Word 2010). Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Feb 24 01:52:25 2017 @@ -4393,6 +4393,9 @@ /* * @implemented */ +// TODO: Move this code into NtGdiGetGlyphIndicesWInternal and wrap +// NtGdiGetGlyphIndicesW around NtGdiGetGlyphIndicesWInternal instead. +// NOTE: See also GreGetGlyphIndicesW. __kernel_entry W32KAPI DWORD @@ -4408,7 +4411,7 @@ PDC_ATTR pdcattr; PTEXTOBJ TextObj; PFONTGDI FontGDI; - HFONT hFont = 0; + HFONT hFont = NULL; NTSTATUS Status = STATUS_SUCCESS; OUTLINETEXTMETRICW *potm; INT i; @@ -4419,12 +4422,31 @@ LPCWSTR UnSafepwc = pwc; LPWORD UnSafepgi = pgi; - if ((!UnSafepwc) && (!UnSafepgi)) return cwc; - - if ((UnSafepwc == NULL) || (UnSafepgi == NULL)) + /* Check for integer overflow */ + if (cwc & 0x80000000) // (INT_MAX + 1) == INT_MIN + return GDI_ERROR; + + if (!UnSafepwc && !UnSafepgi) + return cwc; + + if (!UnSafepwc || !UnSafepgi) { DPRINT1("UnSafepwc == %p, UnSafepgi = %p\n", UnSafepwc, UnSafepgi); - return -1; + return GDI_ERROR; + } + + // TODO: Special undocumented case! + if (!pwc && !pgi && (cwc == 0)) + { + DPRINT1("ERR: NtGdiGetGlyphIndicesW with (!pwc && !pgi && (cwc == 0)) is UNIMPLEMENTED!\n"); + return 0; + } + + // FIXME: This is a hack!! (triggered by e.g. Word 2010). See CORE-12825 + if (cwc == 0) + { + DPRINT1("ERR: NtGdiGetGlyphIndicesW with (cwc == 0) is UNIMPLEMENTED!\n"); + return GDI_ERROR; } dc = DC_LockDc(hdc);

1 0

[hbelusca] 73894: [GDI32_APITEST]: GetGlyphIndices: Have fun & make ReactOS BSoD from user-mode! More seriously, test extra cases of this API, and show that our current implementation certainly is ...
by hbelusca＠svn.reactos.org 24 Feb '17

24 Feb '17

Author: hbelusca Date: Fri Feb 24 01:02:26 2017 New Revision: 73894 URL: http://svn.reactos.org/svn/reactos?rev=73894&view=rev Log: [GDI32_APITEST]: GetGlyphIndices: Have fun & make ReactOS BSoD from user-mode! More seriously, test extra cases of this API, and show that our current implementation certainly is incomplete & prone to bugs. The particular case "GetGlyphIndicesW(hdc, NULL, 0, NULL, 0)" is used by Word 2010 (and other apps) when opening the font combolist, and seems to be undocumented. CORE-12825 CORE-6621 CORE-12279 Modified: trunk/rostests/apitests/gdi32/GetGlyphIndices.c Modified: trunk/rostests/apitests/gdi32/GetGlyphIndices.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetGlyphIn… ============================================================================== --- trunk/rostests/apitests/gdi32/GetGlyphIndices.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetGlyphIndices.c [iso-8859-1] Fri Feb 24 01:02:26 2017 @@ -124,7 +124,17 @@ ok_lasterrornotchanged(); ok_int(GetGlyphIndicesW(hdc, NULL, 1, Indices, 0), GDI_ERROR); ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, Single, 0, NULL, 0), GDI_ERROR); + ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, Single, 0, Indices, 0), GDI_ERROR); + ok_lasterrornotchanged(); ok_int(GetGlyphIndicesW(hdc, Single, 1, NULL, 0), GDI_ERROR); + ok_lasterrornotchanged(); + + /* Test an exceptional case that does not seem to return an error */ + // FIXME: What does the returned value exactly means? + ok(GetGlyphIndicesW(hdc, NULL, 0, NULL, 0) != 0, + "GetGlyphIndicesW(hdc, NULL, 0, NULL, 0) return expected not zero, but got zero!\n"); ok_lasterrornotchanged(); /* Test a single valid char */

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