April 2023 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d: Collect multiple descriptor writes in a buffer and update in one call.
by Alexandre Julliard 25 Apr '23

25 Apr '23

Module: vkd3d Branch: master Commit: 06cc2e1aeed7f7c0d867d595bc7301a689ee5bcd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06cc2e1aeed7f7c0d867d595bc730… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 13 11:22:44 2023 +1000 vkd3d: Collect multiple descriptor writes in a buffer and update in one call. Reduces the cost of calling vkUpdateDescriptorSets() via winevulkan and its thunks. The performance gain can be as high as 20%. --- libs/vkd3d/resource.c | 201 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 121 insertions(+), 80 deletions(-)

1 0

Paul Gofman : ntdll: Avoid integer overflow in block_get_subheap().
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 27c4c64c367f47fe7914c5c87596e6cf3501dbd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/27c4c64c367f47fe7914c5c87596e6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Apr 21 19:19:20 2023 -0600 ntdll: Avoid integer overflow in block_get_subheap(). --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d8dab867ff5..ef1a9c3f3b1 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -359,7 +359,7 @@ static inline void block_set_type( struct block *block, UINT type ) static inline SUBHEAP *block_get_subheap( const struct heap *heap, const struct block *block ) { char *offset = ROUND_ADDR( block, REGION_ALIGN - 1 ); - void *base = offset - block->base_offset * REGION_ALIGN; + void *base = offset - (SIZE_T)block->base_offset * REGION_ALIGN; if (base != (void *)heap) return base; else return (SUBHEAP *)&heap->subheap; }

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_parse() on top of vkd3d_shader_parse_dxbc().
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 93cc58d12190c4536db34401dee8f157883a6d99 URL: https://gitlab.winehq.org/wine/wine/-/commit/93cc58d12190c4536db34401dee8f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 09:33:44 2023 +0200 d3d10: Implement d3d10_effect_parse() on top of vkd3d_shader_parse_dxbc(). --- dlls/d3d10/effect.c | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 61c76416273..1d2b46523ad 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -19,6 +19,7 @@ */ #include "d3d10_private.h" +#include <vkd3d_shader.h> #include <float.h> #include <stdint.h> @@ -4056,28 +4057,42 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, size_t data_ return parse_fx10_body(e, ptr, data_size - (ptr - data)); } -static HRESULT fx10_chunk_handler(const char *data, size_t data_size, uint32_t tag, void *ctx) +HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T data_size) { - struct d3d10_effect *e = ctx; - - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); + const struct vkd3d_shader_code dxbc = {.code = data, .size = data_size}; + const struct vkd3d_shader_dxbc_section_desc *section; + struct vkd3d_shader_dxbc_desc dxbc_desc; + HRESULT hr = S_OK; + unsigned int i; + int ret; - TRACE("Chunk size: %#Ix.\n", data_size); + if ((ret = vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, NULL)) < 0) + { + WARN("Failed to parse DXBC, ret %d.\n", ret); + return E_FAIL; + } - switch(tag) + for (i = 0; i < dxbc_desc.section_count; ++i) { - case TAG_FX10: - return parse_fx10(e, data, data_size); + section = &dxbc_desc.sections[i]; - default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); - return S_OK; + TRACE("Section %u: tag %s, data {%p, %#Ix}.\n", + i, debugstr_an((const char *)&section->tag, 4), + section->data.code, section->data.size); + + if (section->tag != TAG_FX10) + { + FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&section->tag, 4)); + continue; + } + + if (FAILED(hr = parse_fx10(effect, section->data.code, section->data.size))) + break; } -} -HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T data_size) -{ - return parse_dxbc(data, data_size, fx10_chunk_handler, effect); + vkd3d_shader_free_dxbc(&dxbc_desc); + + return hr; } static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s,

1 0

