wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

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 : 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

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

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: 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/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/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

Conor McCarthy : vkd3d/tests: Revert "Enable on vkd3d the tests for ID3D12CommandQueue::Wait().".
by Alexandre Julliard 20 Jan '22

20 Jan '22

Module: vkd3d Branch: master Commit: 31a1026d3e3405e787e35ec1332557d75eefccb6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=31a1026d3e3405e787e35ec… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 23:40:21 2022 +1000 vkd3d/tests: Revert "Enable on vkd3d the tests for ID3D12CommandQueue::Wait().". This reverts commit 41230b6e763980ad02930213a11336e1358197e3. The tests can hang and the Wait() implementation has issues. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d13afc..82f353a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33303,6 +33303,12 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); + if (!vkd3d_test_platform_is_windows()) + { + skip("Wait() is not implemented yet.\n"); /* FIXME */ + goto skip_tests; + } + /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -33378,6 +33384,7 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); +skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7);

1 0

Paul Gofman : msvcp120: Add ?_Byte_reverse_table@details@Concurrency@@3QBEB data export.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 0b5e587e264c619c8242a4801f4466047d89004a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5e587e264c619c8242a480… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 19 19:50:34 2022 +0300 msvcp120: Add ?_Byte_reverse_table@details@Concurrency@@3QBEB data export. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 26 ++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 269290bbf90..6f868e190a9 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1114,7 +1114,7 @@ @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z @ extern ?_BADOFF@std@@3_JB std_BADOFF -# extern ?_Byte_reverse_table@details@Concurrency@@3QBEB +@ extern ?_Byte_reverse_table@details@Concurrency@@3QBEB byte_reverse_table @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str @ cdecl -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ(ptr) _Yarn_char_c_str diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6bc636c4b1f..9e36071d06a 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -417,6 +417,8 @@ static void (__thiscall *p_vector_base_v4__Internal_resize)( vector_base_v4*, size_t, size_t, size_t, void (__cdecl*)(void*, size_t), void (__cdecl *copy)(void*, const void*, size_t), const void*); +static const BYTE *p_byte_reverse_table; + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -809,6 +811,8 @@ static BOOL init(void) SET(p__Cnd_do_broadcast_at_thread_exit, "_Cnd_do_broadcast_at_thread_exit"); + SET(p_byte_reverse_table, "?_Byte_reverse_table@details@Concurrency@@3QBEB"); + hdll = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(hdll, "setlocale"); p__setmbcp = (void*)GetProcAddress(hdll, "_setmbcp"); @@ -3305,6 +3309,26 @@ static void test_vector_base_v4(void) ok(!vector_alloc_count, "vector_alloc_count = %d, expected 0\n", vector_alloc_count); } +static BYTE byte_reverse(BYTE b) +{ + b = ((b & 0xf0) >> 4) | ((b & 0x0f) << 4); + b = ((b & 0xcc) >> 2) | ((b & 0x33) << 2); + b = ((b & 0xaa) >> 1) | ((b & 0x55) << 1); + return b; +} + +static void test_data_exports(void) +{ + unsigned int i; + + ok(IsBadWritePtr((BYTE *)p_byte_reverse_table, 256), "byte_reverse_table is writeable.\n"); + for (i = 0; i < 256; ++i) + { + ok(p_byte_reverse_table[i] == byte_reverse(i), "Got unexpected byte %#x, expected %#x.\n", + p_byte_reverse_table[i], byte_reverse(i)); + } +} + START_TEST(msvcp120) { if(!init()) return; @@ -3350,6 +3374,8 @@ START_TEST(msvcp120) test_vbtable_size_exports(); + test_data_exports(); + free_expect_struct(); TlsFree(expect_idx); FreeLibrary(msvcp); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 4d91e8c6a17..0de36db8b36 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1114,7 +1114,7 @@ @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z @ extern ?_BADOFF@std@@3_JB msvcp120.?_BADOFF@std@@3_JB -# extern ?_Byte_reverse_table@details@Concurrency@@3QBEB +@ extern ?_Byte_reverse_table@details@Concurrency@@3QBEB msvcp120.?_Byte_reverse_table@details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) msvcp120.?_C_str@?$_Yarn@D@std@@QBAPBDXZ @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) msvcp120.?_C_str@?$_Yarn@D@std@@QBEPBDXZ @ cdecl -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ(ptr) msvcp120.?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ

