wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Zhiyi Zhang : uxtheme: Avoid memory leaks.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 6f00a2983aa54bf540ecff79d9fddd5059f2da41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f00a2983aa54bf540ecff79… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:33:49 2021 +0800 uxtheme: Avoid memory leaks. A THEME_FILE struct and four global ATOMs are leaked when unloading uxtheme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/main.c | 8 ++++++-- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxthemedll.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 5e5610a1f84..5f79dd6ed0d 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -31,14 +31,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /***********************************************************************/ /* For the moment, do nothing here. */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *reserved) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, lpv); + TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); UXTHEME_InitSystem(hInstDLL); break; + case DLL_PROCESS_DETACH: + if (reserved) break; + UXTHEME_UninitSystem(); + break; } return TRUE; } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index b18794740a8..dcd2a660042 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -509,6 +509,16 @@ void UXTHEME_InitSystem(HINSTANCE hInst) UXTHEME_LoadTheme(); } +void UXTHEME_UninitSystem(void) +{ + MSSTYLES_SetActiveTheme(NULL, FALSE); + + GlobalDeleteAtom(atWindowTheme); + GlobalDeleteAtom(atSubAppName); + GlobalDeleteAtom(atSubIdList); + GlobalDeleteAtom(atDialogThemeEnabled); +} + /*********************************************************************** * IsAppThemed (UXTHEME.@) */ diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index fee152c9c34..fdf529b422a 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -95,6 +95,7 @@ HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, ParseThemeIniFileProc callback, LPVOID lpData) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; +extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; /* No alpha blending */ #define ALPHABLEND_NONE 0

1 0

Zhiyi Zhang : user32: Call SCROLL_DrawScrollBar() to draw arrows in SCROLL_HandleScrollEvent().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: b5abd534941e3b2559832d9afcb758a266e7eb29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5abd534941e3b2559832d9a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:32:22 2021 +0800 user32: Call SCROLL_DrawScrollBar() to draw arrows in SCROLL_HandleScrollEvent(). So that SCROLL_DrawScrollBar() can eventually be hooked by a themed scroll bar drawing function and use a single function to draw scroll bars, instead of hooking multiple scroll bar drawing functions that draw different parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 15 ++++++++++++++- dlls/user32/scroll.c | 33 ++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 78b393fcddb..9bb6a0047d1 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -179,8 +179,21 @@ extern BOOL NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down ) DECLSPEC_HIDDEN; extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ + +/* Scroll-bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN; -extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; +extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, + BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 5fc75ca42e7..01868bd4238 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -74,17 +74,6 @@ typedef struct /* Scroll timer id */ #define SCROLL_TIMER 0 - /* Scroll-bar hit testing */ -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - /* What to do after SCROLL_SetScrollInfo() */ #define SA_SSI_HIDE 0x0001 #define SA_SSI_SHOW 0x0002 @@ -583,8 +572,8 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, * * Redraw the whole scrollbar. */ -void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, - BOOL arrows, BOOL interior ) +void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, BOOL arrows, + BOOL interior ) { INT arrowSize, thumbSize, thumbPos; RECT rect; @@ -611,8 +600,8 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, { if( vertical == SCROLL_trackVertical && GetCapture() == hwnd ) SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - (SCROLL_trackHitTest == SCROLL_TOP_ARROW), - (SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW) ); + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_ARROW, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_ARROW ); else SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, FALSE, FALSE ); @@ -649,9 +638,9 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) { if (draw_horizontal) - SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, SCROLL_trackHitTest, TRUE, TRUE ); if (draw_vertical) - SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, SCROLL_trackHitTest, TRUE, TRUE ); } /*********************************************************************** @@ -684,7 +673,7 @@ static void SCROLL_RefreshScrollBar( HWND hwnd, INT nBar, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW) ); if (!hdc) return; - SCROLL_DrawScrollBar( hwnd, hdc, nBar, arrows, interior ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_trackHitTest, arrows, interior ); ReleaseDC( hwnd, hdc ); } @@ -831,8 +820,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_TOP_ARROW: - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - (hittest == SCROLL_trackHitTest), FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -929,8 +917,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_BOTTOM_ARROW: - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - FALSE, (hittest == SCROLL_trackHitTest) ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -1430,7 +1417,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); } else - SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, SCROLL_trackHitTest, TRUE, TRUE ); if (!wParam) EndPaint(hwnd, &ps); } break;