Henri Verbeet : d3d10: Implement parse_fx10_preshader() on top of vkd3d_shader_parse_dxbc().
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 5ad68393ecc8bc05d7256352019c0d72c3cfeb63 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ad68393ecc8bc05d7256352019c0d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 09:33:44 2023 +0200 d3d10: Implement parse_fx10_preshader() on top of vkd3d_shader_parse_dxbc(). --- dlls/d3d10/effect.c | 116 ++++++++++++---------------------------------------- 1 file changed, 27 insertions(+), 89 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1d2b46523ad..779bf878651 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) -#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') #define TAG_FXLC MAKE_TAG('F', 'X', 'L', 'C') #define TAG_CLI4 MAKE_TAG('C', 'L', 'I', '4') @@ -1146,89 +1145,6 @@ static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_ return !count || (data_size - offset) / count >= size; } -static HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, size_t data_size, uint32_t tag, void *ctx), void *ctx) -{ - const char *ptr = data; - uint32_t chunk_count; - uint32_t total_size; - HRESULT hr = S_OK; - uint32_t version; - unsigned int i; - uint32_t tag; - - if (!data) - { - WARN("No data supplied.\n"); - return E_FAIL; - } - - tag = read_u32(&ptr); - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - if (tag != TAG_DXBC) - { - WARN("Wrong tag.\n"); - return E_FAIL; - } - - FIXME("Skipping DXBC checksum.\n"); - skip_u32_unknown(&ptr, 4); - - version = read_u32(&ptr); - TRACE("version: %#x.\n", version); - if (version != 0x00000001) - { - WARN("Got unexpected DXBC version %#x.\n", version); - return E_FAIL; - } - - total_size = read_u32(&ptr); - TRACE("Total size: %#x.\n", total_size); - - if (data_size != total_size) - { - WARN("Wrong size supplied.\n"); - return E_FAIL; - } - - chunk_count = read_u32(&ptr); - TRACE("Chunk count: %#x.\n", chunk_count); - - for (i = 0; i < chunk_count; ++i) - { - uint32_t chunk_tag, chunk_size; - const char *chunk_ptr; - uint32_t chunk_offset; - - chunk_offset = read_u32(&ptr); - TRACE("Chunk %u at offset %#x.\n", i, chunk_offset); - - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(uint32_t), data_size)) - { - WARN("Invalid chunk offset %#x (data size %#Ix).\n", chunk_offset, data_size); - return E_FAIL; - } - - chunk_ptr = data + chunk_offset; - - chunk_tag = read_u32(&chunk_ptr); - chunk_size = read_u32(&chunk_ptr); - - if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) - { - WARN("Invalid chunk size %#x (data size %#Ix, chunk offset %#x).\n", - chunk_size, data_size, chunk_offset); - return E_FAIL; - } - - if (FAILED(hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx))) - break; - } - - return hr; -} - static BOOL fx10_get_string(const char *data, size_t data_size, uint32_t offset, const char **s, size_t *l) { size_t len, max_len; @@ -2620,8 +2536,13 @@ static HRESULT parse_fx10_ctab(void *ctx, const char *data, unsigned int data_si return S_OK; } -static HRESULT fxlvm_chunk_handler(const char *data, size_t data_size, uint32_t tag, void *ctx) +static HRESULT fxlvm_chunk_handler(const struct vkd3d_shader_dxbc_section_desc *section, + struct d3d10_preshader_parse_context *ctx) { + const char *data = section->data.code; + size_t data_size = section->data.size; + uint32_t tag = section->tag; + TRACE("Chunk tag: %s, size: %Iu.\n", debugstr_an((const char *)&tag, 4), data_size); switch (tag) @@ -2644,16 +2565,33 @@ static HRESULT fxlvm_chunk_handler(const char *data, size_t data_size, uint32_t static HRESULT parse_fx10_preshader(const char *data, size_t data_size, struct d3d10_effect *effect, struct d3d10_effect_preshader *preshader) { + const struct vkd3d_shader_code dxbc = {.code = data, .size = data_size}; + const struct vkd3d_shader_dxbc_section_desc *section; struct d3d10_preshader_parse_context context; - HRESULT hr; + struct vkd3d_shader_dxbc_desc dxbc_desc; + HRESULT hr = S_OK; + unsigned int i; + int ret; memset(preshader, 0, sizeof(*preshader)); memset(&context, 0, sizeof(context)); context.preshader = preshader; context.effect = effect; - if (FAILED(hr = parse_dxbc(data, data_size, fxlvm_chunk_handler, &context))) - return hr; + if ((ret = vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, NULL)) < 0) + { + WARN("Failed to parse DXBC, ret %d.\n", ret); + return E_FAIL; + } + + for (i = 0; i < dxbc_desc.section_count; ++i) + { + section = &dxbc_desc.sections[i]; + if (FAILED(hr = fxlvm_chunk_handler(section, &context))) + break; + } + + vkd3d_shader_free_dxbc(&dxbc_desc); /* Constant buffer and literal constants are preallocated, validate here that expression has no invalid accesses for those. */ @@ -2671,7 +2609,7 @@ static HRESULT parse_fx10_preshader(const char *data, size_t data_size, return E_FAIL; } - return S_OK; + return hr; } static HRESULT d3d10_effect_add_prop_dependency(struct d3d10_effect_prop_dependencies *d,

