September 2020 - Wine-devel

[PATCH 3/3] msvcrt: Implement _mbbtype_l().
by Paul Gofman 24 Sep '20

24 Sep '20

Fixes Midnight Castle Succubus. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 45 +++++++-------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 55 +++++++++++++++++++ dlls/ucrtbase/tests/string.c | 19 +++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- include/msvcrt/mbstring.h | 1 + 13 files changed, 105 insertions(+), 34 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 287c3c105b2..e5550a24853 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -65,7 +65,7 @@ @ cdecl _mbbtombc(long) ucrtbase._mbbtombc @ stub _mbbtombc_l @ cdecl _mbbtype(long long) ucrtbase._mbbtype -@ stub _mbbtype_l +@ cdecl _mbbtype_l(long long ptr) ucrtbase._mbbtype_l @ stub _mbcasemap @ cdecl _mbccpy(ptr ptr) ucrtbase._mbccpy @ cdecl _mbccpy_l(ptr ptr ptr) ucrtbase._mbccpy_l diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 3bbe14613da..87dc6585f3c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -491,7 +491,7 @@ @ cdecl _o__mbbtombc(long) ucrtbase._o__mbbtombc @ stub _o__mbbtombc_l @ cdecl _o__mbbtype(long long) ucrtbase._o__mbbtype -@ stub _o__mbbtype_l +@ cdecl _o__mbbtype_l(long long ptr) ucrtbase._o__mbbtype_l @ cdecl _o__mbccpy(ptr ptr) ucrtbase._o__mbccpy @ cdecl _o__mbccpy_l(ptr ptr ptr) ucrtbase._o__mbccpy_l @ cdecl _o__mbccpy_s(ptr long ptr ptr) ucrtbase._o__mbccpy_s diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ec1eb0a7714..9f8755c6e85 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1071,7 +1071,7 @@ @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long) -@ stub _mbbtype_l +@ cdecl _mbbtype_l(long long ptr) # extern _mbcasemap @ cdecl _mbccpy(ptr ptr) @ cdecl _mbccpy_l(ptr ptr ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f32f8faba98..64205b704ce 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1428,7 +1428,7 @@ @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long) -@ stub _mbbtype_l +@ cdecl _mbbtype_l(long long ptr) # extern _mbcasemap @ cdecl _mbccpy(ptr ptr) @ cdecl _mbccpy_l(ptr ptr ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 82598b74edd..0d38f97fffe 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1438,7 +1438,7 @@ @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long) -@ stub _mbbtype_l +@ cdecl _mbbtype_l(long long ptr) # extern _mbcasemap @ cdecl _mbccpy(ptr ptr) @ cdecl _mbccpy_l(ptr ptr ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 95ffa62ab51..f83637038b7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -743,7 +743,7 @@ @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long) -@ stub _mbbtype_l +@ cdecl _mbbtype_l(long long ptr) # extern _mbcasemap @ cdecl _mbccpy(ptr ptr) @ cdecl _mbccpy_l(ptr ptr ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f2d56166099..ba75c3452e8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -721,7 +721,7 @@ @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long) -@ stub _mbbtype_l +@ cdecl _mbbtype_l(long long ptr) # extern _mbcasemap @ cdecl _mbccpy(ptr ptr) @ cdecl _mbccpy_l(ptr ptr ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index abd1f1df053..13fffc5734a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1394,31 +1394,6 @@ unsigned int CDECL _mbbtombc(unsigned int c) return c; /* not Japanese or no MB char */ } -/********************************************************************* - * _mbbtype(MSVCRT.@) - */ -int CDECL _mbbtype(unsigned char c, int type) -{ - if (type == 1) - { - if ((c >= 0x20 && c <= 0x7e) || (c >= 0xa1 && c <= 0xdf)) - return _MBC_SINGLE; - else if ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xfc)) - return _MBC_TRAIL; - else - return _MBC_ILLEGAL; - } - else - { - if ((c >= 0x20 && c <= 0x7e) || (c >= 0xa1 && c <= 0xdf)) - return _MBC_SINGLE; - else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) - return _MBC_LEAD; - else - return _MBC_ILLEGAL; - } -} - /********************************************************************* * _ismbbkana_l(MSVCRT.@) */ @@ -1730,6 +1705,26 @@ int CDECL _ismbstrail(const unsigned char* start, const unsigned char* str) return 0; } +/********************************************************************* + * _mbbtype_l(MSVCRT.@) + */ +int CDECL _mbbtype_l(unsigned char c, int type, MSVCRT__locale_t locale) +{ + if (type == 1) + return _ismbbtrail_l(c, locale) ? _MBC_TRAIL : _MBC_ILLEGAL; + else + return _ismbblead_l(c, locale) ? _MBC_LEAD + : MSVCRT__isprint_l(c, locale) ? _MBC_SINGLE : _MBC_ILLEGAL; +} + +/********************************************************************* + * _mbbtype(MSVCRT.@) + */ +int CDECL _mbbtype(unsigned char c, int type) +{ + return _mbbtype_l(c, type, NULL); +} + /********************************************************************* * _mbsbtype (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 86938c8cc0e..4f79778f7cc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1204,6 +1204,7 @@ int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_ int __cdecl MSVCRT__wcsnicmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); int __cdecl MSVCRT_towlower(MSVCRT_wint_t); int __cdecl MSVCRT_towupper(MSVCRT_wint_t); +int __cdecl MSVCRT__isprint_l(int c, MSVCRT__locale_t locale); int __cdecl MSVCRT__iswalnum_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswdigit_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswgraph_l(MSVCRT_wchar_t, MSVCRT__locale_t); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6517995edde..451bc3014d4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -35,6 +35,7 @@ #undef strncpy #include "winbase.h" #include "winnls.h" +#include "winuser.h" static char *buf_to_string(const unsigned char *bin, int len, int nr) { @@ -4396,6 +4397,59 @@ static void test_SpecialCasing(void) } } + +static void test__mbbtype(void) +{ + static const char *test_locales[] = + { + "Arabic_Algeria", + "Chinese_China", + "English_Australia", + "French_Belgium", + "German_Austria", + "Greek", + "Hindi", + "Japanese", + "Korean", + "Polish", + "Portuguese_Brazil", + "Russian", + "Spanish_Argentina", + "Swedish_Finland", + "Ukrainian", + "Vietnamese", + }; + + int expected, ret; + unsigned int c, i; + + for (i = 0; i < ARRAY_SIZE(test_locales); ++i) + { + setlocale(LC_ALL, test_locales[i]); + _setmbcp(_MB_CP_LOCALE); + for (c = 0; c < 256; ++c) + { + if (_ismbblead(c)) + expected = _MBC_LEAD; + else if (isprint(c)) + expected = _MBC_SINGLE; + else + expected = _MBC_ILLEGAL; + + ret = _mbbtype(c, 0); + ok(ret == expected, "test %u, c %#x, got ret %#x, expected %#x.\n", i, c, ret, expected); + + if (_ismbbtrail(c)) + expected = _MBC_TRAIL; + else + expected = _MBC_ILLEGAL; + + ret = _mbbtype(c, 1); + ok(ret == expected, "test %u, c %#x, got ret %#x, expected %#x.\n", i, c, ret, expected); + } + } +} + START_TEST(string) { char mem[100]; @@ -4550,4 +4604,5 @@ START_TEST(string) test_wcscmp(); test___STRINGTOLD(); test_SpecialCasing(); + test__mbbtype(); } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index beeebc5c3ca..1a4fbbd76f0 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -516,6 +516,24 @@ static void test_SpecialCasing(void) } } +static void test__mbbtype_l(void) +{ + int expected, ret; + unsigned int c; + + _setmbcp(_MB_CP_LOCALE); + for (c = 0; c < 256; ++c) + { + expected = _mbbtype(c, 0); + ret = _mbbtype_l(c, 0, NULL); + ok(ret == expected, "c %#x, got ret %#x, expected %#x.\n", c, ret, expected); + + expected = _mbbtype(c, 1); + ret = _mbbtype_l(c, 1, NULL); + ok(ret == expected, "c %#x, got ret %#x, expected %#x.\n", c, ret, expected); + } +} + START_TEST(string) { ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, @@ -530,4 +548,5 @@ START_TEST(string) test_wcstok(); test__strnicmp(); test_SpecialCasing(); + test__mbbtype_l(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a6c30f9a15b..f556b9e1c3d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -584,7 +584,7 @@ @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long) -@ stub _mbbtype_l +@ cdecl _mbbtype_l(long long ptr) @ stub _mbcasemap @ cdecl _mbccpy(ptr ptr) @ cdecl _mbccpy_l(ptr ptr ptr) @@ -1155,7 +1155,7 @@ @ cdecl _o__mbbtombc(long) _mbbtombc @ stub _o__mbbtombc_l @ cdecl _o__mbbtype(long long) _mbbtype -@ stub _o__mbbtype_l +@ cdecl _o__mbbtype_l(long long ptr) _mbbtype_l @ cdecl _o__mbccpy(ptr ptr) _mbccpy @ cdecl _o__mbccpy_l(ptr ptr ptr) _mbccpy_l @ cdecl _o__mbccpy_s(ptr long ptr ptr) _mbccpy_s diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index b3336a2fbae..15eea68215b 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -51,6 +51,7 @@ int __cdecl _ismbcsymbol(unsigned int); int __cdecl _ismbcupper(unsigned int); unsigned int __cdecl _mbbtombc(unsigned int); int __cdecl _mbbtype(unsigned char,int); +int __cdecl _mbbtype_l(unsigned char,int,_locale_t); #define _mbccmp(_cpc1,_cpc2) _mbsncmp((_cpc1),(_cpc2),1) void __cdecl _mbccpy(unsigned char*,const unsigned char*); unsigned int __cdecl _mbcjistojms(unsigned int); -- 2.26.2

