June 2021 - Wine-devel - list.winehq.org

[PATCH 2/4] d3dx10/tests: Add texture frame data to test data.
by Ziqing Hui 10 Jun '21

10 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 250 +++++++++++++++++++++++++--------- 1 file changed, 186 insertions(+), 64 deletions(-)

2 1

[PATCH 1/4] d3dx10/tests: Check more members of texture descriptor.
by Ziqing Hui 10 Jun '21

10 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)

2 1

[PATCH] d3dx9: Remove unnecessary call to D3DXMatrixTranspose.
by Connor McAdams 10 Jun '21

10 Jun '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 376b97f5ea6..7033972af36 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1112,7 +1112,6 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, if (inclass == D3DXPC_MATRIX_ROWS && desc->RegisterSet == D3DXRS_BOOL) { D3DXMATRIX mat, *m, min; - D3DXMatrixTranspose(&mat, &min); if (is_pointer) min = *(D3DXMATRIX *)(indata[index / 16]); -- 2.25.1

2 1

[PATCH v2 1/3] hid: Use HID_VALUE_CAPS Reserved2 to store start bit.
by Rémi Bernon 10 Jun '21

10 Jun '21

It's only going to be used for internal HID preparsed data, to save a custom struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix test failures caused by wine_report->bitSize which was updated before setting the StartBit in the previous version. dlls/hid/hidp.c | 20 ++++++++++---------- dlls/hidclass.sys/descriptor.c | 17 ++++++++--------- include/ddk/hidpi.h | 5 +++++ include/wine/hid.h | 1 - 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2933c2ff7ef..4532f656008 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -277,7 +277,7 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT if (value->IsRange && value->Range.UsageMin <= Usage && Usage <= value->Range.UsageMax) { *element = elems[report->elementIdx + i]; - element->valueStartBit += value->BitSize * (Usage - value->Range.UsageMin); + element->caps.StartBit += value->BitSize * (Usage - value->Range.UsageMin); element->bitCount = elems[report->elementIdx + i].caps.BitSize; return HIDP_STATUS_SUCCESS; } @@ -332,7 +332,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag { ULONG rawValue; rc = get_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, &rawValue); + element.caps.StartBit, element.bitCount, &rawValue); if (rc != HIDP_STATUS_SUCCESS) return rc; *UsageValue = logical_to_physical(sign_extend(rawValue, &element), &element); @@ -357,7 +357,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return get_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, UsageValue); + element.caps.StartBit, element.bitCount, UsageValue); } return rc; @@ -381,7 +381,7 @@ NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE Usage if (element.caps.IsRange || element.caps.ReportCount <= 1 || !element.bitCount) return HIDP_STATUS_NOT_VALUE_ARRAY; - return get_report_data_array((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, + return get_report_data_array((BYTE*)Report, ReportLength, element.caps.StartBit, element.bitCount, element.caps.ReportCount, UsageValue, UsageValueByteLength); } @@ -444,7 +444,7 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH { UINT v = 0; NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); + element->caps.StartBit + k, 1, &v); if (rc != HIDP_STATUS_SUCCESS) return rc; found = TRUE; @@ -636,7 +636,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return set_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, UsageValue); + element.caps.StartBit, element.bitCount, UsageValue); } return rc; @@ -661,7 +661,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH if (rc == HIDP_STATUS_SUCCESS) { rc = set_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, -1); + element.caps.StartBit, element.bitCount, -1); } if (rc != HIDP_STATUS_SUCCESS) @@ -869,7 +869,7 @@ NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollect { UINT v = 0; NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); + element->caps.StartBit + k, 1, &v); if (rc != HIDP_STATUS_SUCCESS) return rc; if (v) @@ -952,7 +952,7 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U { UINT v = 0; NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); + element->caps.StartBit + k, 1, &v); if (rc != HIDP_STATUS_SUCCESS) return rc; if (v) @@ -972,7 +972,7 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U { UINT v; NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, &v); + element->caps.StartBit, element->bitCount, &v); if (rc != HIDP_STATUS_SUCCESS) return rc; DataList[uCount].DataIndex = element->caps.NotRange.DataIndex; diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 65c2f9aadae..9cf6f311fca 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -137,12 +137,12 @@ static inline const char *debugstr_hidp_value_caps( HIDP_VALUE_CAPS *caps ) { if (!caps) return "(null)"; return wine_dbg_sprintf( "RId %d, Usg %02x:%02x-%02x Dat %02x-%02x (%d), Str %d-%d (%d), Des %d-%d (%d), " - "Bits %02x, Als %d, Abs %d, Nul %d, LCol %d LUsg %02x:%02x, BitSz %d, RCnt %d, " + "Bits %02x, Als %d, Abs %d, Nul %d, LCol %d LUsg %02x:%02x, BitStrt %d, BitSz %d, RCnt %d, " "Unit %x E%+d, Log %+d-%+d, Phy %+d-%+d", caps->ReportID, caps->UsagePage, caps->Range.UsageMin, caps->Range.UsageMax, caps->Range.DataIndexMin, caps->Range.DataIndexMax, caps->IsRange, caps->Range.StringMin, caps->Range.StringMax, caps->IsStringRange, caps->Range.DesignatorMin, caps->Range.DesignatorMax, caps->IsDesignatorRange, - caps->BitField, caps->IsAlias, caps->IsAbsolute, caps->HasNull, caps->LinkCollection, caps->LinkUsagePage, caps->LinkUsage, caps->BitSize, caps->ReportCount, - caps->Units, caps->UnitsExp, caps->LogicalMin, caps->LogicalMax, caps->PhysicalMin, caps->PhysicalMax ); + caps->BitField, caps->IsAlias, caps->IsAbsolute, caps->HasNull, caps->LinkCollection, caps->LinkUsagePage, caps->LinkUsage, caps->StartBit, + caps->BitSize, caps->ReportCount, caps->Units, caps->UnitsExp, caps->LogicalMin, caps->LogicalMax, caps->PhysicalMin, caps->PhysicalMax ); } static void debug_feature(struct feature *feature) @@ -196,7 +196,7 @@ static void debug_print_report(const char* type, WINE_HIDP_PREPARSED_DATA *data, for (i = 0; i < report->elementCount; i++) { WINE_HID_ELEMENT *elem = elems + report->elementIdx + i; - TRACE("%s: %s, StartBit %d, BitCount %d\n", type, debugstr_hidp_value_caps(&elem->caps), elem->valueStartBit, elem->bitCount); + TRACE("%s: %s, BitCount %d\n", type, debugstr_hidp_value_caps(&elem->caps), elem->bitCount); } TRACE(">>> END Report %i\n",report->reportID); } @@ -589,11 +589,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems return; } - wine_element->valueStartBit = wine_report->bitSize; - - wine_element->bitCount = (feature->caps.BitSize * feature->caps.ReportCount); - wine_report->bitSize += wine_element->bitCount; - wine_element->caps = feature->caps; wine_element->caps.BitField = feature->BitField; wine_element->caps.LinkCollection = feature->collection->index; @@ -601,6 +596,10 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems wine_element->caps.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.IsAbsolute = feature->IsAbsolute; wine_element->caps.HasNull = feature->HasNull; + wine_element->caps.StartBit = wine_report->bitSize; + + wine_element->bitCount = (wine_element->caps.BitSize * wine_element->caps.ReportCount); + wine_report->bitSize += wine_element->bitCount; if (wine_element->caps.IsRange) { diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index fb497f3282f..9da84f38531 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -83,7 +83,12 @@ typedef struct _HIDP_VALUE_CAPS UCHAR Reserved; USHORT BitSize; USHORT ReportCount; +#ifdef __WINESRC__ + USHORT Reserved2[3]; + ULONG StartBit; +#else USHORT Reserved2[5]; +#endif ULONG UnitsExp; ULONG Units; LONG LogicalMin; diff --git a/include/wine/hid.h b/include/wine/hid.h index cfb4f389eb9..0c0d3fdca99 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -33,7 +33,6 @@ typedef struct __WINE_ELEMENT { - UINT valueStartBit; UINT bitCount; HIDP_VALUE_CAPS caps; } WINE_HID_ELEMENT; -- 2.31.0