1 0

Zhiyi Zhang : user32: Introduce a SCROLL_DrawNCScrollBar() to draw scroll bars in non-client area.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 5541cf32c55a43b6acb5a50afb4b10204a73e479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5541cf32c55a43b6acb5a50a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:32:12 2021 +0800 user32: Introduce a SCROLL_DrawNCScrollBar() to draw scroll bars in non-client area. Having a SCROLL_DrawNCScrollBar() in scroll.c enables it to access global variables there. So that global variables access in SCROLL_DrawScrollBar() can be moved outside of it and SCROLL_DrawScrollBar() can then be refactored into a function without access to global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 + dlls/user32/nonclient.c | 6 +----- dlls/user32/scroll.c | 8 ++++++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 0b0f1c28015..78b393fcddb 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -179,6 +179,7 @@ extern BOOL NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down ) DECLSPEC_HIDDEN; extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ +extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN; extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index e56c03deaf0..50ecb0c4e2e 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1027,11 +1027,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); /* Draw the scroll-bars */ - - if (dwStyle & WS_VSCROLL) - SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); - if (dwStyle & WS_HSCROLL) - SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + SCROLL_DrawNCScrollBar( hwnd, hdc, dwStyle & WS_HSCROLL, dwStyle & WS_VSCROLL ); /* Draw the "size-box" */ if ((dwStyle & WS_VSCROLL) && (dwStyle & WS_HSCROLL)) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9113d57263b..5fc75ca42e7 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -646,6 +646,14 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, } } +void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) +{ + if (draw_horizontal) + SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + if (draw_vertical) + SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); +} + /*********************************************************************** * SCROLL_DrawSizeGrip *

1 0

Zhiyi Zhang : user32: Modify SCROLL_MovingThumb outside of SCROLL_DrawMovingThumb().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: ac6817de54c9c4b12c8de56f20ce45b95be26e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6817de54c9c4b12c8de56f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:31:13 2021 +0800 user32: Modify SCROLL_MovingThumb outside of SCROLL_DrawMovingThumb(). SCROLL_MovingThumb is a global variable. Gradually move it out of scroll bar drawing functions so that those drawing functions can be refactored in a way that doesn't need access to global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 85485eede57..9113d57263b 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -484,8 +484,6 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, SCROLL_DrawInterior( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, rect, arrowSize, thumbSize, pos, 0, vertical, FALSE, FALSE ); - - SCROLL_MovingThumb = !SCROLL_MovingThumb; } /*********************************************************************** @@ -625,6 +623,7 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, if (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) { SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + SCROLL_MovingThumb = FALSE; } else { @@ -867,7 +866,10 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) vertical, SCROLL_TrackingPos ); if (!SCROLL_MovingThumb) + { SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); + SCROLL_MovingThumb = TRUE; + } } else if (msg == WM_LBUTTONUP) {

1 0

Zhiyi Zhang : user32: Remove SCROLL_DrawInterior_9x().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: d164f0627934b181f8a4c14526226b91829c4872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d164f0627934b181f8a4c145… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:31:03 2021 +0800 user32: Remove SCROLL_DrawInterior_9x(). SCROLL_DrawInterior_9x() has the same functionality as SCROLL_DrawInterior(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 102 +++------------------------------------------------ 1 file changed, 5 insertions(+), 97 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index ba8fe7966ec..85485eede57 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -108,11 +108,9 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV ); static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, const SCROLLINFO *info, BOOL bRedraw ); -static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar, - RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, - BOOL top_selected, BOOL bottom_selected ); +static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, + INT thumbSize, INT thumbPos, UINT flags, BOOL vertical, + BOOL top_selected, BOOL bottom_selected ); /********************************************************************* @@ -484,9 +482,8 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, else if( pos > max_size ) pos = max_size; - SCROLL_DrawInterior_9x( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, - rect, arrowSize, thumbSize, pos, - 0, vertical, FALSE, FALSE ); + SCROLL_DrawInterior( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, rect, arrowSize, thumbSize, pos, + 0, vertical, FALSE, FALSE ); SCROLL_MovingThumb = !SCROLL_MovingThumb; } @@ -496,95 +493,6 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, * * Draw the scroll bar interior (everything except the arrows). */ -static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar, - RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, - BOOL top_selected, BOOL bottom_selected ) -{ - RECT r; - HPEN hSavePen; - HBRUSH hSaveBrush,hBrush; - - /* Only scrollbar controls send WM_CTLCOLORSCROLLBAR. - * The window-owned scrollbars need to call DEFWND_ControlColor - * to correctly setup default scrollbar colors - */ - if (nBar == SB_CTL) - { - hBrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSCROLLBAR, - (WPARAM)hdc,(LPARAM)hwnd); - } - else - { - hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR ); - } - - hSavePen = SelectObject( hdc, SYSCOLOR_GetPen(COLOR_WINDOWFRAME) ); - hSaveBrush = SelectObject( hdc, hBrush ); - - /* Calculate the scroll rectangle */ - r = *rect; - if (vertical) - { - r.top += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; - r.bottom -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - } - else - { - r.left += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; - r.right -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - } - - /* Draw the scroll rectangles and thumb */ - if (!thumbPos) /* No thumb to draw */ - { - PatBlt( hdc, r.left, r.top, - r.right - r.left, r.bottom - r.top, - PATCOPY ); - - /* cleanup and return */ - SelectObject( hdc, hSavePen ); - SelectObject( hdc, hSaveBrush ); - return; - } - - if (vertical) - { - PatBlt( hdc, r.left, r.top, - r.right - r.left, - thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), - top_selected ? 0x0f0000 : PATCOPY ); - r.top += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - PatBlt( hdc, r.left, r.top + thumbSize, - r.right - r.left, - r.bottom - r.top - thumbSize, - bottom_selected ? 0x0f0000 : PATCOPY ); - r.bottom = r.top + thumbSize; - } - else /* horizontal */ - { - PatBlt( hdc, r.left, r.top, - thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), - r.bottom - r.top, - top_selected ? 0x0f0000 : PATCOPY ); - r.left += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - PatBlt( hdc, r.left + thumbSize, r.top, - r.right - r.left - thumbSize, - r.bottom - r.top, - bottom_selected ? 0x0f0000 : PATCOPY ); - r.right = r.left + thumbSize; - } - - /* Draw the thumb */ - DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT | BF_MIDDLE ); - - /* cleanup */ - SelectObject( hdc, hSavePen ); - SelectObject( hdc, hSaveBrush ); -} - - static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, INT thumbSize, INT thumbPos,

