September 2021 - Wine-devel

[PATCH] d3dx10_38/tests: Enable tests.
by Nikolay Sivov 08 Sep '21

08 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_38/Makefile.in | 1 + dlls/d3dx10_38/tests/Makefile.in | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 dlls/d3dx10_38/tests/Makefile.in diff --git a/configure.ac b/configure.ac index e10bcca50e1..f986809a603 100644 --- a/configure.ac +++ b/configure.ac @@ -3085,6 +3085,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_38/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in index 5942b7c7c42..a1e7028de86 100644 --- a/dlls/d3dx10_38/Makefile.in +++ b/dlls/d3dx10_38/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_38.dll +IMPORTLIB = d3dx10_38 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_38/tests/Makefile.in b/dlls/d3dx10_38/tests/Makefile.in new file mode 100644 index 00000000000..9e911457c81 --- /dev/null +++ b/dlls/d3dx10_38/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_38.dll +IMPORTS = d3dx10_38 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

2 1

[PATCH 1/5] d3d10/effect: Fix indexing in GetPixelShader().
by Nikolay Sivov 08 Sep '21

08 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 ++++++++++----- dlls/d3d10/tests/effect.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 180d36ce65b..fbfe8d0113a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -7104,19 +7104,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); + struct d3d10_effect_shader_variable *s; + D3D10_SHADER_VARIABLE_TYPE basetype; + HRESULT hr; TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + *shader = NULL; - if (v->type->basetype != D3D10_SVT_PIXELSHADER) + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s, &basetype))) + return hr; + + if (basetype != D3D10_SVT_PIXELSHADER) { WARN("Shader is not a pixel shader.\n"); - return E_FAIL; + return D3DERR_INVALIDCALL; } - if ((*shader = v->u.shader.shader.ps)) + if ((*shader = s->shader.ps)) ID3D10PixelShader_AddRef(*shader); return S_OK; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 4583863d59b..603f3dd049a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6015,6 +6015,7 @@ static void test_effect_shader_object(void) ID3D10EffectShaderVariable *s; ID3D10EffectVariable *v; ID3D10VertexShader *vs; + ID3D10PixelShader *ps; ID3D10Effect* effect; ID3D10Device *device; ULONG refcount; @@ -6060,6 +6061,37 @@ static void test_effect_shader_object(void) ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 0, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 1, &ps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 2, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 3, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 4, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = NULL; + hr = s->lpVtbl->GetPixelShader(s, 5, &ps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!ps, "Unexpected shader object.\n"); + ID3D10PixelShader_Release(ps); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.33.0

2 9

[PATCH 1/5] d3dcompiler/tests: Test including an absolute path.
by Zebediah Figura 08 Sep '21

