- wine-devel - winehq.org

[PATCH 0/1] MR172: dlls/win32u: fix gcc12's warnings (UB)
by eric pouech (＠epo) 16 Jun '22

16 Jun '22

GCC12.* emits tons of warnings when compiling win32'u sysparam bits These warnings stem from: - a union of different structures - allocating one instance of these structure and casting its address to a pointer to the union. This is UB as the whole union should be allocated in order to be a valid object. I tried to keep the original goals: - don't overallocate individual structures - have an OO design (and avoid casting back & forth arguments in methods) and implemented this fix by transforming (as argument to most of the methods) - a pointer to an union of structs into - an union (passed by value) of pointers to structs Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/172

3 4

[PATCH v4 0/6] MR73: Improvement in PDB's types record handling
by eric pouech (＠epo) 16 Jun '22

16 Jun '22

This serie tackles several issues encountered while loading PDB files through dbghelp. It happens that PDB allows to have several type records for user defined types (struct / enums) with the same name. This seems to be generated by a) compiler (when modifying a structure definition between several compilation phases), b) the incremental linker (likely an optimisation of previous case, but not 100% certain when it's triggered). Wine's dbghelp ended up not picking the right record, hence generating errneous outputs. This series: - cleans up some PDB related code - update winedump to display the PDB hash table internals - fixes dbghelp to preserve in Wine's dbghelp hash table the partial order between type records of same name. v2: - rebased - removed a bunch of stray comments -- v4: dlls/dbghelp{pdb}: use remap table from PDB hash stream dlls/dbghelp{pdb}: ensure dbghelp's list order in hash table matches PDB's dlls/dbghelp{pdb}: clearly separate the type loading into two passes include/wine/mscvpdb.h: redefine property with bitfields dlls/dbghelp{pdb}: rely on first/last index from type header tools/winedump{pdb}: explore a bit more TPI hash elements https://gitlab.winehq.org/wine/wine/-/merge_requests/73

2 8

[PATCH 0/3] MR224: Fix GCC12 warnings
by eric pouech (＠epo) 16 Jun '22

16 Jun '22

Fixes a couple of warnings emitted by GCC12 compiler -- https://gitlab.winehq.org/wine/wine/-/merge_requests/224

2 4

Wiki guidance on taking function prototypes from ReactOS
by Alex Henrie 16 Jun '22

16 Jun '22

Yesterday I came across a bug report [1] with an attached patch to stub out the function RtlGetFullPathName_UEx, which is not documented by Microsoft, based on its prototype in ReactOS. Alexandre left the comment: [2] "You should not look at ReactOS code at all, a lot of it is reverse-engineered using methods that are not appropriate for Wine. It's not a usable source of information for us." The patch author, Ben, replied: [3] "I just want the WIKI to be MUCH more definitive/precise on what IS and IS NOT allowed." I took a look and as it currently stands, the wiki clearly encourages collaboration with ReactOS in at least one place: [4] "If you're still resisting the switch to unix for some reason though, you may have some luck investigating ReactOS (they cooperate with us on API issues too)." And it clearly discourages collaboration with ReactOS in at least one place: [5] "it appears that all such documentation is derived from ReactOS, which is not considered a legally safe source for use in Wine." Mention of ReactOS is conspicuously absent from the page that outlines Wine's "clean room" guidelines. [6] Since Alexandre says that Wine developers shouldn't look at ReactOS code at all, I think we should remove from the wiki all references that might be construed to encourage it and add some more that discourage it. Does anyone have any further thoughts before I start editing? -Alex [1] https://bugs.winehq.org/show_bug.cgi?id=50464 [2] https://bugs.winehq.org/show_bug.cgi?id=50464#c6 [3] https://bugs.winehq.org/show_bug.cgi?id=50464#c7 [4] https://wiki.winehq.org/Cygwin_and_More [5] https://wiki.winehq.org/AFD [6] https://wiki.winehq.org/Clean_Room_Guidelines

2 1

[PATCH 0/1] MR256: ntdll: Do not open directory file when setting the same directory path.
by Paul Gofman (＠gofman) 16 Jun '22

16 Jun '22

Fixes The Rising of The Shield Hero: Relieve the Animation hangs on start (and maybe something else with ENIGMA protector). The protector implements virtual file system which hotpatches a lot of file related functions, in particular, NtOpenFile(). When NtOpenFile() is called from RtlSetCurrentDirectory_U() with peb lock held the hotpatcher takes its own lock and that can deadlock with other threads performing file / path operations ending up in get_full_path_helper() which also takes PEB lock. Once the hotpatcher is initialized the game only sets "." or the same full path as current and may do that rather often. It seems that reopening the file handle for the same directory is redundant anyway, so probably makes sense to just avoid that part. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/256

3 2

[PATCH 0/4] MR233: win32u: Partially move raw input APIs.
by Zebediah Figura (＠zfigura) 16 Jun '22

16 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/233

5 26

[PATCH v4 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux
by Alex Henrie (＠alexhenrie) 16 Jun '22

16 Jun '22

Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v4: ntdll: Don't hard-code the battery and AC adapter names on Linux https://gitlab.winehq.org/wine/wine/-/merge_requests/134

2 3

[PATCH v2 0/5] MR131: wined3d: Introduce wined3d_device_check_format_support().
by Chip Davis (＠cdavis5e) 15 Jun '22

15 Jun '22

Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> -- v2: wined3d: Record format UAV capabilities. d3d11: Support D3D11_FEATURE_FORMAT_SUPPORT2. d3d11: Support D3D11_FEATURE_FORMAT_SUPPORT. d3d11: Reimplement ID3D11Device::CheckFormatSupport() using wined3d_device_check_format_support(). wined3d: Introduce wined3d_device_check_format_support(). https://gitlab.winehq.org/wine/wine/-/merge_requests/131

6 16

[PATCH v6 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource
by Alistair Leslie-Hughes (＠alesliehughes) 15 Jun '22

15 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v6: d3drm: Pass all D3DRM_LOAD* flags directly through to CreateEnumObject() in IDirect3DRMMeshBuilder3::Load(). https://gitlab.winehq.org/wine/wine/-/merge_requests/167

4 3

[PATCH 0/1] MR254: winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float.
by Sebastián Aedo (＠saedo) 15 Jun '22

15 Jun '22

Some processes use very naive string matching when detecting extensions, for example, Cossacks III checks if the extension is "contained" in the current extension is checking, causing that `WGL_ARB_pixel_format` is contained in `WGL_ARB_pixel_format_float`, but it ends up with the flag deactivated because they aren't the same. This makes it consistent with the behavior on winemac.drv/opengl.c too. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/254

2 1

[PATCH 1/4] httpapi/tests: Move sleep statement.
by Julian Klemann 15 Jun '22

15 Jun '22

The mentioned bug randomly occurred after some subsequent patches, so the sleep should happen before GetOverlappedResult is called. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- dlls/httpapi/tests/httpapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index be1d31c12ad..9d344f26d02 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -228,10 +228,6 @@ static void test_v1_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); - ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %lu.\n", GetLastError()); - ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); - /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 * version 1507, but probably affecting others) suffer from a bug where the * kernel will report success before completely filling the buffer or @@ -239,6 +235,10 @@ static void test_v1_server(void) * around this. */ Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); ok(req->RequestId, "Expected nonzero connection ID.\n"); -- 2.36.1

2 7

[PATCH v5 0/3] MR247: uiautomationcore: Add basic IAccessible2 support.
by Connor McAdams (＠cmcadams) 15 Jun '22

15 Jun '22

I'm not sure if there's a 'correct' way to import headers from another project, so this might need some work. -- v5: uiautomationcore: Add basic IAccessible2 support. ia2comproxy: Introduce new proxy stub DLL for IAccessible2. include: Import IAccessible2 headers. https://gitlab.winehq.org/wine/wine/-/merge_requests/247

3 4

Re: [PATCH v5 0/6] MR228: d3dx: improvements to texture creation functions - approved
by Alexandre Julliard (＠julliard) 15 Jun '22

15 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228

1 0

Re: [PATCH v5 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers. - approved
by Alexandre Julliard (＠julliard) 15 Jun '22

15 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/212

1 0

Re: [PATCH v2 0/8] MR250: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) 15 Jun '22

15 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/250

1 0

Re: [PATCH v2 0/3] MR251: cryptnet: - approved
by Alexandre Julliard (＠julliard) 15 Jun '22

15 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/251

1 0

[PATCH v3 0/9] MR180: misc: Fixes and workarounds for UAF warnings. (GCC12)
by Rémi Bernon (＠rbernon) 15 Jun '22

15 Jun '22

The mscoree one is a genuine UAF bug, other are more arguably false positive but GCC doesn't like freed pointer value to be used in any way. -- v3: server: Avoid using pointer value after realloc. d3drm: Avoid using pointer value after free. dsound: Avoid using pointer value after free. notepad: Avoid using pointer value after free. msi: Avoid using pointer value after free. user32/tests: Workaround use after free warnings. oleaut32/tests: Workaround use after free warnings. mshtml/tests: Avoid using pointer value after free. mscoree: Avoid using pointer after free. https://gitlab.winehq.org/wine/wine/-/merge_requests/180

3 10

Re: [PATCH v2 0/1] MR245: iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found. - approved
by Alexandre Julliard (＠julliard) 15 Jun '22

15 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/245

1 0

[PATCH v3 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux
by Alex Henrie (＠alexhenrie) 15 Jun '22

15 Jun '22

Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v3: ntdll: Don't hard-code the battery and AC adapter names on Linux https://gitlab.winehq.org/wine/wine/-/merge_requests/134

4 5

[PATCH v4 0/3] MR247: uiautomationcore: Add basic IAccessible2 support.
by Connor McAdams (＠cmcadams) 15 Jun '22

15 Jun '22

I'm not sure if there's a 'correct' way to import headers from another project, so this might need some work. -- v4: uiautomationcore: Add basic IAccessible2 support. https://gitlab.winehq.org/wine/wine/-/merge_requests/247

3 5

[PATCH v4 0/6] MR228: d3dx: improvements to texture creation functions
by Piotr Caban (＠piotr) 15 Jun '22

15 Jun '22

- support HRESULT parameter in D3DX10CreateTextureFrom* - implement D3DX10CreateAsyncTextureProcessor -- v4: d3dx10/tests: Add D3DX10CreateAsyncTextureProcessor tests. d3dx10: Add D3DX10CreateAsyncTextureProcessor implementation. d3dx10: Add D3DX10CreateAsyncTextureProcessor stub. d3dx10: Exit early on volume textures in D3DX10CreateTextureFromMemory. https://gitlab.winehq.org/wine/wine/-/merge_requests/228

3 8

[PATCH v3 0/3] MR247: uiautomationcore: Add basic IAccessible2 support.
by Connor McAdams (＠cmcadams) 15 Jun '22

15 Jun '22

I'm not sure if there's a 'correct' way to import headers from another project, so this might need some work. -- v3: uiautomationcore: Add basic IAccessible2 support. ia2comproxy: Introduce new proxy stub DLL for IAccessible2. include: Import IAccessible2 headers. https://gitlab.winehq.org/wine/wine/-/merge_requests/247

3 6

Re: [PATCH v4 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers. - approved
by Zebediah Figura (＠zfigura) 15 Jun '22

15 Jun '22

This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/212

1 0

[PATCH] include: Remove duplicate ICodecAPI::GetParameterValues function
by Andrew Eikum 15 Jun '22

15 Jun '22

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- include/icodecapi.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/include/icodecapi.idl b/include/icodecapi.idl index 7954b3fc2f6..dc31daf2e2c 100644 --- a/include/icodecapi.idl +++ b/include/icodecapi.idl @@ -42,7 +42,6 @@ interface ICodecAPI : IUnknown HRESULT GetParameterRange ([in] const GUID *api, [out] VARIANT *min, [out] VARIANT *max, [out] VARIANT *delta); HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); - HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); HRESULT GetDefaultValue ([in] const GUID *api, [out] VARIANT *value); HRESULT GetValue ([in] const GUID *api, [out] VARIANT *value); -- 2.36.1

1 0

[PATCH 0/1] MR249: include: Emit CFI directives when building on Mac with gcc.
by Stefan Dösinger (＠stefan) 15 Jun '22

15 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53157 Building with FSF gcc on mac is possible and the only way to get a --without-mingw build since clang does not support -mabi=ms. (Some hacks are needed to build winemac.drv.so though.) Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- No, FSF gcc on macos does not define __GCC_HAVE_DWARF2_CFI_ASM. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/249

3 3

[tools 0/6] Known failures tracking
by Francois Gouget 15 Jun '22

15 Jun '22

This patchset provides support for tracking known failures in the TestBot results. The main goal is to avoid false positives but there are some side benefits as well: * The job reports sent to developers link to the relevant WineHQ bugs which gives them more exposure and may help get them fixed faster. * The failure details pages will eventually link to all the tasks where the failure happened, which could be valuable to find patterns. * The failure page tracks when it was last seen. This simplifies spotting bugs which are fixed and could be closed. (Or failures where the regular expression needs to be updated / fixed) The patchset mostly follows the scheme described in bug 48912: https://bugs.winehq.org/show_bug.cgi?id=48912 There are some differences though: * The bug envisionned this scheme purely as a blacklist to avoid false positives. The implementation can certainly be used in this way but it is not limited to failures that cause false positives. Tracking other failures can provide the side benefits mentionned above. The only limit is the maintenance work required to track more failures. * As a consequence the FailureBlacklist class was renamed to Failure, and the FailureBlacklistUses was renamed to TaskFailures since it links Tasks with the related Failures. * The FailureBlacklistVMs purpose is not really described in the bug but I think the goal was to provide a way to deckare that the failure is expected to only happen on specific test configurations. Instead the Failures class has a ConfigRegExp regular expression which specifies which test configurations the failure applies to. The test 'configuration name' is of the form 'VM:logfile' which allows matching specific Windows versions (thanks to the TestBot VM naming scheme), specific Windows locales (part of the VM name), specific bitnesses (part of the log filename), or specific Wine locales (part of the log filename). For instance: ^w8 -> all Windows 8 VMs :exe -> all Windows tests (exe32.report and exe64.report) ^w10.*_ja.*: -> all Windows 10 Japanese test configurations win|wow -> all Wine test configurations (win32.report, ...) (win|wow).*_fr -> French Wine test configurations * Changes in FailureBlacklists -> Failures - Primary key: (Bug, TestModule, TestUnit) -> Id Some issues generate quite a few failures. So in case trying to match them all results in a regular expression that's too long (either because of the database limit or for readability), this change makes it possible to add multiple Failure objects to track them all. - TestModule -> ErrorGroup The .errors files split the errors in groups. Each group corresponds to a test module, but extra errors (too much output, missing summary lines, etc) are in a separate group. So I renamed TestModule to ErrorGroup as a reminder to the coder that this is meant to match the .errors group names, not just test modules. - Name -> (BugStatus, BugDescription) Instead of having a name describing the failure, this patchset uses the corresponding WineHQ bug description. The TestBot also retrieves the bug status which allows checking that closed bugs dont happen anymore, or open bugs that should be closed. - LastUsed -> (LastNew, LastOld) The LastUse field was split into LastNew and LastOld to track whether the failure would cause false positives without the known failures support. * Changes in FailureBlacklistUses -> TaskFailures - (Bug, TestModule, TestUnit) -> FailureId This is a consequence of the Failure primary key change described above. - () -> (TaskLog) This allows tracking which task log the failure was found in. This is quite important for Wine tasks since they run all the test configurations in just one task. - () -> (NewCount, OldCount) This provides a count of matching failures and whether they would have been tagged as old or new without this patchset. This provides a quick way to know whether there is the same number of failures every time or whether the number of failures changes from one run to the next. It also provides a quick way to know how many failures to look for when jumping to the log. Francois Gouget (6): testbot: Add tables to track the test failures. testbot/web: Add pages to add, edit and show known failures. testbot: Match the failures with the test logs. testbot/web: Link job details to the related known failures. testbot/WineSendLog: Take into account the known failures. testbot/UpdateFailures: Add a script to refresh the failures' bug information. testbot/bin/UpdateFailures.pl | 192 ++++++ testbot/bin/WineSendLog.pl | 78 ++- testbot/ddl/update47.sql | 33 + testbot/ddl/winetestbot.sql | 32 + testbot/doc/INSTALL.txt | 5 + testbot/doc/winetestbot-schema.dia | 852 +++++++++++++++++++++--- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/lib/WineTestBot/Config.pm | 6 +- testbot/lib/WineTestBot/Failures.pm | 184 +++++ testbot/lib/WineTestBot/Jobs.pm | 6 + testbot/lib/WineTestBot/LogUtils.pm | 180 ++++- testbot/lib/WineTestBot/TaskFailures.pm | 120 ++++ testbot/lib/WineTestBot/Tasks.pm | 4 + testbot/web/FailureDetails.pl | 119 ++++ testbot/web/FailuresList.pl | 160 +++++ testbot/web/JobDetails.pl | 54 +- testbot/web/WineTestBot.css | 3 + 17 files changed, 1907 insertions(+), 122 deletions(-) create mode 100755 testbot/bin/UpdateFailures.pl create mode 100644 testbot/ddl/update47.sql create mode 100644 testbot/lib/WineTestBot/Failures.pm create mode 100644 testbot/lib/WineTestBot/TaskFailures.pm create mode 100644 testbot/web/FailureDetails.pl create mode 100644 testbot/web/FailuresList.pl -- 2.30.2

1 6

[PATCH v4 0/1] MR190: shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail).
by Jinoh Kang (＠iamahuman) 15 Jun '22

15 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52673 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v4: shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail). https://gitlab.winehq.org/wine/wine/-/merge_requests/190

3 2

[PATCH v3 0/6] MR228: d3dx: improvements to texture creation functions
by Piotr Caban (＠piotr) 15 Jun '22

15 Jun '22

- support HRESULT parameter in D3DX10CreateTextureFrom* - implement D3DX10CreateAsyncTextureProcessor -- v3: d3dx10/tests: Add D3DX10CreateAsyncTextureProcessor tests. d3dx10: Add D3DX10CreateAsyncTextureProcessor implementation. d3dx10: Add D3DX10CreateAsyncTextureProcessor stub. d3dx10: Exit early on volume textures in D3DX10CreateTextureFromMemory. d3dx10/tests: Add D3DX10CreateTextureFromMemory HRESULT argument tests. d3dx10: Don't ignore HRESULT parameter in D3DX10CreateTextureFromMemory. https://gitlab.winehq.org/wine/wine/-/merge_requests/228

3 9

[PATCH 0/8] MR250: win32u: user32 conversion
by Jacek Caban (＠jacek) 15 Jun '22

15 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/250

4 14

[PATCH v2 0/3] MR247: uiautomationcore: Add basic IAccessible2 support.
by Connor McAdams (＠cmcadams) 15 Jun '22

15 Jun '22

I'm not sure if there's a 'correct' way to import headers from another project, so this might need some work. -- v2: uiautomationcore: Add basic IAccessible2 support. ia2comproxy: Introduce new proxy stub DLL for IAccessible2. include: Import IAccessible2 headers. https://gitlab.winehq.org/wine/wine/-/merge_requests/247

4 8

[PATCH 0/3] MR247: uiautomationcore: Add basic IAccessible2 support.
by Connor McAdams (＠cmcadams) 15 Jun '22

15 Jun '22

I'm not sure if there's a 'correct' way to import headers from another project, so this might need some work. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/247

3 8

[PATCH 0/3] MR251: cryptnet:
by Hans Leidekker (＠hans) 15 Jun '22

15 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/251

2 3

[PATCH v2 0/6] MR228: d3dx: improvements to texture creation functions
by Piotr Caban (＠piotr) 15 Jun '22

15 Jun '22

- support HRESULT parameter in D3DX10CreateTextureFrom* - implement D3DX10CreateAsyncTextureProcessor -- v2: d3dx10/tests: Add D3DX10CreateAsyncTextureProcessor tests. d3dx10: Add D3DX10CreateAsyncTextureProcessor implementation. d3dx10: Add D3DX10CreateAsyncTextureProcessor stub. d3dx10: Exit early on volume textures in D3DX10CreateTextureFromMemory. https://gitlab.winehq.org/wine/wine/-/merge_requests/228

3 17

[PATCH v2 0/1] MR190: shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail).
by Jinoh Kang (＠iamahuman) 15 Jun '22

15 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52673 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail). https://gitlab.winehq.org/wine/wine/-/merge_requests/190

3 2

Re: [PATCH v2 0/1] MR248: winhttp: Release object on allocation failure. - closed
by Hans Leidekker (＠hans) 15 Jun '22

15 Jun '22

This merge request was closed by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/248

1 0

[PATCH 0/1] MR248: winhttp: Release object on allocation failure.
by Hans Leidekker (＠hans) 15 Jun '22

15 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/248

2 1

