May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : user32: Update keyboard / mouse rawinput device paths.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 2735496872ff75e7018bff9e2bf7f91487359c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2735496872ff75e7018bff9e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 12 11:25:27 2021 +0200 user32: Update keyboard / mouse rawinput device paths. Instead of just updating the info. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index d95d29d7656..e4e7bad508f 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -98,7 +98,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { SP_DEVINFO_DATA device_data = {sizeof(device_data)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct device *device; + struct device *device = NULL; UINT32 handle; HANDLE file; DWORD i, size, type; @@ -117,15 +117,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - for (i = 0; i < rawinput_devices_count; ++i) - { - if (rawinput_devices[i].handle == UlongToHandle(handle)) - { - TRACE("Updating device %x / %s\n", handle, debugstr_w(rawinput_devices[i].detail->DevicePath)); - return rawinput_devices + i; - } - } - if (!(detail = malloc(size))) { ERR("Failed to allocate memory.\n"); @@ -134,8 +125,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); SetupDiGetDeviceInterfaceDetailW(set, iface, detail, size, NULL, NULL); - TRACE("Found device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); - file = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) @@ -145,8 +134,24 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - if (!array_reserve((void **)&rawinput_devices, &rawinput_devices_max, - rawinput_devices_count + 1, sizeof(*rawinput_devices))) + for (i = 0; i < rawinput_devices_count && !device; ++i) + if (rawinput_devices[i].handle == UlongToHandle(handle)) + device = rawinput_devices + i; + + if (device) + { + TRACE("Updating device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); + HidD_FreePreparsedData(device->data); + CloseHandle(device->file); + free(device->detail); + } + else if (array_reserve((void **)&rawinput_devices, &rawinput_devices_max, + rawinput_devices_count + 1, sizeof(*rawinput_devices))) + { + device = &rawinput_devices[rawinput_devices_count++]; + TRACE("Adding device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); + } + else { ERR("Failed to allocate memory.\n"); CloseHandle(file); @@ -154,7 +159,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - device = &rawinput_devices[rawinput_devices_count++]; device->detail = detail; device->file = file; device->handle = ULongToHandle(handle); @@ -226,8 +230,6 @@ static void find_devices(void) device->info.dwType = RIM_TYPEMOUSE; device->info.u.mouse = mouse_info; - HidD_FreePreparsedData(device->data); - device->data = NULL; } SetupDiDestroyDeviceInfoList(set); @@ -243,8 +245,6 @@ static void find_devices(void) device->info.dwType = RIM_TYPEKEYBOARD; device->info.u.keyboard = keyboard_info; - HidD_FreePreparsedData(device->data); - device->data = NULL; } SetupDiDestroyDeviceInfoList(set);

1 0

Zebediah Figura : ntdll: Use %I64x instead of %lx to trace 64-bit values.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 07ea3061e2d306a07aab5524b5ed7d127de3a4d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ea3061e2d306a07aab5524… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 19:05:21 2021 -0500 ntdll: Use %I64x instead of %lx to trace 64-bit values. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c5a6666f4d2..0396433cb32 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -525,7 +525,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) - TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); + TRACE( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) { @@ -534,7 +534,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], (char*)rec->ExceptionInformation[1] ); else - MESSAGE( "wine: Call from %p to unimplemented function %s.%ld, aborting\n", + MESSAGE( "wine: Call from %p to unimplemented function %s.%I64d, aborting\n", rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } @@ -557,13 +557,13 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) else WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", context->R12, context->R13, context->R14, context->R15 ); } @@ -1247,17 +1247,17 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND); - TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016lx\n", + TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016I64x\n", rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, context->Rip ); for (i = 0; i < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); i++) - TRACE( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + TRACE( " info[%d]=%016I64x\n", i, rec->ExceptionInformation[i] ); + TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", context->R12, context->R13, context->R14, context->R15 ); dispatch.EstablisherFrame = context->Rsp;

