January 2022 - Wine-commits

Gabriel Ivăncescu : ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only if window is not in foreground.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: a384da88655aa6e8e063c5eb361a2339af7ffe6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a384da88655aa6e8e063c5eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 18 18:50:25 2022 +0200 ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only if window is not in foreground. Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 6 +++-- dlls/ddraw/tests/ddraw1.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 268 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a384da88655aa6e8e063…

1 0

Gabriel Ivăncescu : ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES also if DDSCL_NOWINDOWCHANGES is set.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: f8ac8752ed635d8114971f7c27b30661441ae3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8ac8752ed635d8114971f7c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 18 18:50:26 2022 +0200 ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES also if DDSCL_NOWINDOWCHANGES is set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 14 +++++----- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 267 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f8ac8752ed635d811497…

1 0

Zhiyi Zhang : comctl32/listview: Support themed check boxes for LVS_EX_CHECKBOXES style.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: b4b87987bb86338833f85e888f7b7ab0bbc928fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b87987bb86338833f85e88… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 20 15:17:21 2022 +0800 comctl32/listview: Support themed check boxes for LVS_EX_CHECKBOXES style. Fix check boxes in the list items of 7-zip options dialog not being themed even when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9e35f7879b7..044e64bfa53 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -139,6 +139,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" +#include "vsstyle.h" #include "shlwapi.h" #include "wine/debug.h" @@ -8424,15 +8425,62 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) * Creates the checkbox imagelist. Helper for LISTVIEW_SetExtendedListViewStyle * */ +static HIMAGELIST LISTVIEW_CreateThemedCheckBoxImageList(const LISTVIEW_INFO *info) +{ + HBITMAP bitmap, old_bitmap; + HIMAGELIST image_list; + HDC hdc, mem_hdc; + HTHEME theme; + RECT rect; + SIZE size; + + if (!GetWindowTheme(info->hwndSelf)) + return NULL; + + theme = OpenThemeDataForDpi(NULL, L"Button", GetDpiForWindow(info->hwndSelf)); + if (!theme) + return NULL; + + hdc = GetDC(info->hwndSelf); + GetThemePartSize(theme, hdc, BP_CHECKBOX, 0, NULL, TS_DRAW, &size); + SetRect(&rect, 0, 0, size.cx, size.cy); + image_list = ImageList_Create(size.cx, size.cy, ILC_COLOR32, 2, 2); + mem_hdc = CreateCompatibleDC(hdc); + bitmap = CreateCompatibleBitmap(hdc, size.cx, size.cy); + old_bitmap = SelectObject(mem_hdc, bitmap); + ReleaseDC(info->hwndSelf, hdc); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL)) + FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, &rect, NULL); + ImageList_Add(image_list, bitmap, NULL); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_CHECKEDNORMAL)) + FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, &rect, NULL); + ImageList_Add(image_list, bitmap, NULL); + + SelectObject(mem_hdc, old_bitmap); + DeleteObject(bitmap); + DeleteDC(mem_hdc); + CloseThemeData(theme); + return image_list; +} + static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr) { HDC hdc_wnd, hdc; HBITMAP hbm_im, hbm_mask, hbm_orig; RECT rc; - HBRUSH hbr_white = GetStockObject(WHITE_BRUSH); - HBRUSH hbr_black = GetStockObject(BLACK_BRUSH); + HBRUSH hbr_white, hbr_black; HIMAGELIST himl; + himl = LISTVIEW_CreateThemedCheckBoxImageList(infoPtr); + if (himl) + return himl; + + hbr_white = GetStockObject(WHITE_BRUSH); + hbr_black = GetStockObject(BLACK_BRUSH); himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_MASK, 2, 2); hdc_wnd = GetDC(infoPtr->hwndSelf);

1 0