1 0

Zhiyi Zhang : user32: Avoid unnecessary scroll bar drawing.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 4819ea8509bdbdfb01148deb6000d7f790bdc531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4819ea8509bdbdfb01148deb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:30:55 2021 +0800 user32: Avoid unnecessary scroll bar drawing. These drawing operations are either overwritten by other drawing functions later or not needed at all. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a63039262c7..ba8fe7966ec 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -594,12 +594,6 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT r; HPEN hSavePen; HBRUSH hSaveBrush,hBrush; - BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; - - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, rect, vertical, arrowSize, thumbSize ); /* Select the correct brush and pen */ @@ -672,11 +666,6 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, Rectangle( hdc, r.left+1, r.top+1, r.right-1, r.bottom-1 ); DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT ); - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, rect, vertical, arrowSize, thumbSize ); - /* cleanup */ SelectObject( hdc, hSavePen ); SelectObject( hdc, hSaveBrush ); @@ -695,7 +684,6 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, RECT rect; BOOL vertical; SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ); - BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); if (!(hwnd = WIN_GetFullHandle( hwnd ))) return; @@ -711,11 +699,6 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, /* do not draw if the scrollbar rectangle is empty */ if(IsRectEmpty(&rect)) return; - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); - /* Draw the arrows */ if (arrows && arrowSize) @@ -728,14 +711,19 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, FALSE, FALSE ); } - if( interior ) - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + if (interior) + { + if (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) + { + SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + } + else + { + SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + infoPtr->flags, vertical, FALSE, FALSE ); + } + } /* if scroll bar has focus, reposition the caret */ if(hwnd==GetFocus() && (nBar==SB_CTL)) @@ -975,9 +963,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } else if (msg == WM_LBUTTONUP) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); @@ -994,9 +979,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } if ( (pos != lastMousePos) || (!SCROLL_MovingThumb) ) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, - arrowSize, thumbSize ); lastMousePos = pos; SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos; SCROLL_TrackingVal = SCROLL_GetThumbVal( infoPtr, &rect, @@ -1005,9 +987,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), (LPARAM)hwndCtl ); - if (!SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, - arrowSize, thumbSize ); + SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + SCROLL_MovingThumb = TRUE; } } break; @@ -1077,6 +1058,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) /* Terminate tracking */ SCROLL_TrackingWin = 0; + SCROLL_MovingThumb = FALSE; } ReleaseDC( hwnd, hdc );

