wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Zebediah Figura : quartz: Combine IGraphBuilder::Render() and IGraphBuilder::Connect() into a single helper.
by Alexandre Julliard 16 Jun '20

16 Jun '20

Module: wine Branch: master Commit: c603a5bfbca40f42169aa3b299e81de519781640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c603a5bfbca40f42169aa3b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 15 22:51:25 2020 -0500 quartz: Combine IGraphBuilder::Render() and IGraphBuilder::Connect() into a single helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 750 +++++++++++----------------------------- dlls/quartz/tests/filtergraph.c | 11 +- 2 files changed, 205 insertions(+), 556 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c603a5bfbca40f42169a…

1 0

Zebediah Figura : quartz/tests: Test autoplugging order.
by Alexandre Julliard 16 Jun '20

16 Jun '20

Module: wine Branch: master Commit: 2ddc3e475858f8b91a4e3bdc083660e76fc08bce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ddc3e475858f8b91a4e3bdc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 15 22:51:24 2020 -0500 quartz/tests: Test autoplugging order. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d062ea39c6..22ed37cd30 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -800,6 +800,7 @@ struct testpin const AM_MEDIA_TYPE *types; unsigned int type_count, enum_idx; AM_MEDIA_TYPE *request_mt, *accept_mt; + const struct testpin *require_connected_pin; HRESULT Connect_hr; HRESULT EnumMediaTypes_hr; @@ -1059,6 +1060,9 @@ static HRESULT WINAPI testsink_ReceiveConnection(IPin *iface, IPin *peer, const if (pin->accept_mt && memcmp(pin->accept_mt, mt, sizeof(*mt))) return VFW_E_TYPE_NOT_ACCEPTED; + if (pin->require_connected_pin && !pin->require_connected_pin->peer) + return VFW_E_TYPE_NOT_ACCEPTED; + pin->peer = peer; IPin_AddRef(peer); return S_OK; @@ -1112,6 +1116,9 @@ static HRESULT WINAPI testsource_Connect(IPin *iface, IPin *peer, const AM_MEDIA if (FAILED(pin->Connect_hr)) return pin->Connect_hr; + if (pin->require_connected_pin && !pin->require_connected_pin->peer) + return VFW_E_NO_ACCEPTABLE_TYPES; + ok(!mt, "Got media type %p.\n", mt); if (SUCCEEDED(hr = IPin_ReceiveConnection(peer, &pin->IPin_iface, pin->request_mt))) @@ -2338,6 +2345,33 @@ todo_wine ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); + /* The graph connects from source to sink, not from sink to source. */ + + graph = create_graph(); + IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, L"parser"); + IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, L"sink"); + + parser1_pins[0].require_connected_pin = &parser1_pins[1]; + + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + parser1_pins[0].require_connected_pin = NULL; + parser1_pins[1].require_connected_pin = &parser1_pins[0]; + + hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + + parser1_pins[1].require_connected_pin = NULL; + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + /* Test enumeration of filters from the registry. */ graph = create_graph();

1 0

Zebediah Figura : quartz: Try to connect all source pins when autoplugging from the registry.
by Alexandre Julliard 16 Jun '20

16 Jun '20