2 1

[PATCH resend] kernelbase: Improve Get{, Dynamic}TimeZoneInformation() performance.
by Akihiro Sagawa 24 Sep '20

24 Sep '20

How do we improve the performance? ___________________ Stellaris calls the above API massively. It suffers on poor performance of the API after Wine 4.0-rc1. By caching localized time zone name string, this patch achieves over 50 times better performance compared with the current implementation. Although the code looks an ugly bit, we need a speed. Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=49808 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernelbase/locale.c | 47 ++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-)

1 0

TestBot: The new w10pro64 VM
by Francois Gouget 24 Sep '20

24 Sep '20

So I have put w10pro64 into production. As the name implies this is a 64-bit Windows 10 Professional VM. What the name does not say is that it runs the latest version of Windows 10: 2004. That means it has more failures than the others... for now. The goal is to use it to balance the load across two VM hosts. So it will run the various language tests, always against the latest Windows 10 release, while w1064 will deal with the previous Windows 10 releases and other configurations such as dual-screen and (hopefully) PCI passthrough. Right now w10pro64 also runs the dual-screen tests because it has a newer QXL driver that should have fewer failures (bug 48926) but that should change after I update w1064. For those who are interested I did quite a few tests on w10pro64 before putting it in production to see the impact of the QEmu configuration. One part of it was to see if it was possible to reduce the number of failures by tweaking the configuration. That did not yield any meaningful result. The other part was to check various options' impact on performance. CPU: IvyBridge * 3 cores ------------------------ IvyBridge is the baseline of our current VM hosts (vm1, vm3 and vm4). So it should be possible to move the VM from one host to the other without changing its configuration (and also without risking upsetting Windows' license checks). Most of our tests are single threaded. But in order to root out race conditions I think all VMs should have at least 2 vcpus. The question was whether adding more would help. So I used mpstat at a 5 second interval to trace the CPU usage on the host while WineTest ran in the VM. I mostly ran the tests with 4 vcpus (specifically 4 cores to avoid licensing issues). The host has 4 cores. This showed that even when given 4 cores the VM spends 70% to 80% (depending on the run) of its time using less than one core, 97% using less than two cores and only 0.5% using more than 3 cores. So giving it two or three cores is plenty. So what is the CPU doing when not running the VM / tests? The stats show it waits for IO only 3% of the time which is as it should given the caching available on the host and the SSD disk. System and user CPU usage are also pretty low so most of the time the CPU is just idle. More specifically the host is 75% idle (i.e. uses less than 1 core) more than 50% of the time. The why is still somewhat of a mystery to me. Idle time can result from the audio tests (waiting for the buffered sound to play) and network tests (waiting for network data). There are also a few places where we wait for some operation to time out but surely not that many? So how can we eliminate this idle time and speed up the tests? Memory : 4GB ------------ A test with 8GB shows adding memory does not help the test or allow them to run faster. I prefer limiting how much memory the VMs use because I expect it to result in smaller live snapshots: w10pro64's disk image shot from 14 GB to 53GB when I added the 13 live snaphosts. That works out to about 3GB per live snapshot (disk COW+RAM). Interestingly it's less than the VM's amount of memory which means QEmu does not save the unused memory. But I suspect QEmu still saves Windows disk cache so that increasing memory result in bigger snapshots. Clock : HPET ------------ Initially the guest was using a significant amount of CPU on the host even when Windows was doing nothing. It turns out this is because by default libvirt does not add the HPET timer. Adding the following line fixed this: <clock offset='localtime'> [...] <timer name='hpet' present='yes'/> </clock> Disk: Virtio SCSI + unmap ------------------------- The SCSI Virtio driver is the recommended configuration and I manually set the discard mode to unmap to prevent qcow2 bloat (is that QEmu's default?). Then I tested the disk performance with ATTO. https://www.atto.com/disk-benchmark/ * In its default configuration ATTO uses a small 128 MB test file. Since such a small file easily fits in the OS' cache ATTO uses fsync-like functionality to ensure it tests the disk performance rather than the memory's. * But in the default QEmu configuration (writeback mode) caching still occurs outside the VM which fools Atto and results in read and write speeds in the GB/s range on a SATA SSD (see w10pro64_scsi+default+unmap.png). But then our tests don't write all that much to disk so this test is quite realistic. All in all this means the default configuration should provide more than fast enough disk access. * The results are the same when caching is explicitly set to writeback (i.e. it's QEmu's default). (see wtbw10pro64_scsi+writeback+unmap.png) * I also ran an ATTO test with a bigger file size (see w10pro64_scsi+default+unmap+4GB.png). We then clearly see writes being capped by the SSD speed while reads still benefit from the host cache. This shows that disk performance is still ok even when writing more data. * Some sites recommend setting io.mode=threads but that forces cache.mode=none or directsync. That prevents the host from doing extra caching and then we find the true underlying disk performance in ATTO. I think that configuration makes sense when one wants to be sure the VM's filesystem will remain in a consistent state in case of a host crash or power outage. But in such a case we would just revert the VM to the last snapshot and continue. Then the default configuration provides us with better disk performance. (see w10pro64_scsi+directsync+native+unmap.png and for comparison directsync alone w10pro64_scsi+directsync+unmap.png) -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