1 0

Jacek Caban : gdi32: Move CreateDiscardableBitmap implementation to objects.c.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 0204ebbc67a67fa6d4070416c88b1eccc773f422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0204ebbc67a67fa6d4070416… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:41:28 2021 +0200 gdi32: Move CreateDiscardableBitmap implementation to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 18 ------------------ dlls/gdi32/objects.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 22629f95af4..99b5d42a0d5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -474,24 +474,6 @@ static INT BITMAP_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) } -/****************************************************************************** - * CreateDiscardableBitmap [GDI32.@] - * - * Creates a discardable bitmap. - * - * RETURNS - * Success: Handle to bitmap - * Failure: NULL - */ -HBITMAP WINAPI CreateDiscardableBitmap( - HDC hdc, /* [in] Handle to device context */ - INT width, /* [in] Bitmap width */ - INT height) /* [in] Bitmap height */ -{ - return CreateCompatibleBitmap( hdc, width, height ); -} - - /****************************************************************************** * NtGdiGetBitmapDimension (win32u.@) * diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index a7d565e32ed..b83ee139387 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -215,3 +215,13 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, return NtGdiCreateBitmap( width, height, planes, bpp, bits ); } + +/****************************************************************************** + * CreateDiscardableBitmap (GDI32.@) + * + * Creates a discardable bitmap. + */ +HBITMAP WINAPI CreateDiscardableBitmap( HDC hdc, INT width, INT height ) +{ + return CreateCompatibleBitmap( hdc, width, height ); +}

1 0