08 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index a950fa83d89..ad27084dce0 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -1523,7 +1523,7 @@ struct test_d3dinclude static void test_d3dcompile(void) { struct test_d3dinclude include = {{&test_d3dinclude_vtbl}}; - WCHAR filename[MAX_PATH], directory[MAX_PATH]; + WCHAR filename[MAX_PATH], directory[MAX_PATH], include_filename[MAX_PATH]; ID3D10Blob *blob = NULL, *errors = NULL; CHAR filename_a[MAX_PATH]; HRESULT hr; @@ -1542,12 +1542,20 @@ static void test_d3dcompile(void) static const char include2[] = "#include \"include1.h\"\n" "float4 light_color = LIGHT;\n"; + static const char ps_absolute_template[] = + "#include \"%ls\"\n" + "\n" + "float4 main() : COLOR\n" + "{\n" + " return light_color;\n" + "}"; + char ps_absolute_buffer[sizeof(ps_absolute_template) + MAX_PATH]; create_file(L"source.ps", ps_code, strlen(ps_code), filename); create_directory(L"include"); create_file(L"include\\include1.h", include1_wrong, strlen(include1_wrong), NULL); create_file(L"include1.h", include1, strlen(include1), NULL); - create_file(L"include\\include2.h", include2, strlen(include2), NULL); + create_file(L"include\\include2.h", include2, strlen(include2), include_filename); len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); @@ -1650,6 +1658,18 @@ static void test_d3dcompile(void) blob = NULL; } + sprintf(ps_absolute_buffer, ps_absolute_template, include_filename); + hr = ppD3DCompile(ps_absolute_buffer, sizeof(ps_absolute_buffer), filename_a, NULL, + D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + GetCurrentDirectoryW(MAX_PATH, directory); SetCurrentDirectoryW(temp_dir); -- 2.33.0

5 13

[PATCH] widl: Write default values for VARIANT arguments.
by Nikolay Sivov 08 Sep '21

08 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Main motivation is to fix sapiaut.idl warning from CreateGrammar() method. tools/widl/write_msft.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index c39f38249c8..228f58e2649 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1221,7 +1221,8 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e int vt; if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) { - if (get_type_vt(type) != VT_BSTR) + vt = get_type_vt(type); + if (vt != VT_BSTR && vt != VT_VARIANT) error("string default value applied to non-string type\n"); chat("default value '%s'\n", expr->u.sval); write_string_value(typelib, out, expr->u.sval); @@ -1251,6 +1252,20 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e case VT_UINT: case VT_HRESULT: break; + case VT_VARIANT: { + switch (expr->type) { + case EXPR_DOUBLE: + vt = VT_R4; + break; + case EXPR_NUM: + vt = VT_I4; + break; + default: + warning("can't write default VT_VARIANT value for expression type %d.\n", expr->type); + return; + } + break; + } default: warning("can't write value of type %d yet\n", vt); return; -- 2.33.0

1 0

PE Conversion
by Ulrich Czekalla 08 Sep '21

08 Sep '21

Hi All, As most of you are aware, a significant on-going task has been PE conversion of builtin dlls. There is lots of activity going on in this area and I want to give the broader community visibility into CodeWeavers' efforts to help get this done. We're planning to do a push to complete most of this work in time for Wine 7.0. I also wanted to make sure there was no duplication of effort. Below is a table listing the outstanding dlls along with names next to the dlls that I know are actively being converted. This is mostly a thread to coordinate the effort and hopefully draw some discussion around design/implementation issues that still needs to be resolved in order to convert some of the dlls. avicap32 capi2032 ctapi32 d3d12 dinput*.dll.so - Rémi Bernon dxgi.dll.so gphoto2.ds.so iphlpapi.dll.so - Huw Davies l3codeca.acm.so mountmgr.sys.so mp3dmod.dll.so msgsm32.acm.so msxml3.dll.so nsiproxy.sys.so openal32.dll.so opengl32.dll.so sane.ds.so shell32.dll.so winealsa.drv.so wineandroid.drv winebus.sys.so - Rémi Bernon winecoreaudio.drv wined3d.dll.so - Zebediah Figura winejoystick.drv.so - Zebediah Figura winemac.drv wineoss.drv wineqtdecoder wineusb.sys winex11.drv.so - Jacek Caban winspool.drv.so - Huw Davies wnaspi32.dll.so x3daudio1_*.dll.so - Rémi Bernon xactengine2_*.dll.so - Rémi Bernon xactengine3_* xapofx1_*.dll.so - Rémi Bernon xaudio2_* Thanks, -Ulrich

13 17

[PATCH v2 1/7] winexinput.sys: Look for caps in the lower HID report descriptor.
by Rémi Bernon 08 Sep '21

08 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 68 ++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 60f7a8ed5dd..330c9203b7d 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -82,6 +82,14 @@ struct func_device WCHAR instance_id[MAX_DEVICE_ID_LEN]; + HIDP_VALUE_CAPS lx_caps; + HIDP_VALUE_CAPS ly_caps; + HIDP_VALUE_CAPS lt_caps; + HIDP_VALUE_CAPS rx_caps; + HIDP_VALUE_CAPS ry_caps; + HIDP_VALUE_CAPS rt_caps; + HIDP_DEVICE_DESC device_desc; + /* everything below requires holding the cs */ CRITICAL_SECTION cs; ULONG report_len; @@ -442,13 +450,27 @@ static NTSTATUS sync_ioctl(DEVICE_OBJECT *device, DWORD code, void *in_buf, DWOR return io.Status; } +static void check_value_caps(struct func_device *fdo, USHORT usage, HIDP_VALUE_CAPS *caps) +{ + switch (usage) + { + case HID_USAGE_GENERIC_X: fdo->lx_caps = *caps; break; + case HID_USAGE_GENERIC_Y: fdo->ly_caps = *caps; break; + case HID_USAGE_GENERIC_Z: fdo->lt_caps = *caps; break; + case HID_USAGE_GENERIC_RX: fdo->rx_caps = *caps; break; + case HID_USAGE_GENERIC_RY: fdo->ry_caps = *caps; break; + case HID_USAGE_GENERIC_RZ: fdo->rt_caps = *caps; break; + } +} + static NTSTATUS initialize_device(DEVICE_OBJECT *device) { struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - ULONG i, report_desc_len, report_count; + ULONG i, u, button_count, report_desc_len, report_count; PHIDP_REPORT_DESCRIPTOR report_desc; PHIDP_PREPARSED_DATA preparsed; - HIDP_DEVICE_DESC device_desc; + HIDP_BUTTON_CAPS *button_caps; + HIDP_VALUE_CAPS *value_caps; HIDP_REPORT_IDS *reports; HID_DESCRIPTOR hid_desc; NTSTATUS status; @@ -461,16 +483,48 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(report_desc = malloc(report_desc_len))) return STATUS_NO_MEMORY; status = sync_ioctl(fdo->bus_device, IOCTL_HID_GET_REPORT_DESCRIPTOR, NULL, 0, report_desc, report_desc_len); - if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &device_desc); + if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &fdo->device_desc); free(report_desc); if (status != HIDP_STATUS_SUCCESS) return status; - preparsed = device_desc.CollectionDesc->PreparsedData; + preparsed = fdo->device_desc.CollectionDesc->PreparsedData; status = HidP_GetCaps(preparsed, &caps); if (status != HIDP_STATUS_SUCCESS) return status; - reports = device_desc.ReportIDs; - report_count = device_desc.ReportIDsLength; + button_count = 0; + if (!(button_caps = malloc(sizeof(*button_caps) * caps.NumberInputButtonCaps))) return STATUS_NO_MEMORY; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &caps.NumberInputButtonCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) return status; + else for (i = 0; i < caps.NumberInputButtonCaps; i++) + { + if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) continue; + if (button_caps[i].IsRange) button_count = max(button_count, button_caps[i].Range.UsageMax); + else button_count = max(button_count, button_caps[i].NotRange.Usage); + } + free(button_caps); + if (button_count < 10) WARN("only %u buttons found\n", button_count); + + if (!(value_caps = malloc(sizeof(*value_caps) * caps.NumberInputValueCaps))) return STATUS_NO_MEMORY; + status = HidP_GetValueCaps(HidP_Input, value_caps, &caps.NumberInputValueCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) return status; + else for (i = 0; i < caps.NumberInputValueCaps; i++) + { + HIDP_VALUE_CAPS *caps = value_caps + i; + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) continue; + if (!caps->IsRange) check_value_caps(fdo, caps->NotRange.Usage, caps); + else for (u = caps->Range.UsageMin; u <=caps->Range.UsageMax; u++) check_value_caps(fdo, u, value_caps + i); + } + free(value_caps); + + if (!fdo->lx_caps.UsagePage) WARN("missing lx axis\n"); + if (!fdo->ly_caps.UsagePage) WARN("missing ly axis\n"); + if (!fdo->lt_caps.UsagePage) WARN("missing lt axis\n"); + if (!fdo->rx_caps.UsagePage) WARN("missing rx axis\n"); + if (!fdo->ry_caps.UsagePage) WARN("missing ry axis\n"); + if (!fdo->rt_caps.UsagePage) WARN("missing rt axis\n"); + + reports = fdo->device_desc.ReportIDs; + report_count = fdo->device_desc.ReportIDsLength; for (i = 0; i < report_count; ++i) if (!reports[i].ReportID || reports[i].InputLength) break; if (i == report_count) i = 0; /* no input report?!, just use first ID */ @@ -478,7 +532,6 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(fdo->report_buf = malloc(fdo->report_len))) return STATUS_NO_MEMORY; fdo->report_buf[0] = reports[i].ReportID; - HidP_FreeCollectionDescription(&device_desc); return STATUS_SUCCESS; } @@ -556,6 +609,7 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) status = IoCallDriver(fdo->bus_device, irp); IoDetachDevice(fdo->bus_device); RtlDeleteCriticalSection(&fdo->cs); + HidP_FreeCollectionDescription(&fdo->device_desc); free(fdo->report_buf); IoDeleteDevice(device); return status; -- 2.33.0

