January 2021 - Wine-Devel - list.winehq.org

[PATCH v2] dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers
by Alistair Leslie-Hughes Jan. 18, 2021

Jan. 18, 2021

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=21014 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 2 + dlls/dsound/tests/dsound8.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bc30a8a5448..fafa6fc6015 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -420,6 +420,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } + if (This->dsbd.dwFlags & DSBCAPS_LOCDEFER) + *status |= DSBSTATUS_LOCSOFTWARE; ReleaseSRWLockShared(&This->lock); TRACE("status=%x\n", *status); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 81c5710dbaf..85272dd9b55 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1809,6 +1809,79 @@ static void test_effects(void) ok(!ref, "Got outstanding refcount %u.\n", ref); } +static void test_AcquireResources(void) +{ + IDirectSound8 *dsound; + IDirectSoundBuffer *primary, *secondary; + DSBUFFERDESC bufdesc; + WAVEFORMATEX fmt; + HRESULT hr; + + hr = DirectSoundCreate8(NULL, &dsound, NULL); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_PRIMARYBUFFER; + bufdesc.dwBufferBytes = 0; + bufdesc.dwReserved = 0; + bufdesc.lpwfxFormat = NULL; + bufdesc.guid3DAlgorithm = GUID_NULL; + + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &primary, NULL); + ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + if(hr != S_OK) { + IDirectSound_Release(dsound); + return; + } + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 48000; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = 0; + + bufdesc.lpwfxFormat = &fmt; + bufdesc.dwBufferBytes = fmt.nSamplesPerSec * fmt.nBlockAlign / 10; + bufdesc.dwFlags = DSBCAPS_LOCDEFER | DSBCAPS_CTRLVOLUME; + + /* see if we can create one more */ + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &secondary, NULL); + ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08x\n", hr); + if(hr == S_OK) { + DWORD status; + IDirectSoundBuffer8 *buffer8; + + hr = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + todo_wine ok(status == 0, "got: %08x\n", status); + + hr = IDirectSoundBuffer8_AcquireResources(buffer8, 0, 0, NULL); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08x\n", status); + + IDirectSoundBuffer8_Release(buffer8); + IDirectSoundBuffer_Release(secondary); + } + + IDirectSoundBuffer_Release(primary); + IDirectSound_Release(dsound); +} + START_TEST(dsound8) { DWORD cookie; @@ -1822,6 +1895,7 @@ START_TEST(dsound8) test_hw_buffers(); test_first_device(); test_primary_flags(); + test_AcquireResources(); hr = CoRegisterClassObject(&testdmo_clsid, (IUnknown *)&testdmo_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie); -- 2.29.2

2 1

[PATCH 4/4] winmm: Get rid of TIME_SMPTE format support in waveOutGetPosition().
by Akihiro Sagawa Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 4 ++-- dlls/winmm/waveform.c | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-)

2 1

[PATCH] user.exe16: implement parsing of the Win16 MENUEX resource
by Damjan Jovanovic Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/user.exe16/user.c | 63 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 7 deletions(-)

1 0

[PATCH 3/4] winmm/tests: Clean up waveOutGetPosition()'s time format tests.
by Akihiro Sagawa Jan. 18, 2021

Jan. 18, 2021

An ancient driver might support another time format, e.g. TIME_SMPTE. However, test shows recent Windows only supports TIME_BYTES and TIME_SAMPLES. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 51 +++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 32 deletions(-)

2 1

[PATCH 2/4] winmm: Get rid of TIME_MS format support in waveOutGetPosition().
by Akihiro Sagawa Jan. 18, 2021

Jan. 18, 2021

SofTalk (Japanese text-to-speech software) depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50515 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 4 ++-- dlls/winmm/waveform.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)

2 1

Converting Paths from within Windows processes on top of Wine
by Sebastian M. Ernst Jan. 18, 2021

Jan. 18, 2021

Hi all, I have been converting Windows to Unix paths and vice versa from within Windows processes on top of Wine by calling `wine_unix_to_nt_file_name` and `wine_nt_to_unix_file_name` in `nddll.dll`. The signatures of those functions changed from 5.12 to 5.13, which broke a couple of things. As I need to support multiple versions of Wine, at least down to 4.0, I need to find a generic (and preferably quick) way of converting paths. I am considering to simply call `wine_get_version` for deciding what signatures to use. Would this approach be advisable or is there a better, more stable, long-term way of achieving what I want? All of the mentioned functions are sort of "undocumented" API, as far as I understand. Best regards & thanks, Sebastian

4 4

[PATCH 1/4] winmm/tests: Expect TIME_BYTES format for TIME_MS request.
by Akihiro Sagawa Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)

2 1

