wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Jacek Caban : gdi32: Introduce NtGdiSelectFont.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: aeb8c22f760b0df89032d2f9aa72dc8ab7d9b808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeb8c22f760b0df89032d2f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:38:52 2021 +0200 gdi32: Introduce NtGdiSelectFont. 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/font.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 59deef23c6f..9a3695293fc 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4534,9 +4534,9 @@ static void update_font_code_page( DC *dc, HANDLE font ) } /*********************************************************************** - * FONT_SelectObject + * NtGdiSelectFont (win32u.@) */ -static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) +HGDIOBJ WINAPI NtGdiSelectFont( HDC hdc, HGDIOBJ handle ) { HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); @@ -4569,6 +4569,15 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) } +/*********************************************************************** + * FONT_SelectObject + */ +static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + return NtGdiSelectFont( hdc, handle ); +} + + /*********************************************************************** * FONT_GetObjectA */

1 0

Jacek Caban : gdi32: Introduce NtGdiSelectBrush.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 966663a1d2af3d0f207b68caf41b8c9c122cb6b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=966663a1d2af3d0f207b68ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:38:47 2021 +0200 gdi32: Introduce NtGdiSelectBrush. 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/brush.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 4f968a048ce..acb0e67199a 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -417,19 +417,15 @@ BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg ) /*********************************************************************** - * BRUSH_SelectObject + * NtGdiSelectBrush (win32u.@) */ -static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) +HGDIOBJ WINAPI NtGdiSelectBrush( HDC hdc, HGDIOBJ handle ) { BRUSHOBJ *brush; HGDIOBJ ret = 0; - DC *dc = get_dc_ptr( hdc ); + DC *dc; - if (!dc) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } + if (!(dc = get_dc_ptr( hdc ))) return 0; if ((brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) { @@ -457,6 +453,17 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) } +/*********************************************************************** + * BRUSH_SelectObject + */ +static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + HGDIOBJ ret = NtGdiSelectBrush( hdc, handle ); + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; +} + + /*********************************************************************** * BRUSH_DeleteObject */

1 0

Jacek Caban : gdi32: Introduce NtGdiSelectBitmap.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 30550d2e6da6d0a166e65372acb3c4d537834a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30550d2e6da6d0a166e65372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:38:34 2021 +0200 gdi32: Introduce NtGdiSelectBitmap. 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 | 15 ++++++++++++--- dlls/gdi32/dib.c | 54 +---------------------------------------------------- 2 files changed, 13 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index bb1d7d4eebd..3d2c2e365e1 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -423,9 +423,9 @@ LONG WINAPI SetBitmapBits( /*********************************************************************** - * BITMAP_SelectObject + * NtGdiSelectBitmap (win32u.@) */ -static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) +HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) { HGDIOBJ ret; BITMAPOBJ *bitmap; @@ -456,7 +456,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (bitmap->dib.dsBm.bmBitsPixel != 1 && + if (!is_bitmapobj_dib( bitmap ) && + bitmap->dib.dsBm.bmBitsPixel != 1 && bitmap->dib.dsBm.bmBitsPixel != GetDeviceCaps( hdc, BITSPIXEL )) { WARN( "Wrong format bitmap %u bpp\n", bitmap->dib.dsBm.bmBitsPixel ); @@ -491,6 +492,14 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) return ret; } +/*********************************************************************** + * BITMAP_SelectObject + */ +static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + return NtGdiSelectBitmap( hdc, handle ); +} + /*********************************************************************** * BITMAP_DeleteObject diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2e55579fb6e..fdd7c9bcfbc 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1722,59 +1722,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *des */ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) { - HGDIOBJ ret; - BITMAPOBJ *bitmap; - DC *dc; - PHYSDEV physdev; - - if (!(dc = get_dc_ptr( hdc ))) return 0; - - if (GetObjectType( hdc ) != OBJ_MEMDC) - { - ret = 0; - goto done; - } - ret = dc->hBitmap; - if (handle == dc->hBitmap) goto done; /* nothing to do */ - - if (!(bitmap = GDI_GetObjPtr( handle, OBJ_BITMAP ))) - { - ret = 0; - goto done; - } - - if (GDI_get_ref_count( handle )) - { - WARN( "Bitmap already selected in another DC\n" ); - GDI_ReleaseObj( handle ); - ret = 0; - goto done; - } - - physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - if (!physdev->funcs->pSelectBitmap( physdev, handle )) - { - GDI_ReleaseObj( handle ); - ret = 0; - } - else - { - dc->hBitmap = handle; - GDI_inc_ref_count( handle ); - dc->dirty = 0; - dc->vis_rect.left = 0; - dc->vis_rect.top = 0; - dc->vis_rect.right = bitmap->dib.dsBm.bmWidth; - dc->vis_rect.bottom = bitmap->dib.dsBm.bmHeight; - dc->device_rect = dc->vis_rect; - GDI_ReleaseObj( handle ); - DC_InitDC( dc ); - GDI_dec_ref_count( ret ); - } - - done: - release_dc_ptr( dc ); - return ret; + return NtGdiSelectBitmap( hdc, handle ); }