1 3

[PATCH 1/5] hid: Check preparsed data magic in HidP_GetLinkCollectionNodes.
by Rémi Bernon 10 Jun '21

10 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index a7003717a21..2933c2ff7ef 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -1001,6 +1001,9 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkColle TRACE("(%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (*LinkCollectionNodeLength < data->caps.NumberLinkCollectionNodes) return HIDP_STATUS_BUFFER_TOO_SMALL; -- 2.31.0

2 8

[RFC] A Light Blue theme.
by Zhiyi Zhang 10 Jun '21

10 Jun '21

Hi all, I've been working on theming support for Wine for awhile now. Part of the work is to create a .msstyles file so that UI controls can look better instead of that Win95 look. Now I think it has reached a point where it's good enough for you to try it. The Light Blue theme contains two visual styles. One is Classic Blue and the other is Blue. Classic Blue is a visual style that changes only the system colors and doesn't contain any bitmaps for UI controls. So it still uses the unthemed rendering code path. Blue is a visual style that contains bitmaps for UI controls so it no longer has that Win95-ish look. To install the theme, download attached light.zip and install light.msstyles via winecfg. The patches are on top of Wine 6.10 aadcff4. More in development theme work is at https://github.com/zzhiyi/wine/commits/dev, For example, hooking nonclient scrollbar in user32 to uxtheme. Theming support for Wine still need more fixes. So even with this theme file, some controls may still render poorly/incorrectly. Below is a non-exhaustive list of the theming problems I know of. Some of them are HiDPI issues, some are because of themed rendering is not implemented. Let me know if you encounter any other issues or have suggestions, specifically, regarding the theme file light.msstyles. Enjoy! Zhiyi Known theme issues: 1. Themed explorer support is not implemented, so startmenu, taskbar, titlbar are not themed. 2. Nonclient area theming support is not implemented. 3. Taskdialog theming support is not implemented 4. Unthemed system metrics are not restored after disabling theme, e.g., IconTitleFont after disabling theme 5. Comctl32 v6 should be loaded in some cases even if there is no comctl32 v6 manifest in applications. 6. Winecfg should close current theme before copying a new theme because the name may be the same. 7. When using comctl32 v5, scrollbars and dialogs should not be themed. 8. Trackbar has wrong background color when themed. 9. In Winecfg desktop integration tab, the postion of size updown buttons change after theme changes. 10. Spy++ toolbar icons has dots and black artifacts 11. Changing theme in winecfg doesn't affect windows in other processes in runtime 12. Application title bar is inactive on launch when not using window manager decoration 13. Combox button doesn't stay pressed after clicking and moving mouse the the dropdown menu 14. Select toolbar in controlspy, resize control spy to a larger size. scrollbar doesn't get repaint 15. Treeview in controlspy, expanded Planets still has old background 16. Trackbar adding style TBS_BOTH doesn't repaint on Wine, repaints on Windows 17. Stutter when moving the thumb of trackbar, even if no theme is active 18. EDIT_WM_Paint() should use themed paint. 19. Buttons and edits in dialogs are not themed 20. Tooltip ballon shape is incorrect 21. Theme may not be updated on wineprefix upgrade. Known HiDPI issues: 1. Status Bar in control spy v6 when HiDPI is on, the purple triangle doesn't get enough space 2. Syslink no address is showed, DPI 192 3. Command links no text on HiDPI 4. In file selection dialog folder name size is not the same when showed in preview and in selected mode

3 7

[PATCH] user32: Replace data_looks_unicode with RtlIsTextUnicode.
by Haidong Yu 10 Jun '21

10 Jun '21

2 1

[PATCH 6/6] wineboot: Enable visual styles.
by Zhiyi Zhang 10 Jun '21

10 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/wineboot/wineboot.manifest | 16 ++++++++++++++++ programs/wineboot/wineboot.rc | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 programs/wineboot/wineboot.manifest diff --git a/programs/wineboot/wineboot.manifest b/programs/wineboot/wineboot.manifest new file mode 100644 index 00000000000..6e5892ae6ac --- /dev/null +++ b/programs/wineboot/wineboot.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Wineboot" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 93083c32b36..898926203db 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -45,3 +45,6 @@ BEGIN LTEXT "The Wine configuration in %s is being updated, please wait...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END + +/* @makedep: wineboot.manifest */ +1 RT_MANIFEST wineboot.manifest -- 2.30.2

1 0

[PATCH 5/6] view: Enable visual styles.
by Zhiyi Zhang 10 Jun '21

10 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/view/Makefile.in | 2 +- programs/view/resource.h | 1 + programs/view/view.c | 3 +++ programs/view/view.manifest | 16 ++++++++++++++++ programs/view/view.rc | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 programs/view/view.manifest diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 7e9ff33e2d1..ce55999c1a9 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -1,5 +1,5 @@ MODULE = view.exe -IMPORTS = comdlg32 user32 gdi32 +IMPORTS = comdlg32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/view/resource.h b/programs/view/resource.h index 1cfaf5fca11..76f940d1fad 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -17,6 +17,7 @@ */ #include <windef.h> +#include <winuser.h> #define IDS_DESCRIPTION 2 #define IDS_OPEN_META_STRING 3 diff --git a/programs/view/view.c b/programs/view/view.c index ad29734828b..1e5c7daa8cf 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -17,6 +17,7 @@ */ #include <windows.h> +#include <commctrl.h> #include <commdlg.h> #include <stdio.h> @@ -403,6 +404,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd { MSG msg; + InitCommonControls(); + /* Other instances of app running? */ if (!hPrevInstance) { diff --git a/programs/view/view.manifest b/programs/view/view.manifest new file mode 100644 index 00000000000..198ffbfc055 --- /dev/null +++ b/programs/view/view.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.View" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/view/view.rc b/programs/view/view.rc index 39971dd555f..19a778c8036 100644 --- a/programs/view/view.rc +++ b/programs/view/view.rc @@ -48,3 +48,6 @@ BEGIN IDS_DESCRIPTION "Regular Metafile Viewer" IDS_OPEN_META_STRING "Metafiles (*.wmf, *.emf)" END + +/* @makedep: view.manifest */ +1 RT_MANIFEST view.manifest -- 2.30.2

1 0

[PATCH 4/6] taskmgr: Enable visual styles.
by Zhiyi Zhang 10 Jun '21

10 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/taskmgr/taskmgr.c | 2 ++ programs/taskmgr/taskmgr.manifest | 16 ++++++++++++++++ programs/taskmgr/taskmgr.rc | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 programs/taskmgr/taskmgr.manifest diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index e71d4c9ee9d..d779e5d893a 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -999,6 +999,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HANDLE hToken; TOKEN_PRIVILEGES tkp; + InitCommonControls(); + /* Initialize global variables */ hInst = hInstance; diff --git a/programs/taskmgr/taskmgr.manifest b/programs/taskmgr/taskmgr.manifest new file mode 100644 index 00000000000..b93212bc931 --- /dev/null +++ b/programs/taskmgr/taskmgr.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Taskmgr" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index ffd0699f80d..ccabf34477e 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -571,6 +571,9 @@ END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: taskmgr.manifest */ +1 RT_MANIFEST taskmgr.manifest + /* Icon */ -- 2.30.2

1 0