Module: wine Branch: master Commit: cdab25b03a2e82d717c73f28e4e68e048472f2e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdab25b03a2e82d717c73f28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 15 22:51:23 2020 -0500 quartz: Try to connect all source pins when autoplugging from the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 41 ++++++++++++++++------------------------- dlls/quartz/tests/filtergraph.c | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fa20d98981..cb212e4961 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1327,7 +1327,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, NULL) == S_OK) { VARIANT var; - IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; @@ -1390,35 +1389,27 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IEnumPins_Next(penumpins, 1, &ppinfilter, NULL); - IEnumPins_Release(penumpins); - - if (FAILED(hr)) { - WARN("Obtaining next pin: (%x)\n", hr); - goto error; - } - if (hr == S_FALSE) { - WARN("Cannot use this filter: no pins\n"); - goto error; - } - - hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinfilter, NULL); - if (FAILED(hr)) { - TRACE("Cannot connect to filter (%x), trying next one\n", hr); - goto error; - } - TRACE("Successfully connected to filter, follow chain...\n"); - - if (SUCCEEDED(hr = connect_output_pin(This, pfilter, ppinIn))) + while (IEnumPins_Next(penumpins, 1, &pin, NULL) == S_OK) { - IPin_Release(ppinfilter); - IBaseFilter_Release(pfilter); - break; + if (SUCCEEDED(IFilterGraph2_ConnectDirect(iface, ppinOut, pin, NULL))) + { + if (SUCCEEDED(hr = connect_output_pin(This, pfilter, ppinIn))) + { + IPin_Release(pin); + IEnumPins_Release(penumpins); + IBaseFilter_Release(pfilter); + IEnumMoniker_Release(pEnumMoniker); + goto out; + } + IFilterGraph2_Disconnect(iface, pin); + IFilterGraph2_Disconnect(iface, ppinOut); + } + IPin_Release(pin); } + IEnumPins_Release(penumpins); error: VariantClear(&var); - if (ppinfilter) IPin_Release(ppinfilter); if (pfilter) { IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4f4abeac9b..d062ea39c6 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2136,9 +2136,9 @@ static void test_graph_builder_connect(void) testfilter_init(&parser1, parser1_pins, 3); parser1.pin_count = 2; - testsink_init(&parser2_pins[0]); - testsource_init(&parser2_pins[1], &sink_type, 1); - parser2_pins[1].request_mt = &sink_type; + testsource_init(&parser2_pins[0], &sink_type, 1); + testsink_init(&parser2_pins[1]); + parser2_pins[0].request_mt = &sink_type; testfilter_init(&parser2, parser2_pins, 2); testsink_init(&parser3_pins[0]); @@ -2215,8 +2215,8 @@ static void test_graph_builder_connect(void) sink_pin.accept_mt = &sink_type; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -2227,8 +2227,8 @@ static void test_graph_builder_connect(void) { hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x for Connect() hr %#x.\n", hr, source_pin.Connect_hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -2379,9 +2379,9 @@ todo_wine hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface - || source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + || source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface - || sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + || sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -2417,8 +2417,8 @@ todo_wine hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : ntoskrnl.exe: Call completion callbacks with the correct device.
by Alexandre Julliard 16 Jun '20

16 Jun '20

Module: wine Branch: master Commit: 3e0e12d5975e8fef5f46387f390f664b409e315b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0e12d5975e8fef5f46387f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 15 18:19:56 2020 -0500 ntoskrnl.exe: Call completion callbacks with the correct device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++++--- dlls/ntoskrnl.exe/tests/driver.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f0d529d6c4..2da58dc104 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1902,6 +1902,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; NTSTATUS status, stat; + DEVICE_OBJECT *device; int call_flag = 0; TRACE( "%p %u\n", irp, priority_boost ); @@ -1923,11 +1924,14 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) } ++irp->CurrentLocation; ++irp->Tail.Overlay.s.u2.CurrentStackLocation; + if (irp->CurrentLocation <= irp->StackCount) + device = IoGetCurrentIrpStackLocation(irp)->DeviceObject; + else + device = NULL; if (call_flag) { - TRACE( "calling %p( %p, %p, %p )\n", routine, - irpsp->DeviceObject, irp, irpsp->Context ); - stat = routine( irpsp->DeviceObject, irp, irpsp->Context ); + TRACE( "calling %p( %p, %p, %p )\n", routine, device, irp, irpsp->Context ); + stat = routine( device, irp, irpsp->Context ); TRACE( "CompletionRoutine returned %x\n", stat ); if (STATUS_MORE_PROCESSING_REQUIRED == stat) return; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f4b373264f..bb5bbeb4fa 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1574,7 +1574,7 @@ static unsigned int got_completion; static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *context) { - todo_wine ok(device == context, "Got device %p; expected %p.\n", device, context); + ok(device == context, "Got device %p; expected %p.\n", device, context); ++got_completion; return STATUS_SUCCESS; }

1 0

Zebediah Figura : ntoskrnl.exe/tests: Test completion callback parameters.
by Alexandre Julliard 16 Jun '20

16 Jun '20