[PATCH v2 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux
by Alex Henrie (＠alexhenrie) 15 Jun '22

15 Jun '22

Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v2: ntdll: Don't hard-code the battery and AC adapter names on Linux https://gitlab.winehq.org/wine/wine/-/merge_requests/134

4 5

[PATCH 0/1] MR245: iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found.
by Paul Gofman (＠gofman) 15 Jun '22

15 Jun '22

Fixes SCP: Secret Laboratory crash on launch after recent game update. Windows normally returns some entries even if there is no active network connection. I however was able to test no data case on the up to date Windows 10 by disabling all the network adapters and clearing arp cache with 'arp -d *'. So GetIpNetTable() returns ERROR_INSUFFICIENT_BUFFER when called without buffer (first time in test) with some excessive buffer size. But then when called with the buffer it returns ERROR_NO_DATA and sets number of entries in the table to 0. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/245

3 2

[PATCH v3 1/5] d2d1/tests: Add more test xml.
by Ziqing Hui 15 Jun '22

15 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 120 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..970706bc569 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -99,6 +99,17 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_inputs_attribute = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs min='1' max='10' deadbeef='abcdef'/> \ + </Effect> \ +"; + static const WCHAR *effect_xml_without_version = L"<Effect> \ <Property name='DisplayName' type='string'/> \ @@ -170,6 +181,90 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_wrong_type = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='uint32' value='32'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_duplicate_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_effect = +L"<?xml version='1.0'?> \ + <effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </effect> \ +"; + +static const WCHAR *effect_xml_lower_case_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <property name='DisplayName' type='string'/> \ + <property name='Author' type='string'/> \ + <property name='Category' type='string'/> \ + <property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_inputs = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_a = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='MinInputs' type='uint32' value='1'/> \ + <Property name='MaxInputs' type='uint32' value='2'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_b = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs> \ + <Property name='Min' type='uint32' value='1'/> \ + <Property name='Max' type='uint32' value='2'/> \ + </Inputs> \ + </Effect> \ +"; + + static const DWORD test_vs[] = { #if 0 @@ -10604,10 +10699,11 @@ static void test_effect_register(BOOL d3d11) } xml_tests[] = { - {effect_xml_a, S_OK}, - {effect_xml_b, S_OK}, - {effect_xml_c, S_OK}, - {effect_xml_minimum, S_OK}, + {effect_xml_a, S_OK}, + {effect_xml_b, S_OK}, + {effect_xml_c, S_OK}, + {effect_xml_minimum, S_OK}, + {effect_xml_inputs_attribute, S_OK}, {effect_xml_without_version, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, {effect_xml_without_inputs, E_INVALIDARG}, {effect_xml_without_name, E_INVALIDARG}, @@ -10615,6 +10711,13 @@ static void test_effect_register(BOOL d3d11) {effect_xml_without_category, E_INVALIDARG}, {effect_xml_without_description, E_INVALIDARG}, {effect_xml_without_type, E_INVALIDARG}, + {effect_xml_wrong_type, E_INVALIDARG}, + {effect_xml_duplicate_property, E_INVALIDARG}, + {effect_xml_lower_case_effect, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_property, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_inputs, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_min_max_inputs_a, E_INVALIDARG}, + {effect_xml_min_max_inputs_b, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, }; const D2D1_PROPERTY_BINDING binding[] = @@ -10926,10 +11029,11 @@ static void test_effect_properties(BOOL d3d11) } system_property_tests[] = { - {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_inputs_attribute, L"", L"" ,L"", L"", 0, 0}, }; if (!init_test_context(&ctx, d3d11)) -- 2.25.1

2 6

[PATCH v6 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl (＠besentv) 14 Jun '22

14 Jun '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v6: windows.media.speech: Add stub ISpeechSynthesisStream iface. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. windows.media.speech/tests: Add basic tests for ssml/text to stream functions. windows.media.speech/tests: Handle a possible race condition. windows.media.speech/tests: Remove a useless thread id trace. include/windows.media.speechsynthesis.idl: Update file to newer formatting. include/windows.media.idl: Move IMediaMarker collections from speechsynthesis. include/windows.media.idl: Update file to newer formatting. https://gitlab.winehq.org/wine/wine/-/merge_requests/217

4 15

Re: [PATCH v3 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches. - approved
by Alexandre Julliard (＠julliard) 14 Jun '22

14 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/241

1 0

Re: [PATCH v2 0/1] MR243: winhttp: Fix default port corner cases in WinHttpCrackUrl(). - approved
by Alexandre Julliard (＠julliard) 14 Jun '22

14 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/243

1 0

Re: [PATCH v3 0/5] MR240: win32u: menu conversion - approved
by Alexandre Julliard (＠julliard) 14 Jun '22

14 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/240

1 0

Re: [PATCH v2 0/6] MR226: winegstreamer: Leave stream_cs when calling the async reader callbacks. - approved
by Alexandre Julliard (＠julliard) 14 Jun '22

14 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/226

1 0

Re: [PATCH v2 0/1] MR149: user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity). - approved
by Alexandre Julliard (＠julliard) 14 Jun '22

14 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/149

1 0

[PATCH 0/1] MR246: Allow renaming a file/directory to a different case of itself
by Gabriel Ivăncescu (＠insn) 14 Jun '22

14 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/246

2 1

[PATCH v5 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl (＠besentv) 14 Jun '22

14 Jun '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v5: windows.media.speech: Add stub ISpeechSynthesisStream iface. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. windows.media.speech/tests: Add basic tests for ssml/text to stream functions. windows.media.speech/tests: Handle a possible race condition. windows.media.speech/tests: Remove a useless thread id trace. include/windows.media.speechsynthesis.idl: Update file to newer formatting. include/windows.media.idl: Move IMediaMarker collections from speechsynthesis. include/windows.media.idl: Update file to newer formatting. https://gitlab.winehq.org/wine/wine/-/merge_requests/217

3 10

[PATCH 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used
by Paul Gofman (＠gofman) 14 Jun '22

14 Jun '22

Other drawable types are ref counted and destroyed only when nothing (e. g., existing contexts) reference them anymore, making sure that if we have a context referencing drawable the GLX drawable is still valid. That was probably left behind for PBuffers. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/244

2 2

[tools] testbot/WineSendLog: Tweak the job report emails.
by Francois Gouget 14 Jun '22

14 Jun '22

Don't assume that jobs coming from the patches website necessarily have a sender email address. Update the patches website in all cases. Also mark a patch as failed in the patches website when the job has skipped tasks or TestBot errors. Clearly identify the new failures in the report sent to the developer. Provide more details about the job result, particularly TestBot errors, the presence of skipped tasks, and consequences. Call for help fixing preexisting failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 340 ++++++++++++++++++++++++------------- testbot/tests/TestWTBS | 7 +- 2 files changed, 226 insertions(+), 121 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 9351d5d6f..3897ac034 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -173,146 +173,220 @@ sub SendLog($) { my ($Job) = @_; - my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); - if (! defined($To)) - { - return; - } - - my $StepsTasks = CreateStepsTasks(undef, $Job); - my $SortedStepsTasks = $StepsTasks->GetSortedItems(); - - my $JobURL = MakeOfficialURL("/JobDetails.pl?Key=". $Job->GetKey()); - - # - # Send a job summary and all the logs as attachments to the developer + # Collect and count the new and old failures, etc. # - Debug("-------------------- Developer email --------------------\n"); - my $Sendmail; - if ($Debug) - { - open($Sendmail, ">>&=", 1); - } - else - { - open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); - } - print $Sendmail "From: $RobotEMail\n"; - print $Sendmail "To: $To\n"; - my $Subject = "TestBot job " . $Job->Id . " results"; - my $Description = $Job->GetDescription(); - if ($Description) - { - $Subject .= ": " . $Description; - } - print $Sendmail "Subject: $Subject\n"; - if ($Job->Patch and $Job->Patch->MessageId) - { - print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; - print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; - } + my (@New, $JobInfo); + my ($NewCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0); + my $FileType = "test executable"; - print $Sendmail "\n"; - print $Sendmail "VM Status Failures Command\n"; + my $StepsTasks = CreateStepsTasks(undef, $Job); + my $SortedStepsTasks = $StepsTasks->GetSortedItems(); foreach my $StepTask (@$SortedStepsTasks) { - my $TestFailures = $StepTask->TestFailures; - $TestFailures = "" if (!defined $TestFailures); - my $Status = $StepTask->Status; - $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); - my $Cmd = ""; - $Cmd = $StepTask->FileName ." " if ($StepTask->FileType =~ /^exe/); - $Cmd .= $StepTask->CmdLineArg if (defined $StepTask->CmdLineArg); - - printf $Sendmail "%-20s %-8s %-8s %s\n", $StepTask->VM->Name, $Status, - $TestFailures, $Cmd; - } - - print $Sendmail "\nThe full results can be found at:\n$JobURL\n\n"; + if ($StepTask->Status =~ /^(?:canceled|skipped)$/) + { + $NotRun++; + next; + } - # Print the job summary - my $JobErrors; - foreach my $StepTask (@$SortedStepsTasks) - { - my $Id = $StepTask->Id; my $TaskDir = $StepTask->GetTaskDir(); my $LogNames = GetLogFileNames($TaskDir); - $JobErrors->{$Id}->{LogNames} = $LogNames; + $JobInfo->{$StepTask->Id}->{LogNames} = $LogNames; + $JobInfo->{$StepTask->Id}->{NewCount} = 0; + $JobInfo->{$StepTask->Id}->{OldCount} = 0; + if ($StepTask->Status eq "boterror") + { + $JobInfo->{$StepTask->Id}->{BotCount} = 1; + $BotCount++; + } + $FileType = "patch" if ($StepTask->FileType eq "patch"); + foreach my $LogName (@$LogNames) { my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); - $JobErrors->{$Id}->{HasErrors} = 1; - $JobErrors->{$Id}->{$LogName} = $LogInfo; - - print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; - print $Sendmail "$LogInfo->{BadLog}\n" if (defined $LogInfo->{BadLog}); + $JobInfo->{$StepTask->Id}->{$LogName} = $LogInfo; + my $HasLogHeader; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); + my $HasGroupHeader; my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - print $Sendmail "$_\n" for (@{$Group->{Errors}}); + foreach my $ErrIndex (0..$#{$Group->{Errors}}) + { + if ($Group->{IsNew}->[$ErrIndex]) + { + if (!$HasLogHeader) + { + push @New, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; + $HasLogHeader = 1; + } + if (!$HasGroupHeader) + { + push @New, ($GroupName ? "\n$GroupName:\n" : "\n"); + $HasGroupHeader = 1; + } + push @New, "$Group->{Errors}->[$ErrIndex]\n"; + $JobInfo->{$StepTask->Id}->{NewCount}++; + } + else + { + $JobInfo->{$StepTask->Id}->{OldCount}++; + } + } } + $NewCount += $JobInfo->{$StepTask->Id}->{NewCount}; + $OldCount += $JobInfo->{$StepTask->Id}->{OldCount}; } } - close($Sendmail); - - # This is all for jobs submitted from the website - if (!defined $Job->Patch) - { - Debug("Not a mailing list patch -> all done.\n"); - return; - } - # - # Build a job summary with only the new errors + # Send a job summary to the developer # - # Note that this may be a bit inaccurate right after a Wine commit if this - # job's patch got compiled on top of the new Wine before all the reference - # WineTest results were updated. This is made more likely by the job - # priorities: high for Wine updates, and low for WineTest runs. - # However in practice this would only be an issue if the patch reintroduced - # an error that just disappeared in the latest Wine which is highly unlikely. - my @Messages; - foreach my $StepTask (@$SortedStepsTasks) + my $JobURL = MakeOfficialURL("/JobDetails.pl?Key=". $Job->GetKey()); + my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); + if (defined $To) { - my $Id = $StepTask->Id; - next if (!$JobErrors->{$Id}->{HasErrors}); + Debug("-------------------- Developer email --------------------\n"); + my $Sendmail; + if ($Debug) + { + open($Sendmail, ">>&=", 1); + } + else + { + open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); + } + print $Sendmail "From: $RobotEMail\n"; + print $Sendmail "To: $To\n"; + my $Subject = "TestBot job " . $Job->Id . " results"; + my $Description = $Job->GetDescription(); + if ($Description) + { + $Subject .= ": " . $Description; + } + print $Sendmail "Subject: $Subject\n"; + if ($Job->Patch and $Job->Patch->MessageId) + { + print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; + } + print $Sendmail "\nHi,\n\n"; - # Note: We could check $StepTask->Status for TestBot errors. However, - # whether they are caused by the patch or not, they prevent the TestBot - # from checking for new errors which justifies sending an email to the - # mailing list so that the patch receives greater scrutiny. + if ($NewCount) + { + print $Sendmail <<"EOF"; +It looks like your $FileType introduces some new failures. Please +investigate and fix them if they are indeed new. Note that rare +failures and failures with always changing text (e.g. because of memory +addresses) can cause false positives. If this is what happened, then +fixing those would really help. - foreach my $LogName (@{$JobErrors->{$Id}->{LogNames}}) +EOF + } + if ($BotCount) { - my $LogInfo = $JobErrors->{$Id}->{$LogName}; - # Skip if there are no errors - next if (!$LogInfo->{NewCount}); + print $Sendmail <<"EOF"; +$BotCount TestBot errors prevented a full analysis of your $FileType. +If the test caused the operating system (e.g. Windows) to crash or +reboot you will probably have to modify it to avoid that. +Other issues should be reported to the TestBot administrators. - push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; +EOF + } + elsif (!$NewCount and !$NotRun) + { + print $Sendmail <<"EOF"; +Congratulations! +It looks like your $FileType passed the tests with flying colors. - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) +EOF + } + if ($OldCount) + { + print $Sendmail <<"EOF"; +Some preexisting failures (not caused by your $FileType) happened. +If you know how to fix them that would be helpful. + +EOF + } + + print $Sendmail " Failures\n"; + print $Sendmail "VM Status New / Old Command\n"; + foreach my $StepTask (@$SortedStepsTasks) + { + next if ($StepTask->Status =~ /^(?:canceled|skipped)$/); + + my $TestFailures = $StepTask->TestFailures; + $TestFailures = "" if (!defined $TestFailures); + my $Status = $StepTask->Status ne "completed" ? $StepTask->Status : + $TestFailures ? "failed" : + "success"; + my $Cmd = ""; + $Cmd = $StepTask->FileName ." " if ($StepTask->FileType =~ /^exe/); + $Cmd .= $StepTask->CmdLineArg if (defined $StepTask->CmdLineArg); + + printf $Sendmail "%-20s %-8s %4s / %4s %s\n", $StepTask->VMName, + $Status, $JobInfo->{$StepTask->Id}->{NewCount}, + $JobInfo->{$StepTask->Id}->{OldCount}, $Cmd; + } + if ($NotRun) + { + print $Sendmail <<"EOF"; + +Note that $NotRun additional tasks could not be run due to previous +errors. A full run may uncover more issues. + +EOF + } + + print $Sendmail <<"EOF"; + +The full results can be found at: +$JobURL + +Your paranoid android. + +EOF + + # Print the failures + foreach my $StepTask (@$SortedStepsTasks) + { + my $TaskInfo = $JobInfo->{$StepTask->Id}; + my $TaskDir = $StepTask->GetTaskDir(); + foreach my $LogName (@{$TaskInfo->{LogNames}}) { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - next if (!$Group->{NewCount}); + my $LogInfo = LoadLogErrors("$TaskDir/$LogName"); + next if (!defined $LogInfo->{BadLog} and !$LogInfo->{ErrCount}); - push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); - foreach my $ErrIndex (0..$#{$Group->{Errors}}) + print $Sendmail "\n=== ", GetTitle($StepTask, $LogName), " ===\n"; + print $Sendmail "$LogInfo->{BadLog}\n" if (defined $LogInfo->{BadLog}); + + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - if ($Group->{IsNew}->[$ErrIndex]) + print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + foreach my $ErrIndex (0..$#{$Group->{Errors}}) { - push @Messages, "$Group->{Errors}->[$ErrIndex]\n"; + my $Prefix = $Group->{IsNew}->[$ErrIndex] ? "new" : "old"; + print $Sendmail "[$Prefix] $Group->{Errors}->[$ErrIndex]\n"; } } } } + + close($Sendmail); + } + + # This is all for jobs submitted from the website + if (!defined $Job->Patch) + { + Debug("Not a mailing list patch -> all done.\n"); + return; } @@ -322,8 +396,13 @@ sub SendLog($) Debug("\n-------------------- Mailing list email --------------------\n"); - if (@Messages) + if (!$NewCount) { + Debug("Found no error to report to the mailing list\n"); + } + else + { + my $Sendmail; if ($Debug) { open($Sendmail, ">>&=", 1); @@ -333,36 +412,63 @@ sub SendLog($) open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); } print $Sendmail "From: $RobotEMail\n"; - print $Sendmail "To: $To\n"; - print $Sendmail "Cc: $WinePatchCc\n"; + if (defined $To) + { + print $Sendmail "To: $To\n"; + print $Sendmail "Cc: $WinePatchCc\n"; + } + else + { + print $Sendmail "To: $WinePatchCc\n"; + } print $Sendmail "Subject: Re: ", $Job->Patch->Subject, "\n"; if ($Job->Patch->MessageId) { print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; } - print $Sendmail <<"EOF"; + print $Sendmail "\nHi,\n\n"; -Hi, + if ($NewCount) + { + print $Sendmail <<"EOF"; +It looks like your $FileType introduced the new failures shown below. +Please investigate and fix them if they are indeed new. Note that rare +failures and failures with always changing text (e.g. because of memory +addresses) can cause false positives. If this is what happened, then +fixing those would really help. -While running your changed tests, I think I found new failures. -Being a bot and all I'm not very good at pattern recognition, so I might be -wrong, but could you please double-check? +EOF + } + if ($BotCount) + { + print $Sendmail <<"EOF"; +$BotCount TestBot errors prevented a full analysis of your $FileType. +If the test caused the operating system (e.g. Windows) to crash or +reboot you will probably have to modify it to avoid that. +Other issues should be reported to the TestBot administrators. -Full results can be found at: +EOF + } + if ($OldCount) + { + print $Sendmail <<"EOF"; +The tests also ran into some preexisting test failures. If you know how +to fix them that would be helpful. See the TestBot job for the details: + +EOF + } + print $Sendmail <<"EOF"; +The full results can be found at: $JobURL Your paranoid android. EOF - print $Sendmail $_ for (@Messages); + print $Sendmail $_ for (@New); close($Sendmail); } - else - { - Debug("Found no error to report to the mailing list\n"); - } # @@ -379,14 +485,14 @@ EOF { # Only take into account new errors to decide whether the job was # successful or not. - DebugTee($Result, "Status: ". (@Messages ? "Failed" : "OK") ."\n"); + DebugTee($Result, "Status: ". ($NewCount + $BotCount + $NotRun ? "Failed" : "OK") ."\n"); DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); DebugTee($Result, "URL: $JobURL\n"); foreach my $StepTask (@$SortedStepsTasks) { my $TaskDir = $StepTask->GetTaskDir(); - foreach my $LogName (@{$JobErrors->{$StepTask->Id}->{LogNames}}) + foreach my $LogName (@{$JobInfo->{$StepTask->Id}->{LogNames}}) { print $Result "=== ", GetTitle($StepTask, $LogName), " ===\n"; DumpLogAndErr($Result, "$TaskDir/$LogName"); diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 139f011ef..5663f956c 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -611,13 +611,12 @@ sub LoadMbox($) $State->{JobIdLine} = $LineNo; } } - elsif ($Line =~ /^Content-Disposition: attachment; filename=([^-]+)-/) + elsif ($Line =~ /^([a-zA-Z0-9_]+)\s+(?:success|failed)\s+\d+/) { my $VM = $1; - # This could match attachments in other emails $State->{ResVMs}->{$VM}++ if ($State->{HasResEmail}); } - elsif ($Line =~ /I found new failures/) + elsif ($Line =~ /\bintroduces .* new failures\b/) { $State->{HasFailedEmail} = $LineNo; } @@ -1190,7 +1189,7 @@ sub CheckJobTree($;$) my $VMName = $Task->VM->Name; if ($Task->Status !~ /^(?:canceled|skipped)$/ and $Email->{HasResEmail}) { - ok($Email->{ResVMs}->{$VMName}, "Expecting $VMName logs / reports in the job $JobId results email"); + ok($Email->{ResVMs}->{$VMName}, "Expecting a $VMName error summary in the job $JobId results email"); } } -- 2.30.2

1 0

[PATCH v2 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) 14 Jun '22

14 Jun '22

Opened the previous merge request before the testbot had updated, so it failed to run the tests. Should be updated by now :) -- v2: uiautomationcore: Implement NavigateDirection_{Previous/Next}Sibling for MSAA providers. uiautomationcore: Implement NavigateDirection_{First/Last}Child for MSAA Providers. https://gitlab.winehq.org/wine/wine/-/merge_requests/241

3 5

[tools] testbot/web: Tweak GenerateFullLog() in the job details page.
by Francois Gouget 14 Jun '22

14 Jun '22

Rename %ErrLineNos to %ErrCategory since it contains the error's category indexed by the full log line number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 36bba0d04..7860a4c9d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -400,16 +400,14 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %ErrLineNos; + my %ErrCategory; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - my $ErrCount = @{$Group->{Errors}}; - next if (!$ErrCount); - for my $ErrIndex (0..$ErrCount-1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { - $ErrLineNos{$Group->{LineNos}->[$ErrIndex]} = \ - $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; } } @@ -432,7 +430,7 @@ sub GenerateFullLog($$$$) } my $Html = $self->escapeHTML($Line); - my $Category = $ErrLineNos{$LineNo} || $GetCategory->($Line); + my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; -- 2.30.2

1 0

[tools] testbot/web: Fix hiding the branch column on the main page.
by Francois Gouget 14 Jun '22

14 Jun '22

It is hidden when only one branch exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Branches are not really supported: there is a table for them, they are referenced by the jobs, but they have never been used in any of the scripts or in the TestBot code. In particular the Reconfig scripts only update and rebuild one Wine tree. But support for multiple branches may work by having one Wine source tree and set of build trees per branch. So I'm keeping what branch support we have around for the day we need it. --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 2073b1e6f..a3b26ea91 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -41,7 +41,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : $PropertyName eq "Submitted" ? ("ro", "timetipdate") : - ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : + ($PropertyName eq "BranchName" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); } -- 2.30.2

1 0

[tools] testbot: Include the filename in LoadLogErrors() error messages.
by Francois Gouget 14 Jun '22

14 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Otherwise there is no way to know which file was bad in case of errors, for instance in UpdateTaskLogs. --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17cfc3525..2e3de83b8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1016,6 +1016,10 @@ sub LoadLogErrors($) if (open(my $ErrorsFile, "<", "$LogPath.errors")) { LoadLogErrorsFromFh($LogInfo, $ErrorsFile); + if ($LogInfo->{BadLog}) + { + $LogInfo->{BadLog} = "$LogInfo->{LogName}.errors: $LogInfo->{BadLog}"; + } delete $LogInfo->{CurGroup}; close($ErrorsFile); } -- 2.30.2

1 0

[PATCH 0/1] MR243: winhttp: Fix default port corner cases in WinHttpCrackUrl().
by Hans Leidekker (＠hans) 14 Jun '22

14 Jun '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/243

2 1

[PATCH 0/3] MR241: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) 14 Jun '22

14 Jun '22

Opened the previous merge request before the testbot had updated, so it failed to run the tests. Should be updated by now :) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/241

3 6

Welcome to the GitLab community
by Bryan G. Behrenshausen 14 Jun '22

14 Jun '22

Hello Wine team, I was delighted to read the news [1] that your recent experiment with GitLab has gone well and GitLab will become the primary development platform for Wine. I'm Senior Open Source Program Manager at GitLab [2], and I want to extend my warmest welcome to out community. Should you need anything during your migration, please don't hesitate to reach out. Additionally, please note our GitLab for Open Source [3] and GitLab Open Source Partners programs [4]. If participating in those would add value to your work, I'd be happy to discuss them further. Again, welcome! Sincerely, Bryan [1] https://www.phoronix.com/scan.php?page=news_item&px=Wine-GitLab-Main-Workfl… [2] https://gitlab.com/bbehr [3] https://about.gitlab.com/solutions/open-source/join/ [4] https://about.gitlab.com/solutions/open-source/partners/

1 0

[PATCH v2 1/8] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani 14 Jun '22

14 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the multiplier * The missing test cases will be reinsterted in a later commit --- dlls/mfplat/buffer.c | 22 ++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 40 ++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..1b5e8cf7ed5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5723,48 +5723,49 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int fourcc; unsigned int contiguous_length; int pitch; - unsigned int plane_multiplier; unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5998,13 +5999,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1

2 15

[PATCH 1/5] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani 14 Jun '22

14 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 22 +++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 9 ++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..8fddef8fd40 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5736,9 +5736,11 @@ static void test_MFCreate2DMediaBuffer(void) { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, @@ -5998,13 +6000,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1

3 15

Gitlab experiment status
by Alexandre Julliard 14 Jun '22

14 Jun '22

Folks, The Gitlab experiment seems to be going well. For the last release, more than half the patches were submitted as Gitlab merge requests, so that seems to be working well for us. There are still improvements we can make, and of course many more Gitlab features that we could start using, but before investing more effort we need to decide whether we want to use it going forward. So now that you have had a chance to try it, what do you people think? Should we adopt Gitlab as our development platform? -- Alexandre Julliard julliard(a)winehq.org

13 21

[PATCH v4 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl (＠besentv) 14 Jun '22

14 Jun '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v4: windows.media.speech: Add stub ISpeechSynthesisStream iface. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. windows.media.speech/tests: Add basic tests for ssml/text to stream functions. windows.media.speech/tests: Handle a possible race condition. windows.media.speech/tests: Remove a useless thread id trace. include/windows.media.speechsynthesis.idl: Update file to newer formatting. include/windows.media.idl: Move IMediaMarker collections from speechsynthesis. include/windows.media.idl: Get rid of nested namespaces. https://gitlab.winehq.org/wine/wine/-/merge_requests/217

3 17

ntdll: Fix the return value of NtQueryKey.
by 杨堃 14 Jun '22

14 Jun '22

Signed-off-by: Kun Yang <yangkun(a)uniontech.com> --- dlls/ntdll/tests/reg.c | 2 +- dlls/ntdll/unix/registry.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 6628454440a..767fa36302d 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -321,7 +321,12 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < *result_len){ + if(min(length, fixed_size) == 0) + ret = STATUS_BUFFER_TOO_SMALL; + else + ret = STATUS_BUFFER_OVERFLOW; + } } } SERVER_END_REQ; -- 2.20.1

