February 2022 - Wine-Commits

Alexandre Julliard : mshtml.tlb: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 1bb2d490f79743e9dac87d279e15f29bd359e715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb2d490f79743e9dac87d27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:11:18 2022 +0100 mshtml.tlb: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml.tlb/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml.tlb/Makefile.in b/dlls/mshtml.tlb/Makefile.in index 235a86d4ee5..7eda5da0e18 100644 --- a/dlls/mshtml.tlb/Makefile.in +++ b/dlls/mshtml.tlb/Makefile.in @@ -1,3 +1,5 @@ MODULE = mshtml.tlb +EXTRADLLFLAGS = -Wb,--data-only + IDL_SRCS = mshtml_tlb.idl

1 0

Alexandre Julliard : msimsg: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: d3e2fa064f2efe0a9375df23ec141171b74efe40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e2fa064f2efe0a9375df23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:11:26 2022 +0100 msimsg: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimsg/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msimsg/Makefile.in b/dlls/msimsg/Makefile.in index 0b74e461064..2e8fa718070 100644 --- a/dlls/msimsg/Makefile.in +++ b/dlls/msimsg/Makefile.in @@ -1,3 +1,5 @@ MODULE = msimsg.dll +EXTRADLLFLAGS = -Wb,--data-only + RC_SRCS = msimsg.rc

1 0

Alexandre Julliard : normaliz: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 9b6253199ffb361557c53b1315263518cebc9871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6253199ffb361557c53b13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:11:33 2022 +0100 normaliz: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/normaliz/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/normaliz/Makefile.in b/dlls/normaliz/Makefile.in index 89d7dba795d..a466e0ce7fc 100644 --- a/dlls/normaliz/Makefile.in +++ b/dlls/normaliz/Makefile.in @@ -1,2 +1,4 @@ MODULE = normaliz.dll IMPORTLIB = normaliz + +EXTRADLLFLAGS = -Wb,--data-only

1 0

Alexandre Julliard : security: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 40611a65e73eee2ff8ff8ff647572f93a7ffd4ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=40611a65e73eee2ff8ff8ff6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:11:42 2022 +0100 security: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/security/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/security/Makefile.in b/dlls/security/Makefile.in index aa321ee3e5e..ff4a5a7363a 100644 --- a/dlls/security/Makefile.in +++ b/dlls/security/Makefile.in @@ -1,2 +1,4 @@ MODULE = security.dll IMPORTS = secur32 + +EXTRADLLFLAGS = -Wb,--data-only

1 0

Alexandre Julliard : stdole2.tlb: Build in data-only mode.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 39abfe3a4fba023d47fc6ff4cee03b9d22e48b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39abfe3a4fba023d47fc6ff4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 16:12:07 2022 +0100 stdole2.tlb: Build in data-only mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/stdole2.tlb/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in index 1a254979a54..125d81b6e52 100644 --- a/dlls/stdole2.tlb/Makefile.in +++ b/dlls/stdole2.tlb/Makefile.in @@ -1,4 +1,6 @@ MODULE = stdole2.tlb +EXTRADLLFLAGS = -Wb,--data-only + RC_SRCS = rsrc.rc IDL_SRCS = stdole2.idl

1 0