Module: wine Branch: master Commit: 4da92f3203117a6689644637f8a1568eb7abff71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da92f3203117a6689644637… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 15 18:19:55 2020 -0500 ntoskrnl.exe/tests: Test completion callback parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + include/ddk/wdm.h | 8 +++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index fa8d7b20e3..f4b373264f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1570,6 +1570,33 @@ static void test_stack_limits(void) ok(low < (ULONG_PTR)&low && (ULONG_PTR)&low < high, "stack variable is not in stack limits\n"); } +static unsigned int got_completion; + +static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *context) +{ + todo_wine ok(device == context, "Got device %p; expected %p.\n", device, context); + ++got_completion; + return STATUS_SUCCESS; +} + +static void test_completion(void) +{ + IO_STATUS_BLOCK io; + NTSTATUS ret; + KEVENT event; + IRP *irp; + + KeInitializeEvent(&event, NotificationEvent, FALSE); + + irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, + NULL, 0, NULL, 0, FALSE, &event, &io); + + IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); + ret = IoCallDriver(upper_device, irp); + ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); + ok(got_completion == 2, "got %u calls to completion routine\n"); +} + static void test_IoAttachDeviceToDeviceStack(void) { DEVICE_OBJECT *dev1, *dev2, *dev3, *ret; @@ -1714,6 +1741,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_call_driver(device); test_cancel_irp(device); test_stack_limits(); + test_completion(); /* print process report */ if (winetest_debug) @@ -2174,6 +2202,23 @@ static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, return STATUS_SUCCESS; } +static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + if (device == upper_device) + { + IoCopyCurrentIrpStackLocationToNext(irp); + IoSetCompletionRoutine(irp, completion_cb, upper_device, TRUE, TRUE, TRUE); + return IoCallDriver(lower_device, irp); + } + else + { + ok(device == lower_device, "Got wrong device.\n"); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -2237,6 +2282,8 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) break; case IOCTL_WINETEST_MISMATCHED_STATUS: return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); + case IOCTL_WINETEST_COMPLETION: + return test_completion_ioctl(device, irp); default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 6012efc41c..4b70046b8e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -34,6 +34,7 @@ #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MISMATCHED_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_COMPLETION CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80c, METHOD_NEITHER, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 85d637639f..23ac630f41 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1599,6 +1599,14 @@ static inline void IoMarkIrpPending(IRP *irp) IoGetCurrentIrpStackLocation(irp)->Control |= SL_PENDING_RETURNED; } +static inline void IoCopyCurrentIrpStackLocationToNext(IRP *irp) +{ + IO_STACK_LOCATION *current = IoGetCurrentIrpStackLocation(irp); + IO_STACK_LOCATION *next = IoGetNextIrpStackLocation(irp); + memcpy(next, current, FIELD_OFFSET(IO_STACK_LOCATION, CompletionRoutine)); + next->Control = 0; +} + #define KernelMode 0 #define UserMode 1

1 0