1 0

Davide Beatrici : wineoss: Implement functions to lock and unlock sessions.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 04914b5cd1343bedda00fb84751ab1409b8155b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/04914b5cd1343bedda00fb84751ab1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Apr 21 23:11:52 2023 +0200 wineoss: Implement functions to lock and unlock sessions. --- dlls/wineoss.drv/mmdevdrv.c | 86 +++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 38 deletions(-)

1 0

Davide Beatrici : winepulse: Implement functions to lock and unlock sessions.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 5a9adc1f289aee92b2901bd0b1bd50d7130a1c6a URL: https://gitlab.winehq.org/wine/wine/-/commit/5a9adc1f289aee92b2901bd0b1bd50… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Apr 21 23:12:12 2023 +0200 winepulse: Implement functions to lock and unlock sessions. --- dlls/winepulse.drv/mmdevdrv.c | 64 +++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7f1dbb765cf..12d67c45c4f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -83,6 +83,16 @@ static CRITICAL_SECTION_DEBUG session_cs_debug = { }; static CRITICAL_SECTION session_cs = { &session_cs_debug, -1, 0, 0, 0, 0 }; +static void sessions_lock(void) +{ + EnterCriticalSection(&session_cs); +} + +static void sessions_unlock(void) +{ + LeaveCriticalSection(&session_cs); +} + BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { @@ -601,9 +611,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if (This->stream) { pulse_release_stream(This->stream, This->timer_thread); This->stream = 0; - EnterCriticalSection(&session_cs); + sessions_lock(); list_remove(&This->entry); - LeaveCriticalSection(&session_cs); + sessions_unlock(); } IUnknown_Release(This->marshal); IMMDevice_Release(This->parent); @@ -784,10 +794,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_INVALIDARG; } - EnterCriticalSection(&session_cs); + sessions_lock(); if (This->stream) { - LeaveCriticalSection(&session_cs); + sessions_unlock(); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -797,7 +807,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, event, 0, NULL))) { ERR("Failed to create mainloop thread.\n"); - LeaveCriticalSection(&session_cs); + sessions_unlock(); CloseHandle(event); return E_FAIL; } @@ -820,14 +830,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, free(name); if (FAILED(hr = params.result)) { - LeaveCriticalSection(&session_cs); + sessions_unlock(); return hr; } if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) { pulse_release_stream(stream, NULL); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return E_OUTOFMEMORY; } for (i = 0; i < channel_count; i++) @@ -838,7 +848,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, { free(This->vols); This->vols = NULL; - LeaveCriticalSection(&session_cs); + sessions_unlock(); pulse_release_stream(stream, NULL); return E_OUTOFMEMORY; } @@ -848,7 +858,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); set_stream_volumes(This); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -1771,12 +1781,12 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if (count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&session_cs); + sessions_lock(); for (i = 0; i < count; ++i) This->vols[i] = levels[i]; set_stream_volumes(This); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -1796,10 +1806,10 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if (count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&session_cs); + sessions_lock(); for (i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -1818,10 +1828,10 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if (index >= This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&session_cs); + sessions_lock(); This->vols[index] = level; set_stream_volumes(This); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -1840,9 +1850,9 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if (index >= This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&session_cs); + sessions_lock(); *level = This->vols[index]; - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -1940,7 +1950,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, if (!state) return NULL_PTR_ERR; - EnterCriticalSection(&session_cs); + sessions_lock(); if (list_empty(&This->session->clients)) { *state = AudioSessionStateExpired; goto out; @@ -1961,7 +1971,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, *state = AudioSessionStateInactive; out: - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -2172,11 +2182,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( TRACE("PulseAudio does not support session volume control\n"); - EnterCriticalSection(&session_cs); + sessions_lock(); session->master_vol = level; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -2209,11 +2219,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if (context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session_cs); + sessions_lock(); session->mute = mute; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -2316,11 +2326,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( TRACE("PulseAudio does not support session volume control\n"); - EnterCriticalSection(&session_cs); + sessions_lock(); session->channel_vols[index] = level; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; } @@ -2367,12 +2377,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( TRACE("PulseAudio does not support session volume control\n"); - EnterCriticalSection(&session_cs); + sessions_lock(); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&session_cs); + sessions_unlock(); return S_OK; }