1 0

Paul Gofman : msvcp110: Add ?_Byte_reverse_table@details@Concurrency@@3QBEB data export.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: f1dce4df90397b1deabdc47aa23bfa88c23d4b32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1dce4df90397b1deabdc47a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 19 19:50:33 2022 +0300 msvcp110: Add ?_Byte_reverse_table@details@Concurrency@@3QBEB data export. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp110/tests/msvcp110.c | 24 ++++++++++++++++++++++++ dlls/msvcp90/details.c | 23 +++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b67bc0bb0ad..514bc90b5e7 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1149,7 +1149,7 @@ @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z @ extern ?_BADOFF@std@@3_JB std_BADOFF -# extern ?_Byte_reverse_table@details@Concurrency@@3QBEB +@ extern ?_Byte_reverse_table@details@Concurrency@@3QBEB byte_reverse_table @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str @ cdecl -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ(ptr) _Yarn_char_c_str diff --git a/dlls/msvcp110/tests/msvcp110.c b/dlls/msvcp110/tests/msvcp110.c index 8491e292d58..75f445e4644 100644 --- a/dlls/msvcp110/tests/msvcp110.c +++ b/dlls/msvcp110/tests/msvcp110.c @@ -37,6 +37,8 @@ static __int64 (__cdecl *p_tr2_sys__Last_write_time_wchar)(WCHAR const*); static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); static void (__cdecl *p_tr2_sys__Last_write_time_set_wchar)(WCHAR const*, __int64); +static const BYTE *p_byte_reverse_table; + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -76,6 +78,7 @@ static BOOL init(void) SET(p_tr2_sys__Last_write_time_set_wchar, "?_Last_write_time@sys@tr2@std@@YAXPB_W_J@Z"); } + SET(p_byte_reverse_table, "?_Byte_reverse_table@details@Concurrency@@3QBEB"); return TRUE; } @@ -205,10 +208,31 @@ static void test_vbtable_size_exports(void) } } +static BYTE byte_reverse(BYTE b) +{ + b = ((b & 0xf0) >> 4) | ((b & 0x0f) << 4); + b = ((b & 0xcc) >> 2) | ((b & 0x33) << 2); + b = ((b & 0xaa) >> 1) | ((b & 0x55) << 1); + return b; +} + +static void test_data_exports(void) +{ + unsigned int i; + + ok(IsBadWritePtr((BYTE *)p_byte_reverse_table, 256), "byte_reverse_table is writeable.\n"); + for (i = 0; i < 256; ++i) + { + ok(p_byte_reverse_table[i] == byte_reverse(i), "Got unexpected byte %#x, expected %#x.\n", + p_byte_reverse_table[i], byte_reverse(i)); + } +} + START_TEST(msvcp110) { if(!init()) return; test_tr2_sys__Last_write_time(); test_vbtable_size_exports(); + test_data_exports(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index e3c3148a133..d2969516af4 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1129,3 +1129,26 @@ void init_concurrency_details(void *base) #endif } #endif + +#if _MSVCP_VER >= 110 +/* ?_Byte_reverse_table@details@Concurrency@@3QBEB */ +const BYTE byte_reverse_table[256] = +{ + 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, + 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, + 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, + 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, + 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, + 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, + 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, + 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, + 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, + 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, + 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, + 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, + 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, + 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, + 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, + 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff, +}; +#endif

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
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 January 2022