Zhiyi Zhang : comctl32/treeview: Support themed check boxes for TVS_CHECKBOXES style.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: 0209e51118ea6feab22a5d090ef8617b26f8d060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0209e51118ea6feab22a5d09… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 20 15:17:28 2022 +0800 comctl32/treeview: Support themed check boxes for TVS_CHECKBOXES style. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f4a387dd0d2..1368105f271 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2962,6 +2962,52 @@ TREEVIEW_Invalidate(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) InvalidateRect(infoPtr->hwnd, NULL, TRUE); } +static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info) +{ + HBITMAP bitmap, old_bitmap; + HDC hdc, hdc_screen; + HTHEME theme; + RECT rect; + SIZE size; + + if (!GetWindowTheme(info->hwnd)) + return FALSE; + + theme = OpenThemeDataForDpi(NULL, L"Button", GetDpiForWindow(info->hwnd)); + if (!theme) + return FALSE; + + hdc_screen = GetDC(0); + hdc = CreateCompatibleDC(hdc_screen); + GetThemePartSize(theme, hdc, BP_CHECKBOX, 0, NULL, TS_DRAW, &size); + bitmap = CreateCompatibleBitmap(hdc_screen, size.cx * 3, size.cy); + old_bitmap = SelectObject(hdc, bitmap); + + SetRect(&rect, 0, 0, size.cx * 3, size.cy); + FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + + rect.left = size.cx; + rect.right = rect.left + size.cx; + DrawThemeBackground(theme, hdc, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, &rect, NULL); + + rect.left = size.cx * 2; + rect.right = rect.left + size.cx; + DrawThemeBackground(theme, hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, &rect, NULL); + + SelectObject(hdc, old_bitmap); + info->himlState = ImageList_Create(size.cx, size.cy, ILC_COLOR32, 3, 0); + ImageList_Add(info->himlState, bitmap, NULL); + + DeleteObject(bitmap); + DeleteDC(hdc); + ReleaseDC(0, hdc_screen); + CloseThemeData(theme); + + info->stateImageWidth = size.cx; + info->stateImageHeight = size.cy; + return TRUE; +} + static void TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { @@ -2970,6 +3016,9 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) HDC hdc, hdcScreen; int nIndex; + if (TREEVIEW_InitThemedCheckboxes(infoPtr)) + return; + infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); hdcScreen = GetDC(0);

1 0

