- Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_blt_sub_resource().
by Zebediah Figura April 7, 2021

April 7, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 20 +++++++++++++------- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 462e6d8a93b..f7b947616dd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -474,6 +474,12 @@ static inline void wined3d_device_context_submit(struct wined3d_device_context * context->ops->submit(context, queue_id); } +static inline void wined3d_device_context_finish(struct wined3d_device_context *context, + enum wined3d_cs_queue_id queue_id) +{ + context->ops->finish(context, queue_id); +} + static const char *debug_cs_op(enum wined3d_cs_op op) { switch (op) @@ -2425,14 +2431,14 @@ error: wined3d_resource_release(op->dst_resource); } -void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, - unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, - const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) +void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, + unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { struct wined3d_cs_blt_sub_resource *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_BLT_SUB_RESOURCE; op->dst_resource = dst_resource; op->dst_sub_resource_idx = dst_sub_resource_idx; @@ -2451,9 +2457,9 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso if (src_resource) wined3d_resource_acquire(src_resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) - wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_finish(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c03621c706a..004d3ec8d2a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4613,7 +4613,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, wined3d_texture_get_level_box(dst_texture, i, &box); for (j = 0; j < layer_count; ++j) { - wined3d_cs_emit_blt_sub_resource(device->cs, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, &dst_texture->resource, j * dst_level_count + i, &box, &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, 0, NULL, WINED3D_TEXF_POINT); @@ -4659,7 +4659,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, wined3d_texture_get_level_depth(src_texture, src_level)); } - wined3d_cs_emit_blt_sub_resource(device->cs, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, &dst_texture->resource, i * dst_level_count + j, &box, &src_texture->resource, i * src_level_count + src_level, &box, 0, NULL, WINED3D_TEXF_POINT); @@ -4893,7 +4893,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, if (dst_resource->type == WINED3D_RTYPE_BUFFER) { wined3d_box_set(&src_box, 0, 0, src_resource->size, 1, 0, 1); - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &src_box, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, dst_resource, 0, &src_box, src_resource, 0, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return; } @@ -4918,7 +4918,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, { unsigned int idx = j * dst_texture->level_count + i; - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &dst_box, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, dst_resource, idx, &dst_box, src_resource, idx, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); } } @@ -5079,7 +5079,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } } - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, dst_sub_resource_idx, &dst_box, + wined3d_device_context_emit_blt_sub_resource(&device->cs->c, dst_resource, dst_sub_resource_idx, &dst_box, src_resource, src_sub_resource_idx, src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return WINED3D_OK; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0736f612f12..363f4641b3f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3911,8 +3911,8 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return E_NOTIMPL; } - wined3d_cs_emit_blt_sub_resource(dst_texture->resource.device->cs, &dst_texture->resource, dst_sub_resource_idx, - &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); + wined3d_device_context_emit_blt_sub_resource(&dst_texture->resource.device->cs->c, &dst_texture->resource, + dst_sub_resource_idx, &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 957290c7ece..38f19b21fbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4723,10 +4723,6 @@ void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; -void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, - unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, - const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, @@ -4781,6 +4777,10 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, + struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, + unsigned int flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -- 2.30.2

3 12

[PATCH] winhttp: Invalid url decomposition should return failure when it fails.
by Haoyang Chen April 7, 2021

April 7, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/winhttp/session.c | 5 +++-- dlls/winhttp/tests/winhttp.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 319066db55b..f052c3c569c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1854,7 +1854,7 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX uc.dwStructSize = sizeof(uc); uc.dwHostNameLength = -1; - if (WinHttpCrackUrl( url, 0, 0, &uc )) + if ((ret = WinHttpCrackUrl( url, 0, 0, &uc ))) { char *hostnameA = strdupWA_sized( uc.lpszHostName, uc.dwHostNameLength ); @@ -1868,7 +1868,8 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX heap_free( hostnameA ); } heap_free( urlA ); - return InternetDeInitializeAutoProxyDll( NULL, 0 ); + InternetDeInitializeAutoProxyDll( NULL, 0 ); + return ret; } /*********************************************************************** diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a61a23ec02..56f35252615 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4974,6 +4974,9 @@ static void test_WinHttpGetProxyForUrl(void) trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); + + ret = WinHttpGetProxyForUrl( session, L"http:", &options, &info ); + ok( !ret, "expected failure\n" ); } options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; @@ -4990,6 +4993,13 @@ static void test_WinHttpGetProxyForUrl(void) GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); } + + options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; + options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A; + + ret = WinHttpGetProxyForUrl( session, L"http:", &options, &info ); + ok( !ret, "expected failure\n" ); + WinHttpCloseHandle( session ); } -- 2.20.1

3 2

[PATCH 1/5] ntoskrnl/tests: Test discovery of the root PnP device via setupapi.
by Zebediah Figura April 7, 2021

April 7, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 ++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c9f680f01e8..73f96789f06 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -34,6 +34,8 @@ #include "mssip.h" #include "setupapi.h" #include "newdev.h" +#include "initguid.h" +#include "devguid.h" #include "wine/test.h" #include "wine/heap.h" #include "wine/mssign.h" @@ -990,6 +992,49 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) } } +static void test_pnp_devices(void) +{ + static const GUID control_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc0}}; + + char buffer[200]; + SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA device = {sizeof(device)}; + HDEVINFO set; + HANDLE bus; + BOOL ret; + + set = SetupDiGetClassDevsA(&control_class, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); + + ret = SetupDiEnumDeviceInfo(set, 0, &device); + ok(ret, "failed to get device, error %#x\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &GUID_DEVCLASS_SYSTEM), "wrong class %s\n", debugstr_guid(&device.ClassGuid)); + + ret = SetupDiGetDeviceInstanceIdA(set, &device, buffer, sizeof(buffer), NULL); + ok(ret, "failed to get device ID, error %#x\n", GetLastError()); + ok(!strcasecmp(buffer, "root\\winetest\\0"), "got ID %s\n", debugstr_a(buffer)); + + ret = SetupDiEnumDeviceInterfaces(set, NULL, &control_class, 0, &iface); + ok(ret, "failed to get interface, error %#x\n", GetLastError()); + ok(IsEqualGUID(&iface.InterfaceClassGuid, &control_class), + "wrong class %s\n", debugstr_guid(&iface.InterfaceClassGuid)); + ok(iface.Flags == SPINT_ACTIVE, "got flags %#x\n", iface.Flags); + + iface_detail->cbSize = sizeof(*iface_detail); + ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, iface_detail, sizeof(buffer), NULL, NULL); + ok(ret, "failed to get interface path, error %#x\n", GetLastError()); + ok(!strcasecmp(iface_detail->DevicePath, "\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}"), + "wrong path %s\n", debugstr_a(iface_detail->DevicePath)); + + SetupDiDestroyDeviceInfoList(set); + + bus = CreateFileA(iface_detail->DevicePath, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(bus != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + CloseHandle(bus); +} + static void test_pnp_driver(struct testsign_context *ctx) { static const char hardware_id[] = "test_hardware_id\0"; @@ -1116,9 +1161,7 @@ static void test_pnp_driver(struct testsign_context *ctx) /* Tests. */ - file = CreateFileA("\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - CloseHandle(file); + test_pnp_devices(); /* Clean up. */ -- 2.30.2

5 10

[PATCH 2/2] msvcrt: Add helpers for creating base class RTTI.
by Piotr Caban April 7, 2021

April 7, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cxx.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] msvcp: Remove MSVCP_ prefix from RTTI and vtable related code.
by Piotr Caban April 7, 2021