2 1

[PATCH] ntdll: Fix the return value of NtQueryKey.
by 杨堃 14 Jun '22

14 Jun '22

From bc084bfcf6c342e483f77090593261ac76b6f513 Mon Sep 17 00:00:00 2001 From: Kun Yang <yangkun(a)uniontech.com> Date: Tue, 14 Jun 2022 16:16:53 +0800 Subject: [PATCH] ntdll: Fix the return value of NtQueryKey. Signed-off-by: Kun Yang <yangkun(a)uniontech.com> --- dlls/ntdll/tests/reg.c | 2 +- dlls/ntdll/unix/registry.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 6628454440a..767fa36302d 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -321,7 +321,12 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < *result_len){ + if(min(length, fixed_size) == 0) + ret = STATUS_BUFFER_TOO_SMALL; + else + ret = STATUS_BUFFER_OVERFLOW; + } } } SERVER_END_REQ; -- 2.20.1

2 1

[PATCH v2 0/5] MR240: win32u: menu conversion
by Jacek Caban (＠jacek) 14 Jun '22

14 Jun '22

-- v2: user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo. win32u: Move PopupMenuWndProc implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/240

4 9

[PATCH] ntdll: Fix the return value of NtQueryKey
by 杨堃 14 Jun '22

14 Jun '22

diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2c158be17b4..ab6f7914e4b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1831,7 +1831,7 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 6628454440a..767fa36302d 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -321,7 +321,12 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < *result_len){ + if(min(length, fixed_size) == 0) + ret = STATUS_BUFFER_TOO_SMALL; + else + ret = STATUS_BUFFER_OVERFLOW; + } } } SERVER_END_REQ;

2 1

[patch 2/2]ntdll/tests: Add tests for _allshl and _allshr.
by Zhao Yi 14 Jun '22

14 Jun '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/tests/large_int.c | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 9635cac24ad..793696f1e4d 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -40,6 +40,9 @@ static LONGLONG (WINAPI *p_allmul)( LONGLONG a, LONGLONG b ); static ULONGLONG (WINAPI *p_aulldiv)( ULONGLONG a, ULONGLONG b ); static ULONGLONG (WINAPI *p_aullrem)( ULONGLONG a, ULONGLONG b ); +static LONGLONG (CDECL *p_allshl)(void); +static LONGLONG (CDECL *p_allshr)(void); + static void InitFunctionPtrs(void) { hntdll = LoadLibraryA("ntdll.dll"); @@ -56,6 +59,8 @@ static void InitFunctionPtrs(void) p_allmul = (void *)GetProcAddress(hntdll, "_allmul"); p_aulldiv = (void *)GetProcAddress(hntdll, "_aulldiv"); p_aullrem = (void *)GetProcAddress(hntdll, "_aullrem"); + p_allshl = (void *)GetProcAddress(hntdll, "_allshl"); + p_allshr = (void *)GetProcAddress(hntdll, "_allshr"); } /* if */ } @@ -492,6 +497,56 @@ static void test_builtins(void) #endif /* __i386__ */ } +static void test_allshl(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshl(); + ok(c == 0x56677880, "1. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshl(); + ok(c == 0, "2. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshl(); + ok(c == 0, "3. _allshl returned 0x%x\n", c); + + return; +} + +static void test_allshr(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshr(); + ok(c == 0x45566778, "1. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshr(); + ok(c == 0x112233, "2. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshr(); + ok(c == 0, "3. _allshr returned 0x%x\n", c); + + return; +} + START_TEST(large_int) { InitFunctionPtrs(); @@ -503,4 +558,6 @@ START_TEST(large_int) if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); test_builtins(); + test_allshl(); + test_allshr(); } -- 2.20.1

2 1

[PATCH 1/2]ntdll: Reimplement function _allshl and _allshr.
by Zhao Yi 14 Jun '22

14 Jun '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ntoskrnl.exe: Redeclare function _allshl and _allshr. Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/large_int.c | 46 ++++++++++++++++++++++++----- dlls/ntdll/ntdll.spec | 4 +-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +-- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index b38074158c8..2f6e27eff10 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -821,10 +821,25 @@ ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) * RETURNS * The left-shifted value. */ -LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) -{ - return a << b; -} +__ASM_GLOBAL_FUNC( _allshl, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shld %cl, %eax, %edx\n\t" +"shl %cl, %eax\n\t" +"ret\n\t" +"2:\n\t" +"mov %eax, %edx\n\t" +"xor %eax, %eax\n\t" +"and $0x1f, %cl\n\t" +"shl %cl, %edx\n\t" +"ret\n\t" +"1:\n\t" +"xor %eax, %eax\n\t" +"xor %edx, %edx\n\t" +"ret\n\t" +) /****************************************************************************** * _allshr (NTDLL.@) @@ -838,10 +853,25 @@ LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) * RETURNS * The right-shifted value. */ -LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) -{ - return a >> b; -} +__ASM_GLOBAL_FUNC( _allshr, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shrd %cl,%edx,%eax\n\t" +"sar %cl,%edx\n\t" +"ret\n\t" +"2:\n\t" +"mov %edx,%eax\n\t" +"sar $0x1f,%edx\n\t" +"and $0x1f,%cl\n\t" +"sar %cl,%eax\n\t" +"ret\n\t" +"1:\n\t" +"sar $0x1f,%edx\n\t" +"mov %edx,%eax\n\t" +"ret\n\t" +) /****************************************************************************** * _alldvrm (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..6b96b0433fd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1492,8 +1492,8 @@ @ cdecl -norelay -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @ cdecl -norelay -arch=i386 -ret64 _allrem(int64 int64) -@ stdcall -arch=i386 -ret64 _allshl(int64 long) -@ stdcall -arch=i386 -ret64 _allshr(int64 long) +@ cdecl -arch=i386 -ret64 _allshl() +@ cdecl -arch=i386 -ret64 _allshr() @ cdecl -ret64 _atoi64(str) @ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8ae4bc1f5a9..5d3238200a3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1540,8 +1540,8 @@ @ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) -@ stdcall -arch=i386 -ret64 _allshl(int64 long) -@ stdcall -arch=i386 -ret64 _allshr(int64 long) +@ cdecl -arch=i386 -ret64 _allshl() +@ cdecl -arch=i386 -ret64 _allshr() @ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) -- 2.20.1

1 0

[PATCH 0/6] MR226: winegstreamer: Leave stream_cs when calling the async reader callbacks.
by Rémi Bernon (＠rbernon) 14 Jun '22

14 Jun '22

For https://gitlab.winehq.org/wine/wine/-/merge_requests/140 we will want to be able to enter the ASF Reader filter CS in the callbacks, for instance when a sample is received, or to notify about EOS. At the same time, another thread will possibly try to stop the filter, calling `IWMReader_Stop` which will try to enter the stream_cs as well and wait on the stream thread. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/226

3 7

[PATCH 0/1] MR229: comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush.
by Jinoh Kang (＠iamahuman) 14 Jun '22

14 Jun '22

This is consistent with the behaviour of other static control styles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/229

3 2

[PATCH v4] comctl32/listview: Add partial support for LVM_SETBKIMAGE.
by Zhiyi Zhang 14 Jun '22

14 Jun '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Formatting fixes, add some tests. v3: Add v6 tests, make v6 behaviour the default one. v4: Supersede 238455. I was wrong and LVM_SETBKIMAGE should repaint the control. Also the background bitmap should be painted in LISTVIEW_EraseBkgnd() when the background color is CLR_NONE. dlls/comctl32/listview.c | 90 ++++++++++++++++++++++++++++++---- dlls/comctl32/tests/listview.c | 78 +++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..ab328b3e798 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4551,6 +4552,21 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) return nItem; } +static void LISTVIEW_DrawBackgroundBitmap(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +{ + HDC mem_hdc; + + if (!infoPtr->hBkBitmap) + return; + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + mem_hdc = CreateCompatibleDC(hdc); + SelectObject(mem_hdc, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, mem_hdc, lprcBox->left, lprcBox->top, SRCCOPY); + DeleteDC(mem_hdc); +} /*** * DESCRIPTION: @@ -4565,13 +4581,17 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) * Success: TRUE * Failure: FALSE */ -static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +static BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, lprcBox); + return TRUE; } /* Draw main item or subitem */ @@ -8028,7 +8048,53 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static BOOL LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx, %p, %p, %u, %d, %d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("unsupported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("unsupported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + break; + + case LVBKIF_SOURCE_HBITMAP: + { + BITMAP bm; + + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + if (GetObjectW(image->hbm, sizeof(bm), &bm) == sizeof(bm)) + { + infoPtr->hBkBitmap = image->hbm; + return TRUE; + } + break; + } + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return FALSE; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -9641,10 +9707,11 @@ static inline BOOL LISTVIEW_EraseBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc) if (infoPtr->clrBk == CLR_NONE) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) - return SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, - (WPARAM)hdc, PRF_ERASEBKGND); + SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, (WPARAM)hdc, PRF_ERASEBKGND); else - return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, &rc); + return TRUE; } /* for double buffered controls we need to do this during refresh */ @@ -10406,6 +10473,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11622,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ac7f53137d..ed5222a5ee8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <objbase.h> #include "wine/test.h" #include "v6util.h" @@ -6924,6 +6925,81 @@ static void test_LVM_GETNEXTITEMINDEX(void) DestroyWindow(hwnd); } +static void test_LVM_SETBKIMAGE(BOOL is_v6) +{ + LVBKIMAGEA image; + HBITMAP hbmp; + BITMAP bm; + HWND hwnd; + int ret; + + CoInitialize(NULL); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + hwnd = create_listview_control(LVS_REPORT); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + image.pszImage = NULL; + image.cchImageMax = 0; + image.xOffsetPercent = 0; + image.yOffsetPercent = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); + + CoUninitialize(); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6987,6 +7063,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_LVM_SETBKIMAGE(FALSE); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -7034,6 +7111,7 @@ START_TEST(listview) test_item_state_change(); test_selected_column(); test_LVM_GETNEXTITEMINDEX(); + test_LVM_SETBKIMAGE(TRUE); unload_v6_module(ctx_cookie, hCtx); -- 2.34.1

1 0

[PATCH v2 resend 0/6] Fix LVS_OWNERDATA list view multi select.
by Angelo Haller 14 Jun '22

14 Jun '22

From: Angelo Haller <angelo(a)szanni.org> The following patches fix sending of the LVN_ODSTATECHANGED notification for LVS_OWNERDATA list views. A few more refined tests have been added, some wine_todos removed, and bugs fixed. This is a v2 resend. Warning: I have had access to the Windows Research Kernel (WRK) 1.2 ~10 years ago. These changes are regarding comctrl32 & tests which are NOT part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this should therefore satisfy the requirement of ONLY submitting patches to components I have NOT had access to. Angelo Haller (6): comctl32/tests: Expand ownerdata listview tests. comctl32/listview: Move LVN_ODSTATECHANGED notification to function. comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists. comctl32/listview: Send LVN_ODSTATECHANGED notification. comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges. comctl32/listview: Fix deselect on LVS_OWNERDATA. dlls/comctl32/listview.c | 55 +++++++++++++++++++++---------- dlls/comctl32/tests/listview.c | 59 +++++++++++++++++++++++++++++----- 2 files changed, 89 insertions(+), 25 deletions(-) Signed-off-by: Angelo Haller <angelo(a)szanni.org> -- 2.36.0

2 25

Questions about the GitLab patch review process
by Alex Henrie 14 Jun '22

14 Jun '22

Dear developers, I have a couple of questions about how patch reviews on GitLab are intended to work: * Can I request a review from anyone? * Does requesting a review improve the patch's chances of being accepted? Thanks for your help. -Alex

2 2

[PATCH 0/5] MR240: win32u: menu conversion
by Jacek Caban (＠jacek) 14 Jun '22

14 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/240

3 10

[PATCH 0/1] MR149: user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity).
by Alex Henrie (＠alexhenrie) 14 Jun '22

14 Jun '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/149

3 2

[PATCH 0/3] MR239: uiautomationcore: Test fix and MSAA provider navigation patches.
by Connor McAdams (＠cmcadams) 13 Jun '22

13 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/239

3 6

Re: [PATCH v2 0/1] MR238: ntdll: Move SEH exception info logs back to the seh channel. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/238

1 0

Re: [PATCH v3 0/6] MR220: winegstreamer: Add zero-copy support to quartz_transform. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/220

1 0

Re: [PATCH v4 0/3] MR225: server: Fix races related to socket errors - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/225

1 0

Re: [PATCH v6 0/3] MR227: riched20: Fix for #52752 (use IViewObject implementation) - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/227

1 0

Re: [PATCH v2 0/1] MR236: winebus.sys: Implement SOCD neutral cleaning for hatswitches. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/236

1 0

Re: [PATCH v2 0/5] MR235: ntdll: Preparation for heap region factorization. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/235

1 0

[PATCH v2 0/3] MR187: ntdll/tests: Test if RtlFormatMessage modifies va_list on error.
by Daniel Lehman (＠dlehman25) 13 Jun '22

13 Jun '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- v2: kernelbase: Pass va_list copy to internal RtlFormatMessage. kernel32/tests: Test if FormatMessage modifies va_list on error. ntdll/tests: Test if RtlFormatMessage modifies va_list on error. https://gitlab.winehq.org/wine/wine/-/merge_requests/187

3 4

Re: [PATCH v2 0/1] MR234: d2d1: Update to ID2D1DeviceContext1. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/234

1 0

Re: [PATCH v3 0/5] MR232: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/232

1 0

Re: [PATCH v2 0/3] MR230: UiaProviderFromIAccessible: Initial navigation patches. - approved
by Alexandre Julliard (＠julliard) 13 Jun '22

13 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/230

1 0

[PATCH 0/1] MR238: ntdll: Move SEH exception info logs back to the seh channel.
by Tim Clem (＠tclem) 13 Jun '22

13 Jun '22

These were accidentally moved as part of the introduction of +unwind. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/238

3 2

[PATCH v2 0/6] MR220: winegstreamer: Add zero-copy support to quartz_transform.
by Rémi Bernon (＠rbernon) 13 Jun '22

13 Jun '22

-- v2: winegstreamer: Remove copying support from wg_transform_push_data. winegstreamer: Support zero-copy wg_transform_read_data in quartz_transform.c. winegstreamer: Support zero-copy wg_transform_push_data in quartz_transform.c. winegstreamer: Introduce new wg_sample_create_quartz helper for quartz_transform.c. winegstreamer: Use a union in struct sample to keep API pointers. winegstreamer: Split wg_sample wrapper helpers to a separate source. https://gitlab.winehq.org/wine/wine/-/merge_requests/220

3 8

[PATCH v3 0/3] MR225: server: Fix races related to socket errors
by Piotr Caban (＠piotr) 13 Jun '22

13 Jun '22