[PATCH] msvcm90: Add manifest.
by Dmitry Timoshkov 24 Sep '20

24 Sep '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcm90/Makefile.in | 2 ++ dlls/msvcm90/msvcm90.manifest | 7 +++++++ dlls/msvcm90/msvcm90.rc | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 dlls/msvcm90/msvcm90.manifest create mode 100644 dlls/msvcm90/msvcm90.rc diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in index 86f5616008..f01df662b9 100644 --- a/dlls/msvcm90/Makefile.in +++ b/dlls/msvcm90/Makefile.in @@ -5,3 +5,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ msvcm_main.c + +RC_SRCS = msvcm90.rc diff --git a/dlls/msvcm90/msvcm90.manifest b/dlls/msvcm90/msvcm90.manifest new file mode 100644 index 0000000000..588a0fd7b4 --- /dev/null +++ b/dlls/msvcm90/msvcm90.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="msvcr90.dll"/> + <file name="msvcp90.dll"/> + <file name="msvcm90.dll"/> +</assembly> diff --git a/dlls/msvcm90/msvcm90.rc b/dlls/msvcm90/msvcm90.rc new file mode 100644 index 0000000000..a3fb202f4b --- /dev/null +++ b/dlls/msvcm90/msvcm90.rc @@ -0,0 +1,22 @@ +/* + * Resource file for msvcm90 + * + * Copyright 2020 Dmitry Timoshkov + * + * 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 + */ + +/* @makedep: msvcm90.manifest */ +WINE_MANIFEST 24 msvcm90.manifest -- 2.26.2