1 6

[PATCH 1/5] server: Cancel asyncs through fd_ops.
by Zebediah Figura 07 Sep '21

07 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/async.c | 2 +- server/change.c | 1 + server/console.c | 6 ++++++ server/device.c | 1 + server/fd.c | 10 ++++++++++ server/file.c | 1 + server/file.h | 4 ++++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/serial.c | 1 + server/sock.c | 2 ++ 12 files changed, 34 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 50cb47dec92..278048bc7a3 100644 --- a/server/async.c +++ b/server/async.c @@ -502,7 +502,7 @@ restart: (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) { - async_terminate( async, STATUS_CANCELLED ); + fd_cancel_async( async->fd, async ); woken++; goto restart; } diff --git a/server/change.c b/server/change.c index b02a9cd65bf..5edeebf89d3 100644 --- a/server/change.c +++ b/server/change.c @@ -144,6 +144,7 @@ static const struct fd_ops dir_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/console.c b/server/console.c index 2a23081037b..3a5b1270116 100644 --- a/server/console.c +++ b/server/console.c @@ -115,6 +115,7 @@ static const struct fd_ops console_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ console_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -185,6 +186,7 @@ static const struct fd_ops console_server_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_server_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -254,6 +256,7 @@ static const struct fd_ops screen_buffer_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ screen_buffer_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -340,6 +343,7 @@ static const struct fd_ops console_input_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -395,6 +399,7 @@ static const struct fd_ops console_output_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ console_output_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -451,6 +456,7 @@ static const struct fd_ops console_connection_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_connection_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/device.c b/server/device.c index d9199e8ddd8..2310de43ac4 100644 --- a/server/device.c +++ b/server/device.c @@ -243,6 +243,7 @@ static const struct fd_ops device_file_fd_ops = default_fd_get_file_info, /* get_file_info */ device_file_get_volume_info, /* get_volume_info */ device_file_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ device_file_reselect_async /* reselect_async */ }; diff --git a/server/fd.c b/server/fd.c index 7a88f412c7a..904b4e4217d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2216,6 +2216,11 @@ void fd_async_wake_up( struct fd *fd, int type, unsigned int status ) } } +void fd_cancel_async( struct fd *fd, struct async *async ) +{ + fd->fd_ops->cancel_async( fd, async ); +} + void fd_reselect_async( struct fd *fd, struct async_queue *queue ) { fd->fd_ops->reselect_async( fd, queue ); @@ -2226,6 +2231,11 @@ void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count set_error( STATUS_OBJECT_TYPE_MISMATCH ); } +void default_fd_cancel_async( struct fd *fd, struct async *async ) +{ + async_terminate( async, STATUS_CANCELLED ); +} + void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) { fd_queue_async( fd, async, type ); diff --git a/server/file.c b/server/file.c index aff4d9e09e1..2c7cb0ce5ca 100644 --- a/server/file.c +++ b/server/file.c @@ -124,6 +124,7 @@ static const struct fd_ops file_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/file.h b/server/file.h index b481a68e530..22879b75c05 100644 --- a/server/file.h +++ b/server/file.h @@ -68,6 +68,8 @@ struct fd_ops void (*get_volume_info)( struct fd *, struct async *, unsigned int ); /* perform an ioctl on the file */ void (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async ); + /* cancel an async operation */ + void (*cancel_async)(struct fd *fd, struct async *async); /* queue an async operation */ void (*queue_async)(struct fd *, struct async *async, int type, int count); /* selected events for async i/o need an update */ @@ -106,6 +108,7 @@ extern void get_nt_name( struct fd *fd, struct unicode_str *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); +extern void fd_cancel_async( struct fd *fd, struct async *async ); extern void fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -117,6 +120,7 @@ extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsign extern void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); extern void no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern void default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +extern void default_fd_cancel_async( struct fd *fd, struct async *async ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); extern void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); diff --git a/server/mailslot.c b/server/mailslot.c index d4b2fd1b562..1f4cb87d0fc 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -108,6 +108,7 @@ static const struct fd_ops mailslot_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ mailslot_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -165,6 +166,7 @@ static const struct fd_ops mail_writer_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -255,6 +257,7 @@ static const struct fd_ops mailslot_device_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/mapping.c b/server/mapping.c index a814fe8090f..eb500ea67f4 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -204,6 +204,7 @@ static const struct fd_ops mapping_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ no_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ no_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/named_pipe.c b/server/named_pipe.c index 234dfc701d9..f964ae19637 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -194,6 +194,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -237,6 +238,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -314,6 +316,7 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ named_pipe_device_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/serial.c b/server/serial.c index a5f7ef917b9..bdc27de8e4f 100644 --- a/server/serial.c +++ b/server/serial.c @@ -119,6 +119,7 @@ static const struct fd_ops serial_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ serial_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ serial_queue_async, /* queue_async */ serial_reselect_async /* reselect_async */ }; diff --git a/server/sock.c b/server/sock.c index 3c5f2612b51..bfaf6329ff4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -274,6 +274,7 @@ static const struct fd_ops sock_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ sock_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ sock_queue_async, /* queue_async */ sock_reselect_async /* reselect_async */ }; @@ -2973,6 +2974,7 @@ static const struct fd_ops ifchange_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ no_fd_ioctl, /* ioctl */ + NULL, /* cancel_async */ NULL, /* queue_async */ NULL /* reselect_async */ }; -- 2.33.0

3 7

[PATCH 9/9] wordpad: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/wordpad/wordpad.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/wordpad/wordpad.manifest b/programs/wordpad/wordpad.manifest index 51fb21fa97d..26cdfed0569 100644 --- a/programs/wordpad/wordpad.manifest +++ b/programs/wordpad/wordpad.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 8/9] winver: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winver/winver.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winver/winver.manifest b/programs/winver/winver.manifest index 519bd175c19..f527afb8265 100644 --- a/programs/winver/winver.manifest +++ b/programs/winver/winver.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 7/9] winevdm: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winevdm/winevdm.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest index 9634ec55524..6547ce24206 100644 --- a/programs/winevdm/winevdm.manifest +++ b/programs/winevdm/winevdm.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0