Zebediah Figura : wined3d: Don't use persistent BOs from the client thread if we might need to do vertex attribute conversion.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: ec5a71068b850b6c2aa98b81393b1479465c249e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5a71068b850b6c2aa98b81… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:12 2022 -0600 wined3d: Don't use persistent BOs from the client thread if we might need to do vertex attribute conversion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 +++++++++ dlls/wined3d/shader_spirv.c | 2 ++ 2 files changed, 11 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 63d8628cea7..9f4a39cfe7e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3077,12 +3077,21 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str * a texture can be invalidated to even count. */ if (resource->type == WINED3D_RTYPE_BUFFER && (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) { + const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; struct wined3d_client_resource *client = &resource->client; struct wined3d_device *device = context->device; struct wined3d_bo_address addr; struct wined3d_bo *bo; uint8_t *map_ptr; + /* We can't use persistent maps if we might need to do vertex attribute + * conversion; that will cause the CS thread to invalidate the BO. */ + if (!d3d_info->xyzrhw || !d3d_info->vertex_bgra || !d3d_info->ffp_generic_attributes) + { + TRACE("Not returning a persistent buffer because we might need to do vertex attribute conversion.\n"); + return NULL; + } + if (flags & WINED3D_MAP_DISCARD) { if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1e6a03040b9..9ad11f34ebd 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1176,6 +1176,8 @@ static void spirv_vertex_pipe_vk_vp_enable(const struct wined3d_context *context static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { memset(caps, 0, sizeof(*caps)); + caps->xyzrhw = TRUE; + caps->ffp_generic_attributes = TRUE; } static uint32_t spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info)

1 0

Zebediah Figura : wined3d: Protect access to the OpenGL wined3d_allocator with a critical section.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 4a3cefab75e797398923c54340beb5764c42a28e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a3cefab75e797398923c543… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:10 2022 -0600 wined3d: Protect access to the OpenGL wined3d_allocator with a critical section. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++++ dlls/wined3d/context_gl.c | 12 ++++++++++-- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/wined3d_private.h | 11 +++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2e31d140dd5..bc54f46222f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4274,6 +4274,8 @@ static HRESULT adapter_gl_create_device(struct wined3d *wined3d, const struct wi return hr; } + wined3d_lock_init(&device_gl->allocator_cs, "wined3d_device_gl.allocator_cs"); + *device = &device_gl->d; return WINED3D_OK; } @@ -4283,6 +4285,8 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) struct wined3d_device_gl *device_gl = wined3d_device_gl(device); wined3d_device_cleanup(&device_gl->d); + wined3d_lock_cleanup(&device_gl->allocator_cs); + heap_free(device_gl->retired_blocks); heap_free(device_gl); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8901bafcce3..8217d04686c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2629,6 +2629,14 @@ static void wined3d_context_gl_poll_fences(struct wined3d_context_gl *context_gl } } +static void wined3d_device_gl_free_memory(struct wined3d_device_gl *device_gl, struct wined3d_allocator_block *block) +{ + assert(block->chunk->allocator == &device_gl->allocator); + wined3d_device_gl_allocator_lock(device_gl); + wined3d_allocator_block_free(block); + wined3d_device_gl_allocator_unlock(device_gl); +} + static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *context_gl) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); @@ -2651,7 +2659,7 @@ static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *cont continue; } - wined3d_allocator_block_free(r->block); + wined3d_device_gl_free_memory(device_gl, r->block); if (i != --count) *r = blocks[count]; else @@ -2718,7 +2726,7 @@ static void wined3d_context_gl_destroy_allocator_block(struct wined3d_context_gl if (device_gl->completed_fence_id > fence_id) { - wined3d_allocator_block_free(block); + wined3d_device_gl_free_memory(device_gl, block); TRACE("Freed block %p.\n", block); return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84d2e3a0ce8..e302e1917a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1059,20 +1059,25 @@ static struct wined3d_allocator_block *wined3d_device_gl_allocate_memory(struct struct wined3d_allocator *allocator = &device_gl->allocator; struct wined3d_allocator_block *block; + wined3d_device_gl_allocator_lock(device_gl); + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { *id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type, size); + wined3d_device_gl_allocator_unlock(device_gl); return NULL; } if (!(block = wined3d_allocator_allocate(allocator, &context_gl->c, memory_type, size))) { + wined3d_device_gl_allocator_unlock(device_gl); *id = 0; return NULL; } *id = wined3d_allocator_chunk_gl(block->chunk)->gl_buffer; + wined3d_device_gl_allocator_unlock(device_gl); return block; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48b760edc1b..96ce75fbb58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4194,6 +4194,7 @@ struct wined3d_device_gl /* Textures for when no other textures are bound. */ struct wined3d_dummy_textures dummy_textures; + CRITICAL_SECTION allocator_cs; struct wined3d_allocator allocator; uint64_t completed_fence_id; uint64_t current_fence_id; @@ -4212,6 +4213,16 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +static inline void wined3d_device_gl_allocator_lock(struct wined3d_device_gl *device_gl) +{ + EnterCriticalSection(&device_gl->allocator_cs); +} + +static inline void wined3d_device_gl_allocator_unlock(struct wined3d_device_gl *device_gl) +{ + LeaveCriticalSection(&device_gl->allocator_cs); +} + bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_gl pointer to wined3d_context_gl_create_bo().
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 7c16fb7ce311e0d7e5a4c7d3ae586cd7ec54edc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c16fb7ce311e0d7e5a4c7d3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 15 21:28:09 2022 -0600 wined3d: Pass a wined3d_device_gl pointer to wined3d_context_gl_create_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +- dlls/wined3d/context_gl.c | 116 +---------------------------------------- dlls/wined3d/device.c | 116 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/texture.c | 5 +- dlls/wined3d/view.c | 5 +- dlls/wined3d/wined3d_private.h | 6 +-- 6 files changed, 127 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c16fb7ce311e0d7e5a4…

1 0

Alexandre Julliard : winebuild: Add support for generating data-only DLLs.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 39f6ab55a970dc242304621026b90444037a3daa URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f6ab55a970dc2423046210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 14:58:49 2022 +0100 winebuild: Add support for generating data-only DLLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 + tools/winebuild/main.c | 12 ++ tools/winebuild/parser.c | 6 + tools/winebuild/spec32.c | 241 +++++++++++++++++++++++++++------------ tools/winebuild/utils.c | 2 +- tools/winebuild/winebuild.man.in | 5 + 6 files changed, 194 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39f6ab55a970dc242304…

1 0

Eric Pouech : msadp32.acm: Enable compilation with long types.
by Alexandre Julliard Feb. 16, 2022

Feb. 16, 2022

Module: wine Branch: master Commit: 6cdeed87b32f7f5a2129369155966bc14266fb8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cdeed87b32f7f5a21293691… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:47 2022 +0100 msadp32.acm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msadp32.acm/Makefile.in | 1 - dlls/msadp32.acm/msadp32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msadp32.acm/Makefile.in b/dlls/msadp32.acm/Makefile.in index 1f50f9e5673..6828872bc68 100644 --- a/dlls/msadp32.acm/Makefile.in +++ b/dlls/msadp32.acm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msadp32.acm IMPORTS = winmm user32 diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 8b83f69c006..2dc11b9239a 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -425,7 +425,7 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -486,12 +486,12 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) init_wfx_adpcm((ADPCMWAVEFORMAT*)afd->pwfx); break; default: - WARN("Unsupported tag %08x\n", afd->dwFormatTag); + WARN("Unsupported tag %08lx\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -736,7 +736,7 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS } break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -757,7 +757,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -782,7 +782,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD LRESULT CALLBACK ADPCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %04x %08lx %08lx);\n", + TRACE("(%08Ix %p %04x %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg)

1 0