Jacek Caban : gdi32: Use ntgdi names for bitmap functions.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 6b3c811c763b745f910d96741da36357b805f58a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3c811c763b745f910d9674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:41:16 2021 +0200 gdi32: Use ntgdi names for bitmap functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 18 +++++++++--------- dlls/gdi32/gdi32.spec | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c5a7ef9ca76..22629f95af4 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -176,7 +176,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, } if (bits) - SetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); + NtGdiSetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); TRACE("%dx%d, bpp %d planes %d: returning %p\n", width, height, bpp, planes, hbitmap); return hbitmap; @@ -184,7 +184,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, /*********************************************************************** - * GetBitmapBits [GDI32.@] + * NtGdiGetBitmapBits (win32u.@) * * Copies bitmap bits of bitmap to buffer. * @@ -192,7 +192,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, * Success: Number of bytes copied * Failure: 0 */ -LONG WINAPI GetBitmapBits( +LONG WINAPI NtGdiGetBitmapBits( HBITMAP hbitmap, /* [in] Handle to bitmap */ LONG count, /* [in] Number of bytes to copy */ LPVOID bits) /* [out] Pointer to buffer to receive bits */ @@ -253,7 +253,7 @@ done: /****************************************************************************** - * SetBitmapBits [GDI32.@] + * NtGdiSetBitmapBits (win32u.@) * * Sets bits of color data for a bitmap. * @@ -261,7 +261,7 @@ done: * Success: Number of bytes used in setting the bitmap bits * Failure: 0 */ -LONG WINAPI SetBitmapBits( +LONG WINAPI NtGdiSetBitmapBits( HBITMAP hbitmap, /* [in] Handle to bitmap */ LONG count, /* [in] Number of bytes in bitmap array */ LPCVOID bits) /* [in] Address of array with bitmap bits */ @@ -493,7 +493,7 @@ HBITMAP WINAPI CreateDiscardableBitmap( /****************************************************************************** - * GetBitmapDimensionEx [GDI32.@] + * NtGdiGetBitmapDimension (win32u.@) * * Retrieves dimensions of a bitmap. * @@ -501,7 +501,7 @@ HBITMAP WINAPI CreateDiscardableBitmap( * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetBitmapDimensionEx( +BOOL WINAPI NtGdiGetBitmapDimension( HBITMAP hbitmap, /* [in] Handle to bitmap */ LPSIZE size) /* [out] Address of struct receiving dimensions */ { @@ -514,7 +514,7 @@ BOOL WINAPI GetBitmapDimensionEx( /****************************************************************************** - * SetBitmapDimensionEx [GDI32.@] + * NtGdiSetBitmapDimension (win32u.@) * * Assigns dimensions to a bitmap. * MSDN says that this function will fail if hbitmap is a handle created by @@ -524,7 +524,7 @@ BOOL WINAPI GetBitmapDimensionEx( * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetBitmapDimensionEx( +BOOL WINAPI NtGdiSetBitmapDimension( HBITMAP hbitmap, /* [in] Handle to bitmap */ INT x, /* [in] Bitmap width */ INT y, /* [in] Bitmap height */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index b21f22c3629..6da3721a00b 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -240,8 +240,8 @@ @ stdcall GetArcDirection(long) @ stdcall GetAspectRatioFilterEx(long ptr) # @ stub GetBitmapAttributes -@ stdcall GetBitmapBits(long long ptr) -@ stdcall GetBitmapDimensionEx(long ptr) +@ stdcall GetBitmapBits(long long ptr) NtGdiGetBitmapBits +@ stdcall GetBitmapDimensionEx(long ptr) NtGdiGetBitmapDimension @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) @ stdcall GetBoundsRect(long ptr long) @@ -474,8 +474,8 @@ @ stdcall SetAbortProc(long ptr) @ stdcall SetArcDirection(long long) # @ stub SetBitmapAttributes -@ stdcall SetBitmapBits(long long ptr) -@ stdcall SetBitmapDimensionEx(long long long ptr) +@ stdcall SetBitmapBits(long long ptr) NtGdiSetBitmapBits +@ stdcall SetBitmapDimensionEx(long long long ptr) NtGdiSetBitmapDimension @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) @ stdcall SetBoundsRect(long ptr long)

1 0

Jacek Caban : gdi32: Introduce NtGdiCreateBitmap.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 270f7bed600236c33286d0431f120b23c0c7ea4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=270f7bed600236c33286d043… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:58 2021 +0200 gdi32: Introduce NtGdiCreateBitmap. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 8 ++++---- dlls/gdi32/objects.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index cebe2dea644..c5a7ef9ca76 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -91,12 +91,12 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) /****************************************************************************** - * CreateBitmap [GDI32.@] + * NtGdiCreateBitmap (win32u.@) * * Creates a bitmap with the specified info. */ -HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, - UINT bpp, const void *bits ) +HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, + UINT bpp, const void *bits ) { BITMAPOBJ *bmpobj; HBITMAP hbitmap; @@ -110,7 +110,7 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, } if (!width || !height) - return GetStockObject( DEFAULT_BITMAP ); + return 0; if (height < 0) height = -height; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 1567a02b128..a7d565e32ed 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -201,3 +201,17 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return CreateBitmap( bmp->bmWidth, bmp->bmHeight, bmp->bmPlanes, bmp->bmBitsPixel, bmp->bmBits ); } + +/****************************************************************************** + * CreateBitmap (GDI32.@) + * + * Creates a bitmap with the specified info. + */ +HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, + UINT bpp, const void *bits ) +{ + if (!width || !height) + return GetStockObject( STOCK_LAST + 1 ); /* default 1x1 bitmap */ + + return NtGdiCreateBitmap( width, height, planes, bpp, bits ); +}