1 0

Alexandre Julliard : kernelbase: Move to a higher address on 64-bit.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: cab914c3aa66e26e6756c6704848265ddfcbf3a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/cab914c3aa66e26e6756c670484826… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 16:09:19 2023 +0200 kernelbase: Move to a higher address on 64-bit. --- dlls/kernelbase/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 38db49d7034..1f10fe8cc0b 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -3,7 +3,9 @@ MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--image-base,0x7b000000 +EXTRADLLFLAGS = -nodefaultlibs -nostartfiles +i386_EXTRADLLFLAGS = -Wl,--image-base,0x7b000000 +x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x174000000 C_SRCS = \ console.c \

1 0

Alexandre Julliard : kernel32: Move to a higher address on 64-bit.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: bddfa071901d0c827460a6248c559ae7e7bc8348 URL: https://gitlab.winehq.org/wine/wine/-/commit/bddfa071901d0c827460a6248c559a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 16:09:33 2023 +0200 kernel32: Move to a higher address on 64-bit. --- dlls/kernel32/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index cf07832226d..d606b9aba1c 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -3,7 +3,9 @@ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = kernelbase ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b600000 +EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll +i386_EXTRADLLFLAGS = -Wl,--image-base,0x7b800000 +x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x178000000 C_SRCS = \ atom.c \

1 0

Alexandre Julliard : ntdll: Reimplement RtlSetBits() to set 32 bits at a time.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: d619a44ba6d51ba8b3befaddd2b165817ca04dfd URL: https://gitlab.winehq.org/wine/wine/-/commit/d619a44ba6d51ba8b3befaddd2b165… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 17:31:46 2023 +0200 ntdll: Reimplement RtlSetBits() to set 32 bits at a time. --- dlls/ntdll/rtlbitmap.c | 66 ++++++++++++-------------------------------------- 1 file changed, 16 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index a86c234f778..4ca3df3351c 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -55,6 +55,11 @@ static const signed char NTDLL_mostSignificant[16] = { -1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3 }; +static inline ULONG maskbits( ULONG idx ) +{ + return ~0u << (idx & 31); +} + /************************************************************************* * RtlInitializeBitMap [NTDLL.@] * @@ -115,63 +120,24 @@ VOID WINAPI RtlClearAllBits(PRTL_BITMAP lpBits) /************************************************************************* * RtlSetBits [NTDLL.@] - * - * Set a range of bits in a bitmap. - * - * PARAMS - * lpBits [I] Bitmap pointer - * ulStart [I] First bit to set - * ulCount [I] Number of consecutive bits to set - * - * RETURNS - * Nothing. */ -VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) +void WINAPI RtlSetBits( RTL_BITMAP *bitmap, ULONG start, ULONG count ) { - LPBYTE lpOut; + ULONG end = start + count; + ULONG pos = start / 32; + ULONG end_pos = end / 32; - TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount); - - if (!lpBits || !ulCount || - ulStart >= lpBits->SizeOfBitMap || - ulCount > lpBits->SizeOfBitMap - ulStart) - return; + TRACE( "(%p,%lu,%lu)\n", bitmap, start, count ); - /* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... - */ - lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u); + if (!count || start >= bitmap->SizeOfBitMap || count > bitmap->SizeOfBitMap - start) return; - /* Set bits in first byte, if ulStart isn't a byte boundary */ - if (ulStart & 7) - { - if (ulCount > 7) + if (end_pos > pos) { - /* Set from start bit to the end of the byte */ - *lpOut++ |= 0xff << (ulStart & 7); - ulCount -= (8 - (ulStart & 7)); - } - else - { - /* Set from the start bit, possibly into the next byte also */ - USHORT initialWord = NTDLL_maskBits[ulCount] << (ulStart & 7); - - *lpOut |= (initialWord & 0xff); - if (initialWord >> 8) lpOut[1] |= (initialWord >> 8); - return; + bitmap->Buffer[pos++] |= maskbits( start ); + while (pos < end_pos) bitmap->Buffer[pos++] = ~0u; + if (end & 31) bitmap->Buffer[pos] |= ~maskbits( end ); } - } - - /* Set bits up to complete byte count */ - if (ulCount >> 3) - { - memset(lpOut, 0xff, ulCount >> 3); - lpOut = lpOut + (ulCount >> 3); - } - - /* Set remaining bits, if any */ - if (ulCount & 0x7) - *lpOut |= NTDLL_maskBits[ulCount & 0x7]; + else bitmap->Buffer[pos] |= maskbits( start ) & ~maskbits( end ); } /*************************************************************************