Calling ioctl(..., SO_ERROR, ...) clears pending socket error. Because of that we may clear the error in poll_socket or IOCTL_AFD_GET_SO_ERROR. This leads to failures during Battle.net installation (it's a race that I can only reproduce on slow machines). -- v3: server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR. server: Don't reset socket error in poll_socket. server: Always return Win32 error code from IOCTL_AFD_GET_SO_ERROR. https://gitlab.winehq.org/wine/wine/-/merge_requests/225

3 5

[PATCH v2 0/2] MR231: SetWindowPos() parent window exposure fixes (#53153)
by Jinoh Kang (＠iamahuman) 13 Jun '22

13 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: server: Correctly expose composited parent window on SetWindowPos(). user32/tests: Test for parent window exposure by SetWindowPos(). https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 4

[PATCH v5 0/3] MR227: riched20: Fix for #52752 (use IViewObject implementation)
by Jinoh Kang (＠iamahuman) 13 Jun '22

13 Jun '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52752. -- v5: riched20: Draw OLE objects with IViewObject implementation. riched20: Fetch extent from object if REOBJECT::sizel is unset. riched20/tests: Add tests for drawing embedded OLE objects. https://gitlab.winehq.org/wine/wine/-/merge_requests/227

3 4

[PATCH 0/1] MR236: winebus.sys: Implement SOCD neutral cleaning for hatswitches.
by Rémi Bernon (＠rbernon) 13 Jun '22

13 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/236

2 1

[PATCH 0/5] MR235: ntdll: Preparation for heap region factorization.
by Rémi Bernon (＠rbernon) 13 Jun '22

13 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/235

2 5

[tools 1/3] testbot/WineSendLog: Remove a couple of unused variables.
by Francois Gouget 13 Jun '22

13 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 37949e45f..5affba606 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -247,7 +247,7 @@ EOF print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n"; # Print the job summary - my ($JobErrors, $ReportCounts); + my $JobErrors; foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); @@ -329,7 +329,6 @@ EOF { next if (!$JobErrors->{$Key}->{HasErrors}); my $StepTask = $StepsTasks->GetItem($Key); - my $TaskDir = $StepTask->GetTaskDir(); # Note: We could check $StepTask->Status for TestBot errors. However, # whether they are caused by the patch or not, they prevent the TestBot -- 2.30.2

1 2

[tools resend] testbot/orm: Make the Itemref columns read-only.
by Francois Gouget 13 Jun '22

13 Jun '22

The columns used by an Itemref should be modified through the Itemref property to ensure that they remain in sync with it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Same as before, just out of the patch series since the other two are deferred. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +- testbot/lib/ObjectModel/Item.pm | 8 ++++++ .../ObjectModel/ItemrefPropertyDescriptor.pm | 28 ++++++++++++++++++- testbot/lib/ObjectModel/PropertyDescriptor.pm | 7 +++++ testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 1 + 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 224bf3687..6f3449b5b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -198,7 +198,8 @@ sub DisplayProperty($$) # type the appropriate key value would also be cumbersome so this is # currently not supported. But they can be displayed. $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can displayed, + $PropertyDescriptor->GetIsReadOnly() ? "ro" : + # All other properties can be displayed, !$self->{RW} ? "ro" : # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index b07b76066..11d09be67 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -270,6 +270,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Value = shift; if ($self->ValuesDiffer($Value, $self->{ColValues}{$PropertyName})) { @@ -283,6 +287,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Item = shift; if (!$Item and !$self->{Itemrefs}{$PropertyName}) { diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 6895e801a..171d00a9e 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -28,7 +28,7 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: use Exporter 'import'; use ObjectModel::PropertyDescriptor; our @ISA = qw(ObjectModel::PropertyDescriptor); -our @EXPORT = qw(CreateItemrefPropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor SetupItemrefColumns); sub _initialize($$$) { @@ -78,4 +78,30 @@ sub CreateItemrefPropertyDescriptor($$$$$) return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, !1, $IsRequired, $Creator, $RefColNames); } +sub SetupItemrefColumns($) +{ + my ($PropertyDescriptors) = @_; + + my (@Itemrefs, %Properties); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + $Properties{$PropertyDescriptor->GetName()} = $PropertyDescriptor; + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + push @Itemrefs, $PropertyDescriptor; + } + } + + # Mark the Itemref columns as read-only so they are only modified + # through the Itemref. + foreach my $Itemref (@Itemrefs) + { + foreach my $ColName (@{$Itemref->GetRefColNames()}) + { + my $ColDescriptor = $Properties{$ColName}; + $ColDescriptor->{IsReadOnly} = 1; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index f13a4b248..2f9411aa2 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -86,6 +86,13 @@ sub GetIsRequired($) return $self->{IsRequired}; } +sub GetIsReadOnly($) +{ + my ($self) = @_; + + return $self->{IsReadOnly}; +} + sub GetClass($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 5ca84e734..8594cfcdf 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -75,6 +75,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("User", "User", 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), ); +SetupItemrefColumns(\@PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 140bd572b..7f15a9c57 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -524,6 +524,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", \&CreateSteps), ); +SetupItemrefColumns(\@PropertyDescriptors); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index f4768b823..32a6af44f 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -68,6 +68,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", 1, \&CreatePatches, ["PatchId"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), CreateBasicPropertyDescriptor("PendingPatchSetVersion", "Expected version of the series", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 2533c6a01..87146b277 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -192,6 +192,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); sub CreateStepsTasks(;$$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5c5813cd9..0360e4ebc 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -363,6 +363,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 90c4332c3..900f41fc5 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -61,6 +61,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), CreateItemrefPropertyDescriptor("Role", "Role", 1, \&CreateRoles, ["RoleName"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), @PropertyDescriptors -- 2.30.2

1 0

[PATCH v4 0/3] MR227: riched20: Fix for #52752 (use IViewObject implementation)
by Jinoh Kang (＠iamahuman) 13 Jun '22

13 Jun '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52752. -- v4: riched20: Draw OLE objects with IViewObject implementation. riched20: Fetch extent from object if REOBJECT::sizel is unset. https://gitlab.winehq.org/wine/wine/-/merge_requests/227

3 4

[PATCH v2 1/5] d2d1/tests: Add more test xml.
by Ziqing Hui 13 Jun '22

13 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Add case tests and min/max inputs tests. dlls/d2d1/tests/d2d1.c | 120 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..970706bc569 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -99,6 +99,17 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_inputs_attribute = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs min='1' max='10' deadbeef='abcdef'/> \ + </Effect> \ +"; + static const WCHAR *effect_xml_without_version = L"<Effect> \ <Property name='DisplayName' type='string'/> \ @@ -170,6 +181,90 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_wrong_type = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='uint32' value='32'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_duplicate_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_effect = +L"<?xml version='1.0'?> \ + <effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </effect> \ +"; + +static const WCHAR *effect_xml_lower_case_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <property name='DisplayName' type='string'/> \ + <property name='Author' type='string'/> \ + <property name='Category' type='string'/> \ + <property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_inputs = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_a = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='MinInputs' type='uint32' value='1'/> \ + <Property name='MaxInputs' type='uint32' value='2'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_b = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs> \ + <Property name='Min' type='uint32' value='1'/> \ + <Property name='Max' type='uint32' value='2'/> \ + </Inputs> \ + </Effect> \ +"; + + static const DWORD test_vs[] = { #if 0 @@ -10604,10 +10699,11 @@ static void test_effect_register(BOOL d3d11) } xml_tests[] = { - {effect_xml_a, S_OK}, - {effect_xml_b, S_OK}, - {effect_xml_c, S_OK}, - {effect_xml_minimum, S_OK}, + {effect_xml_a, S_OK}, + {effect_xml_b, S_OK}, + {effect_xml_c, S_OK}, + {effect_xml_minimum, S_OK}, + {effect_xml_inputs_attribute, S_OK}, {effect_xml_without_version, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, {effect_xml_without_inputs, E_INVALIDARG}, {effect_xml_without_name, E_INVALIDARG}, @@ -10615,6 +10711,13 @@ static void test_effect_register(BOOL d3d11) {effect_xml_without_category, E_INVALIDARG}, {effect_xml_without_description, E_INVALIDARG}, {effect_xml_without_type, E_INVALIDARG}, + {effect_xml_wrong_type, E_INVALIDARG}, + {effect_xml_duplicate_property, E_INVALIDARG}, + {effect_xml_lower_case_effect, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_property, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_inputs, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_min_max_inputs_a, E_INVALIDARG}, + {effect_xml_min_max_inputs_b, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, }; const D2D1_PROPERTY_BINDING binding[] = @@ -10926,10 +11029,11 @@ static void test_effect_properties(BOOL d3d11) } system_property_tests[] = { - {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_inputs_attribute, L"", L"" ,L"", L"", 0, 0}, }; if (!init_test_context(&ctx, d3d11)) -- 2.25.1

2 12

[tools 1/3] testbot/orm: Make the Itemref columns read-only.
by Francois Gouget 13 Jun '22

13 Jun '22

The columns used by an Itemref should be modified through the Itemref property to ensure that they remain in sync with it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch is independent from the next two. They just happen to both modify the Tasks property descriptors. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +- testbot/lib/ObjectModel/Item.pm | 8 ++++++ .../ObjectModel/ItemrefPropertyDescriptor.pm | 28 ++++++++++++++++++- testbot/lib/ObjectModel/PropertyDescriptor.pm | 7 +++++ testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 1 + 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 224bf3687..6f3449b5b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -198,7 +198,8 @@ sub DisplayProperty($$) # type the appropriate key value would also be cumbersome so this is # currently not supported. But they can be displayed. $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can displayed, + $PropertyDescriptor->GetIsReadOnly() ? "ro" : + # All other properties can be displayed, !$self->{RW} ? "ro" : # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index b07b76066..11d09be67 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -270,6 +270,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Value = shift; if ($self->ValuesDiffer($Value, $self->{ColValues}{$PropertyName})) { @@ -283,6 +287,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Item = shift; if (!$Item and !$self->{Itemrefs}{$PropertyName}) { diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 6895e801a..171d00a9e 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -28,7 +28,7 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: use Exporter 'import'; use ObjectModel::PropertyDescriptor; our @ISA = qw(ObjectModel::PropertyDescriptor); -our @EXPORT = qw(CreateItemrefPropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor SetupItemrefColumns); sub _initialize($$$) { @@ -78,4 +78,30 @@ sub CreateItemrefPropertyDescriptor($$$$$) return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, !1, $IsRequired, $Creator, $RefColNames); } +sub SetupItemrefColumns($) +{ + my ($PropertyDescriptors) = @_; + + my (@Itemrefs, %Properties); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + $Properties{$PropertyDescriptor->GetName()} = $PropertyDescriptor; + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + push @Itemrefs, $PropertyDescriptor; + } + } + + # Mark the Itemref columns as read-only so they are only modified + # through the Itemref. + foreach my $Itemref (@Itemrefs) + { + foreach my $ColName (@{$Itemref->GetRefColNames()}) + { + my $ColDescriptor = $Properties{$ColName}; + $ColDescriptor->{IsReadOnly} = 1; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index f13a4b248..2f9411aa2 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -86,6 +86,13 @@ sub GetIsRequired($) return $self->{IsRequired}; } +sub GetIsReadOnly($) +{ + my ($self) = @_; + + return $self->{IsReadOnly}; +} + sub GetClass($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 5ca84e734..8594cfcdf 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -75,6 +75,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("User", "User", 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), ); +SetupItemrefColumns(\@PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 140bd572b..7f15a9c57 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -524,6 +524,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", \&CreateSteps), ); +SetupItemrefColumns(\@PropertyDescriptors); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index f4768b823..32a6af44f 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -68,6 +68,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", 1, \&CreatePatches, ["PatchId"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), CreateBasicPropertyDescriptor("PendingPatchSetVersion", "Expected version of the series", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 2533c6a01..87146b277 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -192,6 +192,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); sub CreateStepsTasks(;$$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5c5813cd9..0360e4ebc 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -363,6 +363,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 90c4332c3..900f41fc5 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -61,6 +61,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), CreateItemrefPropertyDescriptor("Role", "Role", 1, \&CreateRoles, ["RoleName"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), @PropertyDescriptors -- 2.30.2

1 3

[PATCH 0/1] MR234: d2d1: Update to ID2D1DeviceContext1.
by Nikolay Sivov (＠nsivov) 13 Jun '22

13 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/234

2 1

[PATCH v2 0/5] MR232: win32u: user32 conversion
by Jacek Caban (＠jacek) 13 Jun '22

13 Jun '22

-- v2: win32u: Simplify get_text_metr_size. win32u: Move GetDialogBaseUnits implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/232

4 10

[PATCH 0/3] MR230: UiaProviderFromIAccessible: Initial navigation patches.
by Connor McAdams (＠cmcadams) 13 Jun '22

13 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/230

3 4

[PATCH 0/5] MR232: win32u: user32 conversion
by Jacek Caban (＠jacek) 13 Jun '22

13 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/232

3 8

[PATCH 0/2] MR231: user32/tests: Test for parent window exposure by SetWindowPos().
by Jinoh Kang (＠iamahuman) 12 Jun '22

12 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 4

[PATCH v2 1/3] shell32: Implement SHBindToFolderIDListParent.
by Mohamad Al-Jaf 12 Jun '22

12 Jun '22

Called by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- This is the code I submitted on May 3. --- dlls/shell32/pidl.c | 49 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + include/shlobj.h | 2 ++ 3 files changed, 52 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..e659427f9cd 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1285,6 +1285,55 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si return SUCCEEDED(hr); } +/************************************************************************* + * SHBindToFolderIDListParent [SHELL32.@] + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; + + TRACE_(shell)("%p,%p,%s\n", psf, pidl, debugstr_guid(riid)); + pdump(pidl); + + if (!pidl || !ppv) + return E_INVALIDARG; + + *ppv = NULL; + if (ppidlLast) + *ppidlLast = NULL; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (_ILIsPidlSimple(pidl)) + { + /* we are on desktop level */ + hr = IShellFolder_QueryInterface(psf, riid, ppv); + } + else + { + LPITEMIDLIST pidlParent = ILClone(pidl); + ILRemoveLastID(pidlParent); + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); + SHFree (pidlParent); + } + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = ILFindLastID(pidl); + + TRACE_(shell)("-- ppv=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); + return hr; +} + /************************************************************************* * SHBindToParent [shell version 5.0] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..5b812774e1f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -334,6 +334,7 @@ @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) @ stdcall SHBrowseForFolderW(ptr) diff --git a/include/shlobj.h b/include/shlobj.h index d30944662f7..93f0201a991 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1639,6 +1639,8 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF */ HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *); +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast); + /**************************************************************************** * SHBindToParent API */ -- 2.36.1

2 4

Re: [PATCH v3 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers.
by Nikolay Sivov (＠nsivov) 11 Jun '22

11 Jun '22

Pushed an update to fix test failure on wine, with patch 2. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/212#note_1907

1 0

[PATCH 0/5] MR228: d3dx: improvements to texture creation functions
by Piotr Caban (＠piotr) 11 Jun '22

11 Jun '22

- support HRESULT parameter in D3DX10CreateTextureFrom* - implement D3DX10CreateAsyncTextureProcessor -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228

2 6

[PATCH 0/6] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl (＠besentv) 11 Jun '22

11 Jun '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/217

4 8

[PATCH v3 0/3] MR227: riched20: Fix for #52752 (use IViewObject implementation)
by Jinoh Kang (＠iamahuman) 11 Jun '22

11 Jun '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52752. -- v3: riched20: Draw OLE objects with IViewObject implementation. riched20: Fetch extent from object if REOBJECT::sizel is unset. riched20/tests: Add tests for drawing embedded OLE objects. https://gitlab.winehq.org/wine/wine/-/merge_requests/227

2 3

[PATCH v2 0/2] MR227: riched20: Fix for #52752 (use IViewObject implementation)
by Jinoh Kang (＠iamahuman) 11 Jun '22

11 Jun '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52752. -- v2: riched20: Draw OLE objects with IViewObject implementation. riched20/tests: Add tests for drawing embedded OLE objects. https://gitlab.winehq.org/wine/wine/-/merge_requests/227

2 2

[PATCH v2 0/3] MR225: server: Fix races related to socket errors
by Piotr Caban (＠piotr) 11 Jun '22

11 Jun '22

Calling ioctl(..., SO_ERROR, ...) clears pending socket error. Because of that we may clear the error in poll_socket or IOCTL_AFD_GET_SO_ERROR. This leads to failures during Battle.net installation (it's a race that I can only reproduce on slow machines). -- v2: server: Don't reset socket error in IOCTL_AFD_GET_SO_ERROR. server: Don't reset socket error in poll_socket. server: Always return Win32 error code from IOCTL_AFD_GET_SO_ERROR. https://gitlab.winehq.org/wine/wine/-/merge_requests/225

3 4

[PATCH 1/3]ntoskrnl.exe: Redeclare function _allshl and _allshr.
by Zhao Yi 10 Jun '22

10 Jun '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8ae4bc1f5a9..5d3238200a3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1540,8 +1540,8 @@ @ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) -@ stdcall -arch=i386 -ret64 _allshl(int64 long) -@ stdcall -arch=i386 -ret64 _allshr(int64 long) +@ cdecl -arch=i386 -ret64 _allshl() +@ cdecl -arch=i386 -ret64 _allshr() @ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) -- 2.20.1

3 3

[PATCH 0/7] MR220: winegstreamer: Add zero-copy support to quartz_transform.
by Rémi Bernon (＠rbernon) 10 Jun '22

10 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/220

3 10

Re: [PATCH v5 0/9] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/205

1 0

Re: [PATCH v3 0/2] MR127: ws2_32: Make wait in select and recv alertable - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/127

1 0

Re: [PATCH v2 0/6] MR222: ntdll: Implement RtlGetUserValueHeap and use it in Local/Global alloc. - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/222

1 0

Re: [PATCH v4 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work. - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/216

1 0

Re: [PATCH v4 0/1] MR181: winebus: Optionally split joysticks with more than 6 axes. - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/181

1 0

Re: [PATCH v2 0/6] MR223: dinput/tests: Cleanup mouse and keyboard tests and merge them into device8.c. - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/223

1 0

Re: [PATCH v2 0/2] MR219: user32: Avoid use of setupapi in raw input device enumeration. - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/219

1 0

Re: [PATCH v2 0/1] MR221: comctl32: Fix integer overflow in DPA_Search. - approved
by Alexandre Julliard (＠julliard) 10 Jun '22

10 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/221

1 0

[PATCH 0/2] MR227: riched20: Fix for #52752 (use IViewObject implementation)
by Jinoh Kang (＠iamahuman) 10 Jun '22

10 Jun '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52752. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/227

3 4

[PATCH v4 0/9] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions
by Piotr Caban (＠piotr) 10 Jun '22

10 Jun '22

-- v4: d3dx10/tests: Add a test for loading an invalid resource from a valid module. d3dx10/tests: Initialize a function argument. d3dx10/tests: Add D3DX10GetImageInfoFromMemory thread pump tests. d3dx10: Support ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromMemory. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromFileW. d3dx10/tests: Add D3DX10GetImageInfoFromMemory HRESULT argument tests. d3dx10: Don't ignore HRESULT parameter in D3DX10GetImageInfoFrom* functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/205

4 11

[PATCH v3 0/7] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions
by Piotr Caban (＠piotr) 10 Jun '22

10 Jun '22

-- v3: d3dx10/tests: Add D3DX10GetImageInfoFromMemory thread pump tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/205

3 11

[PATCH 0/3] MR225: server: Fix races related to socket errors
by Piotr Caban (＠piotr) 10 Jun '22

10 Jun '22

Calling ioctl(..., SO_ERROR, ...) clears pending socket error. Because of that we may clear the error in poll_socket or IOCTL_AFD_GET_SO_ERROR. This leads to failures during Battle.net installation (it's a race that I can only reproduce on slow machines). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/225

3 6

[PATCH v2 0/4] MR218: advapi32: Implement RegRenameKey()
by Nikolay Sivov (＠nsivov) 10 Jun '22

10 Jun '22

-- v2: advapi32: Implement RegRenameKey(). ntdll: Implement NtRenameKey(). advapi32/tests: Add some tests for RegRenameKey(). ntdll/tests: Add some tests for NtRenameKey(). https://gitlab.winehq.org/wine/wine/-/merge_requests/218

3 7

[PATCH v2 0/2] MR127: ws2_32: Make wait in select alertable
by Paul Gofman (＠gofman) 10 Jun '22

10 Jun '22

Fixes V Rising hang on exit. During exit the main thread wants to terminate the other thread by queuing APC which APC is supposed to raise an exception and abort the thread. That is basically how Unity / Mono aborts threads. The thread being terminated is calling select() in a loop and the wait in select() is currently not alertable (while they should be, as the test suggests). But with the first patch the things may get more interesting. ws2_32.select() passes on stack io status block to NtDeviceIoControlFile(), then it is killed from APC while waiting for event to be signaled by ioctl async processing. Then, wineserver wants to complete the async. The async owner thread is already terminated and it delivers SIGUSR1 to process the system APC to the main thread. When the APC is processed from USR1 handler it segfaults trying to put the IO status to iosb pointing to already deallocated thread stack. This is segfault on signal stack and as such is unrecoverable. The process is left hanging. Thus the second patch. In the ideal case we'd probably want to avoid crashing or handle segfault in system APC processing somehow, but I don't yet see a feasible way to do it. In theory the same may happen without ws2_32 if the app does the same, but I don't know that anything hits that case while ws2_32 queues those on stack iosbs, so avoiding that may probably avoid the practical issues. -- v2: ws2_32: Make wait in WS2_recv_base() alertable. ws2_32: Make wait in select() alertable. https://gitlab.winehq.org/wine/wine/-/merge_requests/127

4 4

[tools] testbot/web: Remove the duplicate Author column on the main page.
by Francois Gouget 10 Jun '22

10 Jun '22

Use the job's UserName field instead of looking up the (Itemref) user object for every job. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 8b4af53c0..2073b1e6f 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -39,7 +39,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Branch|PatchId|Patch)$/ ? "" : + return $PropertyName =~ /^(?:Branch|User|PatchId|Patch)$/ ? "" : $PropertyName eq "Submitted" ? ("ro", "timetipdate") : ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); @@ -74,16 +74,16 @@ sub GenerateDataView($$$) my $Job = $Row->{Item}; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName eq "User") + if ($PropertyName eq "UserName") { - if (defined $Job->Patch and defined $Job->Patch->FromName and - $Job->User->GetKey() eq GetBatchUser()->GetKey()) + if (defined $Job->PatchId and defined $Job->Patch->FromName and + $Job->UserName eq GetBatchUser()->Name) { print $self->escapeHTML($Job->Patch->FromName); } else { - print $self->escapeHTML($Job->User->Name); + print $self->escapeHTML($Job->UserName); } } elsif ($PropertyName eq "Status") -- 2.30.2

1 0

[PATCH] WWN 420.
by Cressida Silver 10 Jun '22

10 Jun '22

--- news/en/2022061002.xml | 13 + wwn/en/wn20220610_420.xml | 690 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 703 insertions(+) create mode 100644 news/en/2022061002.xml create mode 100644 wwn/en/wn20220610_420.xml diff --git a/news/en/2022061002.xml b/news/en/2022061002.xml new file mode 100644 index 00000000..505c529f --- /dev/null +++ b/news/en/2022061002.xml @@ -0,0 +1,13 @@ +<news> + <date>June 10, 2022</date> + <title>World Wine News Issue 420</title> + <body> + <a href="{$root}/wwn/ISS">WWN Issue 420</a> was released today. + <p> + <ul> + <li><a href="{$root}/wwn/420#Wine 7.10" class="">Wine 7.10</a></li> + <li><a href="{$root}/wwn/420#A Bug's Life" class="">A Bug's Life</a></li> + </ul> + </p> + </body> +</news> diff --git a/wwn/en/wn20220610_420.xml b/wwn/en/wn20220610_420.xml new file mode 100644 index 00000000..8e285745 --- /dev/null +++ b/wwn/en/wn20220610_420.xml @@ -0,0 +1,690 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn@winehq.org">Cressida Silver</author> + <issue num="420" date="06/10/2022"/> + <intro> + <p> + This is the 420th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open-source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code. + </p> + </intro> + + <section title="Wine 7.10"> + <p> + Wine 7.10 is here and brings the following: + </p> + + <p> + <ul> + <li>Converted macOS driver to PE.</li> + <li>Mono engine updated to version 7.3.0.</li> + <li>Windows-compatible Unicode collation.</li> + <li>Wow64 support in SECUR32.</li> + </ul> + </p> + + <p> + Bugs closed with this release are listed below. + </p> + </section> + + <section title="A Bug's Life"> + <p> + <center> + <table border="2"> + <tr> + <td width="100" align="center"> + <b>Bug ID</b> + </td> + <td width="100" align="center"> + <b>Open Date</b> + </td> + <td width="100" align="center"> + <b>Days Open</b> + </td> + <td width="100" align="center"> + <b>Weeks Open</b> + </td> + <td width="100" align="center"> + <b>Months Open</b> + </td> + <td width="100" align="center"> + <b>Years Open</b> + </td> + <td width="850" align="center"> + <b>Bug Summary</b> + </td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=3599">3599</a> + </td> + <td align="center">10/15/05</td> + <td align="center">DDD</td> + <td align="center">WWW</td> + <td align="center">MMM</td> + <td align="center">YYY</td> + <td>SUMMARY</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=3599">3599</a> + </td> + <td align="center">10/15/05</td> + <td align="center">6,075</td> + <td align="center">868</td> + <td align="center">199</td> + <td align="center">17</td> + <td>Corel Draw 9 printing Issue</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=5163">5163</a> + </td> + <td align="center">4/30/06</td> + <td align="center">5,878</td> + <td align="center">840</td> + <td align="center">193</td> + <td align="center">16</td> + <td>Microsoft Office XP 2002 installer reports error 25003 (installation source corrupted), custom action 'CADpc' returns 1603</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=5989">5989</a> + </td> + <td align="center">8/17/06</td> + <td align="center">5,769</td> + <td align="center">824</td> + <td align="center">189</td> + <td align="center">16</td> + <td>Cannot run uninstall for IE6</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=9583">9583</a> + </td> + <td align="center">9/4/07</td> + <td align="center">5,386</td> + <td align="center">769</td> + <td align="center">176</td> + <td align="center">15</td> + <td>CompareStringW gives incorrect result for some wide strings</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=10767">10767</a> + </td> + <td align="center">12/13/07</td> + <td align="center">5,286</td> + <td align="center">755</td> + <td align="center">173</td> + <td align="center">14</td> + <td>lstrcmp and others do not compare punctuation characters correctly</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=16142">16142</a> + </td> + <td align="center">11/20/08</td> + <td align="center">4,943</td> + <td align="center">706</td> + <td align="center">162</td> + <td align="center">14</td> + <td>Adobe Reader 9.0 outputs error after install, that multiple instances are running</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=19743">19743</a> + </td> + <td align="center">8/15/09</td> + <td align="center">4,675</td> + <td align="center">668</td> + <td align="center">153</td> + <td align="center">13</td> + <td>Acrobat Reader 5 crashes on startup (InterTrust 'docbox.api' plugin incompatible with Windows 7+)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=22603">22603</a> + </td> + <td align="center">5/6/10</td> + <td align="center">4,411</td> + <td align="center">630</td> + <td align="center">144</td> + <td align="center">12</td> + <td>Can't print page in IE6</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=25280">25280</a> + </td> + <td align="center">11/24/10</td> + <td align="center">4,209</td> + <td align="center">601</td> + <td align="center">138</td> + <td align="center">12</td> + <td>Singularity: no sound in game without Hardware Acceleration = emulation</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=26909">26909</a> + </td> + <td align="center">4/23/11</td> + <td align="center">4,059</td> + <td align="center">580</td> + <td align="center">133</td> + <td align="center">11</td> + <td>HaoZip: Cannot navigate to drive_c</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=28437">28437</a> + </td> + <td align="center">9/18/11</td> + <td align="center">3,911</td> + <td align="center">559</td> + <td align="center">128</td> + <td align="center">11</td> + <td>Panzer Corps: no intro video (requires WMV1 codec)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=30503">30503</a> + </td> + <td align="center">4/22/12</td> + <td align="center">3,694</td> + <td align="center">528</td> + <td align="center">121</td> + <td align="center">10</td> + <td>Echo: Secrets of the Lost Cavern upside down on BACKBUFFER</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=33209">33209</a> + </td> + <td align="center">3/14/13</td> + <td align="center">3,368</td> + <td align="center">481</td> + <td align="center">110</td> + <td align="center">9</td> + <td>Tribes: Ascend cannot authenticate user</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=34025">34025</a> + </td> + <td align="center">7/12/13</td> + <td align="center">3,248</td> + <td align="center">464</td> + <td align="center">106</td> + <td align="center">9</td> + <td>IE8 help exits silently</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=34026">34026</a> + </td> + <td align="center">7/12/13</td> + <td align="center">3,248</td> + <td align="center">464</td> + <td align="center">106</td> + <td align="center">9</td> + <td>IE8 help pages are blank</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=37614">37614</a> + </td> + <td align="center">11/22/14</td> + <td align="center">2,750</td> + <td align="center">393</td> + <td align="center">90</td> + <td align="center">8</td> + <td>Applications do not always start inside a configured virtual desktop</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=37877">37877</a> + </td> + <td align="center">1/10/15</td> + <td align="center">2,701</td> + <td align="center">386</td> + <td align="center">88</td> + <td align="center">7</td> + <td>boincmgr crashes with wxWidgets error with WinVer > Win81</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=38929">38929</a> + </td> + <td align="center">7/16/15</td> + <td align="center">2,514</td> + <td align="center">359</td> + <td align="center">82</td> + <td align="center">7</td> + <td>Betfair Poker setup fails to connect to the server</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=38931">38931</a> + </td> + <td align="center">7/16/15</td> + <td align="center">2,514</td> + <td align="center">359</td> + <td align="center">82</td> + <td align="center">7</td> + <td>Betfair Poker log-in stops</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=46155">46155</a> + </td> + <td align="center">11/16/18</td> + <td align="center">1,295</td> + <td align="center">185</td> + <td align="center">42</td> + <td align="center">4</td> + <td>Multiple applications need KERNEL32.dll.RaiseFailFastException (RoyalTS v5, Windows PowerShell Core 6.1 for ARM64)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=46775">46775</a> + </td> + <td align="center">3/4/19</td> + <td align="center">1,187</td> + <td align="center">170</td> + <td align="center">38</td> + <td align="center">3</td> + <td>Steam crashes when attempting to access controller settings for desktop or general</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=46857">46857</a> + </td> + <td align="center">3/17/19</td> + <td align="center">1,174</td> + <td align="center">168</td> + <td align="center">38</td> + <td align="center">3</td> + <td>Steam menus are hidden by macOS native window decoration</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=48011">48011</a> + </td> + <td align="center">10/30/19</td> + <td align="center">947</td> + <td align="center">135</td> + <td align="center">31</td> + <td align="center">3</td> + <td>Rebelbetting: unhandled exception on exit</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=48025">48025</a> + </td> + <td align="center">11/1/19</td> + <td align="center">945</td> + <td align="center">135</td> + <td align="center">31</td> + <td align="center">3</td> + <td>Betfair Poker crashes</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=48270">48270</a> + </td> + <td align="center">11/12/19</td> + <td align="center">934</td> + <td align="center">133</td> + <td align="center">30</td> + <td align="center">3</td> + <td>Rebelbetting sometimes returns insanely high numbers</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=48718">48718</a> + </td> + <td align="center">3/5/20</td> + <td align="center">820</td> + <td align="center">117</td> + <td align="center">26</td> + <td align="center">2</td> + <td>unimplemented function KERNEL32.dll.RaiseFailFastException</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=49052">49052</a> + </td> + <td align="center">4/29/20</td> + <td align="center">765</td> + <td align="center">109</td> + <td align="center">25</td> + <td align="center">2</td> + <td>Japanese Visual Novel "Natural Vacation" doesn't start (ENIGMA 5.X protected)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51572">51572</a> + </td> + <td align="center">8/7/21</td> + <td align="center">300</td> + <td align="center">43</td> + <td align="center">9</td> + <td align="center">1</td> + <td>Crash when opening notes panel in Logos Bible Software</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51665">51665</a> + </td> + <td align="center">8/23/21</td> + <td align="center">284</td> + <td align="center">41</td> + <td align="center">9</td> + <td align="center">1</td> + <td>Multiple applications need IDXGIAdapter3::RegisterVideoMemoryBudgetChangeNotificationEvent() (HITMAN 2 (2018), FAR mod for Nier: Automata)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51788">51788</a> + </td> + <td align="center">9/23/21</td> + <td align="center">253</td> + <td align="center">36</td> + <td align="center">8</td> + <td align="center">1</td> + <td>windowscodecs:wmpformat test_decode() fails randomly</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51936">51936</a> + </td> + <td align="center">10/28/21</td> + <td align="center">218</td> + <td align="center">31</td> + <td align="center">7</td> + <td align="center">1</td> + <td>Honeygain forgets user details</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52032">52032</a> + </td> + <td align="center">11/12/21</td> + <td align="center">203</td> + <td align="center">29</td> + <td align="center">6</td> + <td align="center">1</td> + <td>Bad Mouse Pointer under 32bits app (Poser)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52127">52127</a> + </td> + <td align="center">11/27/21</td> + <td align="center">188</td> + <td align="center">27</td> + <td align="center">6</td> + <td align="center">1</td> + <td>SlingPlayer 2 crashes on load</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52218">52218</a> + </td> + <td align="center">12/14/21</td> + <td align="center">171</td> + <td align="center">24</td> + <td align="center">5</td> + <td align="center">0</td> + <td>Honeygain exits silently</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52458">52458</a> + </td> + <td align="center">1/26/22</td> + <td align="center">128</td> + <td align="center">18</td> + <td align="center">4</td> + <td align="center">0</td> + <td>Lazarus can't start program for debugging</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52513">52513</a> + </td> + <td align="center">2/3/22</td> + <td align="center">120</td> + <td align="center">17</td> + <td align="center">4</td> + <td align="center">0</td> + <td>CEF does not work with sandbox</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52747">52747</a> + </td> + <td align="center">3/29/22</td> + <td align="center">66</td> + <td align="center">9</td> + <td align="center">2</td> + <td align="center">0</td> + <td>Notepad crashes on a StaticColor X display</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52863">52863</a> + </td> + <td align="center">4/22/22</td> + <td align="center">42</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td>kernel32:actctx fails on Windows 10 1909</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52870">52870</a> + </td> + <td align="center">4/23/22</td> + <td align="center">41</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td>shlwapi:url - The UrlGetPartA() tests fails with a UTF-8 code page</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52882">52882</a> + </td> + <td align="center">4/24/22</td> + <td align="center">40</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td>GPU Caps Viewer 1.54 crashes on start</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52918">52918</a> + </td> + <td align="center">4/27/22</td> + <td align="center">37</td> + <td align="center">5</td> + <td align="center">1</td> + <td align="center">0</td> + <td>Corrupted textures in Visual Studio 2010 using native WPF interfaces.</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52956">52956</a> + </td> + <td align="center">5/4/22</td> + <td align="center">30</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Star Citizen crashes on unimplemented function kernel32.dll.SetThreadInformation</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52972">52972</a> + </td> + <td align="center">5/7/22</td> + <td align="center">27</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="center">0</td> + <td>wineusb.sys: add_usb_device erroneously releases critical section on failure path</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52973">52973</a> + </td> + <td align="center">5/7/22</td> + <td align="center">27</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="center">0</td> + <td>A file containing special characters in its name is unreadable/unusable</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53003">53003</a> + </td> + <td align="center">5/14/22</td> + <td align="center">20</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>XM6 TypeG: some MIDI note-on messages aren't sent to MIDI devices (MIDI running status isn't supported in the MIDI mapper)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53005">53005</a> + </td> + <td align="center">5/14/22</td> + <td align="center">20</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>quartz:systemclock Fails after timeGetTime() wraps</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53010">53010</a> + </td> + <td align="center">5/16/22</td> + <td align="center">18</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Split/Second crashes on launch</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53016">53016</a> + </td> + <td align="center">5/18/22</td> + <td align="center">16</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Steam fails to load pages</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53020">53020</a> + </td> + <td align="center">5/19/22</td> + <td align="center">15</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>EA Origin is unable to download games</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53022">53022</a> + </td> + <td align="center">5/20/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Hitomi downloader (Technical Preview) crashes at start</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53027">53027</a> + </td> + <td align="center">5/21/22</td> + <td align="center">13</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Port Royale 4 crashes with wined3d_texture*</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53034">53034</a> + </td> + <td align="center">5/22/22</td> + <td align="center">12</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Lazarus: menu text disappears under mouse if light theme is enabled</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53051">53051</a> + </td> + <td align="center">5/26/22</td> + <td align="center">8</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Kvaser software crashes on unimplemented function ntoskrnl.exe.ExNotifyCallback</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53061">53061</a> + </td> + <td align="center">5/28/22</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Alcoma ASD Client 11.1 fails to start due to missing unicode exports in tapi32</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53079">53079</a> + </td> + <td align="center">5/31/22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Linker error during build. winegstreamer:wg_transform.c:526: undefined reference to `gst_sample_set_info'</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53080">53080</a> + </td> + <td align="center">6/1/22</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Powershell Core crash in FindNLSStringEx</td> + </tr> + </table> + </center> + </p> + </section> +</kc> -- 2.25.1

1 0

[PATCH v3 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.
by Connor McAdams (＠cmcadams) 10 Jun '22

10 Jun '22

-- v3: uiautomationcore: Add ILegacyIAccessibleProvider implementation for MSAA providers. include: Add ILegacyIAccessibleProvider interface definition. uiautomationcore: Implement get_HostRawElementProvider for MSAA providers. https://gitlab.winehq.org/wine/wine/-/merge_requests/216

3 5

[PATCH v2 1/2] user32/tests: Test intra-thread SendMessage and ReplyMessage behavior.
by Gabriel Ivăncescu 10 Jun '22

10 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Add broken() check to fix w10pro64_ar testbot results. dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2705914..ce931d2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18521,6 +18521,12 @@ static void test_SendMessage_other_thread(int thread_n) CloseHandle(wnd_event.stop_event); } +static void CALLBACK msg_callback_nested( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 10, "wrong msg %x\n", msg ); + ok( result == 0, "wrong result %Ix\n", result ); +} + static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { DWORD flags = InSendMessageEx( NULL ); @@ -18561,6 +18567,80 @@ static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, ret = ReplyMessage( msg ); ok( !ret, "ReplyMessage succeeded\n" ); break; + case WM_USER + 4: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageCallbackA( hwnd, WM_USER + 10, 0, 0, msg_callback_nested, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED) || broken(flags == (ISMEX_NOTIFY | ISMEX_REPLIED)), "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED) || broken(flags == (ISMEX_NOTIFY | ISMEX_REPLIED)), "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 5: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageA( hwnd, WM_USER + 11, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 6: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageW( hwnd, WM_USER + 12, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 7: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + SendNotifyMessageW( hwnd, WM_USER + 13, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage succeeded\n" ); + break; + + case WM_USER + 10: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 11: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 12: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 13: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage returned %u\n", ret ); + break; } return DefWindowProcA( hwnd, msg, wp, lp ); @@ -18572,6 +18652,12 @@ static void CALLBACK msg_callback( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT r ok( result == WM_USER + 2, "wrong result %Ix\n", result ); } +static void CALLBACK msg_callback2( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 6, "wrong msg %x\n", msg ); + ok( result == WM_USER + 6, "wrong result %Ix\n", result ); +} + static DWORD WINAPI send_message_thread( void *arg ) { HWND win = arg; @@ -18580,6 +18666,10 @@ static DWORD WINAPI send_message_thread( void *arg ) SendNotifyMessageA( win, WM_USER + 1, 0, 0 ); SendMessageCallbackA( win, WM_USER + 2, 0, 0, msg_callback, 0 ); PostMessageA( win, WM_USER + 3, 0, 0 ); + SendMessageA( win, WM_USER + 4, 0, 0 ); + SendNotifyMessageA( win, WM_USER + 5, 0, 0 ); + SendMessageCallbackA( win, WM_USER + 6, 0, 0, msg_callback2, 0 ); + PostMessageA( win, WM_USER + 7, 0, 0 ); PostMessageA( win, WM_QUIT, 0, 0 ); return 0; } -- 2.34.1

1 1

[PATCH v2 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.
by Connor McAdams (＠cmcadams) 10 Jun '22

10 Jun '22

-- v2: uiautomationcore: Add ILegacyIAccessibleProvider implementation for MSAA providers. include: Add ILegacyIAccessibleProvider interface definition. uiautomationcore: Implement get_HostRawElementProvider for MSAA providers. https://gitlab.winehq.org/wine/wine/-/merge_requests/216

3 8

[PATCH v3 0/6] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.
by Bernhard Kölbl (＠besentv) 10 Jun '22

10 Jun '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v3: windows.media.speech: Add stub ISpeechSynthesisStream iface. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync. windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. windows.media.speech/tests: Add basic tests for ssml/text to stream functions. windows.media.speech/tests: Handle a possible race condition. https://gitlab.winehq.org/wine/wine/-/merge_requests/217

4 15

[PATCH 0/6] MR223: dinput/tests: Cleanup mouse and keyboard tests and merge them into device8.c.
by Rémi Bernon (＠rbernon) 10 Jun '22

10 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/223

3 8

[PATCH 0/4] MR218: advapi32: Implement RegRenameKey()
by Nikolay Sivov (＠nsivov) 10 Jun '22

10 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/218

4 6

[PATCH v4 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource
by Alistair Leslie-Hughes (＠alesliehughes) 10 Jun '22

10 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v4: d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource https://gitlab.winehq.org/wine/wine/-/merge_requests/167

3 2

[PATCH v3 0/1] MR181: winebus: Optionally split joysticks with more than 6 axes.
by Timo Zuccarello (＠timozuccarello) 10 Jun '22

10 Jun '22

Add registry option "Split Controllers" and optionally split joysticks with more than 6 axes to improve compatibility with applications that do not support more than 6 axes where on Windows a driver would be installed that splits the device. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> -- v3: winebus: Optionally split joysticks with more than 6 axes. https://gitlab.winehq.org/wine/wine/-/merge_requests/181

3 2

[PATCH 3/3]ntdll/tests: Add tests for _allshl and _allshr.
by Zhao Yi 10 Jun '22

10 Jun '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/tests/large_int.c | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 9635cac24ad..793696f1e4d 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -40,6 +40,9 @@ static LONGLONG (WINAPI *p_allmul)( LONGLONG a, LONGLONG b ); static ULONGLONG (WINAPI *p_aulldiv)( ULONGLONG a, ULONGLONG b ); static ULONGLONG (WINAPI *p_aullrem)( ULONGLONG a, ULONGLONG b ); +static LONGLONG (CDECL *p_allshl)(void); +static LONGLONG (CDECL *p_allshr)(void); + static void InitFunctionPtrs(void) { hntdll = LoadLibraryA("ntdll.dll"); @@ -56,6 +59,8 @@ static void InitFunctionPtrs(void) p_allmul = (void *)GetProcAddress(hntdll, "_allmul"); p_aulldiv = (void *)GetProcAddress(hntdll, "_aulldiv"); p_aullrem = (void *)GetProcAddress(hntdll, "_aullrem"); + p_allshl = (void *)GetProcAddress(hntdll, "_allshl"); + p_allshr = (void *)GetProcAddress(hntdll, "_allshr"); } /* if */ } @@ -492,6 +497,56 @@ static void test_builtins(void) #endif /* __i386__ */ } +static void test_allshl(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshl(); + ok(c == 0x56677880, "1. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshl(); + ok(c == 0, "2. _allshl returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshl(); + ok(c == 0, "3. _allshl returned 0x%x\n", c); + + return; +} + +static void test_allshr(void) +{ + int c = 0; + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x4,%cl"); + c = p_allshr(); + ok(c == 0x45566778, "1. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x28,%cl"); + c = p_allshr(); + ok(c == 0x112233, "2. _allshr returned 0x%x\n", c); + + asm("mov $0x55667788,%eax"); + asm("mov $0x11223344,%edx"); + asm("mov $0x46,%cl"); + c = p_allshr(); + ok(c == 0, "3. _allshr returned 0x%x\n", c); + + return; +} + START_TEST(large_int) { InitFunctionPtrs(); @@ -503,4 +558,6 @@ START_TEST(large_int) if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); test_builtins(); + test_allshl(); + test_allshr(); } -- 2.20.1

2 1

[PATCH v3] comctl32/listview: Add partial support for LVM_SETBKIMAGE.
by Dmitry Timoshkov 10 Jun '22

10 Jun '22

v2: Formatting fixes, add some tests. v3: Add v6 tests, make v6 behaviour the default one. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 81 +++++++++++++++++++++++++++++++--- dlls/comctl32/tests/listview.c | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..0ad88f779b7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4565,13 +4566,32 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) * Success: TRUE * Failure: FALSE */ -static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +static BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + BOOL ret = FALSE; - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + + ret = FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } + + if (infoPtr->hBkBitmap) + { + HDC hdc_src = CreateCompatibleDC(hdc); + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + SelectObject(hdc_src, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, hdc_src, lprcBox->left, lprcBox->top, SRCCOPY); + + DeleteDC(hdc_src); + ret = TRUE; + } - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + return ret; } /* Draw main item or subitem */ @@ -8028,7 +8048,51 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static BOOL LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx, %p, %p, %u, %d, %d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("not supported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("not supported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + } + break; + + case LVBKIF_SOURCE_HBITMAP: + { + BITMAP bm; + + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + } + if (GetObjectW(image->hbm, sizeof(bm), &bm) == sizeof(bm)) + { + infoPtr->hBkBitmap = image->hbm; + return TRUE; + } + break; + } + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return FALSE; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -10406,6 +10470,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11619,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ac7f53137d..3a78f5f670c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <objbase.h> #include "wine/test.h" #include "v6util.h" @@ -6924,6 +6925,81 @@ static void test_LVM_GETNEXTITEMINDEX(void) DestroyWindow(hwnd); } +static void test_LVM_SETBKIMAGE(BOOL is_v6) +{ + HWND hwnd; + int ret; + HBITMAP hbmp; + BITMAP bm; + LVBKIMAGEA image; + + CoInitialize(NULL); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + hwnd = create_listview_control(LVS_REPORT); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + image.pszImage = NULL; + image.cchImageMax = 0; + image.xOffsetPercent = 0; + image.yOffsetPercent = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); + + CoUninitialize(); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6987,6 +7063,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_LVM_SETBKIMAGE(FALSE); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -7034,6 +7111,7 @@ START_TEST(listview) test_item_state_change(); test_selected_column(); test_LVM_GETNEXTITEMINDEX(); + test_LVM_SETBKIMAGE(TRUE); unload_v6_module(ctx_cookie, hCtx); -- 2.36.1

1 0

[PATCH 2/3]ntdll: Reimplement function _allshl and _allshr.
by Zhao Yi 10 Jun '22

10 Jun '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/ntdll/large_int.c | 46 ++++++++++++++++++++++++++++++++++-------- dlls/ntdll/ntdll.spec | 4 ++-- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index b38074158c8..2f6e27eff10 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -821,10 +821,25 @@ ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) * RETURNS * The left-shifted value. */ -LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) -{ - return a << b; -} +__ASM_GLOBAL_FUNC( _allshl, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shld %cl, %eax, %edx\n\t" +"shl %cl, %eax\n\t" +"ret\n\t" +"2:\n\t" +"mov %eax, %edx\n\t" +"xor %eax, %eax\n\t" +"and $0x1f, %cl\n\t" +"shl %cl, %edx\n\t" +"ret\n\t" +"1:\n\t" +"xor %eax, %eax\n\t" +"xor %edx, %edx\n\t" +"ret\n\t" +) /****************************************************************************** * _allshr (NTDLL.@) @@ -838,10 +853,25 @@ LONGLONG WINAPI _allshl( LONGLONG a, LONG b ) * RETURNS * The right-shifted value. */ -LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) -{ - return a >> b; -} +__ASM_GLOBAL_FUNC( _allshr, +"cmp $0x40, %cl\n\t" +"jnb 1f\n\t" +"cmp $0x20, %cl\n\t" +"jnb 2f\n\t" +"shrd %cl,%edx,%eax\n\t" +"sar %cl,%edx\n\t" +"ret\n\t" +"2:\n\t" +"mov %edx,%eax\n\t" +"sar $0x1f,%edx\n\t" +"and $0x1f,%cl\n\t" +"sar %cl,%eax\n\t" +"ret\n\t" +"1:\n\t" +"sar $0x1f,%edx\n\t" +"mov %edx,%eax\n\t" +"ret\n\t" +) /****************************************************************************** * _alldvrm (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..6b96b0433fd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1492,8 +1492,8 @@ @ cdecl -norelay -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @ cdecl -norelay -arch=i386 -ret64 _allrem(int64 int64) -@ stdcall -arch=i386 -ret64 _allshl(int64 long) -@ stdcall -arch=i386 -ret64 _allshr(int64 long) +@ cdecl -arch=i386 -ret64 _allshl() +@ cdecl -arch=i386 -ret64 _allshr() @ cdecl -ret64 _atoi64(str) @ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -- 2.20.1

1 0

[PATCH v2 0/1] MR181: winebus: Optionally split joysticks with more than 6 axes.
by Timo Zuccarello (＠timozuccarello) 10 Jun '22

10 Jun '22

Add registry option "Split Controllers" and optionally split joysticks with more than 6 axes to improve compatibility with applications that do not support more than 6 axes where on Windows a driver would be installed that splits the device. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> -- v2: winebus: Optionally split joysticks with more than 6 axes. https://gitlab.winehq.org/wine/wine/-/merge_requests/181

3 2

[PATCH v2] comctl32/listview: Add partial support for LVM_SETBKIMAGE.
by Dmitry Timoshkov 10 Jun '22

10 Jun '22

v2: Formatting fixes, add some tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 78 +++++++++++++++++++++++++++++++--- dlls/comctl32/tests/listview.c | 71 +++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..6a98fcc6274 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4565,13 +4566,32 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) * Success: TRUE * Failure: FALSE */ -static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +static BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + BOOL ret = FALSE; - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + + ret = FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } + + if (infoPtr->hBkBitmap) + { + HDC hdc_src = CreateCompatibleDC(hdc); + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + SelectObject(hdc_src, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, hdc_src, lprcBox->left, lprcBox->top, SRCCOPY); + + DeleteDC(hdc_src); + ret = TRUE; + } - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + return ret; } /* Draw main item or subitem */ @@ -8028,7 +8048,48 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static LRESULT LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx, %p, %p, %u, %d, %d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("not supported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("not supported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + } + break; + + case LVBKIF_SOURCE_HBITMAP: + { + BITMAP bm; + + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + } + if (GetObjectW(image->hbm, sizeof(bm), &bm) == sizeof(bm)) + infoPtr->hBkBitmap = image->hbm; + break; + } + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return 0; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -10406,6 +10467,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11616,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ac7f53137d..420e557f2db 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <objbase.h> #include "wine/test.h" #include "v6util.h" @@ -6924,6 +6925,75 @@ static void test_LVM_GETNEXTITEMINDEX(void) DestroyWindow(hwnd); } +static void test_LVM_SETBKIMAGE(void) +{ + HWND hwnd; + int ret; + HBITMAP hbmp; + BITMAP bm; + LVBKIMAGEA image; + + CoInitialize(NULL); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + hwnd = create_listview_control(LVS_REPORT); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + image.pszImage = NULL; + image.cchImageMax = 0; + image.xOffsetPercent = 0; + image.yOffsetPercent = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); + + CoUninitialize(); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6987,6 +7057,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_LVM_SETBKIMAGE(); if (!load_v6_module(&ctx_cookie, &hCtx)) { -- 2.36.1