Zhiyi Zhang : comctl32/status: Remove redundant background drawing code.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: 6b1c2247d055aba06dada5e0a1f1ca4d47586c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1c2247d055aba06dada5e0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 20 15:17:39 2022 +0800 comctl32/status: Remove redundant background drawing code. The part background is already painted in STATUSBAR_Refresh(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index ac93d7712c0..786fcbd291d 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -191,9 +191,6 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART static void STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { - HBRUSH hbrBk; - HTHEME theme; - TRACE("item %d\n", itemID); if (part->bound.right < part->bound.left) return; @@ -201,23 +198,6 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA if (!RectVisible(hdc, &part->bound)) return; - if ((theme = GetWindowTheme (infoPtr->Self))) - { - RECT cr; - GetClientRect (infoPtr->Self, &cr); - DrawThemeBackground(theme, hdc, 0, 0, &cr, &part->bound); - } - else - { - if (infoPtr->clrBk != CLR_DEFAULT) - hbrBk = CreateSolidBrush (infoPtr->clrBk); - else - hbrBk = GetSysColorBrush (COLOR_3DFACE); - FillRect(hdc, &part->bound, hbrBk); - if (infoPtr->clrBk != CLR_DEFAULT) - DeleteObject (hbrBk); - } - STATUSBAR_DrawPart (infoPtr, hdc, part, itemID); }

1 0

Zhiyi Zhang : comctl32/status: Calculate border for part background only when theming is off.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: 1cdea98b18c1c4f9ea9827e9a377a45e8731b5a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cdea98b18c1c4f9ea9827e9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 20 15:17:48 2022 +0800 comctl32/status: Calculate border for part background only when theming is off. This is a no-op. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 786fcbd291d..6fcdc32086a 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -144,16 +144,12 @@ static void STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { RECT r = part->bound; - UINT border = BDR_SUNKENOUTER; + UINT border; HTHEME theme = GetWindowTheme (infoPtr->Self); int themePart = SP_PANE; int x = 0; TRACE("part bound %s\n", wine_dbgstr_rect(&r)); - if (part->style & SBT_POPOUT) - border = BDR_RAISEDOUTER; - else if (part->style & SBT_NOBORDERS) - border = 0; if (theme) { @@ -163,7 +159,15 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART DrawThemeBackground(theme, hdc, themePart, 0, &r, NULL); } else + { + if (part->style & SBT_POPOUT) + border = BDR_RAISEDOUTER; + else if (part->style & SBT_NOBORDERS) + border = 0; + else + border = BDR_SUNKENOUTER; DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST); + } if (part->hIcon) { INT cy = r.bottom - r.top;

1 0

Zhiyi Zhang : comctl32/status: Do not draw background for status text.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: ee3ec759d547116ac0b85da991ea8f57db8a56ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee3ec759d547116ac0b85da9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 20 15:17:57 2022 +0800 comctl32/status: Do not draw background for status text. DrawStatusTextW() always draws the text background, so it's unfit to use it directly to draw status text because status control draws its own background. Fix status control text having wrong background when themed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 67 ++++++++++++++++++++++++++---------------------- dlls/comctl32/status.c | 3 +-- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 44d3b43ab9b..f9ed8b84ffd 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -182,6 +182,7 @@ extern COMCTL32_SysColor comctl32_color DECLSPEC_HIDDEN; /* Internal function */ HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN; +void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) DECLSPEC_HIDDEN; VOID COMCTL32_RefreshSysColors(void) DECLSPEC_HIDDEN; void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal) DECLSPEC_HIDDEN; void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground) DECLSPEC_HIDDEN; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index b457bdcb8be..c707703ccd2 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -460,39 +460,25 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, const INT *lpInfo) } while (*lpRun); } - -/*********************************************************************** - * DrawStatusTextW [COMCTL32.@] - * - * Draws text with borders, like in a status bar. - * - * PARAMS - * hdc [I] handle to the window's display context - * lprc [I] pointer to a rectangle - * text [I] pointer to the text - * style [I] drawing style - * - * RETURNS - * No return value. - * - * NOTES - * The style variable can have one of the following values: - * (will be written ...) - */ - -void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) +void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) { RECT r = *lprc; - UINT border = BDR_SUNKENOUTER; + UINT border; COLORREF oldbkcolor; - if (style & SBT_POPOUT) - border = BDR_RAISEDOUTER; - else if (style & SBT_NOBORDERS) - border = 0; + if (draw_background) + { + if (style & SBT_POPOUT) + border = BDR_RAISEDOUTER; + else if (style & SBT_NOBORDERS) + border = 0; + else + border = BDR_SUNKENOUTER; - oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); - DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); + oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); + DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); + SetBkColor (hdc, oldbkcolor); + } /* now draw text */ if (text) { @@ -524,10 +510,31 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) SetBkMode (hdc, oldbkmode); SetTextColor (hdc, oldtextcolor); } - - SetBkColor (hdc, oldbkcolor); } +/*********************************************************************** + * DrawStatusTextW [COMCTL32.@] + * + * Draws text with borders, like in a status bar. + * + * PARAMS + * hdc [I] handle to the window's display context + * lprc [I] pointer to a rectangle + * text [I] pointer to the text + * style [I] drawing style + * + * RETURNS + * No return value. + * + * NOTES + * The style variable can have one of the following values: + * (will be written ...) + */ + +void WINAPI DrawStatusTextW(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) +{ + COMCTL32_DrawStatusText(hdc, lprc, text, style, TRUE); +} /*********************************************************************** * DrawStatusText [COMCTL32.@] diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 6fcdc32086a..e804c0418f4 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -139,7 +139,6 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); } - static void STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { @@ -187,7 +186,7 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else { r.left += x; - DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); + COMCTL32_DrawStatusText(hdc, &r, part->text, 0, FALSE); } }

1 0

Alexandre Julliard : user.exe: Make sure that the thunk selector doesn't get freed.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: 879ccd33572170e9bcb00d5a45cf65b2ca675439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=879ccd33572170e9bcb00d5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 20 11:07:20 2022 +0100 user.exe: Make sure that the thunk selector doesn't get freed. Spotted by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12732 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 1b4bf9afbd8..5d388a55312 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -161,6 +161,7 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) return NULL; + FarSetOwner16( thunk_selector, 0 ); PrestoChangoSelector16( thunk_selector, thunk_selector ); thunk_array = GlobalLock16( thunk_selector ); relay = GetProcAddress16( GetModuleHandle16("user"), "__wine_call_wndproc" );

1 0

Alexandre Julliard : faudio: Import upstream release 22.01.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: bf527c001a7cadc91667c33053ced7fe0aad7dec URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf527c001a7cadc91667c330… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 20 11:18:11 2022 +0100 faudio: Import upstream release 22.01. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/include/FAudio.h | 4 +-- libs/faudio/src/FAudio_platform_win32.c | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 6f68013d79f..28fa62c4fc5 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -484,8 +484,8 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_TARGET_VERSION 8 /* Targeting compatibility with XAudio 2.8 */ #define FAUDIO_ABI_VERSION 0 -#define FAUDIO_MAJOR_VERSION 21 -#define FAUDIO_MINOR_VERSION 11 +#define FAUDIO_MAJOR_VERSION 22 +#define FAUDIO_MINOR_VERSION 1 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index d99bae044a4..89101a6cf7a 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -70,6 +70,44 @@ void FAudio_Log(char const *msg) OutputDebugStringA(msg); } +static HMODULE kernelbase = NULL; +static HRESULT (WINAPI *my_SetThreadDescription)(HANDLE, PCWSTR) = NULL; + +static void FAudio_resolve_SetThreadDescription(void) +{ + kernelbase = LoadLibraryA("kernelbase.dll"); + if (!kernelbase) + return; + + my_SetThreadDescription = (HRESULT (WINAPI *)(HANDLE, PCWSTR)) GetProcAddress(kernelbase, "SetThreadDescription"); + if (!my_SetThreadDescription) + { + FreeLibrary(kernelbase); + kernelbase = NULL; + } +} + +static void FAudio_set_thread_name(char const *name) +{ + int ret; + WCHAR *nameW; + + if (!my_SetThreadDescription) + return; + + ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0); + + nameW = FAudio_malloc(ret * sizeof(WCHAR)); + if (!nameW) + return; + + ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, nameW, ret); + if (ret) + my_SetThreadDescription(GetCurrentThread(), nameW); + + FAudio_free(nameW); +} + static HRESULT FAudio_FillAudioClientBuffer( struct FAudioAudioClientThreadArgs *args, IAudioRenderClient *client, @@ -121,6 +159,8 @@ static DWORD WINAPI FAudio_AudioClientThread(void *user) HRESULT hr = S_OK; UINT frames, padding = 0; + FAudio_set_thread_name(__func__); + hr = IAudioClient_GetService( args->client, &IID_IAudioRenderClient, @@ -172,6 +212,7 @@ void FAudio_PlatformInit( BOOL has_sse2 = IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE); FAudio_INTERNAL_InitSIMDFunctions(has_sse2, FALSE); + FAudio_resolve_SetThreadDescription(); FAudio_PlatformAddRef(); @@ -305,6 +346,12 @@ void FAudio_PlatformQuit(void* platformDevice) SetEvent(data->stopEvent); WaitForSingleObject(data->audioThread, INFINITE); if (data->client) IAudioClient_Release(data->client); + if (kernelbase) + { + my_SetThreadDescription = NULL; + FreeLibrary(kernelbase); + kernelbase = NULL; + } FAudio_PlatformRelease(); } @@ -500,6 +547,7 @@ static DWORD WINAPI FaudioThreadWrapper(void *user) struct FAudioThreadArgs *args = user; DWORD ret; + FAudio_set_thread_name(args->name); ret = args->func(args->data); FAudio_free(args);

1 0

Alexandre Julliard : mpg123: Import upstream release 1.29.3.
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: wine Branch: master Commit: 727a7b0b9e339f43e1060238cf15da31cfbf795e URL: https://source.winehq.org/git/wine.git/?a=commit;h=727a7b0b9e339f43e1060238… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 20 11:32:03 2022 +0100 mpg123: Import upstream release 1.29.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/mpg123/src/libmpg123/libmpg123.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/mpg123/src/libmpg123/libmpg123.c b/libs/mpg123/src/libmpg123/libmpg123.c index 5a34932d373..f175a5c93fa 100644 --- a/libs/mpg123/src/libmpg123/libmpg123.c +++ b/libs/mpg123/src/libmpg123/libmpg123.c @@ -891,7 +891,7 @@ int attribute_align_arg mpg123_framebyframe_decode(mpg123_handle *mh, off_t *num if(num != NULL) *num = mh->num; debug("decoding"); - if(!mh->state_flags & FRAME_DECODER_LIVE) + if(!(mh->state_flags & FRAME_DECODER_LIVE)) return MPG123_ERR; decode_the_frame(mh); mh->to_decode = mh->to_ignore = FALSE;

1 0