1 0

Jacek Caban : gdi32: Introduce NtGdiSelectPen.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 4dd693a7ea43dde319e01bcbb36ac4539a543b7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dd693a7ea43dde319e01bcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 2 12:38:25 2021 +0200 gdi32: Introduce NtGdiSelectPen. 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/pen.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 14a51e698eb..6ef3d45c4cb 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -215,20 +215,16 @@ invalid: } /*********************************************************************** - * PEN_SelectObject + * NtGdiSelectPen (win32u.@) */ -static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) +HGDIOBJ WINAPI NtGdiSelectPen( HDC hdc, HGDIOBJ handle ) { PENOBJ *pen; HGDIOBJ ret = 0; - DC *dc = get_dc_ptr( hdc ); WORD type; + DC *dc; - if (!dc) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } + if (!(dc = get_dc_ptr( hdc ))) return 0; if ((pen = get_any_obj_ptr( handle, &type ))) { @@ -268,6 +264,16 @@ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) return ret; } +/*********************************************************************** + * PEN_SelectObject + */ +static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + HGDIOBJ ret = NtGdiSelectPen( hdc, handle ); + if (!ret) SetLastError( ERROR_INVALID_HANDLE ); + return ret; +} + /*********************************************************************** * PEN_DeleteObject

1 0

Rémi Bernon : crypt32: Grow item size buffer by more than 1 at a time.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 8b8b43d5f3ebff602bbd15d939de7766ef252114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8b43d5f3ebff602bbd15d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 2 12:18:22 2021 +0200 crypt32: Grow item size buffer by more than 1 at a time. When Steam starts and connects, it sometimes does some crypt32 processing and ends up spending a huge amount of time in ntdll memcpy, reallocating buffers, effectively getting stuck while connecting to the user account. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 5d195d42f7b..a0e78d62b4d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -628,7 +628,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &dataLen))) { - DWORD bytesNeeded = arrayDesc->minArraySize, cItems = 0, decoded; + DWORD bytesNeeded = arrayDesc->minArraySize, cItems = 0, capacity = 0, decoded; BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); /* There can be arbitrarily many items, but there is often only one. */ @@ -687,17 +687,18 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, continue; } - cItems++; - if (itemSizes != &itemSize) - itemSizes = CryptMemRealloc(itemSizes, - cItems * sizeof(struct AsnArrayItemSize)); - else if (cItems > 1) + if (++cItems <= 1) + itemSizes = &itemSize; + else if (itemSizes == &itemSize) { - itemSizes = - CryptMemAlloc( - cItems * sizeof(struct AsnArrayItemSize)); - if (itemSizes) - *itemSizes = itemSize; + capacity = 1024; + itemSizes = CryptMemAlloc(capacity * sizeof(struct AsnArrayItemSize)); + if (itemSizes) *itemSizes = itemSize; + } + else if (cItems > capacity) + { + capacity = capacity * 3 / 2; + itemSizes = CryptMemRealloc(itemSizes, capacity * sizeof(struct AsnArrayItemSize)); } if (itemSizes) {

1 0

Zebediah Figura : wined3d: Print a message when forcing CS serialization.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 0c36633a208f212030470b648a7651ba1be2d96c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c36633a208f212030470b64… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 1 17:35:01 2021 -0500 wined3d: Print a message when forcing CS serialization. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 00cf2f2f1d7..ce0417c9f71 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3310,6 +3310,9 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, cs->c.device = device; cs->serialize_commands = TRACE_ON(d3d_sync) || wined3d_settings.cs_multithreaded & WINED3D_CSMT_SERIALIZE; + if (cs->serialize_commands) + ERR_(d3d_sync)("Forcing serialization of all command streams.\n"); + state_init(&cs->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT, cs->c.state->feature_level); cs->data_size = WINED3D_INITIAL_CS_SIZE;

1 0

Alexandre Julliard : ntdll/tests: Retrieve the actual segment registers for RtlWow64GetThreadSelectorEntry test.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: c6919423a85f5e77b05cb353bcd9e54055b6c988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6919423a85f5e77b05cb353… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 09:59:30 2021 +0200 ntdll/tests: Retrieve the actual segment registers for RtlWow64GetThreadSelectorEntry test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 44010607f77..82543c250af 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -431,8 +431,13 @@ static void test_selectors(void) { /* hardcoded values */ context.SegCs = 0x23; +#ifdef __x86_64__ + __asm__( "movw %%fs,%0" : "=m" (context.SegFs) ); + __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); +#else context.SegSs = 0x2b; context.SegFs = 0x53; +#endif } #define GET_ENTRY(info,size,ret) \ pRtlWow64GetThreadSelectorEntry( GetCurrentThread(), info, size, ret )

1 0

Zhiyi Zhang : winecfg: Don't convert font height to points when saving system font metrics.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 5cebefc24fe9dd944fd8656fd1b160d51bf7ec80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cebefc24fe9dd944fd8656f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:38:31 2021 +0800 winecfg: Don't convert font height to points when saving system font metrics. Fix tooltip font size becomes smaller after clicking the apply button in Desktop Integration tab. For example, the original non-client area tooltip font lfHeight is -11. 11 pixels is 8 points in 96 DPI. Setting font size to 8 points to SPI_SETNONCLIENTMETRICS will make SPI_GETNONCLIENTMETRICS report lfHeight as 8. With lfHeight being 8, CreateFontIndirectW() creates a smaller font. This behavior is added by 5b8fdb9. I assume the intention was to save font size in a DPI-independent way. However, when lfHeight is negative, lfHeight will still be scaled back to 96 DPI before saving it to registry and scaled to system DPI when it's read from registry. So I think converting to points is unnecessary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 687ea571311..e204a911516 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1035,12 +1035,6 @@ static void apply_sysparams(void) ncm.lfStatusFont = metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf; ncm.lfMessageFont = metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf; - ncm.lfMenuFont.lfHeight = MulDiv( ncm.lfMenuFont.lfHeight, -72, dpi ); - ncm.lfCaptionFont.lfHeight = MulDiv( ncm.lfCaptionFont.lfHeight, -72, dpi ); - ncm.lfStatusFont.lfHeight = MulDiv( ncm.lfStatusFont.lfHeight, -72, dpi ); - ncm.lfMessageFont.lfHeight = MulDiv( ncm.lfMessageFont.lfHeight, -72, dpi ); - ncm.lfSmCaptionFont.lfHeight = MulDiv( ncm.lfSmCaptionFont.lfHeight, -72, dpi ); - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);

1 0

Zhiyi Zhang : uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme().
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: fe257dde58f03fe1fc9705caf24edbe16df7a1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe257dde58f03fe1fc9705ca… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:36:59 2021 +0800 uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51348 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 33e407fdf82..b18794740a8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -698,7 +698,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); return hr; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 38cccb3ec6f..7f2e6d04aa4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -233,8 +233,8 @@ static void test_SetWindowTheme(void) } DispatchMessageA(&msg); } - ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", TRUE); - ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", FALSE); + ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", FALSE); DestroyWindow(hWnd); UnregisterClassA("TestSetWindowThemeParentClass", GetModuleHandleA(0)); UnregisterClassA("TestSetWindowThemeChildClass", GetModuleHandleA(0));

1 0

Zhiyi Zhang : uxtheme/tests: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 064dad234295c2f5a2b95017dc280cac06afd614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064dad234295c2f5a2b95017… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:36:49 2021 +0800 uxtheme/tests: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/msg.h | 409 ++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 138 ++++++++++++++- 2 files changed, 545 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=064dad234295c2f5a2b9…

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
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