April 7, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- It's meant to make the msvcrt/cxx.h and msvcp90/cxx.h more similar. dlls/msvcirt/msvcirt.c | 116 ++++++++-------- dlls/msvcirt/msvcirt.spec | 46 +++---- dlls/msvcp100/msvcp100.spec | 72 +++++----- dlls/msvcp110/msvcp110.spec | 78 +++++------ dlls/msvcp120/msvcp120.spec | 78 +++++------ dlls/msvcp140/msvcp140.spec | 76 +++++------ dlls/msvcp140_1/msvcp140_1.c | 12 +- dlls/msvcp60/ios.c | 240 ++++++++++++++++---------------- dlls/msvcp60/msvcp60.spec | 136 +++++++++---------- dlls/msvcp60/string.c | 10 +- dlls/msvcp70/msvcp70.spec | 138 +++++++++---------- dlls/msvcp71/msvcp71.spec | 132 +++++++++--------- dlls/msvcp80/msvcp80.spec | 136 +++++++++---------- dlls/msvcp90/cxx.h | 30 ++-- dlls/msvcp90/exception.c | 158 ++++++++++----------- dlls/msvcp90/ios.c | 256 +++++++++++++++++------------------ dlls/msvcp90/locale.c | 158 ++++++++++----------- dlls/msvcp90/misc.c | 28 ++-- dlls/msvcp90/msvcp90.spec | 134 +++++++++--------- 19 files changed, 1017 insertions(+), 1017 deletions(-)