1 0

Francois Gouget : winetest/build-patterns: Add a failed test units pattern.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: tools Branch: master Commit: 3bba845369f9f50fc2ea491f97c127ffeb56e05c URL: https://source.winehq.org/git/tools.git/?a=commit;h=3bba845369f9f50fc2ea491… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 13 12:24:06 2021 +0200 winetest/build-patterns: Add a failed test units pattern. This pattern shows the number of failed test units for each test configuration. This allows detecting when results get worse after a VM update, or when a test configuration gets worse results than its peers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 121 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 83 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=3bba845369f9f50fc2e…

1 0

Alistair Leslie-Hughes : include: Add IXMLHTTPRequest2/3 interfaces.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 0a50674c6aabb0368811ece4078a2bb69d7ea1bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a50674c6aabb0368811ece4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 7 18:40:50 2021 +1000 include: Add IXMLHTTPRequest2/3 interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msxml6.idl | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 5bfb21d04ae..4948de39f1f 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -52,6 +52,8 @@ interface IXMLDOMEntity; interface IXMLDOMEntityReference; interface IXMLDOMParseError; interface IXMLDOMParseErrorCollection; +interface IXMLHTTPRequest2Callback; +interface IXMLHTTPRequest3Callback; interface IXTLRuntime; interface IXSLTemplate; interface IXSLProcessor; @@ -254,6 +256,35 @@ typedef enum _SCHEMATYPEVARIETY } SCHEMATYPEVARIETY; cpp_quote("#endif /* __msxml_som_enums__ */") +typedef [v1_enum] enum _XHR_PROPERTY +{ + XHR_PROP_NO_CRED_PROMPT, + XHR_PROP_NO_AUTH, + XHR_PROP_TIMEOUT, + XHR_PROP_NO_DEFAULT_HEADERS, + XHR_PROP_REPORT_REDIRECT_STATUS, + XHR_PROP_NO_CACHE, + XHR_PROP_EXTENDED_ERROR, + XHR_PROP_QUERY_STRING_UTF8, + XHR_PROP_IGNORE_CERT_ERRORS, +} XHR_PROPERTY; + +typedef struct tagXHR_COOKIE +{ + [ref, string] WCHAR *pwszUrl; + [ref, string] WCHAR *pwszName; + [unique, string] WCHAR *pwszValue; + [unique, string] WCHAR *pwszP3PPolicy; + FILETIME ftExpires; + DWORD dwFlags; +} XHR_COOKIE; + +typedef struct tagXHR_CERT +{ + DWORD cbCert; + [ref, size_is(cbCert)] BYTE *pbCert; +} XHR_CERT; + [ local, object, @@ -1309,6 +1340,66 @@ interface IServerXMLHTTPRequest : IXMLHTTPRequest [in] VARIANT value); } +[ + object, + uuid(e5d37dc0-552a-4d52-9cc0-a14d546fbd04), +] +interface IXMLHTTPRequest2 : IUnknown +{ + HRESULT Open([in, string, ref] const WCHAR *method, [in, string, ref] const WCHAR *url, + [in] IXMLHTTPRequest2Callback *callback, + [in, string, unique] const WCHAR *username, [in, string, unique] const WCHAR *password, + [in, string, unique] const WCHAR *proxyuser, [in, string, unique] const WCHAR *proxypassword); + + HRESULT Send([in, unique] ISequentialStream *body, [in] ULONGLONG length); + HRESULT Abort(); + HRESULT SetCookie([in, ref] const XHR_COOKIE *cookie, [out] DWORD *state); + HRESULT SetCustomResponseStream([in] ISequentialStream *stream); + HRESULT SetProperty([in] XHR_PROPERTY property, [in] ULONGLONG value); + HRESULT SetRequestHeader([in, string, ref] const WCHAR *header, [in, string, unique] const WCHAR *value); + HRESULT GetAllResponseHeaders([out, string] WCHAR **headers); + HRESULT GetCookie( [in, ref, string] const WCHAR *url, [in, unique, string] const WCHAR *name, + [in] DWORD flags, [out] ULONG *cookies_cnt, [out, size_is(,*cookies_cnt)] XHR_COOKIE **cookies); + HRESULT GetResponseHeader([in, string, ref] const WCHAR *header, [out, string] WCHAR **value); +}; + +[ + object, + uuid(a1c9feee-0617-4f23-9d58-8961ea43567c) +] +interface IXMLHTTPRequest3 : IXMLHTTPRequest2 +{ + HRESULT SetClientCertificate([in] DWORD count, [in, unique, size_is(count)] const BYTE *hashes, + [in, string, unique] const WCHAR *pin); +}; + +[ + object, + uuid(a44a9299-e321-40de-8866-341b41669162), + pointer_default(ref) +] +interface IXMLHTTPRequest2Callback : IUnknown +{ + HRESULT OnRedirect([in] IXMLHTTPRequest2 *xhr, [in, string] const WCHAR *url); + HRESULT OnHeadersAvailable([in] IXMLHTTPRequest2 *xhr, [in] DWORD status, [in, string] const WCHAR *msg); + HRESULT OnDataAvailable([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnResponseReceived([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnError([in] IXMLHTTPRequest2 *xhr, [in] HRESULT error); +}; + +[ + object, + uuid(b9e57830-8c6c-4a6f-9c13-47772bb047bb) +] +interface IXMLHTTPRequest3Callback : IXMLHTTPRequest2Callback +{ + HRESULT OnServerCertificateReceived([in] IXMLHTTPRequest3 *xhr, [in] DWORD errors, + [in] DWORD count, [in, unique, size_is(count)] const XHR_CERT *certificates); + + HRESULT OnClientCertificateRequested([in] IXMLHTTPRequest3 *xhr, + [in] DWORD count, [in, string, unique, size_is(count)] const WCHAR **list); +}; + [ object, dual, @@ -1607,6 +1698,17 @@ interface ISAXDeclHandler : IUnknown [in] int nSystemId); } +[ + helpstring("Free Threaded XML HTTP Request class 6.0"), + progid("Msxml2.FreeThreadedXMLHTTP60.6.0"), + threading(both), + uuid(88d96a09-f192-11d4-a65f-0040963251e5) +] +coclass FreeThreadedXMLHTTP60 +{ + [default] interface IXMLHTTPRequest2; +} + [ object, local,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_sampler_state().
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 29e1fcdac7a826e67a24488c52f722ee0bd232f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e1fcdac7a826e67a24488c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:10:02 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_sampler_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a39ed1dbaf4..e94d1a19dc2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1809,18 +1809,18 @@ static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_SAMPLER(op->sampler_idx)); } -void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, - enum wined3d_sampler_state state, DWORD value) +void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context *context, unsigned int sampler_idx, + enum wined3d_sampler_state state, unsigned int value) { struct wined3d_cs_set_sampler_state *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_SET_SAMPLER_STATE; op->sampler_idx = sampler_idx; op->state = state; op->value = value; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 128dd330f89..e62da01171c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1707,7 +1707,7 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, } device->cs->c.state->sampler_states[sampler_idx][state] = value; - wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value); + wined3d_device_context_emit_set_sampler_state(&device->cs->c, sampler_idx, state, value); } void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, @@ -1818,7 +1818,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_device_context_emit_set_texture(context, i, state->textures[i]); for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j) { - wined3d_cs_emit_set_sampler_state(device->cs, i, j, state->sampler_states[i][j]); + wined3d_device_context_emit_set_sampler_state(context, i, j, state->sampler_states[i][j]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 638d0288e60..39e6e2a68b7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1741,7 +1741,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) wined3d_texture_gl(texture)->texture_rgb.base_level = ~0u; wined3d_texture_gl(texture)->texture_srgb.base_level = ~0u; if (resource->bind_count) - wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, + wined3d_device_context_emit_set_sampler_state(&device->cs->c, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, device->cs->c.state->sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4740bb8799d..c752be692fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4755,8 +4755,6 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, - enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, @@ -4813,6 +4811,8 @@ void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_con struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_sampler(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context *context, unsigned int sampler_idx, + enum wined3d_sampler_state state, unsigned int value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture_state().
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 026a082daf59d8bc6490b86925c6f9d7705da1a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=026a082daf59d8bc6490b869… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:10:01 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4dc4d7ae08f..a39ed1dbaf4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1787,18 +1787,18 @@ static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->stage, op->state)); } -void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, - enum wined3d_texture_stage_state state, DWORD value) +void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage, + enum wined3d_texture_stage_state state, unsigned int value) { struct wined3d_cs_set_texture_state *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_SET_TEXTURE_STATE; op->stage = stage; op->state = state; op->value = value; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e5e55150093..128dd330f89 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1826,7 +1826,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 { for (j = 0; j < WINED3D_HIGHEST_TEXTURE_STATE + 1; ++j) { - wined3d_cs_emit_set_texture_state(device->cs, i, j, state->texture_states[i][j]); + wined3d_device_context_emit_set_texture_state(context, i, j, state->texture_states[i][j]); } } @@ -3928,7 +3928,7 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device device->cs->c.state->texture_states[stage][state] = value; - wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); + wined3d_device_context_emit_set_texture_state(&device->cs->c, stage, state, value); } static void wined3d_device_set_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79f9bd9899a..4740bb8799d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4759,8 +4759,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, - enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4828,6 +4826,8 @@ void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage, + enum wined3d_texture_stage_state state, unsigned int value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : d3d11/tests: Add more tests for state clear and restore via FinishCommandList and ExecuteCommandList.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: b20908a549c26e329f0be74e78009b570e4c627a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20908a549c26e329f0be74e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 23:00:05 2021 -0500 d3d11/tests: Add more tests for state clear and restore via FinishCommandList and ExecuteCommandList. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 213 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 202 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b20908a549c26e329f0b…