1 0

Jacek Caban : gdi32: Implement CreateBitmapIndirect on top of CreateBitmap.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 505a6b9cffa5e7081bce4326c15f4f960601760f URL: https://source.winehq.org/git/wine.git/?a=commit;h=505a6b9cffa5e7081bce4326… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:45 2021 +0200 gdi32: Implement CreateBitmapIndirect on top of CreateBitmap. Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 121 +++++++++++++++------------------------------------ dlls/gdi32/objects.c | 15 +++++++ 2 files changed, 49 insertions(+), 87 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index aaad76dce36..cebe2dea644 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -43,38 +43,6 @@ static const struct gdi_obj_funcs bitmap_funcs = }; -/****************************************************************************** - * CreateBitmap [GDI32.@] - * - * Creates a bitmap with the specified info. - * - * PARAMS - * width [I] bitmap width - * height [I] bitmap height - * planes [I] Number of color planes - * bpp [I] Number of bits to identify a color - * bits [I] Pointer to array containing color data - * - * RETURNS - * Success: Handle to bitmap - * Failure: 0 - */ -HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, - UINT bpp, LPCVOID bits ) -{ - BITMAP bm; - - bm.bmType = 0; - bm.bmWidth = width; - bm.bmHeight = height; - bm.bmWidthBytes = get_bitmap_stride( width, bpp ); - bm.bmPlanes = planes; - bm.bmBitsPixel = bpp; - bm.bmBits = (LPVOID)bits; - - return CreateBitmapIndirect( &bm ); -} - /****************************************************************************** * CreateCompatibleBitmap [GDI32.@] * @@ -123,81 +91,57 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) /****************************************************************************** - * CreateBitmapIndirect [GDI32.@] + * CreateBitmap [GDI32.@] * * Creates a bitmap with the specified info. - * - * PARAMS - * bmp [I] Pointer to the bitmap info describing the bitmap - * - * RETURNS - * Success: Handle to bitmap - * Failure: NULL. Use GetLastError() to determine the cause. - * - * NOTES - * If a width or height of 0 is given, a 1x1 monochrome bitmap is returned. */ -HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) +HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, + UINT bpp, const void *bits ) { - BITMAP bm; BITMAPOBJ *bmpobj; HBITMAP hbitmap; INT dib_stride; SIZE_T size; - if (!bmp || bmp->bmType) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } - - if (bmp->bmWidth > 0x7ffffff || bmp->bmHeight > 0x7ffffff) + if (width > 0x7ffffff || height > 0x7ffffff) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - bm = *bmp; - - if (!bm.bmWidth || !bm.bmHeight) - { + if (!width || !height) return GetStockObject( DEFAULT_BITMAP ); - } - else - { - if (bm.bmHeight < 0) - bm.bmHeight = -bm.bmHeight; - if (bm.bmWidth < 0) - bm.bmWidth = -bm.bmWidth; - } - if (bm.bmPlanes != 1) + if (height < 0) + height = -height; + if (width < 0) + width = -width; + + if (planes != 1) { - FIXME("planes = %d\n", bm.bmPlanes); + FIXME("planes = %d\n", planes); SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } /* Windows only uses 1, 4, 8, 16, 24 and 32 bpp */ - if(bm.bmBitsPixel == 1) bm.bmBitsPixel = 1; - else if(bm.bmBitsPixel <= 4) bm.bmBitsPixel = 4; - else if(bm.bmBitsPixel <= 8) bm.bmBitsPixel = 8; - else if(bm.bmBitsPixel <= 16) bm.bmBitsPixel = 16; - else if(bm.bmBitsPixel <= 24) bm.bmBitsPixel = 24; - else if(bm.bmBitsPixel <= 32) bm.bmBitsPixel = 32; - else { - WARN("Invalid bmBitsPixel %d, returning ERROR_INVALID_PARAMETER\n", bm.bmBitsPixel); + if(bpp == 1) bpp = 1; + else if(bpp <= 4) bpp = 4; + else if(bpp <= 8) bpp = 8; + else if(bpp <= 16) bpp = 16; + else if(bpp <= 24) bpp = 24; + else if(bpp <= 32) bpp = 32; + else + { + WARN("Invalid bmBitsPixel %d, returning ERROR_INVALID_PARAMETER\n", bpp); SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - /* Windows ignores the provided bm.bmWidthBytes */ - bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - - dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel ); - size = dib_stride * bm.bmHeight; + dib_stride = get_dib_stride( width, bpp ); + size = dib_stride * height; /* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */ - if (dib_stride != size / bm.bmHeight) + if (dib_stride != size / height) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -210,8 +154,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return 0; } - bmpobj->dib.dsBm = bm; - bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + bmpobj->dib.dsBm.bmType = 0; + bmpobj->dib.dsBm.bmWidth = width; + bmpobj->dib.dsBm.bmHeight = height; + bmpobj->dib.dsBm.bmWidthBytes = get_bitmap_stride( width, bpp ); + bmpobj->dib.dsBm.bmPlanes = planes; + bmpobj->dib.dsBm.bmBitsPixel = bpp; + bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); if (!bmpobj->dib.dsBm.bmBits) { HeapFree( GetProcessHeap(), 0, bmpobj ); @@ -226,12 +175,10 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return 0; } - if (bm.bmBits) - SetBitmapBits( hbitmap, bm.bmHeight * bm.bmWidthBytes, bm.bmBits ); - - TRACE("%dx%d, bpp %d planes %d: returning %p\n", bm.bmWidth, bm.bmHeight, - bm.bmBitsPixel, bm.bmPlanes, hbitmap); + if (bits) + SetBitmapBits( hbitmap, height * bmpobj->dib.dsBm.bmWidthBytes, bits ); + TRACE("%dx%d, bpp %d planes %d: returning %p\n", width, height, bpp, planes, hbitmap); return hbitmap; } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 0e8453f4af2..1567a02b128 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -186,3 +186,18 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) if (style < 0 || style > PS_INSIDEFRAME) style = PS_SOLID; return NtGdiCreatePen( style, width, color, NULL ); } + +/*********************************************************************** + * CreateBitmapIndirect (GDI32.@) + */ +HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) +{ + if (!bmp || bmp->bmType) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + return CreateBitmap( bmp->bmWidth, bmp->bmHeight, bmp->bmPlanes, + bmp->bmBitsPixel, bmp->bmBits ); +}

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021