1 0

[PATCH 0/2] MR219: user32: Avoid use of setupapi in raw input device enumeration.
by Zebediah Figura (＠zfigura) 10 Jun '22

10 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/219

4 5

[PATCH 0/1] MR213: nls: Add some of the missing codepage files.
by Nikolay Sivov (＠nsivov) 10 Jun '22

10 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/213

3 4

[PATCH 0/6] MR222: ntdll: Implement RtlGetUserValueHeap and use it in Local/Global alloc.
by Rémi Bernon (＠rbernon) 10 Jun '22

10 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/222

2 6

[PATCH vkd3d] include: Add ID3D12Device2 declaration in vkd3d_d3d12.idl.
by Biswapriyo Nath 10 Jun '22

10 Jun '22

2 1

[PATCH vkd3d 2/2] include: Add ID3D12SharingContract interface declarations in vkd3d_d3d12sdklayers.idl.
by Biswapriyo Nath 10 Jun '22

10 Jun '22

2 1

[PATCH vkd3d 1/2] include: Add ID3D12DebugDevice interface declarations in vkd3d_d3d12sdklayers.idl.
by Biswapriyo Nath 10 Jun '22

10 Jun '22

2 1

[PATCH 0/1] MR221: comctl32: Fix integer overflow in DPA_Search.
by Jinoh Kang (＠iamahuman) 10 Jun '22