2 2

[PATCH v2 1/3] wined3d: Track resource binding as render target.
by Paul Gofman 24 Sep '20

24 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - change helpers' names; - use uint32_t instead of long. dlls/wined3d/device.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7fef322e3d0..ac2748a141f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1060,6 +1060,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_swapchain_desc *swapchain_desc; DWORD clear_flags = 0; + unsigned int i; HRESULT hr; TRACE("device %p, swapchain %p.\n", device, swapchain); @@ -1096,6 +1097,10 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str } device->swapchains[0] = swapchain; + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; @@ -4873,13 +4878,19 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3D_OK; if (view) + { wined3d_rendertarget_view_incref(view); + wined3d_rtv_bind_count_inc(view); + } device->state.fb.render_targets[view_idx] = view; wined3d_cs_emit_set_rendertarget_view(device->cs, view_idx, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the surface as still in use. */ if (prev) + { + wined3d_rtv_bind_count_dec(prev); wined3d_rendertarget_view_decref(prev); + } wined3d_unbind_srv_for_rtv(device, view, FALSE); @@ -4912,7 +4923,6 @@ HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *devic wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) wined3d_rendertarget_view_decref(prev); - wined3d_unbind_srv_for_rtv(device, view, TRUE); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 048c16663f4..b828e45046c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3953,7 +3953,8 @@ struct wined3d_resource { LONG ref; LONG bind_count; - LONG srv_bind_count_device; + uint32_t srv_bind_count_device; + uint32_t rtv_bind_count_device; LONG map_count; LONG access_count; struct wined3d_device *device; @@ -5999,23 +6000,24 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, const struct wined3d_resource *resource, const struct wined3d_format *srv_format) { - struct wined3d_rendertarget_view * const *rts = &state->fb.render_targets[0]; const struct wined3d_rendertarget_view *dsv; - unsigned int i; if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) && (dsv = state->fb.depth_stencil) && dsv->resource == resource && wined3d_dsv_srv_conflict(dsv, srv_format)) return TRUE; - if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) - return FALSE; + return resource->rtv_bind_count_device; +} - for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) - if (rts[i] && rts[i]->resource == resource) - return TRUE; +static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) +{ + ++rtv->resource->rtv_bind_count_device; +} - return FALSE; +static inline void wined3d_rtv_bind_count_dec(struct wined3d_rendertarget_view *rtv) +{ + --rtv->resource->rtv_bind_count_device; } static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *vp, float *min_z, float *max_z) -- 2.26.2