1 0

[tools] winetest/dissect: Allow an error code on the 'version error' lines.
by Francois Gouget April 7, 2021

April 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 4f0e95b36..2c89abaa2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -427,7 +427,7 @@ while ($line = <IN> || "") my ($dll, $info) = ($1, $2); $dllinfo{$dll} = { version => $info }; if ($info =~ /^dll is (?:missing|native|a stub)/ or - $info =~ /^(?:load error|version error \d+|version not (?:found|present))$/ or + $info =~ /^(?:(?:load|version) error \d+|version not (?:found|present))/ or # For compatibility with old WineTest versions $info =~ /^(?:failed|unknown|version not available)$/) { -- 2.20.1

1 0

[tools] testbot/PatchUtils: Rerun the tests when the Makefile is modified.
by Francois Gouget April 7, 2021

April 7, 2021

Makefile changes are less likely to cause tests to fail but they are also quite rare so they are not worth special-casing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It also means that adding a new test unit causes all of that module's test units to be rerun. But that's not very frequent either. --- testbot/lib/WineTestBot/PatchUtils.pm | 3 --- 1 file changed, 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index a7d33f685..eb9fa09bb 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -570,9 +570,6 @@ sub GetPatchImpacts($) my $TestFiles = $Module->{TestFiles}; foreach my $File (sort keys %$TestFiles) { - # Assume makefile modifications may break the build but not the tests - next if ($File eq "Makefile.in"); - my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//) { -- 2.20.1

1 0

[tools] testbot/LogUtils: Detect WineTest.exe errors.
by Francois Gouget April 7, 2021

April 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e6e89f556..5d2dc33a5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -106,8 +106,10 @@ sub GetLogLineCategory($) $Line =~ /^Task: / or # Typical perl errors _IsPerlError($Line) or - # The testbot.log errors - $Line =~ /:error: /) + # The TestLauncher / testbot.log errors + $Line =~ /:error: / or + # WineTest.exe errors + $Line =~ /^Error: /) { return "error"; } -- 2.20.1

1 0

[tools] testbot/WineRunTask: Increase the leeway to catch TestLauncher timeouts!
by Francois Gouget April 7, 2021

April 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 714679660..148884328 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -444,9 +444,9 @@ if ($Step->Type eq "single") } $Script .= "$TestLauncher -t $Timeout $FileName "; - # Add 1 second to the timeout so the client-side Wait() does not time out - # right before $TestLauncher does. - $Timeout += 1; + # Add some margin so $TA->Wait() does not time out right before + # TestLauncher does. + $Timeout += 5; $Keepalive = 20; my $CmdLineArg = $Task->CmdLineArg; if ($CmdLineArg) -- 2.20.1

1 0

[PATCH v2 resend 4/4] gdi32: Get rid of redundant ntmCellHeight member.
by Akihiro Sagawa April 7, 2021

April 7, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 1 - dlls/gdi32/gdi_private.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-)

2 1