10 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/221

3 2

[PATCH v6 resend 1/5] include/ddk: Add winusbio.h file.
by Mohamad Al-Jaf 10 Jun '22

10 Jun '22

Needed by winusb.h. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/ddk/winusbio.h | 66 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 include/ddk/winusbio.h diff --git a/include/Makefile.in b/include/Makefile.in index f3e62c4bb5a..58bf7db1e13 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -211,6 +211,7 @@ SOURCES = \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ + ddk/winusbio.h \ ddk/wsk.h \ ddraw.h \ ddrawgdi.h \ diff --git a/include/ddk/winusbio.h b/include/ddk/winusbio.h new file mode 100644 index 00000000000..14d8230d87f --- /dev/null +++ b/include/ddk/winusbio.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINUSBIO_H_ +#define _WINUSBIO_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(WinUSB_TestGuid, 0XDA812BFF, 0X12C3, 0X46A2, 0X8E, 0X2B, 0XDB, 0XD3, 0XB7, 0X83, 0X4C, 0X43); + +#define SHORT_PACKET_TERMINATE 0x01 +#define AUTO_CLEAR_STALL 0x02 +#define PIPE_TRANSFER_TIMEOUT 0x03 +#define IGNORE_SHORT_PACKETS 0x04 +#define ALLOW_PARTIAL_READS 0x05 +#define AUTO_FLUSH 0x06 +#define RAW_IO 0x07 +#define MAXIMUM_TRANSFER_SIZE 0x08 +#define RESET_PIPE_ON_RESUME 0x09 + +typedef struct _WINUSB_PIPE_INFORMATION { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; +} WINUSB_PIPE_INFORMATION, *PWINUSB_PIPE_INFORMATION; + +#define AUTO_SUSPEND 0x81 +#define SUSPEND_DELAY 0x83 + +#define DEVICE_SPEED 0x01 + +#define LowSpeed 0x01 +#define FullSpeed 0x02 +#define HighSpeed 0x03 + +typedef struct _WINUSB_PIPE_INFORMATION_EX { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; + ULONG MaximumBytesPerInterval; +} WINUSB_PIPE_INFORMATION_EX, *PWINUSB_PIPE_INFORMATION_EX; + +#ifdef __cplusplus +} +#endif + +#endif /* _WINUSBIO_H_ */ -- 2.36.0

1 4

[PATCH v2] shell32: Implement SHBindToFolderIDListParent.
by Dmitry Timoshkov 10 Jun '22

10 Jun '22