[PATCH 5/5] wined3d: Also trace memory types in adapter_vk_init_driver_info().
by Henri Verbeet Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0404aa1877b..09180e7fdb6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2025,6 +2025,7 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; UINT64 vram_bytes, sysmem_bytes; + const VkMemoryType *type; const VkMemoryHeap *heap; unsigned int i; @@ -2046,6 +2047,12 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); TRACE("Total shared system memory: 0x%s.\n", wine_dbgstr_longlong(sysmem_bytes)); + for (i = 0; i < memory_properties->memoryTypeCount; ++i) + { + type = &memory_properties->memoryTypes[i]; + TRACE("Memory type [%u]: flags %#x, heap %u.\n", i, type->propertyFlags, type->heapIndex); + } + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_sprintf_cast().
by Henri Verbeet Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 59c73ad4257..1fea6f92be0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3124,6 +3124,11 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type, unsigned int size) { + if (dst_data_type == WINED3D_DATA_UNORM || dst_data_type == WINED3D_DATA_SNORM) + dst_data_type = WINED3D_DATA_FLOAT; + if (src_data_type == WINED3D_DATA_UNORM || src_data_type == WINED3D_DATA_SNORM) + src_data_type = WINED3D_DATA_FLOAT; + if (dst_data_type == src_data_type) { string_buffer_sprintf(dst_param, "%s", src_param); -- 2.20.1

1 0

[PATCH 3/5] wined3d: Handle UNORM/SNORM as FLOAT in shader_glsl_append_dst_ext().
by Henri Verbeet Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7423b2003a6..59c73ad4257 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3271,6 +3271,8 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_string_buffer *buffer, switch (data_type) { case WINED3D_DATA_FLOAT: + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); break; -- 2.20.1

1 0

[PATCH 2/5] wined3d: Cleanup the staging bo on an error path in wined3d_texture_vk_upload_data().
by Henri Verbeet Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3f106bb2d9d..f6037a47c1c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4678,6 +4678,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { ERR("Failed to get command buffer.\n"); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); return; } -- 2.20.1

1 0

[PATCH 1/5] wined3d: Get rid of the destination offset in wined3d_texture_vk_upload_data().
by Henri Verbeet Jan. 18, 2021

Jan. 18, 2021

The idea was once to use permanent bo's for textures, similar to how texture PBOs work in the OpenGL backend. In that case we would have needed to copy to the correct position in the bo, in order not to modify other parts of the bo. With the current scheme, the destination offset serves no purpose. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b630f0dcfc5..3f106bb2d9d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4592,9 +4592,9 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, VkCommandBuffer vk_command_buffer; struct wined3d_bo_vk staging_bo; VkImageAspectFlags aspect_mask; - size_t src_offset, dst_offset; struct wined3d_range range; VkBufferImageCopy region; + size_t src_offset; void *map_ptr; TRACE("context %p, src_bo_addr %s, src_format %s, src_box %s, src_row_pitch %u, src_slice_pitch %u, " @@ -4649,9 +4649,6 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, src_offset = src_box->front * src_slice_pitch + (src_box->top / src_format->block_height) * src_row_pitch + (src_box->left / src_format->block_width) * src_format->block_byte_count; - dst_offset = dst_z * src_slice_pitch - + (dst_y / src_format->block_height) * src_row_pitch - + (dst_x / src_format->block_width) * src_format->block_byte_count; if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) @@ -4670,8 +4667,8 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, return; } - wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, src_slice_pitch, - (uint8_t *)map_ptr + dst_offset, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, + wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, + src_slice_pitch, map_ptr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, src_box->bottom - src_box->top, src_box->back - src_box->front); range.offset = 0; @@ -4691,7 +4688,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->vk_image, aspect_mask); - region.bufferOffset = staging_bo.buffer_offset + dst_offset; + region.bufferOffset = staging_bo.buffer_offset; region.bufferRowLength = (dst_row_pitch / src_format->block_byte_count) * src_format->block_width; if (dst_row_pitch) region.bufferImageHeight = (dst_slice_pitch / dst_row_pitch) * src_format->block_height; -- 2.20.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Implement __LINE__.
by Zebediah Figura Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++++++++ tests/hlsl_d3d12.c | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 388b77f6..c5c49251 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -471,6 +471,26 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) } continue; } + + if (!strcmp(text, "__LINE__")) + { + const struct preproc_file *file = preproc_get_top_file(ctx); + + /* Not the current line number, but rather the line + * number before invoking any macros. */ + + if (ctx->current_directive) + { + char string[13]; + + sprintf(string, "%d", file->buffer.location.line); + return return_token(T_INTEGER, lval, string); + } + + if (preproc_is_writing(ctx)) + vkd3d_string_buffer_printf(&ctx->buffer, "%d ", file->buffer.location.line); + continue; + } } if (ctx->current_directive) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 9d8d16d9..03169716 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -350,7 +350,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i == 9 || (i >= 12 && i <= 14)) + todo_if (i == 9) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); -- 2.30.0

3 14

[PATCH] winemac.drv: Include depth32+stencil pixel formats in enumeration.
by Jan Sikorski Jan. 18, 2021

Jan. 18, 2021

This is especially important for M1 GPUs as they don't support the 24/8 format. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index b66af0f1c47..9f02e93d376 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -741,7 +741,8 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA if (!(renderer.stencil_modes & depth_stencil_modes[stencil_mode].mode)) continue; - if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && stencil_mode > 0) + if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && + depth_stencil_modes[depth_mode].bits != 32 && stencil_mode > 0) continue; attribs[n++] = kCGLPFAStencilSize; -- 2.29.2

1 0

[PATCH] dwrite: Add check for pass parameters of create_trimmingsign() to prevent crash.
by Haoyang Chen Jan. 18, 2021

Jan. 18, 2021

2 1

[v2 PATCH] dwrite/layout: Handle NULL format in CreateEllipsisTrimmingSign().
by Nikolay Sivov Jan. 18, 2021

Jan. 18, 2021