André Hentschel : winex11.drv: Change whitelist to a more neutral word.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 634cb775c27b61ad6ce1fbe3e9972b0edfa31dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=634cb775c27b61ad6ce1fbe3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 15 18:15:42 2020 +0200 winex11.drv: Change whitelist to a more neutral word. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 92f957cf8d..5cfc2b3a38 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -394,7 +394,7 @@ static BOOL match_token(const char *haystack, const char *needle) static BOOL is_tablet_cursor(const char *name, const char *type) { int i; - static const char *tablet_cursor_whitelist[] = { + static const char *tablet_cursor_allowlist[] = { "wacom", "wizardpen", "acecad", @@ -406,10 +406,10 @@ static BOOL is_tablet_cursor(const char *name, const char *type) NULL }; - for (i=0; tablet_cursor_whitelist[i] != NULL; i++) { - if (name && match_token(name, tablet_cursor_whitelist[i])) + for (i=0; tablet_cursor_allowlist[i] != NULL; i++) { + if (name && match_token(name, tablet_cursor_allowlist[i])) return TRUE; - if (type && match_token(type, tablet_cursor_whitelist[i])) + if (type && match_token(type, tablet_cursor_allowlist[i])) return TRUE; } return FALSE; @@ -418,7 +418,7 @@ static BOOL is_tablet_cursor(const char *name, const char *type) static UINT get_cursor_type(const char *name, const char *type) { int i; - static const char* tablet_stylus_whitelist[] = { + static const char* tablet_stylus_allowlist[] = { "stylus", "wizardpen", "acecad", @@ -427,14 +427,14 @@ static UINT get_cursor_type(const char *name, const char *type) }; /* First check device type to avoid cases where name is "Pen and Eraser" and type is "ERASER" */ - for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { - if (type && match_token(type, tablet_stylus_whitelist[i])) + for (i=0; tablet_stylus_allowlist[i] != NULL; i++) { + if (type && match_token(type, tablet_stylus_allowlist[i])) return CSR_TYPE_PEN; } if (type && match_token(type, "eraser")) return CSR_TYPE_ERASER; - for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { - if (name && match_token(name, tablet_stylus_whitelist[i])) + for (i=0; tablet_stylus_allowlist[i] != NULL; i++) { + if (name && match_token(name, tablet_stylus_allowlist[i])) return CSR_TYPE_PEN; } if (name && match_token(name, "eraser"))

1 0

Henri Verbeet : wined3d: Do not explicitly check 3D depth/stencil capabilities in wined3d_check_device_format().
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 67d0038e49323523b745c4a728069d8195273d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d0038e49323523b745c4a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 21:24:02 2020 +0430 wined3d: Do not explicitly check 3D depth/stencil capabilities in wined3d_check_device_format(). WINED3D_RTYPE_NONE checks both 2D and 3D resource capabilities, but has special handling for 3D depth/stencil capabilities. For WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_DEPTH_STENCIL is not an allowed bind flag, so we never get here. This fixes a regression introduced by commit 9b8847ed7b0f15c444c34034d311a8d79b3b06c8. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4094c8fba..efae3444ee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1679,13 +1679,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, for (; gl_type <= gl_type_end; ++gl_type) { - if ((format->flags[gl_type] & format_flags) != format_flags) - { - TRACE("Requested format flags %#x, but format %s only has %#x.\n", - format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); - return WINED3DERR_NOTAVAILABLE; - } - if ((bind_flags & WINED3D_BIND_RENDER_TARGET) && !adapter->adapter_ops->adapter_check_format(adapter, adapter_format, format, NULL)) { @@ -1706,6 +1699,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } + if ((format->flags[gl_type] & format_flags) != format_flags) + { + TRACE("Requested format flags %#x, but format %s only has %#x.\n", + format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); + return WINED3DERR_NOTAVAILABLE; + } + if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP)) mipmap_gen_supported = FALSE; }

1 0

Dmitry Timoshkov : winedump: Fix parsing of SLTG typelib created with some old tool.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 77bf4d497394bb0e93ae4f5568040e745b3d6880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77bf4d497394bb0e93ae4f55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 15 23:48:26 2020 +0800 winedump: Fix parsing of SLTG typelib created with some old tool. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49372 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index c55c6a9f23..6a90879572 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -1214,7 +1214,7 @@ static void print_sltg_name(const char *name) printf(")\n"); } -static int dump_sltg_header(int *sltg_first_blk, int *size_of_index) +static int dump_sltg_header(int *sltg_first_blk, int *size_of_index, int *size_of_pad) { int n_file_blocks; @@ -1222,7 +1222,7 @@ static int dump_sltg_header(int *sltg_first_blk, int *size_of_index) print_hex("magic"); n_file_blocks = print_short_dec("# file blocks"); - print_short_hex("res06"); + *size_of_pad = print_short_hex("pad"); *size_of_index = print_short_hex("size of index"); *sltg_first_blk = print_short_dec("first block"); print_guid("guid"); @@ -1254,10 +1254,10 @@ static void dump_sltg_index(int count) printf("\n"); } -static void dump_sltg_pad9(void) +static void dump_sltg_pad(int size_of_pad) { - printf("pad9:\n"); - dump_binary(9); + printf("pad:\n"); + dump_binary(size_of_pad); printf("\n"); } @@ -1937,13 +1937,13 @@ static void dump_type(int len, const char *hlp_strings) static void sltg_dump(void) { - int i, n_file_blocks, n_first_blk, size_of_index; + int i, n_file_blocks, n_first_blk, size_of_index, size_of_pad; int name_table_start, name_table_size, saved_offset; int libblk_start, libblk_len, hlpstr_len, len; const char *index, *hlp_strings; const struct block_entry *entry; - n_file_blocks = dump_sltg_header(&n_first_blk, &size_of_index); + n_file_blocks = dump_sltg_header(&n_first_blk, &size_of_index, &size_of_pad); saved_offset = offset; entry = tlb_read((n_file_blocks - 1) * sizeof(*entry)); @@ -1959,7 +1959,7 @@ static void sltg_dump(void) dump_sltg_index(n_file_blocks); assert(offset - saved_offset == size_of_index); - dump_sltg_pad9(); + dump_sltg_pad(size_of_pad); /* read the helpstrings for later decoding */ saved_offset = offset;

1 0

Jeff Smith : gdiplus: Handle additional hatch styles.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 7bf86e0016cf3cb89d8d04f4b750055244e5d52b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bf86e0016cf3cb89d8d04f4… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jun 15 09:08:46 2020 -0500 gdiplus: Handle additional hatch styles. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 23 +++++++++++++++++++++++ dlls/gdiplus/tests/brush.c | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 4b6ccca12a..d0da60df3a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -230,6 +230,29 @@ static const unsigned char HatchBrushes[][9] = { { 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff }, /* HatchStyleNarrowHorizontal */ { 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc }, /* HatchStyleDarkVertical */ { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ + { 0x00, 0x00, 0x11, 0x22, 0x44, 0x88, 0x00, 0x00 }, /* HatchStyleDashedDownwardDiagonal */ + { 0x00, 0x00, 0x88, 0x44, 0x22, 0x11, 0x00, 0x00 }, /* HatchStyleDashedUpwardDiagonal */ + { 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xf0 }, /* HatchStyleDashedHorizontal */ + { 0x08, 0x08, 0x08, 0x08, 0x80, 0x80, 0x80, 0x80 }, /* HatchStyleDashedVertical */ + { 0x04, 0x20, 0x01, 0x10, 0x02, 0x40, 0x08, 0x80 }, /* HatchStyleSmallConfetti */ + { 0x8d, 0x0c, 0xc0, 0xd8, 0x1b, 0x03, 0x30, 0xb1 }, /* HatchStyleLargeConfetti */ + { 0x18, 0x24, 0x42, 0x81, 0x18, 0x24, 0x42, 0x81 }, /* HatchStyleZigZag */ + { 0xc0, 0x25, 0x18, 0x00, 0xc0, 0x25, 0x18, 0x00 }, /* HatchStyleWave */ + { 0x81, 0x42, 0x24, 0x18, 0x08, 0x04, 0x02, 0x01 }, /* HatchStyleDiagonalBrick */ + { 0x08, 0x08, 0x08, 0xff, 0x80, 0x80, 0x80, 0xff }, /* HatchStyleHorizontalBrick */ + { 0x51, 0x22, 0x14, 0x88, 0x45, 0x22, 0x54, 0x88 }, /* HatchStyleWeave */ + { 0xf0, 0xf0, 0xf0, 0xf0, 0x55, 0xaa, 0x55, 0xaa }, /* HatchStylePlaid */ + { 0x80, 0x01, 0x80, 0x00, 0x10, 0x08, 0x10, 0x00 }, /* HatchStyleDivot */ + { 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0xaa }, /* HatchStyleDottedGrid */ + { 0x00, 0x22, 0x00, 0x08, 0x00, 0x22, 0x00, 0x80 }, /* HatchStyleDottedDiamond */ + { 0x01, 0x01, 0x02, 0x0c, 0x30, 0x48, 0x84, 0x03 }, /* HatchStyleShingle */ + { 0x99, 0xff, 0x66, 0xff, 0x99, 0xff, 0x66, 0xff }, /* HatchStyleTrellis */ + { 0xf8, 0xf8, 0x98, 0x77, 0x8f, 0x8f, 0x89, 0x77 }, /* HatchStyleSphere */ + { 0x88, 0x88, 0x88, 0xff, 0x88, 0x88, 0x88, 0xff }, /* HatchStyleSmallGrid */ + { 0x99, 0x66, 0x66, 0x99, 0x99, 0x66, 0x66, 0x99 }, /* HatchStyleSmallCheckerBoard */ + { 0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0 }, /* HatchStyleLargeCheckerBoard */ + { 0x01, 0x82, 0x44, 0x28, 0x10, 0x28, 0x44, 0x82 }, /* HatchStyleOutlinedDiamond */ + { 0x00, 0x10, 0x38, 0x7c, 0xfe, 0x7c, 0x38, 0x10 }, /* HatchStyleSolidDiamond */ }; GpStatus get_hatch_data(GpHatchStyle hatchstyle, const unsigned char **result) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 2f34712c71..fca1c17057 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1683,6 +1683,29 @@ static void test_hatchBrushStyles(void) { {0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff}, HatchStyleNarrowHorizontal }, { {0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0}, HatchStyleDarkVertical }, { {0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff}, HatchStyleDarkHorizontal }, + { {0x0000, 0x0000, 0x0303, 0x0c0c, 0x3030, 0xc0c0, 0x0000, 0x0000}, HatchStyleDashedDownwardDiagonal }, + { {0x0000, 0x0000, 0xc0c0, 0x3030, 0x0c0c, 0x0303, 0x0000, 0x0000}, HatchStyleDashedUpwardDiagonal }, + { {0x0000, 0x0000, 0x0000, 0x00ff, 0x0000, 0x0000, 0x0000, 0xff00}, HatchStyleDashedHorizontal }, + { {0x00c0, 0x00c0, 0x00c0, 0x00c0, 0xc000, 0xc000, 0xc000, 0xc000}, HatchStyleDashedVertical }, + { {0x0030, 0x0c00, 0x0003, 0x0300, 0x000c, 0x3000, 0x00c0, 0xc000}, HatchStyleSmallConfetti }, + { {0xc0f3, 0x00f0, 0xf000, 0xf3c0, 0x03cf, 0x000f, 0x0f00, 0xcf03}, HatchStyleLargeConfetti }, + { {0x03c0, 0x0c30, 0x300c, 0xc003, 0x03c0, 0x0c30, 0x300c, 0xc003}, HatchStyleZigZag }, + { {0xf000, 0x0c33, 0x03c0, 0x0000, 0xf000, 0x0c33, 0x03c0, 0x0000}, HatchStyleWave }, + { {0xc003, 0x300c, 0x0c30, 0x03c0, 0x00c0, 0x0030, 0x000c, 0x0003}, HatchStyleDiagonalBrick }, + { {0x00c0, 0x00c0, 0x00c0, 0xffff, 0xc000, 0xc000, 0xc000, 0xffff}, HatchStyleHorizontalBrick }, + { {0x3303, 0x0c0c, 0x0330, 0xc0c0, 0x3033, 0x0c0c, 0x3330, 0xc0c0}, HatchStyleWeave }, + { {0xff00, 0xff00, 0xff00, 0xff00, 0x3333, 0xcccc, 0x3333, 0xcccc}, HatchStylePlaid }, + { {0xc000, 0x0003, 0xc000, 0x0000, 0x0300, 0x00c0, 0x0300, 0x0000}, HatchStyleDivot }, + { {0x0000, 0xc000, 0x0000, 0xc000, 0x0000, 0xc000, 0x0000, 0xcccc}, HatchStyleDottedGrid }, + { {0x0000, 0x0c0c, 0x0000, 0x00c0, 0x0000, 0x0c0c, 0x0000, 0xc000}, HatchStyleDottedDiamond }, + { {0x0003, 0x0003, 0x000c, 0x00f0, 0x0f00, 0x30c0, 0xc030, 0x000f}, HatchStyleShingle }, + { {0xc3c3, 0xffff, 0x3c3c, 0xffff, 0xc3c3, 0xffff, 0x3c3c, 0xffff}, HatchStyleTrellis }, + { {0xffc0, 0xffc0, 0xc3c0, 0x3f3f, 0xc0ff, 0xc0ff, 0xc0c3, 0x3f3f}, HatchStyleSphere }, + { {0xc0c0, 0xc0c0, 0xc0c0, 0xffff, 0xc0c0, 0xc0c0, 0xc0c0, 0xffff}, HatchStyleSmallGrid }, + { {0xc3c3, 0x3c3c, 0x3c3c, 0xc3c3, 0xc3c3, 0x3c3c, 0x3c3c, 0xc3c3}, HatchStyleSmallCheckerBoard }, + { {0x00ff, 0x00ff, 0x00ff, 0x00ff, 0xff00, 0xff00, 0xff00, 0xff00}, HatchStyleLargeCheckerBoard }, + { {0x0003, 0xc00c, 0x3030, 0x0cc0, 0x0300, 0x0cc0, 0x3030, 0xc00c}, HatchStyleOutlinedDiamond }, + { {0x0000, 0x0300, 0x0fc0, 0x3ff0, 0xfffc, 0x3ff0, 0x0fc0, 0x0300}, HatchStyleSolidDiamond }, }; static const ARGB exp_colors[] = { 0xffffffff, 0xffbfbfbf, 0xff151515, 0xff000000 }; static const ARGB fore_color = 0xff000000;

1 0

Jeff Smith : gdiplus: Fix hatch brush patterns that require anti-aliasing.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: d0c70facbd3b539119567652f530246191a33594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0c70facbd3b539119567652… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jun 15 09:08:45 2020 -0500 gdiplus: Fix hatch brush patterns that require anti-aliasing. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 12 ++++---- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 65 +++++++++++++++++++++++++++++++----------- dlls/gdiplus/tests/brush.c | 10 ++----- 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index aa1cda1990..4b6ccca12a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -197,13 +197,15 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return Ok; } -static const char HatchBrushes[][8] = { +/* The first 8 items per entry are bitmaps for each row of the hatch style. + * The 9th item of the entry is a flag indicating anti-aliasing. */ +static const unsigned char HatchBrushes[][9] = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff }, /* HatchStyleHorizontal */ { 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 }, /* HatchStyleVertical */ - { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }, /* HatchStyleForwardDiagonal */ - { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }, /* HatchStyleBackwardDiagonal */ + { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, TRUE }, /* HatchStyleForwardDiagonal */ + { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, TRUE }, /* HatchStyleBackwardDiagonal */ { 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xff }, /* HatchStyleCross */ - { 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81 }, /* HatchStyleDiagonalCross */ + { 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81, TRUE }, /* HatchStyleDiagonalCross */ { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x80 }, /* HatchStyle05Percent */ { 0x00, 0x08, 0x00, 0x80, 0x00, 0x08, 0x00, 0x80 }, /* HatchStyle10Percent */ { 0x00, 0x22, 0x00, 0x88, 0x00, 0x22, 0x00, 0x88 }, /* HatchStyle20Percent */ @@ -230,7 +232,7 @@ static const char HatchBrushes[][8] = { { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ }; -GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) +GpStatus get_hatch_data(GpHatchStyle hatchstyle, const unsigned char **result) { if (hatchstyle < ARRAY_SIZE(HatchBrushes)) { diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9e90a5d28c..d62860360a 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -123,7 +123,7 @@ extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; extern void delete_element(region_element *element) DECLSPEC_HIDDEN; -extern GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; +extern GpStatus get_hatch_data(GpHatchStyle hatchstyle, const unsigned char **result) DECLSPEC_HIDDEN; static inline INT gdip_round(REAL x) { diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 72075e02fb..1ed29d1094 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -114,6 +114,19 @@ static COLORREF get_gdi_brush_color(const GpBrush *brush) return ARGB2COLORREF(argb); } +static ARGB blend_colors(ARGB start, ARGB end, REAL position); + +static void init_hatch_palette(ARGB *hatch_palette, ARGB fore_color, ARGB back_color) +{ + /* Pass the center of a 45-degree diagonal line with width of one unit through the + * center of a unit square, and the portion of the square that will be covered will + * equal sqrt(2) - 1/2. The covered portion for adjacent squares will be 1/4. */ + hatch_palette[0] = back_color; + hatch_palette[1] = blend_colors(back_color, fore_color, 0.25); + hatch_palette[2] = blend_colors(back_color, fore_color, sqrt(2.0) - 0.5); + hatch_palette[3] = fore_color; +} + static HBITMAP create_hatch_bitmap(const GpHatch *hatch) { HBITMAP hbmp; @@ -132,18 +145,30 @@ static HBITMAP create_hatch_bitmap(const GpHatch *hatch) hbmp = CreateDIBSection(0, (BITMAPINFO *)&bmih, DIB_RGB_COLORS, (void **)&bits, NULL, 0); if (hbmp) { - const char *hatch_data; + const unsigned char *hatch_data; if (get_hatch_data(hatch->hatchstyle, &hatch_data) == Ok) { + ARGB hatch_palette[4]; + init_hatch_palette(hatch_palette, hatch->forecol, hatch->backcol); + + /* Anti-aliasing is only specified for diagonal hatch patterns. + * This implementation repeats the pattern, shifts as needed, + * then uses bitmask 1 to check the pixel value, and the 0x82 + * bitmask to check the adjacent pixel values, to determine the + * degree of shading needed. */ for (y = 0; y < 8; y++) { - for (x = 0; x < 8; x++) + unsigned int row = 0x101 * hatch_data[y]; + + for (x = 0; x < 8; x++, row >>= 1) { - if (hatch_data[y] & (0x80 >> x)) - bits[y * 8 + x] = hatch->forecol; + int index; + if (hatch_data[8]) + index = (row & 1) ? 2 : (row & 0x82) ? 1 : 0; else - bits[y * 8 + x] = hatch->backcol; + index = (row & 1) ? 3 : 0; + bits[y * 8 + 7 - x] = hatch_palette[index]; } } } @@ -1160,25 +1185,33 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, { int x, y; GpHatch *fill = (GpHatch*)brush; - const char *hatch_data; + const unsigned char *hatch_data; + ARGB hatch_palette[4]; if (get_hatch_data(fill->hatchstyle, &hatch_data) != Ok) return NotImplemented; - for (x=0; x<fill_area->Width; x++) - for (y=0; y<fill_area->Height; y++) - { - int hx, hy; + init_hatch_palette(hatch_palette, fill->forecol, fill->backcol); - /* FIXME: Account for the rendering origin */ - hx = (x + fill_area->X) % 8; - hy = (y + fill_area->Y) % 8; + /* See create_hatch_bitmap for an explanation of how index is derived. */ + for (y = 0; y < fill_area->Height; y++, argb_pixels += cdwStride) + { + /* FIXME: Account for the rendering origin */ + const int hy = 7 - ((y + fill_area->Y) % 8); + const unsigned int row = 0x101 * hatch_data[hy]; - if ((hatch_data[7-hy] & (0x80 >> hx)) != 0) - argb_pixels[x + y*cdwStride] = fill->forecol; + for (x = 0; x < fill_area->Width; x++) + { + const unsigned int srow = row >> (7 - ((x + fill_area->X) % 8)); + int index; + if (hatch_data[8]) + index = (srow & 1) ? 2 : (srow & 0x82) ? 1 : 0; else - argb_pixels[x + y*cdwStride] = fill->backcol; + index = (srow & 1) ? 3 : 0; + + argb_pixels[x] = hatch_palette[index]; } + } return Ok; } diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 2ab27c9de4..2f34712c71 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1650,16 +1650,15 @@ static void test_hatchBrushStyles(void) { short pattern[8]; GpHatchStyle hs; - BOOL todo; } styles[] = { { {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff}, HatchStyleHorizontal }, { {0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000}, HatchStyleVertical }, - { {0x4006, 0x0019, 0x0064, 0x0190, 0x0640, 0x1900, 0x6400, 0x9001}, HatchStyleForwardDiagonal, TRUE }, - { {0x9001, 0x6400, 0x1900, 0x0640, 0x0190, 0x0064, 0x0019, 0x4006}, HatchStyleBackwardDiagonal, TRUE }, + { {0x4006, 0x0019, 0x0064, 0x0190, 0x0640, 0x1900, 0x6400, 0x9001}, HatchStyleForwardDiagonal }, + { {0x9001, 0x6400, 0x1900, 0x0640, 0x0190, 0x0064, 0x0019, 0x4006}, HatchStyleBackwardDiagonal }, { {0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xffff}, HatchStyleCross }, - { {0x9006, 0x6419, 0x1964, 0x0690, 0x0690, 0x1964, 0x6419, 0x9006}, HatchStyleDiagonalCross, TRUE }, + { {0x9006, 0x6419, 0x1964, 0x0690, 0x0690, 0x1964, 0x6419, 0x9006}, HatchStyleDiagonalCross }, { {0x0000, 0x0000, 0x0000, 0x00c0, 0x0000, 0x0000, 0x0000, 0xc000}, HatchStyle05Percent }, { {0x0000, 0x00c0, 0x0000, 0xc000, 0x0000, 0x00c0, 0x0000, 0xc000}, HatchStyle10Percent }, { {0x0000, 0x0c0c, 0x0000, 0xc0c0, 0x0000, 0x0c0c, 0x0000, 0xc0c0}, HatchStyle20Percent }, @@ -1742,11 +1741,8 @@ static void test_hatchBrushStyles(void) match_image = FALSE; } } - todo_wine_if(styles[i].todo) - { ok(match_hdc, "Unexpected pattern for hatch style %#x with hdc.\n", styles[i].hs); ok(match_image, "Unexpected pattern for hatch style %#x with image.\n", styles[i].hs); - } } status = GdipDeleteGraphics(graphics_image);

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
95
Older →

Jump to page:

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-commits June 2020