Based on SHBindToParent and SHBindToObject implementations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/pidl.c | 46 +++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + dlls/shell32/tests/shlfolder.c | 53 ++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..8d42f58acc7 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1364,6 +1364,52 @@ HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *p } +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, + REFIID riid, void **ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; + + TRACE_(shell)("%p,%p,%s,%p,%p\n", psf, pidl, debugstr_guid(riid), ppv, ppidlLast); + pdump(pidl); + + *ppv = NULL; + if (ppidlLast) + *ppidlLast = NULL; + + if (!pidl) + return E_INVALIDARG; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (_ILIsPidlSimple(pidl)) + /* we are on desktop level */ + hr = IShellFolder_QueryInterface(psf, riid, ppv); + else + { + LPITEMIDLIST pidlParent = ILClone(pidl); + ILRemoveLastID(pidlParent); + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); + SHFree(pidlParent); + } + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = ILFindLastID(pidl); + + TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, ppidlLast ? *ppidlLast : NULL, hr); + return hr; +} + + /************************************************************************* * SHParseDisplayName [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..5b812774e1f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -334,6 +334,7 @@ @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) @ stdcall SHBrowseForFolderW(ptr) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index da606a9e707..1c482c06407 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -60,6 +60,7 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); +static HRESULT (WINAPI *pSHBindToFolderIDListParent)(IShellFolder*,LPCITEMIDLIST,REFIID,void **,LPCITEMIDLIST*); static WCHAR *make_wstr(const char *str) { @@ -89,6 +90,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) + MAKEFUNC(SHBindToFolderIDListParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -5410,6 +5412,56 @@ static void test_SHGetSetFolderCustomSettings(void) RemoveDirectoryW(pathW); } +static void test_SHBindToFolderIDListParent(void) +{ + IShellFolder *psf_desktop; + LPITEMIDLIST pidl; + HRESULT hr; + WCHAR path[MAX_PATH]; + SHITEMID empty_item = { 0, { 0 } }; + LPITEMIDLIST pidl_empty = (LPITEMIDLIST)&empty_item; + LPCITEMIDLIST pidl_last; + IShellFolder *psf; + + if (!pSHBindToFolderIDListParent) + { + win_skip("SHBindToFolderIDListParent not available\n"); + return; + } + + GetTempPathW(ARRAY_SIZE(path), path); + SHGetDesktopFolder(&psf_desktop); + + hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "got %#lx\n", hr); + + pidl_last = NULL; + hr = pSHBindToFolderIDListParent(psf_desktop, pidl, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last != NULL, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl_empty, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last == pidl_empty, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, (void **)&psf, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + IShellFolder_Release(psf); + + if (0) /* crashes under Windows */ + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, NULL, NULL); + + ILFree(pidl); + IShellFolder_Release(psf_desktop); + + pidl_last = (LPITEMIDLIST)0xdeadbeef; + hr = pSHBindToFolderIDListParent(NULL, NULL, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + ok(pidl_last == NULL, "got %p\n", pidl_last); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5417,6 +5469,7 @@ START_TEST(shlfolder) CO_E_NOTINITIALIZED for malformed directory names */ OleInitialize(NULL); + test_SHBindToFolderIDListParent(); test_ParseDisplayName(); test_SHParseDisplayName(); test_BindToObject(); -- 2.36.1

3 3

[PATCH v3 0/5] MR197: winegstreamer: Add support for zero-copy in wg_transform.
by Rémi Bernon (＠rbernon) 09 Jun '22

09 Jun '22

-- v3: winegstreamer: Support zero-copy in wg_transform_push_data. winegstreamer: Support zero-copy output using the allocator. winegstreamer: Introduce a new custom memory allocator. winegstreamer: Rename mf_(create|destroy)_wg_sample helpers. winegstreamer: Introduce new wg_transform_(push|read)_mf helpers. https://gitlab.winehq.org/wine/wine/-/merge_requests/197

4 7

Re: [PATCH v3 0/5] MR201: ntdll: Implement RtlSetUserValueHeap. - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/201

1 0

[PATCH v2 0/1] MR215: winevulkan: Update to VK spec version 1.3.217.
by Georg Lehmann (＠DadSchoorse) 09 Jun '22

09 Jun '22

-- v2: winevulkan: Update to VK spec version 1.3.217. https://gitlab.winehq.org/wine/wine/-/merge_requests/215

3 2

Re: [PATCH v3 0/3] MR208: dinput/tests: Cleanup old tests and merge more dinput8 / dinput tests together. - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/208

1 0

Re: [PATCH v3 0/2] MR210: winhttp: Use completion port for overlapped send. - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/210

1 0

Re: [PATCH v2 0/7] MR211: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/211

1 0

Re: [PATCH v6 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/135

1 0

Re: [PATCH v3 0/1] MR203: ws2_32: Check for valid socket in WSAGetOverlappedResult(). - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/203

1 0

[PATCH v2 0/2] MR214: ntdll: tests: Test returning an exception handler on arm/arm64
by Martin Storsjö (＠mstorsjo) 09 Jun '22

09 Jun '22

Also fix up the error message printed for the handler data. -- v2: ntdll/tests: Test returning an exception handler on arm/arm64. ntdll/tests: Fix printing of incorrect exception handler data. https://gitlab.winehq.org/wine/wine/-/merge_requests/214

3 3

Re: [PATCH v2 0/2] MR209: mfreadwrite: Base MF_SOURCE_READER_ANY_STREAM behavior off timestamps - approved
by Alexandre Julliard (＠julliard) 09 Jun '22

09 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/209

1 0

[PATCH v2 0/7] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions
by Piotr Caban (＠piotr) 09 Jun '22

09 Jun '22

-- v2: d3dx10/tests: Add D3DX10GetImageInfoFromMemory thread pump tests. d3dx10: Support ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromMemory. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromFileW. d3dx10/tests: Add D3DX10GetImageInfoFromMemory HRESULT argument tests. d3dx10: Don't ignore HRESULT parameter in D3DX10GetImageInfoFrom* functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/205

3 9

[PATCH 1/2] user32/tests: Test intra-thread SendMessage and ReplyMessage behavior.
by Gabriel Ivăncescu 09 Jun '22

09 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2705914..fab3221 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18521,6 +18521,12 @@ static void test_SendMessage_other_thread(int thread_n) CloseHandle(wnd_event.stop_event); } +static void CALLBACK msg_callback_nested( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 10, "wrong msg %x\n", msg ); + ok( result == 0, "wrong result %Ix\n", result ); +} + static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { DWORD flags = InSendMessageEx( NULL ); @@ -18561,6 +18567,80 @@ static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, ret = ReplyMessage( msg ); ok( !ret, "ReplyMessage succeeded\n" ); break; + case WM_USER + 4: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageCallbackA( hwnd, WM_USER + 10, 0, 0, msg_callback_nested, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 5: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageA( hwnd, WM_USER + 11, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 6: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageW( hwnd, WM_USER + 12, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 7: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + SendNotifyMessageW( hwnd, WM_USER + 13, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage succeeded\n" ); + break; + + case WM_USER + 10: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 11: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 12: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 13: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage returned %u\n", ret ); + break; } return DefWindowProcA( hwnd, msg, wp, lp ); @@ -18572,6 +18652,12 @@ static void CALLBACK msg_callback( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT r ok( result == WM_USER + 2, "wrong result %Ix\n", result ); } +static void CALLBACK msg_callback2( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 6, "wrong msg %x\n", msg ); + ok( result == WM_USER + 6, "wrong result %Ix\n", result ); +} + static DWORD WINAPI send_message_thread( void *arg ) { HWND win = arg; @@ -18580,6 +18666,10 @@ static DWORD WINAPI send_message_thread( void *arg ) SendNotifyMessageA( win, WM_USER + 1, 0, 0 ); SendMessageCallbackA( win, WM_USER + 2, 0, 0, msg_callback, 0 ); PostMessageA( win, WM_USER + 3, 0, 0 ); + SendMessageA( win, WM_USER + 4, 0, 0 ); + SendNotifyMessageA( win, WM_USER + 5, 0, 0 ); + SendMessageCallbackA( win, WM_USER + 6, 0, 0, msg_callback2, 0 ); + PostMessageA( win, WM_USER + 7, 0, 0 ); PostMessageA( win, WM_QUIT, 0, 0 ); return 0; } -- 2.34.1

2 3

[PATCH v3 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Rémi Bernon 09 Jun '22

09 Jun '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */ -- 2.36.1

2 4

[PATCH resend 1/2] comctl32: Set the selection if it's currently invalid in HandleTimer.
by Gabriel Ivăncescu 09 Jun '22

09 Jun '22

This can happen in a combo box if the dropdown is shown by a mouse click + release followed by the mouse being moved into the dropped listbox (when the listbox has nothing selected). In this case, the first item (with the index zero) would not be selected the first time the mouse moves over it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This can be easily tested with winecfg. Launch winecfg, go to `Libraries` tab, click on the combobox arrow dropdown for `New override for library` to open the listbox, then hover the mouse over the first entry (acledit). Notice that it does not get highlighted, which is the issue. If you move the mouse to the second entry (aclui) and then back to (acledit), it works. dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 6724dee..2942952 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2339,7 +2339,7 @@ static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRECTION case LB_TIMER_NONE: break; } - if (index == descr->focus_item) return FALSE; + if (index == descr->focus_item && descr->selected_item != -1) return FALSE; LISTBOX_MoveCaret( descr, index, FALSE ); return TRUE; } -- 2.34.1

1 1

[PATCH] advapi32: Fix spec for LookupPrivilegeDisplayName{A,W}
by Louis Lenders 09 Jun '22

09 Jun '22

1 0

[PATCH v2 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Rémi Bernon 09 Jun '22

09 Jun '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix some style nitpicks, move the ioctl to wine/hid.h and name it with a wine prefix, similarly to IOCTL_HID_GET_MS_GENRE_DESCRIPTOR. dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */ -- 2.36.1

2 5

[PATCH v3 0/2] MR192: ws2_32: Allow getsockname after AcceptEx
by DavidCurtiss (＠DavidCurtiss) 09 Jun '22

09 Jun '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> -- v3: Set bound in accept_into_socket instead of changing getsockname ws2_32: Allow getsockname after AcceptEx https://gitlab.winehq.org/wine/wine/-/merge_requests/192

3 3

[tools] testbot/orm: Prepare and validate the filters before use.
by Francois Gouget 09 Jun '22

09 Jun '22

This adds documentation to the filter methods. The preparation step replaces the Itemref properties with filters on the underlying database columns so that DBIBackend only has to deal with 'real' table columns. This also adds better support for multi-column Itemref properties. The validation is performed when building the filter. This means errors are reported close to when the invalid instructions were provided rather than when the database complains about a non-sensical WHERE clause. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45023 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the remainder of issue 9 "No Itemref support for multiple key fields". --- testbot/lib/ObjectModel/Collection.pm | 154 +++++++++++++++++++++++++- testbot/lib/ObjectModel/DBIBackEnd.pm | 34 +----- 2 files changed, 153 insertions(+), 35 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1a48eec35..9dcaf33d4 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014, 2021 Francois Gouget +# Copyright 2012-2014, 2021-2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -700,11 +700,31 @@ my %ValueComparators = ( 'NOT LIKE' => 1, ); +=pod +=over 12 + +=item C<FilterValue()> + +Compares the specified property to a set of values, joining the results with +an OR operator. + +If the property is an Itemref, the only allowed comparators are '=' and '<>', +and they apply to the underlying columns. +The inequality and like comparators are not allowed on boolean properties. + +Finally note that applying comparators like ">=" to multiple values is just an +inefficient way of requiring the property to be greater than or equal to the +minimum / maximum value. + +=back +=cut + sub FilterValue($$$) { my ($PropertyName, $Comparator, $Values) = @_; - die "unknown '$Comparator' comparator" if (!$ValueComparators{$Comparator}); + die "unknown $Comparator comparator" if (!$ValueComparators{$Comparator}); + die "invalid set of values" if (ref($Values) ne 'ARRAY' or @$Values == 0); return { Type => 'value', Property => $PropertyName, Comparator => $Comparator, @@ -719,6 +739,17 @@ sub FilterNull($) return { Type => 'null', Property => $PropertyName }; } +=pod +=over 12 + +=item C<FilterNotNull()> + +Requires that the specified property not be NULL. +This type of check is not allowed on required properties. + +=back +=cut + sub FilterNotNull($) { my ($PropertyName) = @_; @@ -744,10 +775,127 @@ sub FilterNot($) return { Type => 'not', Term => $Term }; } +=pod +=over 12 + +=item C<PrepareFilter()> + +Validates the filter and performs some preprocessing to remove references to +Itemrefs. + +=back +=cut + +sub PrepareFilter($$) +{ + my ($self, $Filter) = @_; + + die "undefined filter" if (!defined $Filter); + if ($Filter->{Terms}) + { + foreach my $Term (@{$Filter->{Terms}}) + { + $self->PrepareFilter($Term); + } + return; + } + if ($Filter->{Term}) + { + $self->PrepareFilter($Filter->{Term}); + return; + } + + my $PropertyName = $Filter->{Property}; + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($PropertyName); + die "unknown $PropertyName property" if (!$PropertyDescriptor); + if ($PropertyDescriptor->GetClass() eq "Detailref") + { + die "$PropertyName: cannot filter on Detailref properties"; + } + + if ($Filter->{Type} eq "value") + { + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + if ($Filter->{Comparator} ne "=" and $Filter->{Comparator} ne "<>") + { + die "$PropertyName: cannot perform $Filter->{Comparator} comparisons on Itemrefs"; + } + + my $RefColNames = $PropertyDescriptor->GetRefColNames(); + if (@$RefColNames == 1) + { + $Filter->{Property} = $RefColNames->[0]; + # @$RefColNames == 1 => $Value->GetKey() == column value + $Filter->{Values} = [ map { $_->GetKey() } @{$Filter->{Values}} ]; + $self->PrepareFilter($Filter); + } + elsif (@{$Filter->{Values}} == 1) + { + delete $Filter->{Property}; + delete $Filter->{Values}; + $Filter->{Type} = $Filter->{Comparator} eq "=" ? 'and' : 'or'; + + # The target table column names are unknown and thus cannot be accessed + # directly. But their values correspond to the target's key components. + my ($_ColNames, $ColValues) = $Filter->{Values}->[0]->GetMasterKey(); + foreach my $ColIndex (0..$#{$RefColNames}) + { + my $Term = FilterValue($RefColNames->[$ColIndex], $ColValues->[$ColIndex], $Filter->{Comparator}); + $self->PrepareFilter($Term); + push @{$Filter->{Terms}}, $Term; + } + } + else + { + my @Terms; + foreach my $Item (@{$Filter->{Values}}) + { + my $Term = FilterValue($PropertyName, [$Item], $Filter->{Comparator}); + $self->PrepareFilter($Term); + push @Terms, $Term; + } + delete $Filter->{Property}; + delete $Filter->{Values}; + $Filter->{Type} = 'or'; + $Filter->{Terms} = \@Terms; + } + } + elsif ($Filter->{Comparator} ne "=" and $Filter->{Comparator} ne "<>" and + $PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "B") + { + die "$PropertyName: cannot perform $Filter->{Comparator} comparisons on booleans"; + } + } + elsif ($Filter->{Type} =~ /null/) + { + if ($PropertyDescriptor->GetIsRequired()) + { + die "$PropertyName cannot be NULL (pointless filter)"; + } + elsif ($PropertyDescriptor->GetClass() eq "Itemref") + { + my $RefColNames = $PropertyDescriptor->GetRefColNames(); + if (@$RefColNames > 1) + { + delete $Filter->{Property}; + $Filter->{Terms} = [ map { { Type => $Filter->{Type}, Property => $_ } } @$RefColNames ]; + $Filter->{Type} = $Filter->{Type} eq 'null' ? 'and' : 'or'; + } + else + { + $Filter->{Property} = $RefColNames->[0]; + } + } + } +} + sub AddFilter($$;$$) { my $self = shift; - my $Filter = @_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + my $Filter =@_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + $self->PrepareFilter($Filter); if (!$self->{Filter}) { diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index e837d47f5..d21b3f03f 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -215,31 +215,6 @@ sub BuildFieldList($$) return $Fields; } -sub ColNameToDb($) -{ - my ($PropertyDescriptor) = @_; - - my $ColNames; - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColNames = $PropertyDescriptor->GetRefColNames(); - if (@$ColNames != 1) - { - # This would require building a more complex where clause, something like - # ((col1 = item1.val1 AND col2 = item1.val2...) OR - # (col1 = item2.val1 AND col2 = item2.val2...) OR ...) - # So it is not supported. Instead one should build the where clause by - # hand from the underlying columns. - die "cannot filter on the ". $PropertyDescriptor->GetName() ." Itemref because it has a multi-column key: @$ColNames"; - } - } - else - { - $ColNames = $PropertyDescriptor->GetColNames(); - } - return $ColNames->[0]; -} - =pod =over 12 @@ -273,13 +248,8 @@ sub GetFilterWhere($$$) my (@Wheres, @Data); foreach my $ColValue (@$Values) { - my $ColName = ColNameToDb($PropertyDescriptor); + my $ColName = $PropertyDescriptor->GetColNames()->[0]; push @Wheres, "$ColName $Filter->{Comparator} ?"; - - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColValue = $ColValue->GetKey(); - } push @Data, $self->ToDb($ColValue, $PropertyDescriptor); } return (@$Values > 1, join(" OR ", @Wheres), \@Data); @@ -312,7 +282,7 @@ sub GetFilterWhere($$$) if ($Filter->{Type} eq 'null' or $Filter->{Type} eq 'not null') { my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); - my $ColName = ColNameToDb($PropertyDescriptor); + my $ColName = $PropertyDescriptor->GetColNames()->[0]; my $Operator = ($Filter->{Type} eq 'null' ? "IS NULL" : "IS NOT NULL"); return (0, "$ColName $Operator", []); } -- 2.30.2

1 0

[PATCH vkd3d v6 1/9] tests/shader_runner: Allow creating UAV resources.
by Zebediah Figura 09 Jun '22

09 Jun '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v6: avoid magic numbers... tests/shader_runner.c | 38 +++++++++++++++++++--------- tests/shader_runner.h | 2 ++ tests/shader_runner_d3d11.c | 31 ++++++++++++++++++----- tests/shader_runner_d3d12.c | 37 +++++++++++++++++++++------ tests/shader_runner_d3d9.c | 12 ++++++--- tests/shader_runner_vulkan.c | 48 ++++++++++++++++++++++++++++-------- 6 files changed, 130 insertions(+), 38 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 05e2a8a41..83f804ad3 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -78,14 +78,13 @@ enum parse_state STATE_PREPROC, STATE_PREPROC_INVALID, STATE_REQUIRE, + STATE_RESOURCE, STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_INVALID_PIXEL_TODO, STATE_SHADER_PIXEL, STATE_SHADER_VERTEX, - STATE_TEXTURE, STATE_TEST, - STATE_VERTEX_BUFFER, }; static bool match_string(const char *line, const char *token, const char **const rest) @@ -314,6 +313,13 @@ static void parse_input_layout_directive(struct shader_runner *runner, const cha element->index = 0; } +void init_resource(struct resource *resource, const struct resource_params *params) +{ + resource->type = params->type; + resource->slot = params->slot; + resource->size = params->data_size; +} + static void set_resource(struct shader_runner *runner, struct resource *resource) { size_t i; @@ -617,8 +623,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const goto out; break; - case STATE_TEXTURE: - case STATE_VERTEX_BUFFER: + case STATE_RESOURCE: set_resource(runner, runner->ops->create_resource(runner, &current_resource)); free(current_resource.data); break; @@ -766,7 +771,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const } else if (sscanf(line, "[texture %u]\n", &index)) { - state = STATE_TEXTURE; + state = STATE_RESOURCE; memset(&current_resource, 0, sizeof(current_resource)); @@ -776,9 +781,21 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const current_resource.data_type = TEXTURE_DATA_FLOAT; current_resource.texel_size = 16; } + else if (sscanf(line, "[uav %u]\n", &index)) + { + state = STATE_RESOURCE; + + memset(&current_resource, 0, sizeof(current_resource)); + + current_resource.slot = index; + current_resource.type = RESOURCE_TYPE_UAV; + current_resource.format = DXGI_FORMAT_R32G32B32A32_FLOAT; + current_resource.data_type = TEXTURE_DATA_FLOAT; + current_resource.texel_size = 16; + } else if (sscanf(line, "[vertex buffer %u]\n", &index)) { - state = STATE_VERTEX_BUFFER; + state = STATE_RESOURCE; memset(&current_resource, 0, sizeof(current_resource)); @@ -844,13 +861,12 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const parse_require_directive(runner, line); break; - case STATE_SAMPLER: - parse_sampler_directive(current_sampler, line); + case STATE_RESOURCE: + parse_resource_directive(&current_resource, line); break; - case STATE_TEXTURE: - case STATE_VERTEX_BUFFER: - parse_resource_directive(&current_resource, line); + case STATE_SAMPLER: + parse_sampler_directive(current_sampler, line); break; case STATE_TEST: diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 6ed0109e6..60f894583 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -54,6 +54,7 @@ struct sampler enum resource_type { RESOURCE_TYPE_TEXTURE, + RESOURCE_TYPE_UAV, RESOURCE_TYPE_VERTEX_BUFFER, }; @@ -130,6 +131,7 @@ struct shader_runner_ops void fatal_error(const char *format, ...) VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2); unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot); +void init_resource(struct resource *resource, const struct resource_params *params); void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const struct shader_runner_ops *ops); diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 6edbdf75e..b80a8b65f 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -44,6 +44,7 @@ struct d3d11_resource ID3D11Resource *resource; ID3D11ShaderResourceView *srv; + ID3D11UnorderedAccessView *uav; }; static struct d3d11_resource *d3d11_resource(struct resource *r) @@ -374,13 +375,12 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co HRESULT hr; resource = calloc(1, sizeof(*resource)); - - resource->r.slot = params->slot; - resource->r.type = params->type; + init_resource(&resource->r, params); switch (params->type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: { D3D11_TEXTURE2D_DESC desc = {0}; @@ -391,7 +391,10 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co desc.Format = params->format; desc.SampleDesc.Count = 1; desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + if (params->type == RESOURCE_TYPE_UAV) + desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + else + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = params->data; resource_data.SysMemPitch = params->width * params->texel_size; @@ -399,8 +402,11 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co hr = ID3D11Device_CreateTexture2D(device, &desc, &resource_data, (ID3D11Texture2D **)&resource->resource); ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); - hr = ID3D11Device_CreateShaderResourceView(device, resource->resource, NULL, &resource->srv); - ok(hr == S_OK, "Failed to create shader resource view, hr %#lx.\n", hr); + if (params->type == RESOURCE_TYPE_UAV) + hr = ID3D11Device_CreateUnorderedAccessView(device, resource->resource, NULL, &resource->uav); + else + hr = ID3D11Device_CreateShaderResourceView(device, resource->resource, NULL, &resource->srv); + ok(hr == S_OK, "Failed to create view, hr %#lx.\n", hr); break; } @@ -420,14 +426,18 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour ID3D11Resource_Release(resource->resource); if (resource->srv) ID3D11ShaderResourceView_Release(resource->srv); + if (resource->uav) + ID3D11UnorderedAccessView_Release(resource->uav); free(resource); } static bool d3d11_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { + ID3D11UnorderedAccessView *uavs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11DeviceContext *context = runner->immediate_context; + unsigned int min_uav_slot = ARRAY_SIZE(uavs); ID3D11Device *device = runner->device; ID3D10Blob *vs_code, *ps_code; ID3D11Buffer *cb = NULL; @@ -472,6 +482,11 @@ static bool d3d11_runner_draw(struct shader_runner *r, ID3D11DeviceContext_PSSetShaderResources(context, resource->r.slot, 1, &resource->srv); break; + case RESOURCE_TYPE_UAV: + uavs[resource->r.slot] = resource->uav; + min_uav_slot = min(min_uav_slot, resource->r.slot); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: ID3D11DeviceContext_IASetVertexBuffers(context, resource->r.slot, 1, (ID3D11Buffer **)&resource->resource, &stride, &offset); @@ -479,6 +494,10 @@ static bool d3d11_runner_draw(struct shader_runner *r, } } + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, + D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL, NULL, NULL, + min_uav_slot, ARRAY_SIZE(uavs) - min_uav_slot, &uavs[min_uav_slot], NULL); + for (i = 0; i < runner->r.sampler_count; ++i) { struct sampler *sampler = &runner->r.samplers[i]; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 22c9b2266..ec08fea54 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -79,7 +79,7 @@ static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, cons return blob; } -#define MAX_RESOURCE_DESCRIPTORS 256 +#define MAX_RESOURCE_DESCRIPTORS (MAX_RESOURCES * 2) static struct resource *d3d12_runner_create_resource(struct shader_runner *r, const struct resource_params *params) { @@ -90,9 +90,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co struct d3d12_resource *resource; resource = calloc(1, sizeof(*resource)); - resource->r.slot = params->slot; - resource->r.type = params->type; - resource->r.size = params->data_size; + init_resource(&resource->r, params); switch (params->type) { @@ -101,9 +99,6 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co runner->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); - if (params->slot >= MAX_RESOURCE_DESCRIPTORS) - fatal_error("Resource slot %u is too high; please increase MAX_RESOURCE_DESCRIPTORS.\n", params->slot); - resource->resource = create_default_texture(device, params->width, params->height, params->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); resource_data.pData = params->data; @@ -116,6 +111,23 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; + case RESOURCE_TYPE_UAV: + if (!runner->heap) + runner->heap = create_gpu_descriptor_heap(device, + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); + + resource->resource = create_default_texture(device, params->width, params->height, + params->format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + resource_data.pData = params->data; + resource_data.SlicePitch = resource_data.RowPitch = params->width * params->texel_size; + upload_texture_data(resource->resource, &resource_data, 1, test_context->queue, test_context->list); + reset_command_list(test_context->list, test_context->allocator); + transition_resource_state(test_context->list, resource->resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + ID3D12Device_CreateUnorderedAccessView(device, resource->resource, + NULL, NULL, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: resource->resource = create_upload_buffer(device, params->data_size, params->data); break; @@ -192,6 +204,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: range = &resource->descriptor_range; resource->root_index = root_signature_desc.NumParameters++; @@ -201,7 +214,10 @@ static bool d3d12_runner_draw(struct shader_runner *r, root_param->DescriptorTable.pDescriptorRanges = range; root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + if (resource->r.type == RESOURCE_TYPE_UAV) + range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + else + range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; range->NumDescriptors = 1; range->BaseShaderRegister = resource->r.slot; range->RegisterSpace = 0; @@ -281,6 +297,11 @@ static bool d3d12_runner_draw(struct shader_runner *r, get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot)); break; + case RESOURCE_TYPE_UAV: + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, resource->root_index, + get_gpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(resource->resource); vbv.StrideInBytes = get_vb_stride(&runner->r, resource->r.slot); diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index b9ec55b4e..417d68750 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -222,9 +222,7 @@ static struct resource *d3d9_runner_create_resource(struct shader_runner *r, con void *data; resource = calloc(1, sizeof(*resource)); - resource->r.slot = params->slot; - resource->r.type = params->type; - resource->r.size = params->data_size; + init_resource(&resource->r, params); switch (params->type) { @@ -257,6 +255,10 @@ static struct resource *d3d9_runner_create_resource(struct shader_runner *r, con ok(hr == D3D_OK, "Failed to unmap texture, hr %#lx.\n", hr); break; + case RESOURCE_TYPE_UAV: + fatal_error("UAVs are not supported.\n"); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: hr = IDirect3DDevice9_CreateVertexBuffer(device, params->data_size, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &resource->vb, NULL); @@ -366,6 +368,10 @@ static bool d3d9_runner_draw(struct shader_runner *r, ok(hr == D3D_OK, "Failed to set texture, hr %#lx.\n", hr); break; + case RESOURCE_TYPE_UAV: + assert(0); + break; + case RESOURCE_TYPE_VERTEX_BUFFER: for (j = 0; j < runner->r.input_element_count; ++j) { diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 601eb5a17..f5a0e7ec3 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -245,17 +245,25 @@ static struct resource *vulkan_runner_create_resource(struct shader_runner *r, c void *data; resource = calloc(1, sizeof(*resource)); - - resource->r.slot = params->slot; - resource->r.type = params->type; + init_resource(&resource->r, params); switch (params->type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: + { + VkImageUsageFlagBits usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; + VkImageLayout layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + format = vkd3d_get_vk_format(params->format); - resource->image = create_2d_image(runner, params->width, params->height, - VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, format, &resource->memory); + if (params->type == RESOURCE_TYPE_UAV) + { + layout = VK_IMAGE_LAYOUT_GENERAL; + usage |= VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + } + + resource->image = create_2d_image(runner, params->width, params->height, usage, format, &resource->memory); resource->view = create_2d_image_view(runner, resource->image, format); staging_buffer = create_buffer(runner, params->data_size, @@ -277,14 +285,14 @@ static struct resource *vulkan_runner_create_resource(struct shader_runner *r, c VK_CALL(vkCmdCopyBufferToImage(runner->cmd_buffer, staging_buffer, resource->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); - transition_image_layout(runner, resource->image, - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); + transition_image_layout(runner, resource->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, layout); end_command_buffer(runner); VK_CALL(vkFreeMemory(device, staging_memory, NULL)); VK_CALL(vkDestroyBuffer(device, staging_buffer, NULL)); break; + } case RESOURCE_TYPE_VERTEX_BUFFER: resource->buffer = create_buffer(runner, params->data_size, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, @@ -383,8 +391,12 @@ static bool compile_shader(const struct vulkan_shader_runner *runner, const char break; case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: binding = &bindings[interface_info.binding_count++]; - binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; + if (resource->r.type == RESOURCE_TYPE_UAV) + binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; + else + binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; binding->register_space = 0; binding->register_index = resource->r.slot; binding->shader_visibility = VKD3D_SHADER_VISIBILITY_ALL; @@ -557,6 +569,7 @@ static VkPipeline create_pipeline(const struct vulkan_shader_runner *runner, switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: break; case RESOURCE_TYPE_VERTEX_BUFFER: @@ -662,12 +675,16 @@ static VkDescriptorSetLayout create_descriptor_set_layout(struct vulkan_shader_r break; case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: binding = &bindings[set_desc.bindingCount++]; resource->binding = binding_index++; binding->binding = resource->binding; - binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; + if (resource->r.type == RESOURCE_TYPE_UAV) + binding->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + else + binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; binding->descriptorCount = 1; binding->stageFlags = VK_SHADER_STAGE_ALL; binding->pImmutableSamplers = NULL; @@ -729,6 +746,7 @@ static void bind_resources(struct vulkan_shader_runner *runner, VkPipelineBindPo switch (resource->r.type) { case RESOURCE_TYPE_TEXTURE: + case RESOURCE_TYPE_UAV: image_info.imageView = resource->view; image_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; @@ -739,6 +757,12 @@ static void bind_resources(struct vulkan_shader_runner *runner, VkPipelineBindPo write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; write.pImageInfo = &image_info; + if (resource->r.type == RESOURCE_TYPE_UAV) + { + image_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL; + write.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + } + VK_CALL(vkUpdateDescriptorSets(runner->device, 1, &write, 0, NULL)); break; @@ -967,7 +991,7 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) VkInstanceCreateInfo instance_desc = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO}; VkDeviceCreateInfo device_desc = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO}; VkPhysicalDeviceFeatures ret_features, features; - VkDescriptorPoolSize descriptor_pool_sizes[2]; + VkDescriptorPoolSize descriptor_pool_sizes[3]; VkAttachmentDescription attachment_desc = {0}; static const float queue_priority = 1.0f; VkSubpassDescription subpass_desc = {0}; @@ -1049,7 +1073,9 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) } \ features.x = VK_TRUE + ENABLE_FEATURE(fragmentStoresAndAtomics); ENABLE_FEATURE(shaderImageGatherExtended); + ENABLE_FEATURE(shaderStorageImageWriteWithoutFormat); if ((vr = VK_CALL(vkCreateDevice(runner->phys_device, &device_desc, NULL, &device)))) { @@ -1115,6 +1141,8 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) descriptor_pool_sizes[0].descriptorCount = MAX_RESOURCES; descriptor_pool_sizes[1].type = VK_DESCRIPTOR_TYPE_SAMPLER; descriptor_pool_sizes[1].descriptorCount = MAX_SAMPLERS; + descriptor_pool_sizes[2].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + descriptor_pool_sizes[2].descriptorCount = MAX_RESOURCES; descriptor_pool_desc.maxSets = 1; descriptor_pool_desc.poolSizeCount = ARRAY_SIZE(descriptor_pool_sizes); -- 2.36.1

3 18

[PATCH] shell32: Implement SHBindToFolderIDListParent.
by Dmitry Timoshkov 09 Jun '22

09 Jun '22

Based on SHBindToParent and SHBindToObject implementations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/pidl.c | 56 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 57 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..f004b2ff1b6 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1364,6 +1364,62 @@ HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *p } +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, + REFIID riid, void **ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + LPITEMIDLIST pidlChild; + LPITEMIDLIST pidlParent; + HRESULT hr; + + TRACE_(shell)("%p,%p,%s,%p,%p\n", psf, pidl, debugstr_guid(riid), ppv, ppidlLast); + pdump(pidl); + + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (ppidlLast) + *ppidlLast = NULL; + + if (_ILIsPidlSimple(pidl)) + { + /* we are on desktop level */ + if (ppidlLast) + *ppidlLast = ILClone(pidl); + hr = SHGetDesktopFolder((IShellFolder **)ppv); + } + else + { + pidlChild = ILClone(ILFindLastID(pidl)); + pidlParent = ILClone(pidl); + ILRemoveLastID(pidlParent); + + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = pidlChild; + else + ILFree(pidlChild); + ILFree(pidlParent); + } + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + TRACE_(shell)("-- ppv=%p ret=0x%08lx\n", *ppv, hr); + return hr; +} + + /************************************************************************* * SHParseDisplayName [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..5b812774e1f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -334,6 +334,7 @@ @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) @ stdcall SHBrowseForFolderW(ptr) -- 2.36.1

2 2

[PATCH 0/3] MR216: uiautomationcore: More UiaProviderFromIAccessible work.
by Connor McAdams (＠cmcadams) 09 Jun '22

09 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/216

3 10

[PATCH] include: Add IDXGIDebug1 declaration in dxgidebug.idl.
by Biswapriyo Nath 09 Jun '22

09 Jun '22

1 0

[PATCH 0/1] MR215: winevulkan: Update to VK spec version 1.3.217.
by Georg Lehmann (＠DadSchoorse) 09 Jun '22

09 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/215

2 1

[PATCH v2 0/5] MR201: ntdll: Implement RtlSetUserValueHeap.
by Rémi Bernon (＠rbernon) 09 Jun '22

09 Jun '22

And prepare HLOCAL allocation to use it. -- v2: kernelbase: Use RtlSetUserValueHeap to store HLOCAL. ntdll: Implement RtlSetUserValueHeap. kernelbase: Use HEAP_ADD_USER_INFO for HLOCAL allocations. ntdll: Add block padding when HEAP_ADD_USER_INFO flag is set. ole32/tests: Update IStream_SetSize with large size test result. https://gitlab.winehq.org/wine/wine/-/merge_requests/201

2 6

[PATCH resend] comctl32: Add partial support for LVM_SETBKIMAGE.
by Dmitry Timoshkov 09 Jun '22

09 Jun '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 65 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..3ca76c2ef05 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4567,11 +4568,30 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) */ static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + if (infoPtr->hBkBitmap) + { + HDC hdc_src = CreateCompatibleDC(hdc); + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + SelectObject(hdc_src, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, + lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, + hdc_src, lprcBox->left, lprcBox->top, SRCCOPY); + + DeleteDC(hdc_src); - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + return TRUE; + } + else if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } + + return FALSE; } /* Draw main item or subitem */ @@ -8028,7 +8048,37 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static BOOL LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx,%p,%p,%u,%d,%d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("not supported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("not supported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = 0; + return TRUE; + + case LVBKIF_SOURCE_HBITMAP: + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = image->hbm; + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return TRUE; + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return FALSE; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -10406,6 +10456,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11605,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; -- 2.35.3

1 2

[PATCH v2 0/3] MR208: Draft: dinput/tests: Cleanup old tests and merge more dinput8 / dinput tests together.
by Rémi Bernon (＠rbernon) 09 Jun '22

09 Jun '22

-- v2: dinput/tests: Merge device.c tests into device8.c. dinput/tests: Use dinput_test_(init|exit) for all tests. dinput/tests: Avoid requiring foreground window in SetCooperativeLevel tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/208

3 6

[PATCH] sechost: Support decimal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Dmitry Timoshkov 09 Jun '22

09 Jun '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/security.c | 1 + dlls/sechost/security.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ed91ccc39d3..1a874de75c4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4240,6 +4240,7 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;1;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 6916b3ad662..f6fcffd9cfc 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -903,6 +903,9 @@ static DWORD parse_ace_right( const WCHAR **string_ptr ) if (string[0] == '0' && string[1] == 'x') return wcstoul( string, (WCHAR **)string_ptr, 16 ); + if (iswdigit( string[0] )) + return wcstoul( string, (WCHAR **)string_ptr, 10 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) -- 2.36.1

1 0

[PATCH] wbemprox: Add a few properties to Win32_QuickFixEngineering.
by Louis Lenders 09 Jun '22

09 Jun '22

2 1

[PATCH v2 0/2] MR210: winhttp: Use completion port for overlapped send.
by Paul Gofman (＠gofman) 09 Jun '22

09 Jun '22

There are a few issues with the way it is done now: 1. We queue overlapped WSARecv from one (user) thread and then await completion on another. As it became apparent the completions queued by a thread are canceled when thread terminates. That is currently not the case in Wine, but I have a pending MR for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/135. User may use WinhttpWebSocketSend() and close the thread, if it gets to async send path that send may be canceled before it is complete. The only condition when the async operation is not canceled is that the queued async IO has a completion port and no event (which becomes the case with these patches). I tested on Windows that terminating the thread which called WinhttpWebSocketSend() doesn't cancel the async send, while I am reproducing this case with Wine and the refernced patch. 2. Using overlapped WSASend without a completion port or an event is fragile: the socket may potentially be signaled by a parallel async operation (or maybe instead not singaled until that operation completes; I think Wine and Windows currently don't agree in lot of details how that works, including maybe the higher level WSAGetOverlappedResult). This is more of theoretical point as currently we don't queue any overlapped receives. 3. WSAGetOverlappedResult is currently buggy in a funny way. It doesn't check for valid socket handle, and so if called with an overlapped without an event it waits on socket, and if socket is -1 it is current process pseudo handle and the wait hangs forever. I've sent a patch for winsock for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/203. But since we need completion port for 1 anyway it also seems to also solve the potential race issue between setting socket to -1 when aborting operation and starting wait for overlapped IO on it without additional complications. -- v2: winhttp: Use completion port for async send. winhttp: Introduce netconn_wait_overlapped_result() helper. https://gitlab.winehq.org/wine/wine/-/merge_requests/210