1 0

Jacek Caban : winepulse: Move pulse_test_connect to unix lib.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: e264ec9c718eb66038221f8b533fc099927ed966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e264ec9c718eb66038221f8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:30:00 2021 +0200 winepulse: Move pulse_test_connect to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 327 ++++---------------------------------- dlls/winepulse.drv/pulse.c | 353 ++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 12 ++ 3 files changed, 391 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e264ec9c718eb6603822…

1 0

Ziqing Hui : windowscodecs: Implement IWICDdsEncoder_SetParameters.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 0e7e1a7ee0531cc356eba59b05f4a0671c076779 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7e1a7ee0531cc356eba59b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 12 13:07:56 2021 +0800 windowscodecs: Implement IWICDdsEncoder_SetParameters. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 77 +++++++++++++++++++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 2 - 2 files changed, 58 insertions(+), 21 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 8f505aed993..af062de06f2 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -487,6 +487,30 @@ static UINT get_bytes_per_block_from_format(DXGI_FORMAT format) } } +static UINT get_frame_count(UINT depth, UINT mip_levels, UINT array_size, WICDdsDimension dimension) +{ + UINT frame_count, i; + + if (depth == 1) + { + frame_count = mip_levels; + } + else + { + frame_count = 0; + for (i = 0; i < mip_levels; i++) + { + frame_count += depth; + if (depth > 1) depth /= 2; + } + } + + frame_count *= array_size; + if (dimension == WICDdsTextureCube) frame_count *= 6; + + return frame_count; +} + static const GUID *dxgi_format_to_wic_format(DXGI_FORMAT dxgi_format) { UINT i; @@ -512,8 +536,6 @@ static BOOL is_compressed(DXGI_FORMAT format) static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *header_dxt10) { - int i; - UINT depth; struct dds_format *format_info; info->width = header->width; @@ -554,21 +576,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->bytes_per_block = get_bytes_per_block_from_format(info->format); } - /* get frame count */ - - if (info->depth == 1) { - info->frame_count = info->array_size * info->mip_levels; - } else { - info->frame_count = 0; - depth = info->depth; - for (i = 0; i < info->mip_levels; i++) - { - info->frame_count += depth; - if (depth > 1) depth /= 2; - } - info->frame_count *= info->array_size; - } - if (info->dimension == WICDdsTextureCube) info->frame_count *= 6; + info->frame_count = get_frame_count(info->depth, info->mip_levels, info->array_size, info->dimension); } static void decode_block(const BYTE *block_data, UINT block_count, DXGI_FORMAT format, @@ -1734,8 +1742,39 @@ static ULONG WINAPI DdsEncoder_Dds_Release(IWICDdsEncoder *iface) static HRESULT WINAPI DdsEncoder_Dds_SetParameters(IWICDdsEncoder *iface, WICDdsParameters *parameters) { - FIXME("(%p,%p): stub.\n", iface, parameters); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, parameters); + + if (!parameters) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (!This->stream) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + This->info.width = parameters->Width; + This->info.height = parameters->Height; + This->info.depth = parameters->Depth; + This->info.mip_levels = parameters->MipLevels; + This->info.array_size = parameters->ArraySize; + This->info.format = parameters->DxgiFormat; + This->info.dimension = parameters->Dimension; + This->info.alpha_mode = parameters->AlphaMode; + + This->info.bytes_per_block = get_bytes_per_block_from_format(This->info.format); + This->info.frame_count = get_frame_count(This->info.depth, This->info.mip_levels, + This->info.array_size, This->info.dimension); + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI DdsEncoder_Dds_GetParameters(IWICDdsEncoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index dc8333a433f..52828e6bf43 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1334,11 +1334,9 @@ static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder * ok(params.AlphaMode == WICDdsAlphaModeUnknown, "Got unexpected AlphaMode %#x\n", params.AlphaMode); hr = IWICDdsEncoder_SetParameters(dds_encoder, NULL); - todo_wine ok(hr == E_INVALIDARG, "SetParameters got unexpected hr %#x\n", hr); hr = IWICDdsEncoder_SetParameters(dds_encoder, &params_set); - todo_wine ok(hr == S_OK, "SetParameters failed, hr %#x\n", hr); if (hr != S_OK) return;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture().
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 8853b1007ef74eddc0f14543a823b7fe427043b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8853b1007ef74eddc0f14543… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:10:00 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 36bf39cf789..4dc4d7ae08f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1551,16 +1551,17 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->c.device, STATE_COLOR_KEY); } -void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) +void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, + struct wined3d_texture *texture) { struct wined3d_cs_set_texture *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_SET_TEXTURE; op->stage = stage; op->texture = texture; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fc07c78bb43..e5e55150093 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1815,7 +1815,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) { - wined3d_cs_emit_set_texture(device->cs, i, state->textures[i]); + wined3d_device_context_emit_set_texture(context, i, state->textures[i]); for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j) { wined3d_cs_emit_set_sampler_state(device->cs, i, j, state->sampler_states[i][j]); @@ -3960,7 +3960,7 @@ static void wined3d_device_set_texture(struct wined3d_device *device, if (texture) wined3d_texture_incref(texture); - wined3d_cs_emit_set_texture(device->cs, stage, texture); + wined3d_device_context_emit_set_texture(&device->cs->c, stage, texture); if (prev) wined3d_texture_decref(prev); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d68262b8d31..79f9bd9899a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4759,7 +4759,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, @@ -4827,6 +4826,8 @@ void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, + struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN;

1 0