From: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: added a test dlls/dwrite/layout.c | 3 +++ dlls/dwrite/tests/layout.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 79d5ad50c6d..0b5bad80339 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5364,6 +5364,9 @@ HRESULT create_trimmingsign(IDWriteFactory7 *factory, IDWriteTextFormat *format, *sign = NULL; + if (!format) + return E_INVALIDARG; + /* Validate reading/flow direction here, layout creation won't complain about invalid combinations. */ reading = IDWriteTextFormat_GetReadingDirection(format); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 328403ea9ba..52f17820e5e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1354,6 +1354,11 @@ static void test_CreateEllipsisTrimmingSign(void) DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"en-GB", &format); ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + sign = (void *)0xdeadbeef; + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, NULL, &sign); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!sign, "Unexpected pointer %p.\n", sign); + EXPECT_REF(format, 1); hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.29.2

1 0

[PATCH 1/5] dwrite: Set lookup flags for joiners.
by Nikolay Sivov Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 3 +++ dlls/dwrite/opentype.c | 23 +++++++++++++++-------- dlls/dwrite/shape.c | 12 ++++++------ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7c9fe8a6873..632b2776bfc 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -615,6 +615,9 @@ enum shaping_feature_flags { FEATURE_GLOBAL = 0x1, FEATURE_GLOBAL_SEARCH = 0x2, + FEATURE_MANUAL_ZWNJ = 0x4, + FEATURE_MANUAL_ZWJ = 0x8, + FEATURE_MANUAL_JOINERS = FEATURE_MANUAL_ZWNJ | FEATURE_MANUAL_ZWJ, }; struct shaping_feature diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 260a0a8f5db..55ef482c42d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3508,6 +3508,8 @@ struct lookup unsigned int mask; unsigned int offset; + unsigned int auto_zwnj : 1; + unsigned int auto_zwj : 1; }; static unsigned int opentype_layout_get_gsubgpos_subtable(const struct scriptshaping_context *context, @@ -4337,8 +4339,8 @@ static int lookups_sorting_compare(const void *a, const void *b) return left->index < right->index ? -1 : left->index > right->index ? 1 : 0; }; -static BOOL opentype_layout_init_lookup(const struct ot_gsubgpos_table *table, unsigned short lookup_index, unsigned int mask, - struct lookup *lookup) +static BOOL opentype_layout_init_lookup(const struct ot_gsubgpos_table *table, unsigned short lookup_index, + const struct shaping_feature *feature, struct lookup *lookup) { unsigned short subtable_count, lookup_type, flags, mark_filtering_set; const struct ot_lookup_table *lookup_table; @@ -4372,8 +4374,13 @@ static BOOL opentype_layout_init_lookup(const struct ot_gsubgpos_table *table, u lookup->type = lookup_type; lookup->flags = flags; lookup->subtable_count = subtable_count; - lookup->mask = mask; lookup->offset = offset; + if (feature) + { + lookup->mask = feature->mask; + lookup->auto_zwnj = !(feature->flags & FEATURE_MANUAL_ZWNJ); + lookup->auto_zwj = !(feature->flags & FEATURE_MANUAL_ZWJ); + } return TRUE; } @@ -4409,7 +4416,7 @@ static void opentype_layout_add_lookups(const struct ot_feature_list *feature_li if (lookup_index >= total_lookup_count) continue; - if (opentype_layout_init_lookup(table, lookup_index, feature->mask, &lookups->lookups[lookups->count])) + if (opentype_layout_init_lookup(table, lookup_index, feature, &lookups->lookups[lookups->count])) lookups->count++; } } @@ -4567,6 +4574,8 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex else { lookups->lookups[j].mask |= lookups->lookups[i].mask; + lookups->lookups[j].auto_zwnj &= lookups->lookups[i].auto_zwnj; + lookups->lookups[j].auto_zwj &= lookups->lookups[i].auto_zwj; } } lookups->count = j + 1; @@ -4648,8 +4657,7 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex static void opentype_layout_apply_gpos_context_lookup(struct scriptshaping_context *context, unsigned int lookup_index) { struct lookup lookup = { 0 }; - /* Feature mask is intentionally zero, it's not used outside of main loop. */ - if (opentype_layout_init_lookup(context->table, lookup_index, 0, &lookup)) + if (opentype_layout_init_lookup(context->table, lookup_index, NULL, &lookup)) opentype_layout_apply_gpos_lookup(context, &lookup); } @@ -5742,8 +5750,7 @@ static BOOL opentype_is_gsub_lookup_reversed(const struct scriptshaping_context static void opentype_layout_apply_gsub_context_lookup(struct scriptshaping_context *context, unsigned int lookup_index) { struct lookup lookup = { 0 }; - /* Feature mask is intentionally zero, it's not used outside of main loop. */ - if (opentype_layout_init_lookup(context->table, lookup_index, 0, &lookup)) + if (opentype_layout_init_lookup(context->table, lookup_index, NULL, &lookup)) opentype_layout_apply_gsub_lookup(context, &lookup); } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index be8a69c27c4..567ec5fa54f 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -189,12 +189,12 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) { - static const unsigned int common_features[] = + static const struct shaping_feature common_features[] = { - DWRITE_MAKE_OPENTYPE_TAG('a','b','v','m'), - DWRITE_MAKE_OPENTYPE_TAG('b','l','w','m'), - DWRITE_MAKE_OPENTYPE_TAG('m','a','r','k'), - DWRITE_MAKE_OPENTYPE_TAG('m','k','m','k'), + { DWRITE_MAKE_OPENTYPE_TAG('a','b','v','m') }, + { DWRITE_MAKE_OPENTYPE_TAG('b','l','w','m') }, + { DWRITE_MAKE_OPENTYPE_TAG('m','a','r','k'), FEATURE_MANUAL_JOINERS }, + { DWRITE_MAKE_OPENTYPE_TAG('m','k','m','k'), FEATURE_MANUAL_JOINERS }, }; static const unsigned int horizontal_features[] = { @@ -207,7 +207,7 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigne struct shaping_features features = { 0 }; for (i = 0; i < ARRAY_SIZE(common_features); ++i) - shape_add_feature(&features, common_features[i]); + shape_add_feature_full(&features, common_features[i].tag, FEATURE_GLOBAL | common_features[i].flags, 1); /* Horizontal features */ if (!context->is_sideways) -- 2.29.2

1 4

[PATCH v2 7/7] bcrypt: Fix padding in format_gnutls_signature().
by Hans Leidekker Jan. 18, 2021

Jan. 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 2981dc6bc9c..efab65b8315 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1641,9 +1641,8 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_DSA: { int err; - unsigned int pad_size_r, pad_size_s, sig_len = get_signature_length( type ); + unsigned int sig_len = get_signature_length( type ); gnutls_datum_t r, s; /* format as r||s */ - unsigned char *r_data, *s_data; if ((err = pgnutls_decode_rs_value( &signature, &r, &s ))) { @@ -1654,21 +1653,7 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat *ret_len = sig_len; if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; - if (r.size % 2) /* remove prepended zero byte */ - { - r.size--; - r_data = r.data + 1; - } - else r_data = r.data; - - if (s.size % 2) - { - s.size--; - s_data = s.data + 1; - } - else s_data = s.data; - - if (r.size + s.size > sig_len) + if (r.size > sig_len / 2 + 1 || s.size > sig_len / 2 + 1) { ERR( "we didn't get a correct signature\n" ); return STATUS_INTERNAL_ERROR; @@ -1676,12 +1661,8 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat if (output) { - pad_size_r = (sig_len / 2) - r.size; - pad_size_s = (sig_len / 2) - s.size; - memset( output, 0, sig_len ); - - memcpy( output + pad_size_r, r_data, r.size ); - memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); + export_gnutls_datum( output, sig_len / 2, &r, NULL ); + export_gnutls_datum( output + sig_len / 2, sig_len / 2, &s, NULL ); } free( r.data ); free( s.data ); -- 2.29.2

1 0

[PATCH v2 6/7] bcrypt: Pad exported datums in key_export_dsa_capi().
by Hans Leidekker Jan. 18, 2021

Jan. 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 5bddc621f80..2981dc6bc9c 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1143,8 +1143,8 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le BLOBHEADER *hdr; DSSPUBKEY *pubkey; gnutls_datum_t p, q, g, y, x; - UCHAR *src, *dst; - int i, ret, size; + UCHAR *dst; + int ret, size; if ((ret = pgnutls_privkey_export_dsa_raw( key_data(key)->privkey, &p, &q, &g, &y, &x ))) { @@ -1152,7 +1152,7 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_INTERNAL_ERROR; } - if ((q.size != 20 && q.size != 21) || (x.size != 20 && x.size != 21)) + if (q.size > 21 || x.size > 21) { ERR( "can't export key in this format\n" ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); free( x.data ); @@ -1174,26 +1174,22 @@ static NTSTATUS CDECL key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG le pubkey->bitlen = key->u.a.bitlen; dst = (UCHAR *)(pubkey + 1); - if (p.size % 2) src = p.data + 1; - else src = p.data; - for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; - + export_gnutls_datum( dst, size, &p, NULL ); + reverse_bytes( dst, size ); dst += size; - if (q.size % 2) src = q.data + 1; - else src = q.data; - for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; + export_gnutls_datum( dst, 20, &q, NULL ); + reverse_bytes( dst, 20 ); dst += 20; - if (g.size % 2) src = g.data + 1; - else src = g.data; - for (i = 0; i < size; i++) dst[i] = src[size - i - 1]; + export_gnutls_datum( dst, size, &g, NULL ); + reverse_bytes( dst, size ); dst += size; - if (x.size % 2) src = x.data + 1; - else src = x.data; - for (i = 0; i < 20; i++) dst[i] = src[20 - i - 1]; + export_gnutls_datum( dst, 20, &x, NULL ); + reverse_bytes( dst, 20 ); dst += 20; + memcpy( dst, &key->u.a.dss_seed, sizeof(key->u.a.dss_seed) ); } -- 2.29.2

1 0

[PATCH v2 5/7] bcrypt: Pad exported datums in key_export_ecc().
by Hans Leidekker Jan. 18, 2021

Jan. 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 52c70d61cf6..5bddc621f80 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1000,7 +1000,7 @@ static NTSTATUS CDECL key_export_ecc( struct key *key, UCHAR *buf, ULONG len, UL gnutls_ecc_curve_t curve; gnutls_datum_t x, y, d; DWORD magic, size; - UCHAR *src, *dst; + UCHAR *dst; int ret; switch (key->alg_id) @@ -1040,19 +1040,13 @@ static NTSTATUS CDECL key_export_ecc( struct key *key, UCHAR *buf, ULONG len, UL ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - if (x.size == size + 1) src = x.data + 1; - else src = x.data; - memcpy( dst, src, size ); - + export_gnutls_datum( dst, size, &x, NULL ); dst += size; - if (y.size == size + 1) src = y.data + 1; - else src = y.data; - memcpy( dst, src, size ); + export_gnutls_datum( dst, size, &y, NULL ); dst += size; - if (d.size == size + 1) src = d.data + 1; - else src = d.data; - memcpy( dst, src, size ); + + export_gnutls_datum( dst, size, &d, NULL ); } free( x.data ); free( y.data ); free( d.data ); -- 2.29.2

1 0

[PATCH v2 4/7] bcrypt: Pad exported datums in export_gnutls_pubkey_dsa_capi().
by Hans Leidekker Jan. 18, 2021

Jan. 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> v2: Use a define for the expected Q size. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 66 ++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index abbbb1ee89f..52c70d61cf6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -841,14 +841,28 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } +static void reverse_bytes( UCHAR *buf, ULONG len ) +{ + unsigned int i; + UCHAR tmp; + + for (i = 0; i < len / 2; ++i) + { + tmp = buf[i]; + buf[i] = buf[len - i - 1]; + buf[len - i - 1] = tmp; + } +} + +#define Q_SIZE 20 static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, const DSSSEED *seed, ULONG bitlen, UCHAR **pubkey, ULONG *pubkey_len ) { BLOBHEADER *hdr; DSSPUBKEY *dsskey; gnutls_datum_t p, q, g, y; - UCHAR *dst, *src; - int i, ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(*seed); + UCHAR *dst; + int ret, size = sizeof(*hdr) + sizeof(*dsskey) + sizeof(*seed); if (bitlen > 1024) { @@ -862,7 +876,7 @@ static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, cons return STATUS_INTERNAL_ERROR; } - if (!(hdr = RtlAllocateHeap( GetProcessHeap(), 0, size + p.size + q.size + g.size + y.size ))) + if (!(hdr = RtlAllocateHeap( GetProcessHeap(), 0, size + bitlen / 8 * 3 + Q_SIZE ))) { pgnutls_perror( ret ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); @@ -879,46 +893,26 @@ static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, cons dsskey->bitlen = bitlen; dst = (UCHAR *)(dsskey + 1); - if (p.size % 2) - { - src = p.data + 1; - p.size--; - } - else src = p.data; - for (i = 0; i < p.size; i++) dst[i] = src[p.size - i - 1]; + export_gnutls_datum( dst, bitlen / 8, &p, NULL ); + reverse_bytes( dst, bitlen / 8 ); + dst += bitlen / 8; - dst += p.size; - if (q.size % 2) - { - src = q.data + 1; - q.size--; - } - else src = q.data; - for (i = 0; i < q.size; i++) dst[i] = src[q.size - i - 1]; + export_gnutls_datum( dst, Q_SIZE, &q, NULL ); + reverse_bytes( dst, Q_SIZE ); + dst += Q_SIZE; - dst += q.size; - if (g.size % 2) - { - src = g.data + 1; - g.size--; - } - else src = g.data; - for (i = 0; i < g.size; i++) dst[i] = src[g.size - i - 1]; + export_gnutls_datum( dst, bitlen / 8, &g, NULL ); + reverse_bytes( dst, bitlen / 8 ); + dst += bitlen / 8; - dst += g.size; - if (y.size % 2) - { - src = y.data + 1; - y.size--; - } - else src = y.data; - for (i = 0; i < y.size; i++) dst[i] = src[y.size - i - 1]; + export_gnutls_datum( dst, bitlen / 8, &y, NULL ); + reverse_bytes( dst, bitlen / 8 ); + dst += bitlen / 8; - dst += y.size; memcpy( dst, seed, sizeof(*seed) ); *pubkey = (UCHAR *)hdr; - *pubkey_len = size + p.size + q.size + g.size + y.size; + *pubkey_len = size + bitlen / 8 * 3 + Q_SIZE; free( p.data ); free( q.data ); free( g.data ); free( y.data ); return STATUS_SUCCESS; -- 2.29.2

1 0

[PATCH v2 3/7] bcrypt: Pad exported datums in export_gnutls_pubkey_dsa().
by Hans Leidekker Jan. 18, 2021

Jan. 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 42 +++++++++--------------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 86a8fed0bab..abbbb1ee89f 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -795,7 +795,7 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit { BCRYPT_DSA_KEY_BLOB *dsa_blob; gnutls_datum_t p, q, g, y; - UCHAR *dst, *src; + UCHAR *dst; int ret; if ((ret = pgnutls_privkey_export_dsa_raw( gnutls_key, &p, &q, &g, &y, NULL ))) @@ -810,7 +810,7 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_NOT_IMPLEMENTED; } - if (!(dsa_blob = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*dsa_blob) + p.size + g.size + y.size ))) + if (!(dsa_blob = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*dsa_blob) + bitlen / 8 * 3 ))) { pgnutls_perror( ret ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); @@ -818,40 +818,16 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit } dst = (UCHAR *)(dsa_blob + 1); - if (p.size == bitlen / 8 + 1 && !p.data[0]) - { - src = p.data + 1; - p.size--; - } - else src = p.data; - memcpy( dst, src, p.size ); + export_gnutls_datum( dst, bitlen / 8, &p, NULL ); - dst += p.size; - if (g.size == bitlen / 8 + 1 && !g.data[0]) - { - src = g.data + 1; - g.size--; - } - else src = g.data; - memcpy( dst, src, g.size ); + dst += bitlen / 8; + export_gnutls_datum( dst, bitlen / 8, &g, NULL ); - dst += g.size; - if (y.size == bitlen / 8 + 1 && !y.data[0]) - { - src = y.data + 1; - y.size--; - } - else src = y.data; - memcpy( dst, src, y.size ); + dst += bitlen / 8; + export_gnutls_datum( dst, bitlen / 8, &y, NULL ); dst = dsa_blob->q; - if (q.size == sizeof(dsa_blob->q) + 1 && !q.data[0]) - { - src = q.data + 1; - q.size--; - } - else src = q.data; - memcpy( dst, src, sizeof(dsa_blob->q) ); + export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, NULL ); dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC; dsa_blob->cbKey = bitlen / 8; @@ -859,7 +835,7 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit memset( dsa_blob->Seed, 0, sizeof(dsa_blob->Seed) ); /* FIXME */ *pubkey = (UCHAR *)dsa_blob; - *pubkey_len = sizeof(*dsa_blob) + p.size + g.size + y.size; + *pubkey_len = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; free( p.data ); free( q.data ); free( g.data ); free( y.data ); return STATUS_SUCCESS; -- 2.29.2