3 3

[PATCH 0/7] MR211: win32u: user32 conversion
by Jacek Caban (＠jacek) 09 Jun '22

09 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/211

4 13

[PATCH 0/2] MR214: ntdll: tests: Test returning an exception handler on arm/arm64
by Martin Storsjö (＠mstorsjo) 09 Jun '22

09 Jun '22

Also fix up the error message printed for the handler data. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/214

2 2

[PATCH 0/2] MR209: mfreadwrite: Base new MF_SOURCE_READER_ANY_STREAM behavior off timestamps
by Derek Lesho (＠dlesho) 09 Jun '22

09 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/209

3 3

[PATCH] msvcrt: Avoid passing an invalid LCID to LCMapStringW.
by Akihiro Sagawa 09 Jun '22

09 Jun '22

Because it complains as follows on startup in Japanese locale: 002c:err:msvcrt:create_mbcinfo WideCharToMultiByte failed for cp 932, ret=0 (exp 196), error=122 This happens after commit c2a455a20d7b5124bab0086df75178d8c53f27ef. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/msvcrt/mbcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH v2] po: Update Traditional Chinese translation.
by Chilung Chan 09 Jun '22

09 Jun '22

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- v2: Fix line 6988 and add Signed-off-by back po/zh_TW.po | 66 +++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e1e2c09a37e..f7bd3501244 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-23 14:09+0800\n" +"PO-Revision-Date: 2022-06-09 03:15+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -3924,13 +3924,11 @@ msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 't #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "循環的 __proto__ 值" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "無法定義屬性 '|': 物件不能擴展" +msgstr "無法為不可擴展的物件建立屬性" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -3945,10 +3943,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' 不是 Map 物件" +msgstr "'this' 不是一個 | 物件" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -3965,45 +3961,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "西歐和美國" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "中歐語言" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "土耳其語" +msgstr "突厥語" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "韓語" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "作業已停止" +msgstr "繁體中文" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "簡體中文" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "印度語" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "喬治亞語" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -6962,54 +6952,40 @@ msgid "This network connection does not exist.\n" msgstr "這個網路連線不存在。\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "於插斷時間無效。\n" +msgstr "呼叫已中斷。\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "無效的控制代碼。\n" +msgstr "無效的檔案控制代碼。\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "無效的網路位址。\n" +msgstr "無效的指標位址。\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "無效的名稱。\n" +msgstr "無效的引數。\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "連線被同儕節點重設。\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "找不到點。\n" +msgstr "找不到主機。\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "找不到屬性。\n" +msgstr "找不到未授權的主機。\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "發生致命錯誤。\n" +msgstr "無法復原的錯誤。\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "名稱有效，無資料記錄。\n" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -7695,7 +7671,7 @@ msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" -msgstr "發生致命錯誤。\n" +msgstr "發生無法復原的錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -- 2.36.1.windows.1

2 1

[PATCH v2 0/5] MR197: winegstreamer: Add support for zero-copy in wg_transform.
by Rémi Bernon (＠rbernon) 09 Jun '22

09 Jun '22

-- v2: winegstreamer: Support zero-copy in wg_transform_push_data. winegstreamer: Support zero-copy output using the allocator. winegstreamer: Introduce a new custom memory allocator. winegstreamer: Rename mf_(create|destroy)_wg_sample helpers. winegstreamer: Introduce new wg_transform_(push|read)_mf helpers. https://gitlab.winehq.org/wine/wine/-/merge_requests/197

4 9

[PATCH] conhost: Update debug output and comments when loading/saving settings
by Hugh McMaster 09 Jun '22

09 Jun '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index cc2df3e6e7b..54719cdb391 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -239,7 +239,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) HKEY key, app_key; - TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); + TRACE( "Loading default console settings\n" ); memcpy( config->color_map, color_map, sizeof(color_map) ); memset( config->face_name, 0, sizeof(config->face_name) ); @@ -265,13 +265,15 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) config->win_pos.Y = 0; config->edition_mode = 0; - /* read global settings */ + /* Load default console settings */ if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Console", &key )) { load_registry_key( key, config ); - /* if requested, load part related to console title */ + + /* Load app-specific console settings (if any) */ if (key_name && !RegOpenKeyW( key, key_name, &app_key )) { + TRACE( "Loading %s console settings\n", wine_dbgstr_w(key_name) ); load_registry_key( app_key, config ); RegCloseKey( app_key ); } @@ -408,7 +410,7 @@ static void save_config( const WCHAR *key_name, const struct console_config *con { HKEY key, app_key; - TRACE( "%s %s\n", debugstr_w( key_name ), debugstr_config( config )); + TRACE( "Saving %s console settings\n", key_name ? debugstr_w( key_name ) : "default" ); if (RegCreateKeyW( HKEY_CURRENT_USER, L"Console", &key )) { -- 2.36.1

2 1

[PATCH] conhost: Show caret immediately after reshaping
by Hugh McMaster 09 Jun '22

09 Jun '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index cc2df3e6e7b..b72278ddc0e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -659,8 +659,11 @@ static void update_window( struct console *console ) if (console->win == GetFocus()) { if (console->window->cursor_visible) + { CreateCaret( console->win, console->window->cursor_bitmap, console->active->font.width, console->active->font.height ); + update_window_cursor( console ); + } else DestroyCaret(); } -- 2.36.1

2 1

[PATCH v5 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v5: ws2_32/tests: Add tests for terminated thread asyncs completion. ntdll: Cancel asyncs when thread is terminated. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

3 4

[PATCH 0/1] MR192: ws2_32: Allow getsockname after AcceptEx
by DavidCurtiss (＠DavidCurtiss) 08 Jun '22

08 Jun '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/192

3 2

[PATCH v2 0/1] MR203: ws2_32: Check for valid socket in WSAGetOverlappedResult().
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

-- v2: ws2_32: Check for valid socket in WSAGetOverlappedResult(). https://gitlab.winehq.org/wine/wine/-/merge_requests/203

3 2

[PATCH] wevtapi: Add stub for EvtCreateRenderContext.
by Louis Lenders 08 Jun '22

08 Jun '22

1 0

[PATCH v4 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v4: ws2_32/tests: Add tests for terminated thread asyncs completion. ntdll: Cancel asyncs when thread is terminated. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

3 4

[PATCH 0/2] MR210: winhttp: Use completion port for overlapped send.
by Paul Gofman (＠gofman) 08 Jun '22

08 Jun '22

There are a few issues with the way it is done now: 1. We queue overlapped WSARecv from one (user) thread and then await completion on another. As it became apparent the completions queued by a thread are canceled when thread terminates. That is currently not the case in Wine, but I have a pending MR for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/135. User may use WinhttpWebSocketSend() and close the thread, if it gets to async send path that send may be canceled before it is complete. The only condition when the async operation is not canceled is that the queued async IO has a completion port and no event (which becomes the case with these patches). I tested on Windows that terminating the thread which called WinhttpWebSocketSend() doesn't cancel the async send, while I am reproducing this case with Wine and the refernced patch. 2. Using overlapped WSASend without a completion port or an event is fragile: the socket may potentially be signaled by a parallel async operation (or maybe instead not singaled until that operation completes; I think Wine and Windows currently don't agree in lot of details how that works, including maybe the higher level WSAGetOverlappedResult). This is more of theoretical point as currently we don't queue any overlapped receives. 3. WSAGetOverlappedResult is currently buggy in a funny way. It doesn't check for valid socket handle, and so if called with an overlapped without an event it waits on socket, and if socket is -1 it is current process pseudo handle and the wait hangs forever. I've sent a patch for winsock for that: https://gitlab.winehq.org/wine/wine/-/merge_requests/203. But since we need completion port for 1 anyway it also seems to also solve the potential race issue between setting socket to -1 when aborting operation and starting wait for overlapped IO on it without additional complications. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/210

3 4

Re: [PATCH v2 0/6] MR207: UiaProviderFromIAccessible improvements. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/207

1 0

Re: [PATCH v2 0/3] MR206: windows.gaming.input: Implement stub IGamepad2 interface. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/206

1 0

Re: [PATCH v3 0/7] MR195: winhttp: Abort web socket receive operations when the socket handle is closed - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/195

1 0

Re: [PATCH v2 0/5] MR204: win32u: Avoid calling PE code with user lock - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/204

1 0

Re: [PATCH v2 0/1] MR196: winegstreamer: Return void from align_video_info_planes. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/196

1 0

Re: [PATCH v6 0/1] MR175: d3d11: Do not return uninitialized values on Map() failure. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/175

1 0

[PATCH 0/5] MR197: winegstreamer: Add support for zero-copy in wg_transform.
by Rémi Bernon (＠rbernon) 08 Jun '22

08 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/197

5 12

[PATCH v2 1/5] mshtml: Set the channel's content type when parsing the header.
by Gabriel Ivăncescu 08 Jun '22

08 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Needed by 3rd patch. dlls/mshtml/navigate.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e6f2035..5d74cc1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -708,12 +708,26 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW static void parse_content_type(nsChannelBSC *This, const WCHAR *value) { - const WCHAR *ptr; - size_t len; + const WCHAR *ptr, *beg, *end; + size_t len = wcslen(value); + char *content_type; static const WCHAR charsetW[] = {'c','h','a','r','s','e','t','='}; ptr = wcschr(value, ';'); + for(end = ptr ? ptr : value + len; end > value; end--) + if(!iswspace(end[-1])) + break; + for(beg = value; beg < end; beg++) + if(!iswspace(*beg)) + break; + + if((content_type = heap_strndupWtoU(beg, end - beg))) { + heap_free(This->nschannel->content_type); + This->nschannel->content_type = content_type; + strlwr(content_type); + } + if(!ptr) return; -- 2.34.1

2 6

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 08 Jun '22

08 Jun '22

--- po/zh_TW.po | 66 +++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e1e2c09a37e..6d91a2902c9 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-23 14:09+0800\n" +"PO-Revision-Date: 2022-06-09 03:05+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -3924,13 +3924,11 @@ msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 't #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "循環的 __proto__ 值" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "無法定義屬性 '|': 物件不能擴展" +msgstr "無法為不可擴展的物件建立屬性" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -3945,10 +3943,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' 不是 Map 物件" +msgstr "'this' 不是一個 | 物件" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -3965,45 +3961,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "西歐和美國" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "中歐語言" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "土耳其語" +msgstr "突厥語" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "韓語" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "作業已停止" +msgstr "繁體中文" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "簡體中文" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "印度語" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "喬治亞語" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -6962,54 +6952,40 @@ msgid "This network connection does not exist.\n" msgstr "這個網路連線不存在。\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "於插斷時間無效。\n" +msgstr "呼叫已中斷。\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "無效的控制代碼。\n" +msgstr "無效的檔案控制代碼。\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "無效的網路位址。\n" +msgstr "無效的指標位址。\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "無效的名稱。\n" +msgstr "無效的引數。\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "連線被同儕節點重設。\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "找不到點。\n" +msgstr "找不到主機。\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "找不到屬性。\n" +msgstr "找不到未授權的主機。\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "發生致命錯誤。\n" +msgstr "無法復原的錯誤。\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "名稱有效，無資料記錄。" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -7695,7 +7671,7 @@ msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" -msgstr "發生致命錯誤。\n" +msgstr "發生無法復原的錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -- 2.36.1.windows.1

2 1

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