1 0

Alexandre Julliard : ntdll: Reimplement RtlClearBits() to clear 32 bits at a time.
by Alexandre Julliard 24 Apr '23

24 Apr '23

Module: wine Branch: master Commit: 500ec80e9fe574044bacc410cd96ea9009c3fe5d URL: https://gitlab.winehq.org/wine/wine/-/commit/500ec80e9fe574044bacc410cd96ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 22 17:32:25 2023 +0200 ntdll: Reimplement RtlClearBits() to clear 32 bits at a time. --- dlls/ntdll/rtlbitmap.c | 61 +++++++++----------------------------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 4ca3df3351c..3c3f2182a72 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -142,63 +142,24 @@ void WINAPI RtlSetBits( RTL_BITMAP *bitmap, ULONG start, ULONG count ) /************************************************************************* * RtlClearBits [NTDLL.@] - * - * Clear bits in a bitmap. - * - * PARAMS - * lpBits [I] Bitmap pointer - * ulStart [I] First bit to set - * ulCount [I] Number of consecutive bits to clear - * - * RETURNS - * Nothing. */ -VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) +void WINAPI RtlClearBits( RTL_BITMAP *bitmap, ULONG start, ULONG count) { - LPBYTE lpOut; - - TRACE("(%p,%lu,%lu)\n", lpBits, ulStart, ulCount); + ULONG end = start + count; + ULONG pos = start / 32; + ULONG end_pos = end / 32; - if (!lpBits || !ulCount || - ulStart >= lpBits->SizeOfBitMap || - ulCount > lpBits->SizeOfBitMap - ulStart) - return; + TRACE( "(%p,%lu,%lu)\n", bitmap, start, count ); - /* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... - */ - lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u); + if (!count || start >= bitmap->SizeOfBitMap || count > bitmap->SizeOfBitMap - start) return; - /* Clear bits in first byte, if ulStart isn't a byte boundary */ - if (ulStart & 7) - { - if (ulCount > 7) - { - /* Clear from start bit to the end of the byte */ - *lpOut++ &= ~(0xff << (ulStart & 7)); - ulCount -= (8 - (ulStart & 7)); - } - else + if (end_pos > pos) { - /* Clear from the start bit, possibly into the next byte also */ - USHORT initialWord = ~(NTDLL_maskBits[ulCount] << (ulStart & 7)); - - *lpOut &= (initialWord & 0xff); - if ((initialWord >> 8) != 0xff) lpOut[1] &= (initialWord >> 8); - return; + bitmap->Buffer[pos++] &= ~maskbits( start ); + while (pos < end_pos) bitmap->Buffer[pos++] = 0; + if (end & 31) bitmap->Buffer[pos] &= maskbits( end ); } - } - - /* Clear bits (in blocks of 8) on whole byte boundaries */ - if (ulCount >> 3) - { - memset(lpOut, 0, ulCount >> 3); - lpOut = lpOut + (ulCount >> 3); - } - - /* Clear remaining bits, if any */ - if (ulCount & 0x7) - *lpOut &= ~NTDLL_maskBits[ulCount & 0x7]; + else bitmap->Buffer[pos] &= ~maskbits( start ) | maskbits( end ); } /*************************************************************************

1 0