3 6

[PATCH] conhost: Validate screen_buffer->width param in fill_output.
by Pengpeng Dong 24 Sep '20

24 Sep '20

2 1

[PATCH] conhost: Improve bound checking in fill_output.
by Jacek Caban 24 Sep '20

24 Sep '20

Inspider by Pengpeng Dong's patch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v4 1/7] wmphoto: Don't build with msvcrt.
by Rémi Bernon 24 Sep '20

24 Sep '20

This will be needed later, and having to remove the PE module in the middle of the series is just making things more annoying. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: * Do this first so the module nature does not change in the middle of the series. dlls/wmphoto/Makefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index 24e1f49496a..d31af339faf 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,7 +1,5 @@ MODULE = wmphoto.dll -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = main.c IDL_SRCS = wmphoto.idl -- 2.28.0

3 16

[PATCH vkd3d v3 1/2] vkd3d: Move the ID3DBlob implementation to vkd3d-common.
by Zebediah Figura 24 Sep '20

24 Sep '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 + include/private/vkd3d_blob.h | 27 +++++++ libs/vkd3d-common/blob.c | 137 ++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_main.c | 141 ++--------------------------------- libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 173 insertions(+), 135 deletions(-) create mode 100644 include/private/vkd3d_blob.h create mode 100644 libs/vkd3d-common/blob.c diff --git a/Makefile.am b/Makefile.am index 05403157..d0c7cd59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,7 @@ BUILT_SOURCES = $(widl_headers) \ noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d_common_la_SOURCES = \ include/private/vkd3d_debug.h \ + libs/vkd3d-common/blob.c \ libs/vkd3d-common/debug.c \ libs/vkd3d-common/memory.c \ libs/vkd3d-common/utf8.c @@ -93,6 +94,7 @@ EXTRA_libvkd3d_shader_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-shader/vkd3d_shader endif libvkd3d_la_SOURCES = \ + include/private/vkd3d_blob.h \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ diff --git a/include/private/vkd3d_blob.h b/include/private/vkd3d_blob.h new file mode 100644 index 00000000..e78d3916 --- /dev/null +++ b/include/private/vkd3d_blob.h @@ -0,0 +1,27 @@ +/* + * Copyright 2017 Józef Kucia for CodeWeavers + * + * 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 __VKD3D_BLOB_H +#define __VKD3D_BLOB_H + +#include "vkd3d_windows.h" +#include "vkd3d_d3dcommon.h" + +HRESULT vkd3d_blob_create(void *buffer, SIZE_T size, ID3D10Blob **blob) DECLSPEC_HIDDEN; + +#endif /* __VKD3D_BLOB_H */ diff --git a/libs/vkd3d-common/blob.c b/libs/vkd3d-common/blob.c new file mode 100644 index 00000000..c46abb55 --- /dev/null +++ b/libs/vkd3d-common/blob.c @@ -0,0 +1,137 @@ +/* + * Copyright 2017 Józef Kucia for CodeWeavers + * + * 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 + */ + +#define COBJMACROS +#define INITGUID +#include "vkd3d.h" +#include "vkd3d_blob.h" +#include "vkd3d_debug.h" +#include "vkd3d_memory.h" + +struct vkd3d_blob +{ + ID3D10Blob ID3DBlob_iface; + LONG refcount; + + void *buffer; + SIZE_T size; +}; + +static struct vkd3d_blob *impl_from_ID3DBlob(ID3DBlob *iface) +{ + return CONTAINING_RECORD(iface, struct vkd3d_blob, ID3DBlob_iface); +} + +static HRESULT STDMETHODCALLTYPE vkd3d_blob_QueryInterface(ID3DBlob *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3DBlob) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D10Blob_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE vkd3d_blob_AddRef(ID3DBlob *iface) +{ + struct vkd3d_blob *blob = impl_from_ID3DBlob(iface); + ULONG refcount = InterlockedIncrement(&blob->refcount); + + TRACE("%p increasing refcount to %u.\n", blob, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE vkd3d_blob_Release(ID3DBlob *iface) +{ + struct vkd3d_blob *blob = impl_from_ID3DBlob(iface); + ULONG refcount = InterlockedDecrement(&blob->refcount); + + TRACE("%p decreasing refcount to %u.\n", blob, refcount); + + if (!refcount) + { + vkd3d_free(blob->buffer); + + vkd3d_free(blob); + } + + return refcount; +} + +static void * STDMETHODCALLTYPE vkd3d_blob_GetBufferPointer(ID3DBlob *iface) +{ + struct vkd3d_blob *blob = impl_from_ID3DBlob(iface); + + TRACE("iface %p.\n", iface); + + return blob->buffer; +} + +static SIZE_T STDMETHODCALLTYPE vkd3d_blob_GetBufferSize(ID3DBlob *iface) +{ + struct vkd3d_blob *blob = impl_from_ID3DBlob(iface); + + TRACE("iface %p.\n", iface); + + return blob->size; +} + +static const struct ID3D10BlobVtbl vkd3d_blob_vtbl = +{ + /* IUnknown methods */ + vkd3d_blob_QueryInterface, + vkd3d_blob_AddRef, + vkd3d_blob_Release, + /* ID3DBlob methods */ + vkd3d_blob_GetBufferPointer, + vkd3d_blob_GetBufferSize +}; + +static void vkd3d_blob_init(struct vkd3d_blob *blob, void *buffer, SIZE_T size) +{ + blob->ID3DBlob_iface.lpVtbl = &vkd3d_blob_vtbl; + blob->refcount = 1; + + blob->buffer = buffer; + blob->size = size; +} + +HRESULT vkd3d_blob_create(void *buffer, SIZE_T size, ID3D10Blob **blob) +{ + struct vkd3d_blob *object; + + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + vkd3d_blob_init(object, buffer, size); + + TRACE("Created blob object %p.\n", object); + + *blob = &object->ID3DBlob_iface; + + return S_OK; +} diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 327cdf88..21d998bf 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define INITGUID #include "vkd3d_private.h" VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); @@ -423,126 +422,11 @@ HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZ &IID_ID3D12VersionedRootSignatureDeserializer, iid, deserializer); } -/* ID3DBlob */ -struct d3d_blob -{ - ID3D10Blob ID3DBlob_iface; - LONG refcount; - - void *buffer; - SIZE_T size; -}; - -static struct d3d_blob *impl_from_ID3DBlob(ID3DBlob *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_blob, ID3DBlob_iface); -} - -static HRESULT STDMETHODCALLTYPE d3d_blob_QueryInterface(ID3DBlob *iface, REFIID riid, void **object) -{ - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_ID3DBlob) - || IsEqualGUID(riid, &IID_IUnknown)) - { - ID3D10Blob_AddRef(iface); - *object = iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; -} - -static ULONG STDMETHODCALLTYPE d3d_blob_AddRef(ID3DBlob *iface) -{ - struct d3d_blob *blob = impl_from_ID3DBlob(iface); - ULONG refcount = InterlockedIncrement(&blob->refcount); - - TRACE("%p increasing refcount to %u.\n", blob, refcount); - - return refcount; -} - -static ULONG STDMETHODCALLTYPE d3d_blob_Release(ID3DBlob *iface) -{ - struct d3d_blob *blob = impl_from_ID3DBlob(iface); - ULONG refcount = InterlockedDecrement(&blob->refcount); - - TRACE("%p decreasing refcount to %u.\n", blob, refcount); - - if (!refcount) - { - vkd3d_free(blob->buffer); - - vkd3d_free(blob); - } - - return refcount; -} - -static void * STDMETHODCALLTYPE d3d_blob_GetBufferPointer(ID3DBlob *iface) -{ - struct d3d_blob *blob = impl_from_ID3DBlob(iface); - - TRACE("iface %p.\n", iface); - - return blob->buffer; -} - -static SIZE_T STDMETHODCALLTYPE d3d_blob_GetBufferSize(ID3DBlob *iface) -{ - struct d3d_blob *blob = impl_from_ID3DBlob(iface); - - TRACE("iface %p.\n", iface); - - return blob->size; -} - -static const struct ID3D10BlobVtbl d3d_blob_vtbl = -{ - /* IUnknown methods */ - d3d_blob_QueryInterface, - d3d_blob_AddRef, - d3d_blob_Release, - /* ID3DBlob methods */ - d3d_blob_GetBufferPointer, - d3d_blob_GetBufferSize -}; - -static void d3d_blob_init(struct d3d_blob *blob, void *buffer, SIZE_T size) -{ - blob->ID3DBlob_iface.lpVtbl = &d3d_blob_vtbl; - blob->refcount = 1; - - blob->buffer = buffer; - blob->size = size; -} - -static HRESULT d3d_blob_create(void *buffer, SIZE_T size, struct d3d_blob **blob) -{ - struct d3d_blob *object; - - if (!(object = vkd3d_malloc(sizeof(*object)))) - return E_OUTOFMEMORY; - - d3d_blob_init(object, buffer, size); - - TRACE("Created blob object %p.\n", object); - - *blob = object; - - return S_OK; -} - HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) { struct vkd3d_shader_versioned_root_signature_desc vkd3d_desc; struct vkd3d_shader_code dxbc; - struct d3d_blob *blob_object; char *messages; HRESULT hr; int ret; @@ -571,25 +455,19 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); if (error_blob && messages) { - if (FAILED(hr = d3d_blob_create(messages, strlen(messages), &blob_object))) + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) ERR("Failed to create error blob, hr %#x.\n", hr); - else - *error_blob = &blob_object->ID3DBlob_iface; } return hresult_from_vkd3d_result(ret); } vkd3d_shader_free_messages(messages); - if (FAILED(hr = d3d_blob_create((void *)dxbc.code, dxbc.size, &blob_object))) + if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { WARN("Failed to create blob object, hr %#x.\n", hr); vkd3d_shader_free_shader_code(&dxbc); - return hr; } - - *blob = &blob_object->ID3DBlob_iface; - - return S_OK; + return hr; } HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, @@ -597,7 +475,6 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN { const struct vkd3d_shader_versioned_root_signature_desc *vkd3d_desc; struct vkd3d_shader_code dxbc; - struct d3d_blob *blob_object; char *messages; HRESULT hr; int ret; @@ -619,23 +496,17 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); if (error_blob && messages) { - if (FAILED(hr = d3d_blob_create(messages, strlen(messages), &blob_object))) + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) ERR("Failed to create error blob, hr %#x.\n", hr); - else - *error_blob = &blob_object->ID3DBlob_iface; } return hresult_from_vkd3d_result(ret); } vkd3d_shader_free_messages(messages); - if (FAILED(hr = d3d_blob_create((void *)dxbc.code, dxbc.size, &blob_object))) + if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { WARN("Failed to create blob object, hr %#x.\n", hr); vkd3d_shader_free_shader_code(&dxbc); - return hr; } - - *blob = &blob_object->ID3DBlob_iface; - - return S_OK; + return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9f0982df..4af970c1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -24,6 +24,7 @@ #define VK_NO_PROTOTYPES #include "vkd3d_common.h" +#include "vkd3d_blob.h" #include "vkd3d_memory.h" #include "vkd3d_utf8.h" #include "list.h" -- 2.28.0