1 0

[PATCH v2 2/7] bcrypt: Pad exported datums in export_gnutls_pubkey_ecc().
by Hans Leidekker Jan. 18, 2021

Jan. 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 9e6dd4cc9a6..86a8fed0bab 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -670,6 +670,7 @@ static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, { ULONG size = d->size; UCHAR *src = d->data; + ULONG offset; assert( size <= length + 1 ); if (size == length + 1) @@ -678,8 +679,17 @@ static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, ++src; --size; } - *actual_length = size; - memcpy( buffer, src, size ); + if (actual_length) + { + offset = 0; + *actual_length = size; + } + else + { + offset = length - size; + memset( buffer, 0, offset ); + } + memcpy( buffer + offset, src, size ); } static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, UCHAR **pubkey, ULONG *pubkey_len ) @@ -727,7 +737,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ gnutls_ecc_curve_t curve; gnutls_datum_t x, y; DWORD magic, size; - UCHAR *src, *dst; + UCHAR *dst; int ret; switch (alg_id) @@ -758,7 +768,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ return STATUS_NOT_IMPLEMENTED; } - if (!(ecc_blob = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*ecc_blob) + x.size + y.size ))) + if (!(ecc_blob = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*ecc_blob) + size * 2 ))) { pgnutls_perror( ret ); free( x.data ); free( y.data ); @@ -769,14 +779,10 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - if (x.size == size + 1) src = x.data + 1; - else src = x.data; - memcpy( dst, src, size ); + export_gnutls_datum( dst, size, &x, NULL ); dst += size; - if (y.size == size + 1) src = y.data + 1; - else src = y.data; - memcpy( dst, src, size ); + export_gnutls_datum( dst, size, &y, NULL ); *pubkey = (UCHAR *)ecc_blob; *pubkey_len = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; -- 2.29.2

1 0

[PATCH v2 1/7] bcrypt: Introduce export_gnutls_datum() helper and use it in export_gnutls_pubkey_rsa().
by Hans Leidekker Jan. 18, 2021

Jan. 18, 2021

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c065ac31fba..9e6dd4cc9a6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -28,6 +28,7 @@ #ifdef HAVE_GNUTLS_CIPHER_INIT #include <stdarg.h> +#include <assert.h> #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #include <gnutls/abstract.h> @@ -665,11 +666,27 @@ static void CDECL key_symmetric_destroy( struct key *key ) if (key_data(key)->cipher) pgnutls_cipher_deinit( key_data(key)->cipher ); } +static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, ULONG *actual_length ) +{ + ULONG size = d->size; + UCHAR *src = d->data; + + assert( size <= length + 1 ); + if (size == length + 1) + { + assert(!src[0]); + ++src; + --size; + } + *actual_length = size; + memcpy( buffer, src, size ); +} + static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, UCHAR **pubkey, ULONG *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob; gnutls_datum_t m, e; - UCHAR *dst, *src; + UCHAR *dst; int ret; if ((ret = pgnutls_privkey_export_rsa_raw( gnutls_key, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) @@ -686,32 +703,18 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit } dst = (UCHAR *)(rsa_blob + 1); - if (e.size == bitlen / 8 + 1 && !e.data[0]) - { - src = e.data + 1; - e.size--; - } - else src = e.data; - memcpy( dst, src, e.size ); + export_gnutls_datum( dst, bitlen / 8, &e, &rsa_blob->cbPublicExp ); - dst += e.size; - if (m.size == bitlen / 8 + 1 && !m.data[0]) - { - src = m.data + 1; - m.size--; - } - else src = m.data; - memcpy( dst, src, m.size ); + dst += rsa_blob->cbPublicExp; + export_gnutls_datum( dst, bitlen / 8, &m, &rsa_blob->cbModulus ); rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; rsa_blob->BitLength = bitlen; - rsa_blob->cbPublicExp = e.size; - rsa_blob->cbModulus = m.size; rsa_blob->cbPrime1 = 0; rsa_blob->cbPrime2 = 0; *pubkey = (UCHAR *)rsa_blob; - *pubkey_len = sizeof(*rsa_blob) + e.size + m.size; + *pubkey_len = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; free( e.data ); free( m.data ); return STATUS_SUCCESS; -- 2.29.2

1 0

[PATCH] ws2_32: Reimplement SIO_GET_INTERFACE_LIST on top of GetIpAddrTable().
by Paul Gofman Jan. 18, 2021

Jan. 18, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 208 ++++++++++++++++++++------------------- dlls/ws2_32/tests/sock.c | 31 ++++++ 2 files changed, 136 insertions(+), 103 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 33cbd3d9537..31ea9b339ed 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4792,6 +4792,110 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s return NtStatusToWSAError( status ); } +static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD *ret_size, DWORD *total_bytes) +{ + DWORD size, interface_count = 0, ret; + INTERFACE_INFO *info = out_buff; + PMIB_IPADDRTABLE table = NULL; + DWORD status = 0; + int fd; + + if (!out_buff || !ret_size) + return WSAEFAULT; + + if ((fd = get_sock_fd(s, 0, NULL)) == -1) + return SOCKET_ERROR; + + if ((ret = GetIpAddrTable(NULL, &size, TRUE)) != ERROR_INSUFFICIENT_BUFFER) + { + if (ret != ERROR_NO_DATA) + { + ERR("Unable to get ip address table.\n"); + status = WSAEINVAL; + } + goto done; + } + if (!(table = heap_alloc(size))) + { + ERR("No memory.\n"); + status = WSAEINVAL; + goto done; + } + if (GetIpAddrTable(table, &size, TRUE) != NO_ERROR) + { + ERR("Unable to get interface table./\n"); + status = WSAEINVAL; + goto done; + } + if (table->dwNumEntries * sizeof(INTERFACE_INFO) > out_size) + { + WARN("Buffer too small, dwNumEntries %u, out_size = %u.\n", table->dwNumEntries, out_size); + *ret_size = 0; + status = WSAEFAULT; + goto done; + } + + for (; interface_count < table->dwNumEntries; ++interface_count, ++info) + { + unsigned int addr, mask; + struct ifreq if_info; + + memset(info, 0, sizeof(*info)); + + if_info.ifr_ifindex = table->table[interface_count].dwIndex; + if (ioctl(fd, SIOCGIFNAME, &if_info) < 0) + { + ERR("Error obtaining interface name for ifindex %d.\n", if_info.ifr_ifindex); + status = WSAEINVAL; + break; + } + + if (ioctl(fd, SIOCGIFFLAGS, &if_info) < 0) + { + ERR("Error obtaining status flags for socket!\n"); + status = WSAEINVAL; + break; + } + + if (if_info.ifr_flags & IFF_BROADCAST) + info->iiFlags |= WS_IFF_BROADCAST; +#ifdef IFF_POINTOPOINT + if (if_info.ifr_flags & IFF_POINTOPOINT) + info->iiFlags |= WS_IFF_POINTTOPOINT; +#endif + if (if_info.ifr_flags & IFF_LOOPBACK) + info->iiFlags |= WS_IFF_LOOPBACK; + if (if_info.ifr_flags & IFF_UP) + info->iiFlags |= WS_IFF_UP; + if (if_info.ifr_flags & IFF_MULTICAST) + info->iiFlags |= WS_IFF_MULTICAST; + + addr = table->table[interface_count].dwAddr; + mask = table->table[interface_count].dwMask; + + info->iiAddress.AddressIn.sin_family = WS_AF_INET; + info->iiAddress.AddressIn.sin_port = 0; + info->iiAddress.AddressIn.sin_addr.WS_s_addr = addr; + + info->iiNetmask.AddressIn.sin_family = WS_AF_INET; + info->iiNetmask.AddressIn.sin_port = 0; + info->iiNetmask.AddressIn.sin_addr.WS_s_addr = mask; + + if (if_info.ifr_flags & IFF_BROADCAST) + { + info->iiBroadcastAddress.AddressIn.sin_family = WS_AF_INET; + info->iiBroadcastAddress.AddressIn.sin_port = 0; + info->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = addr | ~mask; + } + } + +done: + heap_free(table); + *total_bytes = sizeof(INTERFACE_INFO) * interface_count; + release_sock_fd(s, fd); + return status; +} + /********************************************************************** * WSAIoctl (WS2_32.50) * @@ -4898,111 +5002,9 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_GET_INTERFACE_LIST: { - INTERFACE_INFO* intArray = out_buff; - DWORD size, numInt = 0, apiReturn; - TRACE("-> SIO_GET_INTERFACE_LIST request\n"); - if (!out_buff || !ret_size) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - fd = get_sock_fd( s, 0, NULL ); - if (fd == -1) return SOCKET_ERROR; - - apiReturn = GetAdaptersInfo(NULL, &size); - if (apiReturn == ERROR_BUFFER_OVERFLOW) - { - PIP_ADAPTER_INFO table = HeapAlloc(GetProcessHeap(),0,size); - - if (table) - { - if (GetAdaptersInfo(table, &size) == NO_ERROR) - { - PIP_ADAPTER_INFO ptr; - - for (ptr = table, numInt = 0; ptr; ptr = ptr->Next) - { - unsigned int addr, mask, bcast; - struct ifreq ifInfo; - - /* Skip interfaces without an IPv4 address. */ - if (ptr->IpAddressList.IpAddress.String[0] == '\0') - continue; - - if ((numInt + 1) * sizeof(INTERFACE_INFO) > out_size) - { - WARN("Buffer too small = %u, out_size = %u\n", numInt + 1, out_size); - status = WSAEFAULT; - if (ret_size) *ret_size = 0; - break; - } - - /* Socket Status Flags */ - lstrcpynA(ifInfo.ifr_name, ptr->AdapterName, IFNAMSIZ); - if (ioctl(fd, SIOCGIFFLAGS, &ifInfo) < 0) - { - ERR("Error obtaining status flags for socket!\n"); - status = WSAEINVAL; - break; - } - else - { - /* set flags; the values of IFF_* are not the same - under Linux and Windows, therefore must generate - new flags */ - intArray->iiFlags = 0; - if (ifInfo.ifr_flags & IFF_BROADCAST) - intArray->iiFlags |= WS_IFF_BROADCAST; -#ifdef IFF_POINTOPOINT - if (ifInfo.ifr_flags & IFF_POINTOPOINT) - intArray->iiFlags |= WS_IFF_POINTTOPOINT; -#endif - if (ifInfo.ifr_flags & IFF_LOOPBACK) - intArray->iiFlags |= WS_IFF_LOOPBACK; - if (ifInfo.ifr_flags & IFF_UP) - intArray->iiFlags |= WS_IFF_UP; - if (ifInfo.ifr_flags & IFF_MULTICAST) - intArray->iiFlags |= WS_IFF_MULTICAST; - } - - addr = inet_addr(ptr->IpAddressList.IpAddress.String); - mask = inet_addr(ptr->IpAddressList.IpMask.String); - bcast = addr | ~mask; - intArray->iiAddress.AddressIn.sin_family = WS_AF_INET; - intArray->iiAddress.AddressIn.sin_port = 0; - intArray->iiAddress.AddressIn.sin_addr.WS_s_addr = addr; - - intArray->iiNetmask.AddressIn.sin_family = WS_AF_INET; - intArray->iiNetmask.AddressIn.sin_port = 0; - intArray->iiNetmask.AddressIn.sin_addr.WS_s_addr = mask; - - intArray->iiBroadcastAddress.AddressIn.sin_family = WS_AF_INET; - intArray->iiBroadcastAddress.AddressIn.sin_port = 0; - intArray->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = bcast; - intArray++; - numInt++; - } - } - else - { - ERR("Unable to get interface table!\n"); - status = WSAEINVAL; - } - HeapFree(GetProcessHeap(),0,table); - } - else status = WSAEINVAL; - } - else if (apiReturn != ERROR_NO_DATA) - { - ERR("Unable to get interface table!\n"); - status = WSAEINVAL; - } - /* Calculate the size of the array being returned */ - total = sizeof(INTERFACE_INFO) * numInt; - release_sock_fd( s, fd ); + status = get_interface_list(s, out_buff, out_size, ret_size, &total); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2b0a7354f4b..81536cb9dbe 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10516,6 +10516,9 @@ static void test_WSCGetProviderPath(void) static void test_wsaioctl(void) { + unsigned int i, count; + INTERFACE_INFO *info; + BOOL loopback_found; char buffer[4096]; DWORD size; SOCKET s; @@ -10529,12 +10532,40 @@ static void test_wsaioctl(void) ok(!ret, "Got unexpected ret %d.\n", ret); ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); + info = (INTERFACE_INFO *)buffer; + count = size / sizeof(INTERFACE_INFO); + loopback_found = FALSE; + for (i = 0; i < count; ++i) + { + if (info[i].iiFlags & IFF_LOOPBACK) + loopback_found = TRUE; + + ok(info[i].iiAddress.AddressIn.sin_family == AF_INET, "Got unexpected sin_family %#x.\n", + info[i].iiAddress.AddressIn.sin_family); + ok(info[i].iiNetmask.AddressIn.sin_family == AF_INET, "Got unexpected sin_family %#x.\n", + info[i].iiNetmask.AddressIn.sin_family); + ok(info[i].iiBroadcastAddress.AddressIn.sin_family + == (info[i].iiFlags & IFF_BROADCAST) ? AF_INET : 0, "Got unexpected sin_family %#x.\n", + info[i].iiBroadcastAddress.AddressIn.sin_family); + ok(info[i].iiAddress.AddressIn.sin_addr.S_un.S_addr, "Got zero iiAddress.\n"); + ok(info[i].iiNetmask.AddressIn.sin_addr.S_un.S_addr, "Got zero iiNetmask.\n"); + ok((info[i].iiFlags & IFF_BROADCAST) ? info[i].iiBroadcastAddress.AddressIn.sin_addr.S_un.S_addr + : !info[i].iiBroadcastAddress.AddressIn.sin_addr.S_un.S_addr, + "Got unexpected iiBroadcastAddress %s.\n", inet_ntoa(info[i].iiBroadcastAddress.AddressIn.sin_addr)); + } + + ok(loopback_found, "Loopback interface not found.\n"); + size = 0xdeadbeef; ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO) - 1, &size, NULL, NULL); ok(ret == -1, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); ok(!size, "Got unexpected size %u.\n", size); + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), NULL, NULL, NULL); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + closesocket(s); } -- 2.29.2

1 0