2 3

[PATCH vkd3d 1/3] vkd3d-shader: Add shader_dump_to_buffer helper function.
by Isabella Bosia 24 Sep '20

24 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 30 ++++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d7495ee..b2512ac 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1557,21 +1557,13 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "\n"); } -void vkd3d_shader_trace(void *data) +void vkd3d_shader_dump_to_buffer(void *data, struct vkd3d_string_buffer *buffer) { struct vkd3d_shader_version shader_version; - struct vkd3d_string_buffer buffer; - const char *p, *q; const DWORD *ptr; - if (!vkd3d_string_buffer_init(&buffer)) - { - ERR("Failed to initialize string buffer.\n"); - return; - } - shader_sm4_read_header(data, &ptr, &shader_version); - shader_addline(&buffer, "%s_%u_%u\n", + shader_addline(buffer, "%s_%u_%u\n", shader_get_type_prefix(shader_version.type), shader_version.major, shader_version.minor); while (!shader_sm4_is_end(data, &ptr)) @@ -1582,13 +1574,27 @@ void vkd3d_shader_trace(void *data) if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); - shader_addline(&buffer, "<unrecognized instruction>\n"); + shader_addline(buffer, "<unrecognized instruction>\n"); continue; } - shader_dump_instruction(&buffer, &ins, &shader_version); + shader_dump_instruction(buffer, &ins, &shader_version); + } +} + +void vkd3d_shader_trace(void *data) +{ + struct vkd3d_string_buffer buffer; + const char *p, *q; + + if (!vkd3d_string_buffer_init(&buffer)) + { + ERR("Failed to initialize string buffer.\n"); + return; } + vkd3d_shader_dump_to_buffer(data, &buffer); + for (p = buffer.buffer; *p; p = q) { if (!(q = strstr(p, "\n"))) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 00b2441..9ed8be2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -830,6 +830,7 @@ struct vkd3d_string_buffer unsigned int content_size; }; +void vkd3d_shader_dump_to_buffer(void *data, struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; -- 2.25.1

3 4