February 2020 - wine-devel

[PATCH] testbot/UpdateTaskLogs: MoveRefReport() is not given .err files.
by Francois Gouget 06 Feb '20

06 Feb '20

So there is no point allowing for a .err extension in the regexp splitting the report filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index f259302a20..c6f7b753d3 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -270,7 +270,7 @@ sub MoveRefReport($$;$) $NewDir ||= $RefDir; my $NewName = $RefName; - if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?)$/) + if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report)$/) { # We don't know which job generated this reference log. # So use a fixed, arbitrary JobId. -- 2.20.1

1 0

[PATCH 5/5] setupapi: Fix hex digit check in SetupGetBinaryField.
by Jacek Caban 06 Feb '20

06 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/setupapi/parser.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)

2 1

[PATCH 4/5] quartz: Fix hex digit checks in process_pattern_string.
by Jacek Caban 06 Feb '20

06 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/quartz/filesource.c | 46 ++++++++++++---------------------------- 1 file changed, 14 insertions(+), 32 deletions(-)

2 1

[PATCH v2] atl: Allow only ASCII digit for registrar binary values.
by Jacek Caban 06 Feb '20

06 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/atl/registrar.c | 17 +++++++++++------ dlls/atl/tests/registrar.c | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-)

1 0

[PATCH] user32/tests: Add some tests for Static/SS_BITMAP control.
by Dmitry Timoshkov 06 Feb '20

06 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/bmp1x1_32bpp.bmp | Bin 0 -> 58 bytes dlls/user32/tests/resource.rc | 3 ++ dlls/user32/tests/static.c | 60 +++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 dlls/user32/tests/bmp1x1_32bpp.bmp diff --git a/dlls/user32/tests/bmp1x1_32bpp.bmp b/dlls/user32/tests/bmp1x1_32bpp.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3b565be8c2b1ca5b8d121df4e3b6f57822b72600 GIT binary patch literal 58 hcmZ?rwPJt(Ga#h_#EfvP0Aw*Ruz*QaLQu)r1pq_i0r>y` literal 0 HcmV?d00001 diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 4301af6d68..89aaf5a61c 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -249,6 +249,9 @@ FONT 8, "MS Shell Dlg" /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp +/* @makedep: bmp1x1_32bpp.bmp */ +101 BITMAP bmp1x1_32bpp.bmp + 1 MENU { POPUP "&File" diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 8776c3a9e0..0c453d08a6 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -130,6 +130,65 @@ static void test_set_text(void) DestroyWindow(hStatic); } +static void test_image(HBITMAP image) +{ + BITMAP bm; + HDC hdc; + BITMAPINFO info; + BYTE bits[4]; + + GetObjectW(image, sizeof(bm), &bm); + ok(bm.bmWidth == 1, "got %d\n", bm.bmWidth); + ok(bm.bmHeight == 1, "got %d\n", bm.bmHeight); + ok(bm.bmBitsPixel == 32, "got %d\n", bm.bmBitsPixel); + ok(bm.bmBits == NULL, "bmBits is not NULL\n"); + + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = bm.bmWidth; + info.bmiHeader.biHeight = bm.bmHeight; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 32; + info.bmiHeader.biCompression = BI_RGB; + info.bmiHeader.biSizeImage = 4; + info.bmiHeader.biXPelsPerMeter = 0; + info.bmiHeader.biYPelsPerMeter = 0; + info.bmiHeader.biClrUsed = 0; + info.bmiHeader.biClrImportant = 0; + + hdc = CreateCompatibleDC(0); + GetDIBits(hdc, image, 0, bm.bmHeight, bits, &info, DIB_RGB_COLORS); + DeleteDC(hdc); + + ok(bits[0] == 0x11 && bits[1] == 0x22 && bits[2] == 0x33 && bits[3] == 0x44, + "bits: %02x %02x %02x %02x\n", bits[0], bits[1], bits[2], bits[3]); +} + +static void test_set_image(void) +{ + HWND hwnd = build_static(SS_BITMAP); + HBITMAP bmp, image; + + image = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(101), IMAGE_BITMAP, 0, 0, 0); + ok(image != NULL, "LoadImage failed\n"); + + test_image(image); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp == NULL, "got not NULL\n"); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp != NULL, "got NULL\n"); + ok(bmp == image, "bmp != image\n"); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)image); + ok(bmp != NULL, "got NULL\n"); + ok(bmp == image, "bmp != image\n"); + test_image(image); + + DestroyWindow(hwnd); + DeleteObject(image); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -162,6 +221,7 @@ START_TEST(static) test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); + test_set_image(); DestroyWindow(hMainWnd); } -- 2.20.1

2 1

[PATCH 2/5] crypt32: Allow only ASCII digits in CRYPT_AsnEncodeNumericString.
by Jacek Caban 06 Feb '20

06 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] wined3d: Add GPU information for NVIDIA GeForce GTX 1650 SUPER.
by Zhiyi Zhang 06 Feb '20

06 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7e6f8a2817..732119463d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1359,6 +1359,7 @@ cards_nvidia_binary[] = {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ {"GTX 1660 Ti", CARD_NVIDIA_GEFORCE_GTX1660TI}, /* GeForce 1600 - highend */ + {"GTX 1650 SUPER", CARD_NVIDIA_GEFORCE_GTX1650SUPER}, /* GeForce 1600 - midend high */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 12b53f7577..03d682db34 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -420,6 +420,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1650SUPER,"NVIDIA GeForce GTX 1650 SUPER", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660TI, "NVIDIA GeForce GTX 1660 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5beaa927d7..aea3481c40 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2585,6 +2585,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_NVIDIA_GEFORCE_GTX1650SUPER= 0x2187, CARD_NVIDIA_GEFORCE_GTX1660TI = 0x2182, CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, -- 2.20.1

2 1

[PATCH v2 1/5] d3d9: Set the primary stateblock when executing draw calls.
by Zebediah Figura 06 Feb '20

06 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 111 ++++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8122ab0a05..dcd54cac48 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2818,19 +2818,21 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, int base_vertex, unsigned int start_vertex, unsigned int vertex_count) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_vertex_declaration *wined3d_decl; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *d3d9_buffer; struct wined3d_resource *dst_resource; struct d3d9_vertex_declaration *decl; - unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; + unsigned int stride, map; HRESULT hr; if (!device->sysmem_vb) return; - wined3d_decl = wined3d_device_get_vertex_declaration(device->wined3d_device); + wined3d_decl = state->vertex_declaration; if (!wined3d_decl) return; @@ -2843,14 +2845,14 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, map = decl->stream_map & device->sysmem_vb; while (map) { - i = wined3d_bit_scan(&map); + stream = &state->streams[wined3d_bit_scan(&map)]; + dst_buffer = stream->buffer; + stride = stream->stride; - if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); dst_resource = wined3d_buffer_get_resource(dst_buffer); wined3d_resource_get_desc(dst_resource, &desc); - box.left = offset + start_vertex * stride; + box.left = stream->offset + start_vertex * stride; box.right = min(box.left + vertex_count * stride, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, dst_resource, 0, box.left, 0, 0, @@ -2862,25 +2864,26 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, unsigned int start_idx, unsigned int idx_count) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct wined3d_resource *dst_resource; struct d3d9_indexbuffer *d3d9_buffer; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; enum wined3d_format_id format; - unsigned int offset, idx_size; + unsigned int idx_size; HRESULT hr; if (!device->sysmem_ib) return; - if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))) - ERR("Failed to get index buffer.\n"); + dst_buffer = state->index_buffer; + format = state->index_format; d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); dst_resource = wined3d_buffer_get_resource(dst_buffer); wined3d_resource_get_desc(dst_resource, &desc); idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; - box.left = offset + start_idx * idx_size; + box.left = start_idx * idx_size; box.right = min(box.left + idx_count * idx_size, desc.size); if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, dst_resource, 0, box.left, 0, 0, @@ -2938,13 +2941,13 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); - wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); + wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3025,7 +3028,6 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3048,14 +3050,15 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3142,7 +3145,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -3187,20 +3189,21 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vertex_stride); if (FAILED(hr)) goto done; d3d9_generate_auto_mipmaps(device); - wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, - wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, + wined3dformat_from_d3dformat(index_format)); + wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); - wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); + wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3217,17 +3220,17 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *dst_impl = unsafe_impl_from_IDirect3DVertexBuffer9(dst_buffer); struct d3d9_vertex_declaration *decl_impl = unsafe_impl_from_IDirect3DVertexDeclaration9(declaration); + const struct wined3d_stateblock_state *state; + const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *d3d9_buffer; - struct wined3d_buffer *wined3d_buffer; - unsigned int i, offset, stride, map; + unsigned int i, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, declaration %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, declaration, flags); wined3d_mutex_lock(); - - wined3d_device_apply_stateblock(device->wined3d_device, device->state); + state = wined3d_stateblock_get_state(device->state); /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we @@ -3238,16 +3241,15 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d9_buffer->wined3d_buffer, offset, stride))) + d3d9_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d9_buffer->wined3d_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst_impl->wined3d_buffer, decl_impl ? decl_impl->wined3d_declaration : NULL, flags, dst_impl->fvf); @@ -3256,13 +3258,11 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d9_buffer->draw_buffer, offset, stride))) + d3d9_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d9_buffer->draw_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } @@ -3663,8 +3663,12 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); if (!buffer_impl) - wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &offset, &stride); + { + const struct wined3d_stream_state *stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + wined3d_buffer = stream->buffer; + offset = stream->offset; + stride = stream->stride; + } if (!buffer_impl) wined3d_buffer = NULL; @@ -3695,9 +3699,8 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *buffer_impl; - struct wined3d_buffer *wined3d_buffer; - HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", iface, stream_idx, buffer, offset, stride); @@ -3705,23 +3708,28 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, if (!buffer) return D3DERR_INVALIDCALL; + if (stream_idx > WINED3D_MAX_STREAMS) + { + WARN("Stream index %u out of range.\n", stream_idx); + return WINED3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, offset, stride); - if (SUCCEEDED(hr) && wined3d_buffer) + stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + if (stream->buffer) { - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffer_impl = wined3d_buffer_get_parent(stream->buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer9_iface; IDirect3DVertexBuffer9_AddRef(*buffer); } else - { - if (FAILED(hr)) - FIXME("Call to GetStreamSource failed %p %p\n", offset, stride); *buffer = NULL; - } + if (offset) + *offset = stream->offset; + *stride = stream->stride; wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetStreamSourceFreq(IDirect3DDevice9Ex *iface, UINT stream_idx, UINT freq) @@ -3784,7 +3792,6 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d9_indexbuffer *buffer_impl; @@ -3794,7 +3801,7 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, NULL))) + if ((wined3d_buffer = wined3d_stateblock_get_state(device->state)->index_buffer)) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; -- 2.25.0

2 9

[PATCH] ddraw/test: Completely disable the refcount stealing GetClipper call.
by Stefan Dösinger 06 Feb '20

06 Feb '20

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- fg-win7u64-1spie9t64 got worse with b9a9ad4c. I suspect the GetDeviceIdentifier shuffled data on the heap around enough to trigger the same bug I see on that one Nvidia machine. Other testbot boxes have problems too: https://testbot.winehq.org/JobDetails.pl?Key=64390 . --- dlls/ddraw/tests/ddraw1.c | 5 +++-- dlls/ddraw/tests/ddraw2.c | 5 +++-- dlls/ddraw/tests/ddraw4.c | 5 +++-- dlls/ddraw/tests/ddraw7.c | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 16c0cfb4e5b..b86d75eef76 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12938,12 +12938,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f0ae458d851..75d6853d6f5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13767,12 +13767,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b6cb97c3c98..4bfe02ba63b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16413,12 +16413,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0afbe76b6c6..6f48caa0a20 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16340,12 +16340,13 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - if (!ddraw_is_nvidia(ddraw)) + if (0) { /* Disabled because it causes heap corruption (HeapValidate fails and random * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 - * is affected too. + * is affected too. Some testbot machines have crashes directly in GetClipper + * or proceed with a corrupted heap too. * * The same Windows and driver versions run the test without heap corruption on * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ -- 2.24.1

3 2

[PATCH] wined3d: Avoid accessing freed memory in wined3d_view_gl_destroy() (Valgrind).
by Sven Baars 06 Feb '20

06 Feb '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7e6f8a2817..634a0be36a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4848,7 +4848,7 @@ static void wined3d_view_gl_destroy(struct wined3d_device *device, ctx->free = ctx != &c ? ctx : NULL; wined3d_cs_destroy_object(device->cs, wined3d_view_gl_destroy_object, ctx); - if (!ctx->free) + if (ctx == &c) device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } -- 2.24.0

4 5

[PATCH] wined3d: Fix the spelling of a comment.
by Zebediah Figura 06 Feb '20

06 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc220f0cf4..fe8e239dea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1031,7 +1031,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit DWORD location; /* If we would need to copy from a renderbuffer or drawable, we'd probably - * be better of using the FBO blitter directly, since we'd need to use it + * be better off using the FBO blitter directly, since we'd need to use it * to copy the resource contents to the texture anyway. */ if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_texture->resource.format->id == dst_texture->resource.format->id -- 2.25.0

3 2

[PATCH 1/3] ddraw: Apply the device state before executing a draw call.
by Zebediah Figura 06 Feb '20

06 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 12 ++++++++++-- dlls/ddraw/executebuffer.c | 4 ++++ dlls/ddraw/surface.c | 2 ++ dlls/ddraw/vertexbuffer.c | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 725a935022..6cd8948f56 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3520,6 +3520,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, size = vertex_count * stride; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3713,6 +3714,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -4057,6 +4059,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, dst_size); if (FAILED(hr)) goto done; @@ -4173,6 +4176,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_dst_size); if (FAILED(hr)) goto done; @@ -4330,6 +4334,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wined3d_buffer, 0, stride))) @@ -4452,6 +4457,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); @@ -5251,6 +5257,7 @@ static HRESULT d3d_device7_ValidateDevice(IDirect3DDevice7 *iface, DWORD *pass_c TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -5313,7 +5320,7 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, (color & 0xff) / 255.0f, ((color >> 24) & 0xff) / 255.0f, }; - struct d3d_device *This = impl_from_IDirect3DDevice7(iface); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); HRESULT hr; TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", @@ -5326,7 +5333,8 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, } wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + hr = wined3d_device_clear(device->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 9f0fdb85e5..0d1726ed7f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -74,6 +74,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DOP_POINT: { const D3DPOINT *p = (D3DPOINT *)instr; + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_POINTLIST, 0); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); @@ -106,6 +107,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d primitive_size = 3; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + index_count = count * primitive_size; if (buffer->index_size < index_count) { @@ -300,6 +303,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d { case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->src_vertex_buffer, buffer->src_vertex_pos * sizeof(D3DVERTEX), sizeof(D3DVERTEX)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fda42f2982..03546e17f1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1472,6 +1472,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, &colour, 0.0f, 0); @@ -1487,6 +1488,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, NULL, colour.r, 0); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 9df386d1a0..1e3d25f6cb 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -277,6 +277,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device_impl->wined3d_device, device_impl->state); /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to -- 2.25.0

2 5

[PATCH 1/3] rtworkq: Add RtwqSetLongRunning().
by Nikolay Sivov 06 Feb '20

06 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index a6aac6abda..13bce0836a 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1071,3 +1071,24 @@ HRESULT WINAPI RtwqUnlockWorkQueue(DWORD queue) return unlock_user_queue(queue); } + +HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable) +{ + struct queue *queue; + HRESULT hr; + int i; + + TRACE("%#x, %d.\n", queue_id, enable); + + lock_user_queue(queue_id); + + if (SUCCEEDED(hr = grab_queue(queue_id, &queue))) + { + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + queue->envs[i].u.s.LongFunction = !!enable; + } + + unlock_user_queue(queue_id); + + return hr; +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 48bc17cbfc..2d0d3b40e6 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -27,7 +27,7 @@ @ stdcall RtwqScheduleWorkItem(ptr int64 ptr) @ stub RtwqSetDeadline @ stub RtwqSetDeadline2 -@ stub RtwqSetLongRunning +@ stdcall RtwqSetLongRunning(long long) @ stdcall RtwqShutdown() @ stdcall RtwqStartup() @ stub RtwqUnjoinWorkQueue diff --git a/include/rtworkq.idl b/include/rtworkq.idl index 001cf2c3e9..6ddb232fbd 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -88,6 +88,7 @@ cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IR cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") +cpp_quote("HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);") cpp_quote("HRESULT WINAPI RtwqStartup(void);") cpp_quote("HRESULT WINAPI RtwqUnlockPlatform(void);") -- 2.24.1

1 2

[PATCH] winevulkan: handle bitmask pointers for spec generation
by Liam Middlebrook 06 Feb '20

06 Feb '20

Fixes a bug where pointer types for the following functions would be marked as long: vkGetDeviceGroupPeerMemoryFeatures vkGetDeviceGroupSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: James Jones <jajones(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5eebc0f3b2..52ef25948c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1491,12 +1491,12 @@ class VkParam(object): def spec(self): """ Generate spec file entry for this parameter. """ - if self.type_info["category"] in ["bitmask", "enum"]: - return "long" if self.is_pointer() and self.type == "char": return "str" if self.is_dispatchable() or self.is_pointer() or self.is_static_array(): return "ptr" + if self.type_info["category"] in ["bitmask", "enum"]: + return "long" if self.is_handle() and not self.is_dispatchable(): return "int64" if self.type == "float": -- 2.17.2

1 0

[PATCH] oledb32: Add Advanced page to datalink dialog
by Alistair Leslie-Hughes 06 Feb '20

06 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 63 +++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 16 ++++++++++ dlls/oledb32/version.rc | 26 +++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 556390fdf8..d33d637264 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -380,11 +380,67 @@ static LRESULT CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARA return 0; } +static void advanced_fill_permission_list(HWND parent) +{ + LVITEMW item; + LVCOLUMNW column; + RECT rc; + int resources[] = {IDS_PERM_READ, IDS_PERM_READWRITE, IDS_PERM_SHAREDENYNONE, + IDS_PERM_SHAREDENYREAD, IDS_PERM_SHAREDENYWRITE, IDS_PERM_SHAREEXCLUSIVE, + IDS_PERM_WRITE}; + int i; + WCHAR buf[256]; + HWND lv = GetDlgItem(parent, IDC_LST_PERMISSIONS); + if (!lv) + return; + + SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_CHECKBOXES); + GetWindowRect(lv, &rc); + column.mask = LVCF_WIDTH | LVCF_FMT; + column.fmt = LVCFMT_FIXED_WIDTH; + column.cx = (rc.right - rc.left) - 25; + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + + for(i =0; i < ARRAY_SIZE(resources); i++) + { + item.mask = LVIF_TEXT; + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(instance, resources[i], buf, ARRAY_SIZE(buf)); + item.pszText = buf; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + } +} + +static LRESULT CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + { + EnableWindow(GetDlgItem(hwnd, IDC_LBL_LEVEL), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_CBO_LEVEL), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_LBL_PROTECTION), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_CBO_PROTECTION), FALSE); + + advanced_fill_permission_list(hwnd); + + break; + } + default: + break; + } + return 0; +} + static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **connection) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); PROPSHEETHEADERW hdr; - PROPSHEETPAGEW pages[2]; + PROPSHEETPAGEW pages[3]; INT_PTR ret; FIXME("(%p, %p) Semi-stub\n", iface, connection); @@ -406,6 +462,11 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); pages[1].pfnDlgProc = data_link_connection_dlg_proc; + pages[2].dwSize = sizeof(PROPSHEETPAGEW); + pages[2].hInstance = instance; + pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); + pages[2].pfnDlgProc = data_link_advanced_dlg_proc; + memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); hdr.hwndParent = This->hwnd; diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index 57e7d5496a..99d3595d4a 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -22,6 +22,13 @@ #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 +#define IDS_PERM_READ 2002 +#define IDS_PERM_READWRITE 2003 +#define IDS_PERM_SHAREDENYNONE 2004 +#define IDS_PERM_SHAREDENYREAD 2005 +#define IDS_PERM_SHAREDENYWRITE 2006 +#define IDS_PERM_SHAREEXCLUSIVE 2007 +#define IDS_PERM_WRITE 2008 #define IDD_CONNECTION 3000 #define IDC_BTN_EDIT 3001 @@ -41,3 +48,12 @@ #define IDC_LBL_LOGIN 3015 #define IDC_LBL_INITIAL 3016 #define IDC_LBL_CONNECTION 3017 + +#define IDD_ADVANCED 4000 +#define IDC_CBO_LEVEL 4001 +#define IDC_CBO_PROTECTION 4002 +#define IDC_EDT_TIMEOUT 4003 +#define IDC_LST_PERMISSIONS 4004 +#define IDC_GRP_NETWORK 4005 +#define IDC_LBL_LEVEL 4006 +#define IDC_LBL_PROTECTION 4007 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 63d1d6c002..bb5266d92c 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -35,6 +35,14 @@ STRINGTABLE { IDS_PROPSHEET_TITLE "Data Link Properties" IDS_COL_PROVIDER "OLE DB Provider(s)" + + IDS_PERM_READ "Read" + IDS_PERM_READWRITE "ReadWrite" + IDS_PERM_SHAREDENYNONE "Share Deny None" + IDS_PERM_SHAREDENYREAD "Share Deny Read" + IDS_PERM_SHAREDENYWRITE "Share Deny Write" + IDS_PERM_SHAREEXCLUSIVE "Share Exclusive" + IDS_PERM_WRITE "Write" } IDD_PROVIDER DIALOG 0, 0, 227, 225 @@ -72,3 +80,21 @@ BEGIN COMBOBOX IDC_CBO_INITIAL,29,170,191,64,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Test Connection",IDC_BTN_TEST,140,194,81,14,WS_GROUP END + +IDD_ADVANCED DIALOG 0, 0, 227, 225 +STYLE DS_SETFONT | WS_CHILD | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Network settings",IDC_GRP_NETWORK,7,7,213,51 + LTEXT "&Impersonation level:",IDC_LBL_LEVEL,14,22,66,8 + COMBOBOX IDC_CBO_LEVEL,83,20,131,60,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "P&rotection level:",IDC_LBL_PROTECTION,14,39,54,8 + COMBOBOX IDC_CBO_PROTECTION,83,37,131,60,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Other",-1,7,62,213,92 + LTEXT "Connect:",-1,14,76,100,8 + EDITTEXT IDC_EDT_TIMEOUT,83,74,48,12,ES_RIGHT | ES_NUMBER + LTEXT "seconds.",-1,133,75,28,8 + LTEXT "A&ccess:",-1,14,91,100,8 + CONTROL "List1",IDC_LST_PERMISSIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOLABELWRAP | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,83,91,131,55 +END -- 2.17.1

1 0

[PATCH 1/5] strmbase: Rename the "pFuncsTable" member of struct strmbase_pin to "ops".
by Zebediah Figura 06 Feb '20

06 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 19 +++++++++---------- include/wine/strmbase.h | 25 +++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 6b84c9d1f18..3df9e3e333c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -57,7 +57,7 @@ static HRESULT enum_media_types_create(struct strmbase_pin *pin, IEnumMediaTypes object->pin = pin; IPin_AddRef(&pin->IPin_iface); - while (pin->pFuncsTable->pin_get_media_type(pin, object->count, &mt) == S_OK) + while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) { FreeMediaType(&mt); ++object->count; @@ -124,7 +124,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, for (i = 0; i < count; ++i) { if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) - hr = enummt->pin->pFuncsTable->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); + hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); else hr = E_OUTOFMEMORY; if (FAILED(hr)) @@ -169,7 +169,7 @@ static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface) TRACE("enummt %p.\n", enummt); enummt->count = 0; - while (enummt->pin->pFuncsTable->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) { FreeMediaType(&mt); ++enummt->count; @@ -267,8 +267,7 @@ static HRESULT WINAPI pin_QueryInterface(IPin *iface, REFIID iid, void **out) *out = NULL; - if (pin->pFuncsTable->pin_query_interface - && SUCCEEDED(hr = pin->pFuncsTable->pin_query_interface(pin, iid, out))) + if (pin->ops->pin_query_interface && SUCCEEDED(hr = pin->ops->pin_query_interface(pin, iid, out))) return hr; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPin)) @@ -392,7 +391,7 @@ static HRESULT WINAPI pin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) TRACE("pin %p %s:%s, mt %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), mt); strmbase_dump_media_type(mt); - return (pin->pFuncsTable->pin_query_accept(pin, mt) == S_OK ? S_OK : S_FALSE); + return (pin->ops->pin_query_accept(pin, mt) == S_OK ? S_OK : S_FALSE); } static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) @@ -404,7 +403,7 @@ static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_med TRACE("pin %p %s:%s, enum_media_types %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), enum_media_types); - if (FAILED(hr = pin->pFuncsTable->pin_get_media_type(pin, 0, &mt))) + if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) return hr; if (hr == S_OK) FreeMediaType(&mt); @@ -791,7 +790,7 @@ void strmbase_source_init(struct strmbase_source *pin, struct strmbase_filter *f pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); - pin->pin.pFuncsTable = &func_table->base; + pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; } @@ -844,7 +843,7 @@ static HRESULT WINAPI sink_ReceiveConnection(IPin *iface, IPin *pReceivePin, con if (This->pin.peer) hr = VFW_E_ALREADY_CONNECTED; - if (SUCCEEDED(hr) && This->pin.pFuncsTable->pin_query_accept(&This->pin, pmt) != S_OK) + if (SUCCEEDED(hr) && This->pin.ops->pin_query_accept(&This->pin, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */ @@ -1171,7 +1170,7 @@ void strmbase_sink_init(struct strmbase_sink *pin, struct strmbase_filter *filte pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); - pin->pin.pFuncsTable = &func_table->base; + pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; pin->pAllocator = pin->preferred_allocator = allocator; if (pin->preferred_allocator) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 965f6be401a..57ff0247084 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -39,16 +39,17 @@ struct strmbase_pin IPin *peer; AM_MEDIA_TYPE mt; - const struct BasePinFuncTable* pFuncsTable; + const struct strmbase_pin_ops *ops; }; -typedef struct BasePinFuncTable { +struct strmbase_pin_ops +{ /* Required for QueryAccept(), Connect(), ReceiveConnection(). */ HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); /* Required for EnumMediaTypes(). */ HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); HRESULT (*pin_query_interface)(struct strmbase_pin *pin, REFIID iid, void **out); -} BasePinFuncTable; +}; struct strmbase_source { @@ -65,14 +66,14 @@ typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(struct strmbase_source * struct strmbase_source_ops { - BasePinFuncTable base; - - /* Required for Connect(). */ - BaseOutputPin_AttemptConnection pfnAttemptConnection; - /* Required for BaseOutputPinImpl_DecideAllocator */ - BaseOutputPin_DecideBufferSize pfnDecideBufferSize; - /* Required for BaseOutputPinImpl_AttemptConnection */ - BaseOutputPin_DecideAllocator pfnDecideAllocator; + struct strmbase_pin_ops base; + + /* Required for Connect(). */ + BaseOutputPin_AttemptConnection pfnAttemptConnection; + /* Required for BaseOutputPinImpl_DecideAllocator */ + BaseOutputPin_DecideBufferSize pfnDecideBufferSize; + /* Required for BaseOutputPinImpl_AttemptConnection */ + BaseOutputPin_DecideAllocator pfnDecideAllocator; }; struct strmbase_sink @@ -91,7 +92,7 @@ typedef HRESULT (WINAPI *BaseInputPin_Receive)(struct strmbase_sink *This, IMedi struct strmbase_sink_ops { - BasePinFuncTable base; + struct strmbase_pin_ops base; BaseInputPin_Receive pfnReceive; HRESULT (*sink_connect)(struct strmbase_sink *pin, IPin *peer, const AM_MEDIA_TYPE *mt); void (*sink_disconnect)(struct strmbase_sink *pin); -- 2.25.0

1 4

[PATCH] include: Add X3DAUDIO_CALCULATE_* defines.
by Alistair Leslie-Hughes 05 Feb '20

05 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/x3daudio.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/x3daudio.h b/include/x3daudio.h index a503507a40..0fd9a30092 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -87,6 +87,16 @@ typedef struct X3DAUDIO_DSP_SETTINGS { float ListenerVelocityComponent; } X3DAUDIO_DSP_SETTINGS; +#define X3DAUDIO_CALCULATE_MATRIX 0x00000001 +#define X3DAUDIO_CALCULATE_DELAY 0x00000002 +#define X3DAUDIO_CALCULATE_LPF_DIRECT 0x00000004 +#define X3DAUDIO_CALCULATE_LPF_REVERB 0x00000008 +#define X3DAUDIO_CALCULATE_REVERB 0x00000010 +#define X3DAUDIO_CALCULATE_DOPPLER 0x00000020 +#define X3DAUDIO_CALCULATE_EMITTER_ANGLE 0x00000040 +#define X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 +#define X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 + #define X3DAUDIO_HANDLE_BYTESIZE 20 typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE]; -- 2.17.1

1 0

po: Update Lithuanian translation
by Aurimas Fišeras 05 Feb '20

05 Feb '20

1 0

[PATCH v3] wldap32: Define a debug channel only when we are using it.
by Gerald Pfeifer 05 Feb '20

05 Feb '20

We only need a debug channel when we're later using it - and all uses in these files are guarded by #ifdef HAVE_LDAP, so use the same guard around the definition of the debug channel as well. Thanks to Nikolay for this hint based on an earlier patch, and Alexandre for encouraging to go for the whole set of files. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wldap32/add.c | 2 +- dlls/wldap32/bind.c | 2 ++ dlls/wldap32/compare.c | 2 ++ dlls/wldap32/control.c | 2 ++ dlls/wldap32/delete.c | 2 ++ dlls/wldap32/dn.c | 2 ++ dlls/wldap32/modify.c | 2 +- dlls/wldap32/modrdn.c | 2 ++ dlls/wldap32/option.c | 2 ++ dlls/wldap32/parse.c | 2 ++ dlls/wldap32/rename.c | 2 ++ dlls/wldap32/search.c | 2 ++ 12 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 0a24d95f32..270311e561 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -34,9 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -#ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; #endif diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 0e9404ec50..27fb286f50 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_bindA (WLDAP32.@) diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c index 7cadc2a970..a7eab26d96 100644 --- a/dlls/wldap32/compare.c +++ b/dlls/wldap32/compare.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_compareA (WLDAP32.@) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index 1ec8641847..ffbf41ef68 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_control_freeA (WLDAP32.@) diff --git a/dlls/wldap32/delete.c b/dlls/wldap32/delete.c index 47e1cb4f2c..7d62edc8ac 100644 --- a/dlls/wldap32/delete.c +++ b/dlls/wldap32/delete.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_deleteA (WLDAP32.@) diff --git a/dlls/wldap32/dn.c b/dlls/wldap32/dn.c index fbe1a0c091..1303eb5057 100644 --- a/dlls/wldap32/dn.c +++ b/dlls/wldap32/dn.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_dn2ufnA (WLDAP32.@) diff --git a/dlls/wldap32/modify.c b/dlls/wldap32/modify.c index 292fa831a8..defc32af9c 100644 --- a/dlls/wldap32/modify.c +++ b/dlls/wldap32/modify.c @@ -34,9 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -#ifdef HAVE_LDAP static LDAPMod *nullmods[] = { NULL }; #endif diff --git a/dlls/wldap32/modrdn.c b/dlls/wldap32/modrdn.c index 3e2c867956..97ab0a9258 100644 --- a/dlls/wldap32/modrdn.c +++ b/dlls/wldap32/modrdn.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_modrdnA (WLDAP32.@) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index ddc5ca4933..4b7ec36c38 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_get_optionA (WLDAP32.@) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index e83e6d2351..88464a3b13 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_parse_extended_resultA (WLDAP32.@) diff --git a/dlls/wldap32/rename.c b/dlls/wldap32/rename.c index 2de50818b7..f8cac439a9 100644 --- a/dlls/wldap32/rename.c +++ b/dlls/wldap32/rename.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_rename_extA (WLDAP32.@) diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index 7e774f6894..f3d3eb48d4 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_searchA (WLDAP32.@) -- 2.25.0

1 0

[PATCH v2 1/4] d3dcompiler: Get rid of the "node" field from struct hlsl_ir_function_decl.
by Zebediah Figura 05 Feb '20

05 Feb '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- dlls/d3dcompiler_43/hlsl.y | 20 ++++++++++---------- dlls/d3dcompiler_43/utils.c | 4 +--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1ab343de2d8..01f6ce0e60a 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -712,7 +712,6 @@ enum hlsl_ir_node_type HLSL_IR_CONSTRUCTOR, HLSL_IR_DEREF, HLSL_IR_EXPR, - HLSL_IR_FUNCTION_DECL, HLSL_IR_IF, HLSL_IR_LOOP, HLSL_IR_JUMP, @@ -776,7 +775,8 @@ struct hlsl_ir_function struct hlsl_ir_function_decl { - struct hlsl_ir_node node; + struct hlsl_type *return_type; + struct source_location loc; struct wine_rb_entry entry; struct hlsl_ir_function *func; const char *semantic; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5585b899463..7c14ad0091c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1084,28 +1084,28 @@ hlsl_prog: /* empty */ { if (decl->body && $2.decl->body) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefinition of function %s", debugstr_a($2.name)); YYABORT; } - else if (!compare_hlsl_types(decl->node.data_type, $2.decl->node.data_type)) + else if (!compare_hlsl_types(decl->return_type, $2.decl->return_type)) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefining function %s with a different return type", debugstr_a($2.name)); - hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_NOTE, + hlsl_report_message(decl->loc.file, decl->loc.line, decl->loc.col, HLSL_LEVEL_NOTE, "%s previously declared here", debugstr_a($2.name)); YYABORT; } } - if ($2.decl->node.data_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) + if ($2.decl->return_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "void function with a semantic"); } @@ -1280,7 +1280,7 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' c } $$.name = $3; $$.decl->semantic = $7.semantic; - set_location(&$$.decl->node.loc, &@3); + set_location(&$$.decl->loc, &@3); } compound_statement: '{' '}' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5ecbbc9dc1d..ad2d02e1452 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1577,8 +1577,7 @@ struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, struc ERR("Out of memory.\n"); return NULL; } - decl->node.type = HLSL_IR_FUNCTION_DECL; - decl->node.data_type = return_type; + decl->return_type = return_type; decl->parameters = parameters; return decl; @@ -1775,7 +1774,6 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_CONSTRUCTOR", "HLSL_IR_DEREF", "HLSL_IR_EXPR", - "HLSL_IR_FUNCTION_DECL", "HLSL_IR_IF", "HLSL_IR_JUMP", "HLSL_IR_SWIZZLE", -- 2.20.1

2 5

[PATCH v2 1/6] server: Improve APC error handling when alloc_handle fails.
by Rémi Bernon 05 Feb '20

05 Feb '20

Whenever alloc_handle fails, we ignored the error and dequeued the next APC. This patch makes the loop break whenever the error status changes. Note that the APC is still marked as executed although it failed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- server/thread.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/server/thread.c b/server/thread.c index aec4c1acf4e..0d502eecba5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1581,26 +1581,23 @@ DECL_HANDLER(select) reply->timeout = select_on( &select_op, op_size, req->cookie, req->flags, req->timeout ); - if (get_error() == STATUS_USER_APC) + while (get_error() == STATUS_USER_APC) { - for (;;) + if (!(apc = thread_dequeue_apc( current, !(req->flags & SELECT_ALERTABLE) ))) + break; + /* Optimization: ignore APC_NONE calls, they are only used to + * wake up a thread, but since we got here the thread woke up already. + */ + if (apc->call.type != APC_NONE && + (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) { - if (!(apc = thread_dequeue_apc( current, !(req->flags & SELECT_ALERTABLE) ))) - break; - /* Optimization: ignore APC_NONE calls, they are only used to - * wake up a thread, but since we got here the thread woke up already. - */ - if (apc->call.type != APC_NONE && - (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - { - reply->call = apc->call; - release_object( apc ); - break; - } - apc->executed = 1; - wake_up( &apc->obj, 0 ); + reply->call = apc->call; release_object( apc ); + break; } + apc->executed = 1; + wake_up( &apc->obj, 0 ); + release_object( apc ); } } -- 2.25.0

3 12

[PATCH 01/11] mfplat/tests: Add more comprehensive media source tests.
by Derek Lesho 05 Feb '20

05 Feb '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 184 ++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d0e05650c2..43ca186236 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -350,6 +350,67 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +struct expected_event +{ + HRESULT status_code; + MediaEventType type; + GUID *extended_type; +}; + +static BOOL expect_event(IMFMediaEventGenerator *gen, struct expected_event *expected, PROPVARIANT *out) +{ + HRESULT hr; + IMFMediaEvent *event; + BOOL ret = TRUE; + + hr = IMFMediaEventGenerator_GetEvent(gen, 0, &event); + ok(hr == S_OK, "Failed to get event from media source, hr %#x.\n", hr); + { + HRESULT status_code; + hr = IMFMediaEvent_GetStatus(event, &status_code); + ok (hr == S_OK, "Failed to get status code, hr %#x.\n", hr); + ok (status_code == expected->status_code, "Unexpected status code %#x, expected %#x.\n", + status_code, expected->status_code); + + if (hr != S_OK || status_code != expected->status_code) + ret = FALSE; + } + { + MediaEventType event_type; + hr = IMFMediaEvent_GetType(event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + ok(event_type == expected->type, "Unexpected event type %u, expected %u.\n", + event_type, expected->type); + + if (hr != S_OK || event_type != expected->type) + ret = FALSE; + } + if (expected->extended_type) + { + GUID extended_type; + BOOL is_equal; + hr = IMFMediaEvent_GetExtendedType(event, &extended_type); + ok(hr == S_OK, "Failed to get extended type, hr %#x.\n", hr); + is_equal = IsEqualGUID(&extended_type, expected->extended_type); + ok(is_equal, "Unexpected extended type %s, expected %s.\n", + debugstr_guid(&extended_type), debugstr_guid(expected->extended_type)); + + if (hr != S_OK || !is_equal) + ret = FALSE; + } + if (out) + { + hr = IMFMediaEvent_GetValue(event, out); + ok (hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + + if (hr != S_OK) + ret = FALSE; + } + IMFMediaEvent_Release(event); + + return ret; +} + static void test_source_resolver(void) { static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; @@ -361,7 +422,7 @@ static void test_source_resolver(void) IMFMediaSource *mediasource; IMFPresentationDescriptor *descriptor; IMFMediaTypeHandler *handler; - BOOL selected, do_uninit; + IMFMediaType *type; MF_OBJECT_TYPE obj_type; IMFStreamDescriptor *sd; IUnknown *cancel_cookie; @@ -370,6 +431,9 @@ static void test_source_resolver(void) HRESULT hr; WCHAR *filename; GUID guid; + PROPVARIANT empty_var; + BOOL selected, do_uninit, skip_source_tests; + ULONG refcount; if (!pMFCreateSourceResolver) { @@ -451,13 +515,127 @@ static void test_source_resolver(void) hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); todo_wine ok(hr == S_OK, "Failed to get stream major type, hr %#x.\n", hr); + if (hr == S_OK) + { + ok (IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &type); + ok (hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); + + hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); + ok(hr == S_OK, "Failed to select video stream, hr %#x.\n", hr); + + IMFMediaType_Release(type); + + skip_source_tests = FALSE; + } + else + { + /* skip media source tests to avoid crashing, as the media source is fake */ + skip_source_tests = TRUE; + } IMFMediaTypeHandler_Release(handler); IMFStreamDescriptor_Release(sd); + if (skip_source_tests) + goto source_tests_end; + + empty_var.vt = VT_EMPTY; + hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &empty_var); + ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + + if (hr == S_OK) + { + static struct expected_event new_stream_event = { S_OK, MENewStream, NULL }; + static struct expected_event source_started_event = { S_OK, MESourceStarted, NULL }; + static struct expected_event end_of_presentation_event = {S_OK, MEEndOfPresentation, NULL }; + PROPVARIANT new_stream_value; + IMFMediaStream *video_stream; + + expect_event((IMFMediaEventGenerator*)mediasource, &new_stream_event, &new_stream_value); + ok(new_stream_value.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", + new_stream_value.vt); + video_stream = (IMFMediaStream *)new_stream_value.punkVal; + expect_event((IMFMediaEventGenerator*)mediasource, &source_started_event, NULL); + + /* TODO: verify stream information */ + + /* Request samples, our file is 10 frames at 25fps */ + { + static struct expected_event stream_started_event = { S_OK, MEStreamStarted, NULL }; + static struct expected_event new_sample_event = {S_OK, MEMediaSample, NULL}; + static struct expected_event end_of_stream_event = {S_OK, MEEndOfStream, NULL}; + unsigned int i, sample_count = 10; + + expect_event((IMFMediaEventGenerator*)video_stream, &stream_started_event, NULL); + + /* request one beyond EOS, otherwise EndOfStream isn't queued */ + for (i = 0; i <= sample_count; i++) + { + hr = IMFMediaStream_RequestSample(video_stream, NULL); + if (i == sample_count) + break; + ok(hr == S_OK, "Failed to request sample %u, hr %#x.\n", i + 1, hr); + if (hr != S_OK) + break; + } + + for (i = 0; i < sample_count; i++) + { + PROPVARIANT new_sample_value; + IMFSample *sample; + DWORD buffer_count; + LONGLONG duration, time; + static const LONGLONG MILLI_TO_100_NANO = 10000; + + if (!(expect_event((IMFMediaEventGenerator*)video_stream, &new_sample_event, &new_sample_value))) + { + ok(FALSE, "Sample %u not recieved.\n", i + 1); + break; + } + ok(new_sample_value.vt == VT_UNKNOWN, "Unexpected value type %u from MEMediaSample event.\n", + new_sample_value.vt); + sample = (IMFSample *)new_sample_value.punkVal; + + hr = IMFSample_GetBufferCount(sample, &buffer_count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(buffer_count == 1, "Unexpected buffer count %u.\n", buffer_count); + + hr = IMFSample_GetSampleDuration(sample, &duration); + ok(hr == S_OK, "Failed to get sample duration, hr %#x.\n", hr); + ok(duration == 40 * MILLI_TO_100_NANO, "Unexpected duration %s.\n", wine_dbgstr_longlong(duration)); + + hr = IMFSample_GetSampleTime(sample, &time); + ok(hr == S_OK, "Failed to get sample time, hr %#x.\n", hr); + ok(time == i * 40 * MILLI_TO_100_NANO, "Unexpected time %s.\n", wine_dbgstr_longlong(time)); + } + + if (i == sample_count) + expect_event((IMFMediaEventGenerator*)video_stream, &end_of_stream_event, NULL); + + hr = IMFMediaStream_RequestSample(video_stream, NULL); + ok (hr == MF_E_END_OF_STREAM, "Unexpected hr %#x, expected MF_E_END_OF_STREAM.\n", hr); + } + + expect_event((IMFMediaEventGenerator*)mediasource, &end_of_presentation_event, NULL); + } + IMFPresentationDescriptor_Release(descriptor); - IMFMediaSource_Release(mediasource); - IMFByteStream_Release(stream); + IMFMediaSource_Shutdown(mediasource); + + hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); + ok (hr == MF_E_SHUTDOWN, "Got 0x%08x\n", hr); + + source_tests_end: + refcount = IMFMediaSource_Release(mediasource); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + refcount = IMFByteStream_Release(stream); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Create from URL. */ callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); -- 2.25.0

4 26

[PATCH 2/2] kernelbase: Allow NULL lpAssemblyDirectoryName in find_actctx_dllpath.
by Jacek Caban 05 Feb '20

05 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] ntdll: Allow NULL lpAssemblyDirectoryName in find_actctx_dll.
by Jacek Caban 05 Feb '20

05 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Such activation context are perfectly fine and we should handle them just like any non-winsxs manifests. dlls/ntdll/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH] include: Add some E_* defines.
by Daniel Lehman 05 Feb '20

05 Feb '20

1 0

[PATCH v5 2/2] msvcrt: Set return value on all paths in wcstombs_s_l.
by Daniel Lehman 05 Feb '20

05 Feb '20

2 1

[PATCH v5 1/2] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Daniel Lehman 05 Feb '20

05 Feb '20

2 1

[PATCH] guiddef.h: Improve __uuidof implementation.
by Jacek Caban 05 Feb '20

05 Feb '20

This patch ensures that the reference is unique and identical for all uses in module, fixes handling of const types and uses direct reference instead of depending on optimizer to produce sane code. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/guiddef.h | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-)

1 0

[PATCH v2 1/6] vbscript: Fail if we have no context in InvokeEx.
by Gabriel Ivăncescu 05 Feb '20

05 Feb '20

The current code can't cope with it, so do the same thing as in GetDispID, to prevent a possible crash. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/vbdisp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c14cd7b..36eba21 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1388,6 +1388,9 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if (!This->ctx) + return E_UNEXPECTED; + if (id & DISPID_FUNCTION_MASK) { id &= ~DISPID_FUNCTION_MASK; -- 2.21.0

1 6

[PATCH v4 1/2] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Daniel Lehman 05 Feb '20

05 Feb '20

2 1

[PATCH v4 2/2] msvcrt: Set return value on all paths in wcstombs_s_l.
by Daniel Lehman 05 Feb '20

05 Feb '20

1 0

[PATCH v3 resend 1/8] msvcr90/tests: Test _get_current_locale()/setlocale() interaction.
by Chip Davis 05 Feb '20

05 Feb '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v3: Fix implicit pointer-to-int cast warnings, because we haven't adopted the C99 _Bool type yet. --- dlls/msvcr90/tests/msvcr90.c | 466 +++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f25492d..d51e3c985d63 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -139,6 +139,22 @@ static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static _locale_t (__cdecl *p__get_current_locale)(void); + +struct __lc_time_data { + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; + LCID lcid; + int unk; + int refcount; +}; /* make sure we use the correct errno */ #undef errno @@ -408,6 +424,7 @@ static BOOL init(void) SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); SET(p__create_locale, "_create_locale"); SET(p__free_locale, "_free_locale"); + SET(p__get_current_locale, "_get_current_locale"); if (sizeof(void *) == 8) { @@ -1961,6 +1978,454 @@ static void test____mb_cur_max_l_func(void) p__free_locale(l); } +static void test__get_current_locale(void) +{ + _locale_t l = p__get_current_locale(), l2 = p__get_current_locale(); + int i; +#define lc_str(lc, s) \ + ok(!strcmp(l->locinfo->lc_category[lc].locale, s), #lc " = \"%s\"\n", \ + l->locinfo->lc_category[lc].locale) + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + + ok(l->locinfo->refcount == 3, "refcount = %d\n", l->locinfo->refcount); + + if(!p_setlocale(LC_ALL, "english")) { + win_skip("English locale not available\n"); + p__free_locale(l); + p__free_locale(l2); + return; + } + + todo_wine { + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + } +#undef lc_str + + todo_wine ok(l->locinfo->refcount == 2, "refcount = %d\n", l->locinfo->refcount); + ok(l->locinfo == l2->locinfo, "different locinfo pointers\n"); + ok(l->mbcinfo == l2->mbcinfo, "different mbcinfo pointers\n"); + + p__free_locale(l); + p__free_locale(l2); + + l = p__get_current_locale(); + p_setlocale(LC_COLLATE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + ok(l->locinfo->lc_category[LC_COLLATE].locale != l2->locinfo->lc_category[LC_COLLATE].locale, + "same locale name pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount != l2->locinfo->lc_category[LC_COLLATE].refcount, + "same refcount pointers for LC_COLLATE\n"); + ok(!!l->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l->locinfo->lc_category[LC_COLLATE].refcount == 1, "refcount = %d\n", + *l->locinfo->lc_category[LC_COLLATE].refcount); + ok(!!l2->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l2->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l2->locinfo->lc_category[LC_COLLATE].refcount == 2, "refcount = %d\n", + *l2->locinfo->lc_category[LC_COLLATE].refcount); + } + for(i = LC_CTYPE; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage == l2->locinfo->lc_codepage, "different lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike == l2->locinfo->lc_clike, "different lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + /* The meaning of this member seems to be reversed--go figure */ + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(l->locinfo->ctype1 == l2->locinfo->ctype1, "different ctype1 pointers\n"); + ok(l->locinfo->pclmap == l2->locinfo->pclmap, "different clmap pointers\n"); + ok(l->locinfo->pcumap == l2->locinfo->pcumap, "different cumap pointers\n"); + ok(l->locinfo->ctype1_refcount == l2->locinfo->ctype1_refcount, "different ctype1_refcount pointers\n"); + todo_wine ok(*l->locinfo->ctype1_refcount == 3, "refcount = %d\n", *l->locinfo->ctype1_refcount); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(!!l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(!!l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(!!l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_CTYPE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i < LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(!!l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(!!l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_MONETARY; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(!!l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(!!l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(!!l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(!!l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_MONETARY, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(!!l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(!!l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_NUMERIC; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(!!l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(!!l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + ok(!!l2->locinfo->lconv_intl_refcount, "null refcount pointer for C locale\n"); + if(l2->locinfo->lconv_intl_refcount) + ok(*l2->locinfo->lconv_intl_refcount == 2, "refcount = %d\n", *l2->locinfo->lconv_intl_refcount); + } + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(!!l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(!!l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_NUMERIC, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_NUMERIC; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(!!l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(!!l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + ok(l->locinfo->lc_category[LC_TIME].locale == l2->locinfo->lc_category[LC_TIME].locale, + "different locale name pointers for LC_TIME\n"); + ok(l->locinfo->lc_category[LC_TIME].refcount == l2->locinfo->lc_category[LC_TIME].refcount, + "different refcount pointers for LC_TIME\n"); + todo_wine ok(*l->locinfo->lc_category[LC_TIME].refcount == 3, "refcount = %d\n", + *l->locinfo->lc_category[LC_TIME].refcount); + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(!!l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(!!l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(!!l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(!!l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_TIME, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + for(i = LC_MIN+1; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(!!l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(!!l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(!!l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(!!l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(!!l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(!!l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine ok(l->locinfo->lc_time_curr != l2->locinfo->lc_time_curr, "same lc_time_curr pointers\n"); + ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); + todo_wine ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), + "refcount = %d\n", l2->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p__free_locale(l); + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr90) { if(!init()) @@ -2001,4 +2466,5 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); + test__get_current_locale(); } -- 2.24.0

3 11

[PATCH] testbot: Increase the Windows executable build timeout.
by Francois Gouget 05 Feb '20

05 Feb '20

configure now takes 45 to 60 seconds and make 3.5 minutes for a full build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Config.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index d59233f617..ea08aa0f96 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -110,8 +110,8 @@ $MaxTaskTries = 3; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildNativeTimeout = 60; -$ExeBuildTestTimeout = 4 * 60; +$ExeBuildNativeTimeout = 2 * 60; +$ExeBuildTestTimeout = 7 * 60; # - For a single module $ExeModuleTimeout = 30; -- 2.20.1

1 0

[PATCH] testbot/web: Fix the log / report name validation in GetTaskFile.pl.
by Francois Gouget 05 Feb '20

05 Feb '20

Allow downloading task.log, testbot.log and their old versions. Also, dashes are not allowed in report names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/GetTaskFile.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 6353219e46..41111197df 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -37,7 +37,7 @@ sub SendTaskFile($$$$$) $StepNo = $1; return undef if ($TaskNo !~ m/^(\d+)$/); $TaskNo = $1; - return undef if ($File !~ m/^(log|[a-zA-Z0-9_-]+\.report)$/); + return undef if ($File !~ m/^((?:old_)?(?:task|testbot)\.log|[a-zA-Z0-9_]+\.report)$/); $File = $1; my $FileName = "$DataDir/jobs/$JobId/$StepNo/$TaskNo/$File"; -- 2.20.1

1 0

[PATCH] msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors.
by Piotr Caban 05 Feb '20

05 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48561 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] mshtml.idl: Fix duplicated dispinterface functions.
by Jacek Caban 05 Feb '20

05 Feb '20

From: Donna Whisnant <WhisantDonnaE(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 135 --------------------------------------------- 1 file changed, 135 deletions(-)

2 2

[v2 PATCH] gdi32: Retry with hinting disabled if glyph load failed in hinted mode.
by Nikolay Sivov 05 Feb '20

05 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Freetype bug with test font is at https://savannah.nongnu.org/bugs/?57732. v2: changed existing warning message. dlls/gdi32/freetype.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 10127bb77a..03bd097af2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7620,9 +7620,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + if (err && !(load_flags & FT_LOAD_NO_HINTING)) + { + WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph_index, err); + load_flags |= FT_LOAD_NO_HINTING; + err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + } if(err) { - WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err); + WARN("Failed to load glyph %#x, error %#x.\n", glyph_index, err); return GDI_ERROR; } -- 2.24.1

2 1

[PATCH 2/3] d3d9/tests: Add multiple adapters tests.
by Zhiyi Zhang 05 Feb '20

05 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 03ebe242e9..c59a09d839 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3476,6 +3476,47 @@ err_out: IDirect3D9_Release(d3d9_ptr); } +static void test_multi_adapter(void) +{ + UINT adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D9 *d3d9; + UINT i; + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(d3d9 != NULL, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D9_GetAdapterCount(d3d9); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Expect adapter count %d, got %d\n", + expected_adapter_count, adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D9_GetAdapterMonitor(d3d9, i); + ok(monitor != NULL, "IDirect3D9_GetAdapterMonitor failed\n"); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + + if (i == 0) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, "Expect adapter is primary.\n"); + else + ok(monitor_info.dwFlags == 0, "Expect adapter is non-primary.\n"); + } + + IDirect3D9_Release(d3d9); +} + static void test_multi_device(void) { IDirect3DDevice9 *device1, *device2; @@ -13441,6 +13482,7 @@ START_TEST(device) test_vertex_declaration_alignment(); test_unused_declaration_type(); test_fpu_setup(); + test_multi_adapter(); test_multi_device(); test_display_formats(); test_display_modes(); -- 2.20.1

2 1

[PATCH 1/3] d3d8/tests: Add multiple adapters tests.
by Zhiyi Zhang 05 Feb '20

05 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 80bf62e361..c897341629 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9760,6 +9760,47 @@ static void test_get_display_mode(void) DestroyWindow(window); } +static void test_multi_adapter(void) +{ + UINT adapter_count, expected_adapter_count = 0; + DISPLAY_DEVICEA display_device; + MONITORINFO monitor_info; + HMONITOR monitor; + IDirect3D8 *d3d8; + DWORD i; + + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(d3d8 != NULL, "Failed to create a D3D object.\n"); + + display_device.cb = sizeof(display_device); + for (i = 0; EnumDisplayDevicesA(NULL, i, &display_device, 0); ++i) + { + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ++expected_adapter_count; + } + + adapter_count = IDirect3D8_GetAdapterCount(d3d8); + todo_wine_if(expected_adapter_count > 1) + ok(adapter_count == expected_adapter_count, "Expect adapter count %u, got %u.\n", + expected_adapter_count, adapter_count); + + for (i = 0; i < adapter_count; ++i) + { + monitor = IDirect3D8_GetAdapterMonitor(d3d8, i); + ok(monitor != NULL, "IDirect3D8_GetAdapterMonitor failed\n"); + + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + + if (i == 0) + ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, "Expect adapter is primary.\n"); + else + ok(monitor_info.dwFlags == 0, "Expect adapter is non-primary.\n"); + } + + IDirect3D8_Release(d3d8); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9876,6 +9917,7 @@ START_TEST(device) test_multiply_transform(); test_draw_primitive(); test_get_display_mode(); + test_multi_adapter(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

2 1

[PATCH 3/3] dxgi/tests: Add multiple adapters tests.
by Zhiyi Zhang 05 Feb '20

05 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 110 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index aaef811364..d52676912d 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4899,6 +4899,115 @@ static void flush_events(void) } } +struct adapter_info +{ + const WCHAR *name; + HMONITOR monitor; +}; + +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC hdc, RECT *rect, LPARAM lparam) +{ + struct adapter_info *adapter_info = (struct adapter_info *)lparam; + MONITORINFOEXW monitor_info; + + monitor_info.cbSize = sizeof(monitor_info); + if (GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info) + && !lstrcmpiW(adapter_info->name, monitor_info.szDevice)) + { + adapter_info->monitor = monitor; + return FALSE; + } + + return TRUE; +} + +static HMONITOR get_monitor(const WCHAR *adapter_name) +{ + struct adapter_info info = {adapter_name, NULL}; + + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)&info); + return info.monitor; +} + +static void test_multi_adapter(void) +{ + UINT output_count = 0, expected_output_count = 0; + UINT adapter_index, output_index, device_index; + DISPLAY_DEVICEW display_device; + DXGI_OUTPUT_DESC output_desc; + MONITORINFO monitor_info; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + HMONITOR monitor; + BOOL found; + HRESULT hr; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) + { + skip("Failed to create IDXGIFactory, hr %#x.\n", hr); + return; + } + + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Could not enumerate adapters.\n"); + IDXGIFactory_Release(factory); + return; + } + ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr); + + for (adapter_index = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)); ++adapter_index) + { + for (output_index = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_index, &output)); ++output_index) + { + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "IDXGIOutput_GetDesc failed, hr %#x\n", hr); + + found = FALSE; + display_device.cb = sizeof(display_device); + for (device_index = 0; EnumDisplayDevicesW(NULL, device_index, &display_device, 0); ++device_index) + { + if (!lstrcmpiW(display_device.DeviceName, output_desc.DeviceName)) + { + found = TRUE; + break; + } + } + ok(found, "%s not found\n", wine_dbgstr_w(output_desc.DeviceName)); + ok(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "%s is detached\n", + wine_dbgstr_w(output_desc.DeviceName)); + if (adapter_index == 0 && output_index == 0) + ok(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, "Expect first output is primary\n"); + else + ok(!(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), "Expect output is non-primary\n"); + + /* Should have the same monitor handle */ + monitor = get_monitor(display_device.DeviceName); + ok(monitor != NULL, "Failed to find monitor %s\n", wine_dbgstr_w(display_device.DeviceName)); + ok(output_desc.Monitor == monitor, "Expect monitor %p, got %p\n", monitor, output_desc.Monitor); + + /* Should have the same monitor rectangle */ + monitor_info.cbSize = sizeof(monitor_info); + ok(GetMonitorInfoA(monitor, &monitor_info), "GetMonitorInfo failed, error %#x\n", GetLastError()); + ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), "Expect output rect %s, got %s\n", + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&output_desc.DesktopCoordinates)); + + IDXGIOutput_Release(output); + ++output_count; + } + + IDXGIAdapter_Release(adapter); + } + + IDXGIFactory_Release(factory); + + expected_output_count = GetSystemMetrics(SM_CMONITORS); + todo_wine_if(expected_output_count > 1) + ok(output_count == expected_output_count, "Expect output count %d, got %d\n", expected_output_count, output_count); +} + struct message { unsigned int message; @@ -5824,6 +5933,7 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); + queue_test(test_multi_adapter); run_queued_tests(); -- 2.20.1

1 0

[PATCH 1/9] rtworkq: Add a stub dll.
by Nikolay Sivov 05 Feb '20

05 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/rtworkq/Makefile.in | 4 ++++ dlls/rtworkq/rtworkq.spec | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 dlls/rtworkq/Makefile.in create mode 100644 dlls/rtworkq/rtworkq.spec diff --git a/configure b/configure index 80235dd995..9f23d268e8 100755 --- a/configure +++ b/configure @@ -1539,6 +1539,7 @@ enable_rsabase enable_rsaenh enable_rstrtmgr enable_rtutils +enable_rtworkq enable_samlib enable_sane_ds enable_sapi @@ -20798,6 +20799,7 @@ wine_fn_config_makefile dlls/rsaenh enable_rsaenh wine_fn_config_makefile dlls/rsaenh/tests enable_tests wine_fn_config_makefile dlls/rstrtmgr enable_rstrtmgr wine_fn_config_makefile dlls/rtutils enable_rtutils +wine_fn_config_makefile dlls/rtworkq enable_rtworkq wine_fn_config_makefile dlls/samlib enable_samlib wine_fn_config_makefile dlls/sane.ds enable_sane_ds wine_fn_config_makefile dlls/sapi enable_sapi diff --git a/configure.ac b/configure.ac index 40374210bb..e06743c2ea 100644 --- a/configure.ac +++ b/configure.ac @@ -3606,6 +3606,7 @@ WINE_CONFIG_MAKEFILE(dlls/rsaenh) WINE_CONFIG_MAKEFILE(dlls/rsaenh/tests) WINE_CONFIG_MAKEFILE(dlls/rstrtmgr) WINE_CONFIG_MAKEFILE(dlls/rtutils) +WINE_CONFIG_MAKEFILE(dlls/rtworkq) WINE_CONFIG_MAKEFILE(dlls/samlib) WINE_CONFIG_MAKEFILE(dlls/sane.ds) WINE_CONFIG_MAKEFILE(dlls/sapi) diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in new file mode 100644 index 0000000000..d6d7d6f715 --- /dev/null +++ b/dlls/rtworkq/Makefile.in @@ -0,0 +1,4 @@ +MODULE = rtworkq.dll +IMPORTLIB = rtworkq + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec new file mode 100644 index 0000000000..29e56846c6 --- /dev/null +++ b/dlls/rtworkq/rtworkq.spec @@ -0,0 +1,37 @@ +@ stub RtwqAddPeriodicCallback +@ stub RtwqAllocateSerialWorkQueue +@ stub RtwqAllocateWorkQueue +@ stub RtwqBeginRegisterWorkQueueWithMMCSS +@ stub RtwqBeginUnregisterWorkQueueWithMMCSS +@ stub RtwqCancelDeadline +@ stub RtwqCancelMultipleWaitingWorkItem +@ stub RtwqCancelWorkItem +@ stub RtwqCreateAsyncResult +@ stub RtwqEndRegisterWorkQueueWithMMCSS +@ stub RtwqEndUnregisterWorkQueueWithMMCSS +@ stub RtwqGetPlatform +@ stub RtwqGetWorkQueueMMCSSClass +@ stub RtwqGetWorkQueueMMCSSPriority +@ stub RtwqGetWorkQueueMMCSSTaskId +@ stub RtwqInvokeCallback +@ stub RtwqJoinWorkQueue +@ stub RtwqLockPlatform +@ stub RtwqLockSharedWorkQueue +@ stub RtwqLockWorkQueue +@ stub RtwqPutMultipleWaitingWorkItem +@ stub RtwqPutWaitingWorkItem +@ stub RtwqPutWorkItem +@ stub RtwqRegisterPlatformEvents +@ stub RtwqRegisterPlatformWithMMCSS +@ stub RtwqRemovePeriodicCallback +@ stub RtwqScheduleWorkItem +@ stub RtwqSetDeadline +@ stub RtwqSetDeadline2 +@ stub RtwqSetLongRunning +@ stub RtwqShutdown +@ stub RtwqStartup +@ stub RtwqUnjoinWorkQueue +@ stub RtwqUnlockPlatform +@ stub RtwqUnlockWorkQueue +@ stub RtwqUnregisterPlatformEvents +@ stub RtwqUnregisterPlatformFromMMCSS -- 2.24.1

1 8

[PATCH 1/5] quartz/tests: Add tests for AVI splitter pin connection.
by Zebediah Figura 05 Feb '20

05 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 458 +++++++++++++++++++++++++++++++++++ 1 file changed, 458 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 4af101767d6..23b7c5b9150 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -23,6 +23,7 @@ #include "dshow.h" #include "initguid.h" #include "wmcodecdsp.h" +#include "wine/strmbase.h" #include "wine/test.h" static IBaseFilter *create_avi_splitter(void) @@ -34,6 +35,12 @@ static IBaseFilter *create_avi_splitter(void) return filter; } +static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -792,6 +799,456 @@ static void test_enum_media_types(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; + struct strmbase_sink sink; + IAsyncReader IAsyncReader_iface, *reader; + const AM_MEDIA_TYPE *mt; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->source.pin; + else if (index == 1) + return &filter->sink.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_sink_cleanup(&filter->sink); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IAsyncReader)) + *out = &filter->IAsyncReader_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, + IPin *peer, const AM_MEDIA_TYPE *mt) +{ + HRESULT hr; + + iface->pin.peer = peer; + IPin_AddRef(peer); + CopyMediaType(&iface->pin.mt, mt); + + if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) + { + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + IPin_Release(peer); + iface->pin.peer = NULL; + FreeMediaType(&iface->pin.mt); + } + + return hr; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_query_interface = testsource_query_interface, + .base.pin_query_accept = testsource_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnAttemptConnection = testsource_AttemptConnection, +}; + +static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT testsink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + if (filter->mt && !compare_media_types(mt, filter->mt)) + return S_FALSE; + return S_OK; +} + +static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + if (!index && filter->mt) + { + CopyMediaType(mt, filter->mt); + return S_OK; + } + return VFW_S_NO_MORE_ITEMS; +} + +static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + return S_OK; +} + +static const struct strmbase_sink_ops testsink_ops = +{ + .base.pin_query_interface = testsink_query_interface, + .base.pin_query_accept = testsink_query_accept, + .base.pin_get_media_type = testsink_get_media_type, + .pfnReceive = testsink_Receive, +}; + +static struct testfilter *impl_from_IAsyncReader(IAsyncReader *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IAsyncReader_iface); +} + +static HRESULT WINAPI async_reader_QueryInterface(IAsyncReader *iface, REFIID iid, void **out) +{ + return IPin_QueryInterface(&impl_from_IAsyncReader(iface)->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI async_reader_AddRef(IAsyncReader *iface) +{ + return IPin_AddRef(&impl_from_IAsyncReader(iface)->source.pin.IPin_iface); +} + +static ULONG WINAPI async_reader_Release(IAsyncReader *iface) +{ + return IPin_Release(&impl_from_IAsyncReader(iface)->source.pin.IPin_iface); +} + +static HRESULT WINAPI async_reader_RequestAllocator(IAsyncReader *iface, + IMemAllocator *preferred, ALLOCATOR_PROPERTIES *props, IMemAllocator **allocator) +{ + return IAsyncReader_RequestAllocator(impl_from_IAsyncReader(iface)->reader, preferred, props, allocator); +} + +static HRESULT WINAPI async_reader_Request(IAsyncReader *iface, IMediaSample *sample, DWORD_PTR cookie) +{ + return IAsyncReader_Request(impl_from_IAsyncReader(iface)->reader, sample, cookie); +} + +static HRESULT WINAPI async_reader_WaitForNext(IAsyncReader *iface, + DWORD timeout, IMediaSample **sample, DWORD_PTR *cookie) +{ + return IAsyncReader_WaitForNext(impl_from_IAsyncReader(iface)->reader, timeout, sample, cookie); +} + +static HRESULT WINAPI async_reader_SyncReadAligned(IAsyncReader *iface, IMediaSample *sample) +{ + return IAsyncReader_SyncReadAligned(impl_from_IAsyncReader(iface)->reader, sample); +} + +static HRESULT WINAPI async_reader_SyncRead(IAsyncReader *iface, LONGLONG position, LONG length, BYTE *buffer) +{ + return IAsyncReader_SyncRead(impl_from_IAsyncReader(iface)->reader, position, length, buffer); +} + +static HRESULT WINAPI async_reader_Length(IAsyncReader *iface, LONGLONG *total, LONGLONG *available) +{ + return IAsyncReader_Length(impl_from_IAsyncReader(iface)->reader, total, available); +} + +static HRESULT WINAPI async_reader_BeginFlush(IAsyncReader *iface) +{ + return IAsyncReader_BeginFlush(impl_from_IAsyncReader(iface)->reader); +} + +static HRESULT WINAPI async_reader_EndFlush(IAsyncReader *iface) +{ + return IAsyncReader_EndFlush(impl_from_IAsyncReader(iface)->reader); +} + +static const struct IAsyncReaderVtbl async_reader_vtbl = +{ + async_reader_QueryInterface, + async_reader_AddRef, + async_reader_Release, + async_reader_RequestAllocator, + async_reader_Request, + async_reader_WaitForNext, + async_reader_SyncReadAligned, + async_reader_SyncRead, + async_reader_Length, + async_reader_BeginFlush, + async_reader_EndFlush, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + memset(filter, 0, sizeof(*filter)); + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); + strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); + filter->IAsyncReader_iface.lpVtbl = &async_reader_vtbl; +} + +static void test_connect_pin(void) +{ + AM_MEDIA_TYPE req_mt = + { + .majortype = MEDIATYPE_Stream, + .subtype = MEDIASUBTYPE_Avi, + .lSampleSize = 888, + }; + IBaseFilter *filter = create_avi_splitter(), *reader; + const WCHAR *filename = load_resource(L"test.avi"); + struct testfilter testsource, testsink; + IFileSourceFilter *filesource; + AM_MEDIA_TYPE mt, *source_mt; + IPin *sink, *source, *peer; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + BOOL ret; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + testfilter_init(&testsource); + testfilter_init(&testsink); + IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); + IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"splitter"); + IBaseFilter_FindPin(filter, L"input pin", &sink); + + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&reader); + IBaseFilter_QueryInterface(reader, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + IFileSourceFilter_Release(filesource); + IBaseFilter_FindPin(reader, L"Output", &source); + IPin_QueryInterface(source, &IID_IAsyncReader, (void **)&testsource.reader); + IPin_Release(source); + + /* Test sink connection. */ + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(sink, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(sink, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + req_mt.majortype = MEDIATYPE_Video; + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Stream; + + req_mt.subtype = MEDIASUBTYPE_RGB8; + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_Avi; + + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(sink, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &testsource.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(sink, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsource.source.pin.mt, &req_mt), "Media types didn't match.\n"); + + /* Test source connection. */ + + IBaseFilter_FindPin(filter, L"Stream 00", &source); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(source, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + /* Exact connection. */ + + IPin_EnumMediaTypes(source, &enummt); + IEnumMediaTypes_Next(enummt, 1, &source_mt, NULL); + IEnumMediaTypes_Release(enummt); + CopyMediaType(&req_mt, source_mt); + + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(source, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &testsink.sink.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(testsink.sink.pin.peer == source, "Got peer %p.\n", testsink.sink.pin.peer); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.lSampleSize = 999; + req_mt.bTemporalCompression = req_mt.bFixedSizeSamples = TRUE; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.majortype = MEDIATYPE_Stream; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.subtype = MEDIASUBTYPE_RGB32; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.subtype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } + req_mt.subtype = MEDIASUBTYPE_I420; + + /* Connection with wildcards. */ + + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.majortype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.subtype = MEDIASUBTYPE_RGB32; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + req_mt.subtype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.formattype = FORMAT_None; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + } + + req_mt.majortype = MEDIATYPE_Video; + req_mt.subtype = MEDIASUBTYPE_I420; + req_mt.formattype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.subtype = MEDIASUBTYPE_RGB32; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + req_mt.subtype = GUID_NULL; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&testsink.sink.pin.mt, source_mt), "Media types didn't match.\n"); + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + req_mt.majortype = MEDIATYPE_Audio; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + testsink.mt = &req_mt; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.subtype = MEDIASUBTYPE_I420; + req_mt.formattype = FORMAT_VideoInfo; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(source); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(testsource.source.pin.peer == sink, "Got peer %p.\n", testsource.source.pin.peer); + IFilterGraph2_Disconnect(graph, &testsource.source.pin.IPin_iface); + + CoTaskMemFree(req_mt.pbFormat); + CoTaskMemFree(source_mt->pbFormat); + CoTaskMemFree(source_mt); + + IAsyncReader_Release(testsource.reader); + IPin_Release(sink); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsource.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -1114,6 +1571,7 @@ START_TEST(avisplit) test_enum_media_types(); test_unconnected_filter_state(); test_filter_graph(); + test_connect_pin(); CoUninitialize(); } -- 2.25.0

1 4

[PATCH 1/2] comctl32/tests: Add a test for notification messages order in the monthcal control.
by Dmitry Timoshkov 05 Feb '20

05 Feb '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/monthcal.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 11a637fb82..974787ac36 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -47,6 +47,7 @@ static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND parent_wnd; +static BOOL got_MCN_SELECT, got_MCN_SELCHANGE; static const struct message create_parent_window_seq[] = { { WM_GETMINMAXINFO, sent }, @@ -544,6 +545,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if(GetWindowLongPtrA(nmchg->nmhdr.hwndFrom, GWLP_ID) != SEL_NOTIFY_TEST_ID) break; + + if (hdr->code == MCN_SELECT) + got_MCN_SELECT = TRUE; + else + got_MCN_SELCHANGE = TRUE; + SendMessageA(nmchg->nmhdr.hwndFrom, is_multisel ? MCM_GETSELRANGE : MCM_GETCURSEL, 0, (LPARAM)st); @@ -2032,8 +2039,21 @@ static void test_sel_notify(void) mchit.pt.y++; SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); } + got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + if (styles[i].val & MCS_MULTISELECT) +todo_wine + ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); + else + ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); + ok(!got_MCN_SELECT, "%d: MCN_SELECT should not be sent\n", i); + got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); + if (styles[i].val & MCS_MULTISELECT) + ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); + else + ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); + ok(got_MCN_SELECT, "%d: MCN_SELECT should be sent\n", i); DestroyWindow(hwnd); } } -- 2.20.1

1 1

[PATCH] testbot/LogUtils: Reorder the functions to get a more logical grouping.
by Francois Gouget 05 Feb '20

05 Feb '20

Add headers to each section. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 185 ++++++++++++++-------------- 1 file changed, 92 insertions(+), 93 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0a98a5a693..66359a9dc7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -63,6 +63,78 @@ sub _IsPerlError($) $Str =~ /^Possible precedence issue /; } +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a Wine +diagnostic line, a TestBot error, etc. + +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if (# Build messages + $Line =~ /^\+ \S/ or + $Line =~ /^LANG=/ or + $Line =~ /^Running (?:the tests|WineTest) / or + $Line =~ /^Task: (?:ok|tests|Updated)/) + { + return "info"; + } + if (# Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /: undefined reference to `/ or + $Line =~ /^make: [*]{3} No rule to make target / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^Task: / or + # Typical perl errors + _IsPerlError($Line)) + { + return "error"; + } + if ($Line =~ /:winediag:/) + { + if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree + # calls it as a test. + $Line =~ /CorIsLatestSvc If this function is called,/ or + # VMs and most test machines don't have a midi port. + $Line =~ /No software synthesizer midi port found,/ or + # Most VMs have limited OpenGL support. + $Line =~ /None of the requested D3D feature levels is supported / or + # The tests are not run as root. + $Line =~ /this requires special permissions/) + { + return "diag"; + } + return "error"; + } + if (# TestBot script error messages + $Line =~ /^[a-zA-Z.]+:error: / or + # TestBot error + $Line =~ /^BotError:/ or + $Line =~ /^Error:/ or + # X errors + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) + { + return "boterror"; + } + + return "none"; +} + =pod =over 12 @@ -138,13 +210,17 @@ sub ParseTaskLog($) } +# +# WineTest report parser +# + =pod =over 12 -=item C<GetLogLineCategory()> +=item C<GetReportLineCategory()> -Identifies the category of the given log line: an error message, a Wine -diagnostic line, a TestBot error, etc. +Identifies the category of the given test report line: an error message, +a todo, just an informational message or none of these. The category can then be used to decide whether to hide the line or, on the contrary, highlight it. @@ -152,69 +228,36 @@ the contrary, highlight it. =back =cut -sub GetLogLineCategory($) +sub GetReportLineCategory($) { my ($Line) = @_; - if (# Build messages - $Line =~ /^\+ \S/ or - $Line =~ /^LANG=/ or - $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests|Updated)/) + if ($Line =~ /: Test marked todo: /) { - return "info"; + return "todo"; } - if (# Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /: undefined reference to `/ or - $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^Task: / or - # Typical perl errors - _IsPerlError($Line)) + if ($Line =~ /: Tests skipped: / or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) { - return "error"; + return "skip"; } - if ($Line =~ /:winediag:/) + if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or + $Line =~ /Fatal: test .* does not exist/ or + $Line =~ / done $258$/ or + $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or + $Line =~ /^Unhandled exception: /) { - if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree - # calls it as a test. - $Line =~ /CorIsLatestSvc If this function is called,/ or - # VMs and most test machines don't have a midi port. - $Line =~ /No software synthesizer midi port found,/ or - # Most VMs have limited OpenGL support. - $Line =~ /None of the requested D3D feature levels is supported / or - # The tests are not run as root. - $Line =~ /this requires special permissions/) - { - return "diag"; - } return "error"; } - if (# TestBot script error messages - $Line =~ /^[a-zA-Z.]+:error: / or - # TestBot error - $Line =~ /^BotError:/ or - $Line =~ /^Error:/ or - # X errors - $Line =~ /^X Error of failed request: / or - $Line =~ / opcode of failed request: /) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) { - return "boterror"; + return "info"; } return "none"; } -# -# WineTest report parser -# - sub _NewCurrentUnit($$) { my ($Dll, $Unit) = @_; @@ -553,50 +596,6 @@ sub ParseWineTestReport($$$) } -=pod -=over 12 - -=item C<GetReportLineCategory()> - -Identifies the category of the given test report line: an error message, -a todo, just an informational message or none of these. - -The category can then be used to decide whether to hide the line or, on -the contrary, highlight it. - -=back -=cut - -sub GetReportLineCategory($) -{ - my ($Line) = @_; - - if ($Line =~ /: Test marked todo: /) - { - return "todo"; - } - if ($Line =~ /: Tests skipped: / or - $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) - { - return "skip"; - } - if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or - $Line =~ /Fatal: test .* does not exist/ or - $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: /) - { - return "error"; - } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) - { - return "info"; - } - - return "none"; -} - - # # Log querying and formatting # -- 2.20.1

1 0

[PATCH] testbot/doc: There is no direct dependency on DBD.
by Francois Gouget 05 Feb '20

05 Feb '20

Standardize the way the DBI::mysql dependency is documented. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4d430d9157..7ac155d09f 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -4,9 +4,9 @@ Dependencies: - Apache2 with mod_perl - MySQL -- Perl DBD and DBI::mysql modules - Sendmail and Procmail - Bytes::Random::Secure (libbytes-random-secure-perl) +- DBI::mysql (libdbd-mysql-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) -- 2.20.1

1 0

[PATCH] testbot/UpdateTaskLogs: Also remove the .err file for the step reference report.
by Francois Gouget 05 Feb '20

05 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 4ba383f5ab..4fe6ff3c42 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -341,6 +341,7 @@ sub ProcessTaskLogs($$$) $StepReportPath = $Step->GetFullFileName($StepReportName); } $Rc += Delete($StepReportPath, "unneeded"); + $Rc += Delete("$StepReportPath.err", "unneeded"); } my %LogMap = ( -- 2.20.1

1 0

[PATCH] itss/tests: Get rid of a2w() and strcmp_wa()
by Michael Stefaniuc 05 Feb '20

05 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/tests/protocol.c | 79 +++++++++++++++----------------------- 1 file changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index a41916b192..4cafba7b61 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -98,24 +98,6 @@ static const WCHAR cache_file3[] = {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; static const WCHAR *cache_file = cache_file1; -static const WCHAR *a2w(const char *str) -{ - static WCHAR bufs[8][128]; - static int i; - - if(!str) - return NULL; - - i = (i+1) % 8; - MultiByteToWideChar(CP_ACP, 0, str, -1, bufs[i], 128); - return bufs[i]; -} - -static int strcmp_wa(const WCHAR *str1, const char *str2) -{ - return lstrcmpW(str1, a2w(str2)); -} - static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { @@ -456,34 +438,34 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url, BOOL expect_m } static const struct { - const char *base_url; - const char *rel_url; + const WCHAR *base_url; + const WCHAR *rel_url; DWORD flags; HRESULT hres; - const char *combined_url; + const WCHAR *combined_url; } combine_tests[] = { - {"its:test.chm::/blank.html", "its:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, - {"mS-iTs:test.chm::/blank.html", "mS-iTs:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "test.chm::/test.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "te:t.html", 0, STG_E_INVALIDNAME, NULL}, - {"its:test.chm::/blank.html", "/test.html", URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "dir/test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, - {"test.html", "test.chm::/test.html", 0, 0x80041001, NULL}, - {"its:test:.chm::/blank.html", "test.html", 0, S_OK, "its:test:.chm::/test.html"}, - {"its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "its:test.chm::/dir/test.html"}, - {"its:test.chm::blank.html", "test.html", 0, S_OK, "its:test.chm::blank.htmltest.html"}, - {"ms-its:test.chm::/dir/blank.html", "test.html", 0, S_OK, "ms-its:test.chm::/dir/test.html"}, - {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, - {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, - {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, - {"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"}, - {"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"}, - {"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, - {"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, - {"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"}, - {"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"}, + {L"its:test.chm::/blank.html", L"its:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {L"mS-iTs:test.chm::/blank.html", L"mS-iTs:test.chm::/blank.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"test.chm::/test.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"/test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"te:t.html", 0, STG_E_INVALIDNAME, NULL}, + {L"its:test.chm::/blank.html", L"/test.html", URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"dir/test.html", 0, S_OK, L"its:test.chm::/dir/test.html"}, + {L"test.html", L"test.chm::/test.html", 0, 0x80041001, NULL}, + {L"its:test:.chm::/blank.html", L"test.html", 0, S_OK, L"its:test:.chm::/test.html"}, + {L"its:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"its:test.chm::/dir/test.html"}, + {L"its:test.chm::blank.html", L"test.html", 0, S_OK, L"its:test.chm::blank.htmltest.html"}, + {L"ms-its:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"ms-its:test.chm::/dir/test.html"}, + {L"mk:@MSITStore:test.chm::/dir/blank.html", L"test.html", 0, S_OK, L"mk:@MSITStore:test.chm::/dir/test.html"}, + {L"xxx:test.chm::/dir/blank.html", L"test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, + {L"its:test.chm::/dir/blank.html", L"/test.html", 0, S_OK, L"its:test.chm::/test.html"}, + {L"its:test.chm::/blank.html", L"#frag", 0, S_OK, L"its:test.chm::/blank.html#frag"}, + {L"its:test.chm::/blank.html#hash", L"#frag", 0, S_OK, L"its:test.chm::/blank.html#hash#frag"}, + {L"its:test.chm::/blank.html", L"test.html#frag", 0, S_OK, L"its:test.chm::/test.html#frag"}, + {L"its:test.chm::/blank.html", L"/test.html#frag", 0, S_OK, L"its:test.chm::/test.html#frag"}, + {L"its:test.chm::/blank.html", L"?query", 0, S_OK, L"its:test.chm::/?query"}, + {L"its:test.chm::/blank.html#frag/blank", L"test.html", 0, S_OK, L"its:test.chm::/blank.html#frag/test.html"}, }; static void test_its_protocol_info(IInternetProtocol *protocol) @@ -510,22 +492,21 @@ static void test_its_protocol_info(IInternetProtocol *protocol) for(i=0; i < ARRAY_SIZE(combine_tests); i++) { size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url), - a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf, - ARRAY_SIZE(buf), &size, 0); + hres = IInternetProtocolInfo_CombineUrl(info, combine_tests[i].base_url, + combine_tests[i].rel_url, combine_tests[i].flags, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n", i, hres, combine_tests[i].hres); - ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1 + ok(size == (combine_tests[i].combined_url ? lstrlenW(combine_tests[i].combined_url)+1 : 0xdeadbeef), "[%d] unexpected size=%d\n", i, size); if(combine_tests[i].combined_url) - ok(!strcmp_wa(buf, combine_tests[i].combined_url), "[%d] unexpected result: %s\n", i, wine_dbgstr_w(buf)); + ok(!lstrcmpW(buf, combine_tests[i].combined_url), "[%d] unexpected result: %s\n", i, wine_dbgstr_w(buf)); else ok(buf[0] == 0xfefe, "buf changed\n"); } size = 0xdeadbeef; memset(buf, 0xfe, sizeof(buf)); - hres = IInternetProtocolInfo_CombineUrl(info, a2w("its:test.chm::/blank.html"), a2w("test.html"), 0, buf, + hres = IInternetProtocolInfo_CombineUrl(info, L"its:test.chm::/blank.html", L"test.html", 0, buf, 1, &size, 0); ok(hres == E_OUTOFMEMORY, "CombineUrl failed: %08x\n", hres); ok(size == 25, "size=%d\n", size); -- 2.24.1

1 0

[PATCH] include: Add X3DAUDIO_CALCULATE_* defines.
by Alistair Leslie-Hughes 04 Feb '20

04 Feb '20

--- include/x3daudio.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/x3daudio.h b/include/x3daudio.h index a503507a40..0fd9a30092 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -87,6 +87,16 @@ typedef struct X3DAUDIO_DSP_SETTINGS { float ListenerVelocityComponent; } X3DAUDIO_DSP_SETTINGS; +#define X3DAUDIO_CALCULATE_MATRIX 0x00000001 +#define X3DAUDIO_CALCULATE_DELAY 0x00000002 +#define X3DAUDIO_CALCULATE_LPF_DIRECT 0x00000004 +#define X3DAUDIO_CALCULATE_LPF_REVERB 0x00000008 +#define X3DAUDIO_CALCULATE_REVERB 0x00000010 +#define X3DAUDIO_CALCULATE_DOPPLER 0x00000020 +#define X3DAUDIO_CALCULATE_EMITTER_ANGLE 0x00000040 +#define X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 +#define X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 + #define X3DAUDIO_HANDLE_BYTESIZE 20 typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE]; -- 2.24.1

1 0

[PATCH 1/2] testbot: Move reference logs to the task and prepare for having more than one.
by Francois Gouget 04 Feb '20

04 Feb '20

The old reference report filename format was '<vmname>_<reportname>' which means there could only be one per report. Each job should only have one report of a given type per VM so add it to the reference filename. Also the use of an underscore as the separator made it hard to split the components apart as both <vmname> and <reportname> can contain underscores such as 'w1064v1809_fr' and 'win32_fr_FR.report'. Dashes are a better choice since they are not allowed in either the VM name or the report name. So the new refeence filename format is '<vmname>-job<jobid>-<reportname>'. Note: * After applying this patch run UpdateTaskLogs to move and rename the existing reference reports. * When downgrading to run code before this patch it's best to run UpdateTaskLogs --delete before downgrading and then UpdateTaskLogs after the downgrade. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- To simplify one can just apply both patches in the series and then just run UpdateTaskLogs once to upgrade the existing reports and logs. It may be a good idea to run it as follows to help with debugging in case something goes wrong: cd testbot/var && ../bin/UpdateTaskLogs --debug 2>&1 | tee UpdateTaskLogs.log testbot/bin/Janitor.pl | 3 +- testbot/bin/UpdateTaskLogs | 113 +++++++++++++++++++++++--- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 5 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/JobDetails.pl | 4 +- 7 files changed, 110 insertions(+), 21 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index bf3989a712..dd13966018 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -314,7 +314,8 @@ if (opendir(my $dh, "$DataDir/latest")) my $Age = int((-M $FileName) + 0.5); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) + # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() + if ($Entry =~ /^([a-zA-Z0-9_]+)-job[0-9]+-[a-zA-Z0-9_]+\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are # retired or scheduled for deletion. diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 887061dab2..11dd6d31b9 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -261,18 +261,66 @@ sub DoUpdateLatestReport($$$) return $Rc; } +sub MoveRefReport($$;$) +{ + my ($RefDir, $RefName, $NewDir) = @_; + + my $RefPath = "$RefDir/$RefName"; + return Delete("$RefPath.err", "orphaned") if (!-f $RefPath); + + $NewDir ||= $RefDir; + my $NewName = $RefName; + if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?)$/) + { + # We don't know which job generated this reference log. + # So use a fixed, arbitrary JobId. + $NewName = "$1-job000000-$2"; + } + + my $NewPath = "$NewDir/$NewName"; + return 0 if ($RefPath eq $NewPath); + + my $Rc = 0; + my $TaskKey = Path2TaskKey($NewDir); + if (-f $NewPath and -M $NewPath <= -M $RefPath) + { + # A WineTest job has probably completed after the upgrade already + $Rc += Delete($RefPath); + $Rc += Delete("$RefPath.err"); + return $Rc; + } + + if (-f $NewPath) + { + Error "Could not move '$RefName' because '$NewName' already exists and is older!\n"; + return 1; + } + + my $RelRefDir = ($RefDir eq $NewDir) ? "" : "../"; + Debug("$TaskKey: $RelRefDir$RefName* -> $NewName\n"); + foreach my $Suffix ("", ".err") + { + next if (!-f "$RefPath$Suffix"); + next if (rename("$RefPath$Suffix", "$NewPath$Suffix")); + Error "Could not move '$RefName$Suffix' to '$NewName$Suffix' for $TaskKey: $!\n"; + $Rc = 1; + } + + return $Rc; +} + sub ProcessTaskLogs($$$) { my ($Step, $Task, $CollectOnly) = @_; my $Rc = 0; - my $StepDir = $Step->GetDir(); + my $ReportNames; my $TaskDir = $Task->GetDir(); - if (($OptDelete or $OptRebuild) and !$CollectOnly) + if (!$CollectOnly) { - # Save / delete the task's reference reports... all of them, - # even if they were not supposed to exist (e.g. failed builds). + # Upgrade the naming scheme of the task's old reference reports, + # delete those that are not meant to exist. my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); if ($ErrMessage) { @@ -280,9 +328,30 @@ sub ProcessTaskLogs($$$) $Rc = 1; } foreach my $ReportName (@$ReportNames) + { + my $StepReportName = $Task->VM->Name ."_$ReportName"; + my $StepReportPath = $Step->GetFullFileName($StepReportName); + if (-f "$TaskDir/$ReportName") + { + $Rc += MoveRefReport(dirname($StepReportPath), $StepReportName, $TaskDir); + # The old WineTest reference reports for Windows tasks may end up being + # duplicated: one copy in the build step and another in the step for + # the task. MoveRefReport() moved the latter, now ensure Delete() can + # remove the former. + $StepReportPath = $Step->GetFullFileName($StepReportName); + } + $Rc += Delete($StepReportPath, "unneeded"); + } + } + + if (($OptDelete or $OptRebuild) and !$CollectOnly) + { + # Save / delete the task's reference reports... all of them, + # even if they were not supposed to exist (e.g. failed builds). + foreach my $ReportName (@$ReportNames) { my $RefReportName = $Task->GetRefReportName($ReportName); - my $RefReportPath = "$StepDir/$RefReportName"; + my $RefReportPath = "$TaskDir/$RefReportName"; if (-f $RefReportPath or -f "$RefReportPath.err") { @@ -290,7 +359,7 @@ sub ProcessTaskLogs($$$) { # (Re)Build the .err file before adding the reference report to # latest/. - my $ErrMessage = BuildErrFile($StepDir, $RefReportName, 1, 0); + my $ErrMessage = BuildErrFile($TaskDir, $RefReportName, 1, 0); if (defined $ErrMessage) { Error "$ErrMessage\n"; @@ -315,7 +384,7 @@ sub ProcessTaskLogs($$$) { next if ($ReportName !~ /\.report$/); my $RefReportName = $Task->GetRefReportName($ReportName); - next if (-f "$StepDir/$RefReportName"); + next if (-f "$TaskDir/$RefReportName"); my $LatestReportPath = $LatestReports{$RefReportName}; if (!defined $LatestReportPath) @@ -328,9 +397,9 @@ sub ProcessTaskLogs($$$) Debug(TaskKeyStr($Task) .": Snapshotting $RefReportName from ". Path2TaskKey($LatestReportPath) ."\n"); foreach my $Suffix ("", ".err") { - unlink "$StepDir/$RefReportName$Suffix"; + unlink "$TaskDir/$RefReportName$Suffix"; if (-f "$LatestReportPath$Suffix" and - !link("$LatestReportPath$Suffix", "$StepDir/$RefReportName$Suffix")) + !link("$LatestReportPath$Suffix", "$TaskDir/$RefReportName$Suffix")) { Error "Could not link '$RefReportName$Suffix': $!\n"; $Rc = 1; @@ -390,18 +459,38 @@ sub ProcessLatestReports() my $Rc = 0; my $LatestGlob = "$DataDir/latest/*.report"; - # Perform cleanups and updates + # Delete or rename the old reference reports foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.err")) { my $RefReportName = basename($LatestReportPath); - # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() next if ($RefReportName !~ /^([a-zA-Z0-9_]+_[a-zA-Z0-9_]+\.report)(?:\.err)?$/); $RefReportName = $1; # untaint $LatestReportPath = "$DataDir/latest/$RefReportName"; if ($OptDelete or $OptRebuild) { - # Delete the reports that should be deleted / rebuilt + $Rc += Delete($LatestReportPath); + $Rc += Delete("$LatestReportPath.err"); + } + else + { + # MoveRefReport() also renames .err files + $Rc += MoveRefReport("$DataDir/latest", $RefReportName); + } + } + + # Then perform cleanups and rebuild missing files + foreach my $LatestReportPath (glob("$LatestGlob $LatestGlob.err")) + { + my $RefReportName = basename($LatestReportPath); + # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() + next if ($RefReportName !~ /^([a-zA-Z0-9_]+-job[0-9]+-[a-zA-Z0-9_]+\.report)(?:\.err)?$/); + $RefReportName = $1; # untaint + $LatestReportPath = "$DataDir/latest/$RefReportName"; + + if ($OptDelete or $OptRebuild) + { + # These can be rebuilt from the task reports $Rc += Delete($LatestReportPath); $Rc += Delete("$LatestReportPath.err"); } diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 44d7255e71..e0cd585b11 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -293,7 +293,7 @@ EOF next if (!$LogInfo->{ErrCount}); my $AllNew; - my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + my $RefReportPath = "$TaskDir/". $StepTask->GetRefReportName($LogName); TagNewErrors($RefReportPath, $LogInfo); if ($LogInfo->{NoRef}) { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5b567bc23b..36f367497b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1070,11 +1070,10 @@ sub SnapshotLatestReport($$) { next if (!-f "$DataDir/latest/$RefReportName$Suffix"); - # FIXME: The reference reports are stored at the step level! if (!link("$DataDir/latest/$RefReportName$Suffix", - "$TaskDir/../$RefReportName$Suffix")) + "$TaskDir/$RefReportName$Suffix")) { - push @ErrMessages, "Could not create the '../$RefReportName$Suffix' link: $!"; + push @ErrMessages, "Could not create the '$RefReportName$Suffix' link: $!"; } } diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index bad0e24375..f65e6a6327 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -71,7 +71,7 @@ sub GetTaskDir($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - return $self->VM->Name ."_$ReportName"; + return $self->VM->Name ."-job000000-$ReportName"; } sub GetTitle($) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 1a46f0d57c..7b9ac9b816 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -141,7 +141,7 @@ sub GetReportNames($) sub GetRefReportName($$) { my ($self, $ReportName) = @_; - return $self->VM->Name ."_$ReportName"; + return $self->VM->Name ."-job000000-$ReportName"; } sub _SetupTask($$) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index f1ffd498ed..3dce91595d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -494,7 +494,7 @@ EOF if ($LogInfo->{ErrCount}) { # Identify new errors in test reports - my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($MoreInfo->{Full})); + my $RefReportPath = "$TaskDir/". $StepTask->GetRefReportName($MoreInfo->{Full}); TagNewErrors($RefReportPath, $LogInfo); } } @@ -563,7 +563,7 @@ EOF if ($LogName =~ /\.report$/) { # For test reports try to identify the new errors - my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + my $RefReportPath = "$TaskDir/". $StepTask->GetRefReportName($LogName); TagNewErrors($RefReportPath, $LogInfo); } -- 2.20.1

1 2

[PATCH v5] ucrtbase: Added stub for _get_FMA3_enable.
by Piotr Caban 04 Feb '20

04 Feb '20

From: Rosa Hase <daxcore(a)online.de> Proton-Bug: https://github.com/ValveSoftware/Proton/issues/3227 Signed-off-by: Rosa Hase <daxcore(a)online.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v5: - don't export the function from msvcr120.dll .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcrt/math.c | 15 ++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-)

2 1

[PATCH] ucrtbase: added function implementation for get_FMA3_enable
by daxcore 04 Feb '20

04 Feb '20

replaced the stub with a real implementation for FMA3 Proton-Bug: https://github.com/ValveSoftware/Proton/issues/3227 --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 1 + dlls/msvcrt/math.c | 14 ++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index cb8fdc9227..579b97fee3 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -81,7 +81,7 @@ @ cdecl _fpclass(double) ucrtbase._fpclass @ stub _fpclassf @ cdecl -arch=i386 -ret64 _ftol() ucrtbase._ftol -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() ucrtbase._get_FMA3_enable @ cdecl _hypot(double double) ucrtbase._hypot @ cdecl _hypotf(float float) ucrtbase._hypotf @ cdecl _isnan(double) ucrtbase._isnan diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 903f4b7ce3..1016f6a649 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1639,6 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable +@ cdecl -arch=win64 _get_FMA3_enable() MSVCRT__get_FMA3_enable @ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f6824128cd..80e73ccefe 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -118,6 +118,20 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) } #if defined(_WIN64) && _MSVCR_VER>=120 +/********************************************************************* + * _get_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__get_FMA3_enable(void) +{ + #if !defined(__FMA__) && defined(__AVX2__) + #define __FMA__ 1 + #endif + #if defined(__FMA__) + return 1; + #endif + return 0; +} + /********************************************************************* * _set_FMA3_enable (MSVCR120.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 568019da51..6cac7a5ef5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -357,7 +357,7 @@ @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() MSVCRT__get_FMA3_enable @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) -- 2.25.0

6 11

[PATCH v8] include: Add xact3.idl
by Alistair Leslie-Hughes 04 Feb '20

04 Feb '20

From: Ethan Lee <elee(a)codeweavers.com> v8. Fixed nameless union. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3.idl | 533 ++++++++++++++++++++++++++++++++++++++++++++ include/xact3wb.h | 2 + 3 files changed, 536 insertions(+) create mode 100644 include/xact3.idl diff --git a/include/Makefile.in b/include/Makefile.in index 5f967b616d..909f025261 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -773,6 +773,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3.idl \ xact3wb.h \ xapo.idl \ xapofx.h \ diff --git a/include/xact3.idl b/include/xact3.idl new file mode 100644 index 0000000000..e073b6b605 --- /dev/null +++ b/include/xact3.idl @@ -0,0 +1,533 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "xaudio2.idl"; + +import "xact3wb.h"; + +[ + uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) +] +coclass XACTEngine +{ +} + +interface IXACT3Engine; +interface IXACT3SoundBank; +interface IXACT3WaveBank; +interface IXACT3Cue; +interface IXACT3Wave; + +typedef WORD XACTCATEGORY; +typedef BYTE XACTCHANNEL; +typedef WORD XACTINDEX; +typedef BYTE XACTINSTANCELIMIT; +typedef BYTE XACTLOOPCOUNT; +typedef BYTE XACTNOTIFICATIONTYPE; +typedef SHORT XACTPITCH; +typedef LONG XACTTIME; +typedef WORD XACTVARIABLEINDEX; +typedef FLOAT XACTVARIABLEVALUE; +typedef BYTE XACTVARIATIONWEIGHT; +typedef FLOAT XACTVOLUME; + +#define XACT_RENDERER_ID_LENGTH 0xff +#define XACT_RENDERER_NAME_LENGTH 0xff +#define XACT_CUE_NAME_LENGTH 0xff + +cpp_quote("#ifndef WAVEBANK_ENTRYNAME_LENGTH") +#define WAVEBANK_ENTRYNAME_LENGTH 64 +cpp_quote("#endif") + +typedef struct XACT_RENDERER_DETAILS +{ + WCHAR rendererID[XACT_RENDERER_ID_LENGTH]; + WCHAR displayName[XACT_RENDERER_NAME_LENGTH]; + BOOL defaultDevice; +} XACT_RENDERER_DETAILS; + +typedef BOOL (__stdcall *XACT_READFILE_CALLBACK)( + HANDLE hFile, + LPVOID lpBuffer, + DWORD nNumberOfBytesRead, + LPDWORD lpNumberOfBytesRead, + void* lpOverlapped +); +typedef BOOL (__stdcall *XACT_GETOVERLAPPEDRESULT_CALLBACK)( + HANDLE hFile, + void* lpOverlapped, + LPDWORD lpNumberOfBytesTransferred, + BOOL bWait +); +typedef struct XACT_FILEIO_CALLBACKS +{ + XACT_READFILE_CALLBACK readFileCallback; + XACT_GETOVERLAPPEDRESULT_CALLBACK getOverlappedResultCallback; +} XACT_FILEIO_CALLBACKS; + +typedef struct XACT_NOTIFICATION XACT_NOTIFICATION; +typedef void (__stdcall *XACT_NOTIFICATION_CALLBACK)( + const XACT_NOTIFICATION *pNotification +); + +typedef struct XACT_RUNTIME_PARAMETERS +{ + DWORD lookAheadTime; + void* pGlobalSettingsBuffer; + DWORD globalSettingsBufferSize; + DWORD globalSettingsFlags; + DWORD globalSettingsAllocAttributes; + XACT_FILEIO_CALLBACKS fileIOCallbacks; + XACT_NOTIFICATION_CALLBACK fnNotificationCallback; + LPCWSTR pRendererID; + IXAudio2 *pXAudio2; + IXAudio2MasteringVoice *pMasteringVoice; +} XACT_RUNTIME_PARAMETERS; + +typedef struct XACT_STREAMING_PARAMETERS +{ + HANDLE file; + DWORD offset; + DWORD flags; + WORD packetSize; +} XACT_STREAMING_PARAMETERS; + +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES; + +cpp_quote("#if 0") +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES waveProperties; /* properties is a keyword for midl */ + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES; +cpp_quote("#endif") + +cpp_quote("typedef struct XACT_WAVE_INSTANCE_PROPERTIES") +cpp_quote("{") +cpp_quote(" XACT_WAVE_PROPERTIES properties;") +cpp_quote(" BOOL backgroundMusic;") +cpp_quote("} XACT_WAVE_INSTANCE_PROPERTIES;") + +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[XACT_CUE_NAME_LENGTH]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES; + +cpp_quote("#include <pshpack1.h>") + +typedef struct XACT_NOTIFICATION_DESCRIPTION +{ + XACTNOTIFICATIONTYPE type; + BYTE flags; + IXACT3SoundBank *pSoundBank; + IXACT3WaveBank *pWaveBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; + XACTINDEX cueIndex; + XACTINDEX waveIndex; + void* pvContext; +} XACT_NOTIFICATION_DESCRIPTION; + +typedef struct XACT_NOTIFICATION_CUE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; +} XACT_NOTIFICATION_CUE; + +typedef struct XACT_NOTIFICATION_MARKER +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + DWORD marker; +} XACT_NOTIFICATION_MARKER; + +typedef struct XACT_NOTIFICATION_SOUNDBANK +{ + IXACT3SoundBank *pSoundBank; +} XACT_NOTIFICATION_SOUNDBANK; + +typedef struct XACT_NOTIFICATION_WAVEBANK +{ + IXACT3WaveBank *pWaveBank; +} XACT_NOTIFICATION_WAVEBANK; + +typedef struct XACT_NOTIFICATION_VARIABLE +{ + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + XACTVARIABLEINDEX variableIndex; + XACTVARIABLEVALUE variableValue; + BOOL local; +} XACT_NOTIFICATION_VARIABLE; + +typedef struct XACT_NOTIFICATION_GUI +{ + DWORD reserved; +} XACT_NOTIFICATION_GUI; + +typedef struct XACT_NOTIFICATION_WAVE +{ + IXACT3WaveBank *pWaveBank; + XACTINDEX waveIndex; + XACTINDEX cueIndex; + IXACT3SoundBank *pSoundBank; + IXACT3Cue *pCue; + IXACT3Wave *pWave; +} XACT_NOTIFICATION_WAVE; + +struct XACT_NOTIFICATION +{ + XACTNOTIFICATIONTYPE type; + LONG timeStamp; + PVOID pvContext; + union + { + XACT_NOTIFICATION_CUE cue; + XACT_NOTIFICATION_MARKER marker; + XACT_NOTIFICATION_SOUNDBANK soundBank; + XACT_NOTIFICATION_WAVEBANK waveBank; + XACT_NOTIFICATION_VARIABLE variable; + XACT_NOTIFICATION_GUI gui; + XACT_NOTIFICATION_WAVE wave; + } DUMMYUNIONNAME; +}; + +cpp_quote("#include <poppack.h>") + +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_CUEDESTROYED = 4; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED = 6; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED = 7; +static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED = 16; + +[ + object, + local, + uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), +] +interface IXACT3Engine : IUnknown +{ + HRESULT GetRendererCount(XACTINDEX *pnRendererCount); + + HRESULT GetRendererDetails( + XACTINDEX nRendererIndex, + XACT_RENDERER_DETAILS *pRendererDetails); + + HRESULT GetFinalMixFormat(WAVEFORMATEXTENSIBLE *pFinalMixFormat); + + HRESULT Initialize(const XACT_RUNTIME_PARAMETERS *pParams); + + HRESULT ShutDown(); + + HRESULT DoWork(); + + HRESULT CreateSoundBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3SoundBank **ppSoundBank); + + HRESULT CreateInMemoryWaveBank( + const void* pvBuffer, + DWORD dwSize, + DWORD dwFlags, + DWORD dwAllocAttributes, + IXACT3WaveBank **ppWaveBank); + + HRESULT CreateStreamingWaveBank( + const XACT_STREAMING_PARAMETERS *pParms, + IXACT3WaveBank **ppWaveBank); + + HRESULT PrepareWave( + DWORD dwFlags, + LPCSTR szWavePath, + WORD wStreamingPacketSize, + DWORD dwAlignment, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareInMemoryWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + DWORD *pdwSeekTable, + BYTE *pbWaveData, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT PrepareStreamingWave( + DWORD dwFlags, + WAVEBANKENTRY entry, + XACT_STREAMING_PARAMETERS streamingParams, + DWORD dwAlignment, + DWORD *pdwSeekTable, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT RegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + HRESULT UnRegisterNotification( + const XACT_NOTIFICATION_DESCRIPTION *pNotificationDesc); + + XACTCATEGORY GetCategory( + LPCSTR szFriendlyName); + + HRESULT Stop(XACTCATEGORY nCategory, DWORD dwFlags); + + HRESULT SetVolume(XACTCATEGORY nCategory, XACTVOLUME nVolume); + + HRESULT Pause(XACTCATEGORY nCategory, BOOL fPause); + + XACTVARIABLEINDEX GetGlobalVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE nValue); + + HRESULT GetGlobalVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); +} + +[ + object, + local +] +interface IXACT3SoundBank +{ + XACTINDEX GetCueIndex(LPCSTR szFriendlyName); + + HRESULT GetNumCues(XACTINDEX *pnNumCues); + + HRESULT GetCueProperties( + XACTINDEX nCueIndex, + XACT_CUE_PROPERTIES *pProperties); + + HRESULT Prepare( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Play( + XACTINDEX nCueIndex, + DWORD dwFlags, + XACTTIME timeOffset, + IXACT3Cue **ppCue); + + HRESULT Stop(XACTINDEX nCueIndex, DWORD dwFlags); + + HRESULT Destroy(); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT3WaveBank +{ + HRESULT Destroy(); + + HRESULT GetNumWaves(XACTINDEX *pnNumWaves); + + XACTINDEX GetWaveIndex(LPCSTR szFriendlyName); + + HRESULT GetWaveProperties( + XACTINDEX nWaveIndex, + XACT_WAVE_PROPERTIES *pWaveProperties); + + HRESULT Prepare( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Play( + XACTINDEX nWaveIndex, + DWORD dwFlags, + DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, + IXACT3Wave **ppWave); + + HRESULT Stop(XACTINDEX nWaveIndex, DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); +} + +[ + object, + local +] +interface IXACT34Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); +} + +[ + object, + local +] +interface IXACT3Cue +{ + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT GetState(DWORD *pdwState); + + HRESULT Destroy(); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + XACTVARIABLEINDEX GetVariableIndex(LPCSTR szFriendlyName); + + HRESULT SetVariable(XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue); + + HRESULT GetVariable( + XACTVARIABLEINDEX nIndex, + XACTVARIABLEVALUE *nValue); + + HRESULT Pause(BOOL fPause); + + HRESULT GetProperties(XACT_CUE_INSTANCE_PROPERTIES **ppProperties); + + HRESULT SetOutputVoices(const XAUDIO2_VOICE_SENDS *pSendList); + + HRESULT SetOutputVoiceMatrix( + IXAudio2Voice *pDestinationVoice, + UINT32 SourceChannels, + UINT32 DestinationChannels, + const float *pLevelMatrix); +} + +[ + object, + local +] +interface IXACT3Wave +{ + HRESULT Destroy(); + + HRESULT Play(); + + HRESULT Stop(DWORD dwFlags); + + HRESULT Pause(BOOL fPause); + + HRESULT GetState(DWORD *pdwState); + + HRESULT SetPitch(XACTPITCH pitch); + + HRESULT SetVolume(XACTVOLUME volume); + + HRESULT SetMatrixCoefficients( + UINT32 uSrcChannelCount, + UINT32 uDstChannelCount, + float *pMatrixCoefficients); + + HRESULT GetProperties(XACT_WAVE_INSTANCE_PROPERTIES *pProperties); +} diff --git a/include/xact3wb.h b/include/xact3wb.h index b4c5a53d40..130efc9745 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -18,6 +18,8 @@ #ifndef __XACT3WB_H__ #define __XACT3WB_H__ +#define WAVEBANK_ENTRYNAME_LENGTH 64 + typedef union WAVEBANKMINIWAVEFORMAT { struct -- 2.24.1

1 0

[PATCH] Make CallProcEx32W16 clear CPEX_DEST_CDECL flag in 'nrofargs' argument before looping over arguments. The flag being set previously caused the procedure to try to loop over 2^31 + n arguments, triggering an exception.
by Dirk Niggemann 04 Feb '20

04 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48480 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> --- dlls/krnl386.exe16/thunk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index c8ad3824c0..f12766d7d9 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2477,9 +2477,9 @@ DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32 DWORD args[32]; unsigned int i; - TRACE("(%d,%d,%p args[",nrofargs,argconvmask,proc32); + TRACE("(%s,%d,%d,%p args[",nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall",nrofargs & ~CPEX_DEST_CDECL,argconvmask,proc32); - for (i=0;i<nrofargs;i++) + for (i=0;i<(nrofargs & ~CPEX_DEST_CDECL);i++) { if (argconvmask & (1<<i)) { -- 2.17.2 (Apple Git-113)

1 0

[PATCH resend] msctf: Always provide a context when from GetBase/Top.
by Derek Lesho 04 Feb '20

04 Feb '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/msctf/documentmgr.c | 20 +++++++++++++++++--- dlls/msctf/tests/inputprocessor.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 44856db632..37d55557f5 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -44,6 +44,7 @@ typedef struct tagDocumentMgr { /* Aggregation */ ITfCompartmentMgr *CompartmentMgr; + ITfContext* initialContext; ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; @@ -87,6 +88,8 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfThreadMgr_Release(tm); } + if (This->initialContext) + ITfContext_Release(This->initialContext); if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) @@ -222,14 +225,21 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = impl_from_ITfDocumentMgr(iface); + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[0]) - ITfContext_AddRef(This->contextStack[0]); + tgt = This->contextStack[0]; + else + tgt = This->initialContext; + + if (tgt) + ITfContext_AddRef(tgt); - *ppic = This->contextStack[0]; + *ppic = tgt; return S_OK; } @@ -245,8 +255,10 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **pp if (This->contextStack[1]) tgt = This->contextStack[1]; - else + else if (This->contextStack[0]) tgt = This->contextStack[0]; + else + tgt = This->initialContext; if (tgt) ITfContext_AddRef(tgt); @@ -342,6 +354,7 @@ static const ITfSourceVtbl DocumentMgrSourceVtbl = HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; + DWORD cookie; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DocumentMgr)); if (This == NULL) @@ -354,6 +367,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + Context_Constructor(processId,NULL,&This->ITfDocumentMgr_iface, &This->initialContext, &cookie); *ppOut = &This->ITfDocumentMgr_iface; TRACE("returning %p\n", *ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea40..52921ec7cd 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1639,10 +1639,10 @@ static HRESULT TextEditSink_Constructor(ITfTextEditSink **ppOut) static void test_startSession(void) { HRESULT hr; - DWORD cnt; + DWORD cnt, initial_ctx_cnt; DWORD editCookie; ITfDocumentMgr *dmtest; - ITfContext *cxt,*cxt2,*cxt3,*cxtTest; + ITfContext *cxt,*cxt2,*cxt3,*cxtTest,*initial_ctx; ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1684,6 +1684,23 @@ static void test_startSession(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + test_OnPushContext = SINK_EXPECTED; + test_OnInitDocumentMgr = SINK_EXPECTED; + + /* For some reason, even when the object isn't initialized, this yields a context */ + hr = ITfDocumentMgr_GetBase(g_dm, &initial_ctx); + ok(SUCCEEDED(hr), "GetBase Failed\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr), "GetTop Failed\n"); + ok(cxtTest == initial_ctx, "GetTop != GetBase\n"); + + ok(initial_ctx != NULL, "Expected initial context\n"); + initial_ctx_cnt = check_context_refcount(initial_ctx); + hr = ITfContext_GetDocumentMgr(initial_ctx,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + test_EnumDocumentMgr(g_tm,g_dm,NULL); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dmtest); @@ -1740,6 +1757,7 @@ static void test_startSession(void) test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; test_OnInitDocumentMgr = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt); ok(SUCCEEDED(hr),"Push Failed\n"); ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); @@ -1749,6 +1767,9 @@ static void test_startSession(void) test_EnumContexts(g_dm, cxt); + /* the initial context is released with the document manager */ + ok(initial_ctx_cnt == check_context_refcount(initial_ctx), "Context ref count changed after documentmgr initialization\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1859,6 +1880,7 @@ static void test_startSession(void) ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITfContext_Release(initial_ctx); ITextStoreACP_Release(ts); } -- 2.25.0

2 1

[PATCH 1/3] ntdll/tests: Simplify test_file_name_information().
by Zebediah Figura 04 Feb '20

04 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/file.c | 133 ++++++++++------------------------------ 1 file changed, 34 insertions(+), 99 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 539ce44e0a4..21889870499 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3146,131 +3146,66 @@ todo_wine static void test_file_name_information(void) { - WCHAR *file_name, *volume_prefix, *expected; - FILE_NAME_INFORMATION *info; + char buffer[300]; + FILE_NAME_INFORMATION *info = (FILE_NAME_INFORMATION *)buffer; ULONG old_redir = 1, tmp; - UINT file_name_size; IO_STATUS_BLOCK io; - UINT info_size; - HRESULT hr; + NTSTATUS status; HANDLE h; - UINT len; - - /* GetVolumePathName is not present before w2k */ - if (!pGetVolumePathNameW) { - win_skip("GetVolumePathNameW not found\n"); - return; - } - - file_name_size = GetSystemDirectoryW( NULL, 0 ); - file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); - volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - - len = GetSystemDirectoryW( file_name, file_name_size ); - ok(len == file_name_size - 1, - "GetSystemDirectoryW returned %u, expected %u.\n", - len, file_name_size - 1); - - len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); - ok(len, "GetVolumePathNameW failed.\n"); - - len = lstrlenW( volume_prefix ); - if (len && volume_prefix[len - 1] == '\\') --len; - memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); - expected[file_name_size - len - 1] = '\0'; - - /* A bit more than we actually need, but it keeps the calculation simple. */ - info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); - info = HeapAlloc( GetProcessHeap(), 0, info_size ); if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( TRUE, &old_redir ); - h = CreateFileW( file_name, GENERIC_READ, + h = CreateFileW( L"C:/windows/system32", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); if (pRtlWow64EnableFsRedirectionEx) pRtlWow64EnableFsRedirectionEx( old_redir, &tmp ); ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); - ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", hr); + status = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", status); - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); - ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", - hr, STATUS_BUFFER_OVERFLOW); - ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", - U(io).Status, STATUS_BUFFER_OVERFLOW); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x.\n", status); + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x.\n", U(io).Status); + ok(info->FileNameLength == wcslen( L"\\windows\\system32" ) * sizeof(WCHAR), + "info->FileNameLength is %u\n", info->FileNameLength); + ok(!wcsnicmp( info->FileName, L"\\w", 2 ), "Got file name %s.\n", debugstr_wn( info->FileName, 2 )); ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); - ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), - "info->FileName[1] is %p, expected %p.\n", - CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(buffer), FileNameInformation ); + ok(!status, "Got status %#x.\n", status); + ok(!U(io).Status, "Got io.Status %#x.\n", U(io).Status); + ok(info->FileNameLength == wcslen( L"\\windows\\system32" ) * sizeof(WCHAR), + "info->FileNameLength is %u\n", info->FileNameLength); ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[len] is %#x, expected 0xcccc.\n", info->FileName[info->FileNameLength / sizeof(WCHAR)]); info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; - ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", - wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + ok(!wcsicmp( info->FileName, L"\\windows\\system32" ), "Got file name %s.\n", debugstr_w( info->FileName )); ok(io.Information == FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength, "io.Information is %lu, expected %u.\n", io.Information, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength); CloseHandle( h ); - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, expected ); - HeapFree( GetProcessHeap(), 0, volume_prefix ); - if (old_redir || !pGetSystemWow64DirectoryW || !(file_name_size = pGetSystemWow64DirectoryW( NULL, 0 ))) + if (!old_redir && pGetSystemWow64DirectoryW && pGetSystemWow64DirectoryW( NULL, 0 )) { - skip("Not running on WoW64, skipping test.\n"); - HeapFree( GetProcessHeap(), 0, file_name ); - return; - } - - h = CreateFileW( file_name, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); - ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - HeapFree( GetProcessHeap(), 0, file_name ); - - file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); - volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); - expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*expected) ); - - len = pGetSystemWow64DirectoryW( file_name, file_name_size ); - ok(len == file_name_size - 1, - "GetSystemWow64DirectoryW returned %u, expected %u.\n", - len, file_name_size - 1); - - len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); - ok(len, "GetVolumePathNameW failed.\n"); + h = CreateFileW( L"C:/windows/system32", GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); - len = lstrlenW( volume_prefix ); - if (len && volume_prefix[len - 1] == '\\') --len; - memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); - expected[file_name_size - len - 1] = '\0'; - - info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); - info = HeapAlloc( GetProcessHeap(), 0, info_size ); - - memset( info, 0xcc, info_size ); - hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); - ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); - info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; - ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", - wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + memset( info, 0xcc, sizeof(buffer) ); + status = pNtQueryInformationFile( h, &io, info, sizeof(buffer), FileNameInformation ); + ok(!status, "Got status %#x.\n", status); + info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!wcsicmp( info->FileName, L"\\windows\\syswow64" ), "Got file name %s.\n", debugstr_w( info->FileName )); - CloseHandle( h ); - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, expected ); - HeapFree( GetProcessHeap(), 0, volume_prefix ); - HeapFree( GetProcessHeap(), 0, file_name ); + CloseHandle( h ); + } + else + skip("Not running on WoW64, skipping test.\n"); } static void test_file_all_name_information(void) -- 2.25.0

2 3

[PATCH] bcrypt/tests: Get rid of strcmp_wa()
by Michael Stefaniuc 04 Feb '20

04 Feb '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 45 +++++++++++++++----------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d26150f469..0dc2085111 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -155,13 +155,6 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) return; } -static int strcmp_wa(const WCHAR *strw, const char *stra) -{ - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); - return lstrcmpW(strw, buf); -} - #define test_object_length(a) _test_object_length(__LINE__,a) static void _test_object_length(unsigned line, void *handle) { @@ -211,7 +204,7 @@ static void _test_hash_length(unsigned line, void *handle, ULONG exlen) } #define test_alg_name(a,b) _test_alg_name(__LINE__,a,b) -static void _test_alg_name(unsigned line, void *handle, const char *exname) +static void _test_alg_name(unsigned line, void *handle, const WCHAR *exname) { ULONG size = 0xdeadbeef; UCHAR buf[256]; @@ -220,13 +213,14 @@ static void _test_alg_name(unsigned line, void *handle, const char *exname) status = pBCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); - ok_(__FILE__,line)(size == (strlen(exname)+1)*sizeof(WCHAR), "got %u\n", size); - ok_(__FILE__,line)(!strcmp_wa(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), exname); + ok_(__FILE__,line)(size == (lstrlenW(exname)+1)*sizeof(WCHAR), "got %u\n", size); + ok_(__FILE__,line)(!lstrcmpW(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), + wine_dbgstr_w(exname)); } struct hash_test { - const char *alg; + const WCHAR *alg; unsigned hash_size; const char *hash; const char *hash2; @@ -239,15 +233,12 @@ static void test_hash(const struct hash_test *test) BCRYPT_ALG_HANDLE alg; BCRYPT_HASH_HANDLE hash; UCHAR buf[512], buf_hmac[1024], hash_buf[128], hmac_hash[128]; - WCHAR alg_name[64]; char str[512]; NTSTATUS ret; ULONG len; - MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, ARRAY_SIZE(alg_name)); - alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, 0); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -312,7 +303,7 @@ static void test_hash(const struct hash_test *test) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); alg = NULL; - ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ret = pBCryptOpenAlgorithmProvider(&alg, test->alg, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(alg != NULL, "alg not set\n"); @@ -380,19 +371,19 @@ static void test_hashes(void) { static const struct hash_test tests[] = { - { "SHA1", 20, + { L"SHA1", 20, "961fa64958818f767707072755d7018dcd278e94", "9314f62ff64197143c91fc86de37e9ae776a3fb8", "2472cf65d0e090618d769d3e46f0d9446cf212da", "b2d2ba8cfd714d474cf0d9622cc5d15e1f53d53f", }, - { "SHA256", 32, + { L"SHA256", 32, "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", "ea0938c118a7b15954f41b85195f2b42aec3a9429c63f593cfa65c137ffaa986", "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72", "55feb7052060bd99e33f36eb0982c7f4856eb6a84fbefe19a1afd9faafc3af6f", }, - { "SHA384", 48, + { L"SHA384", 48, "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" "63eed1e743a692d70e0504b0cfd12ef9", "724db7c0bbc51ef1ac3fc793083fc54c0e5c423faec9b11378c01c236b19aaaf" @@ -402,7 +393,7 @@ static void test_hashes(void) "03e1818e5c165a0e54619e513acb06c393e1a6cb0ddbb4036b5f29617b334642" "e6e0be8b214d8508595b17a8c4b4e7db", }, - { "SHA512", 64, + { L"SHA512", 64, "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", "7752d707b54d2b00e7d1c09120d189475b0fd2e31ebb988cf0a01fc8492ddc0b" @@ -412,19 +403,19 @@ static void test_hashes(void) "1487bcecba46ae677622fa499e4cb2f0fdf92f6f3427cba76382d537a06e49c3" "3e70a2fc1fc730092bf21128c3704cc6387f6dfbf7e2f9f315bbb894505a1205", }, - { "MD2", 16, + { L"MD2", 16, "1bb33606ba908912a84221109d29cd7e", "b9a6ad9323b17e2d0cd389dddd6ef78a", "7f05b0638d77f4a27f3a9c4d353cd648", "05980873e6bfdd05dd7b30078de7e42a", }, - { "MD4", 16, + { L"MD4", 16, "74b5db93c0b41e36ca7074338fc0b637", "a14a9ff2059a8c28f47b01e6bc48a1bf", "bc2e8ac4d8248ed21b8d26227a30ea3a", "b609db0eb4b8669db74f2c20099701e4", }, - { "MD5", 16, + { L"MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", "bcdd7ca574342aa9db0e212348eacb16", "7bda029b93fa8d817fcc9e13d6bdf092", @@ -460,7 +451,7 @@ static void test_BcryptHash(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 16); - test_alg_name(alg, "MD5"); + test_alg_name(alg, L"MD5"); memset(md5, 0, sizeof(md5)); ret = pBCryptHash(alg, NULL, 0, (UCHAR *)"test", sizeof("test"), md5, sizeof(md5)); @@ -541,7 +532,7 @@ static void test_BcryptDeriveKeyPBKDF2(void) ok(alg != NULL, "alg not set\n"); test_hash_length(alg, 20); - test_alg_name(alg, "SHA1"); + test_alg_name(alg, L"SHA1"); ret = pBCryptDeriveKeyPBKDF2(alg, rfc6070[0].pwd, rfc6070[0].pwd_len, rfc6070[0].salt, rfc6070[0].salt_len, 0, buf, rfc6070[0].dk_len, 0); @@ -581,7 +572,7 @@ static void test_rng(void) ret = pBCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); - test_alg_name(alg, "RNG"); + test_alg_name(alg, L"RNG"); memset(buf, 0, 16); ret = pBCryptGenRandom(alg, buf, 8, 0); @@ -654,7 +645,7 @@ static void test_aes(void) ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); ok(size == 64, "got %u\n", size); - test_alg_name(alg, "AES"); + test_alg_name(alg, L"AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); -- 2.24.1

1 0

[PATCH 1/3] kernelbase: Return FALSE in ContinueDebugEvent if status is unknown.
by Rémi Bernon 04 Feb '20

04 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/debug.c | 7 +++++++ dlls/ntdll/tests/exception.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 53b95aa6dda..d99309377f0 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -70,6 +70,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH CheckRemoteDebuggerPresent( HANDLE process, BOOL * BOOL WINAPI DECLSPEC_HOTPATCH ContinueDebugEvent( DWORD pid, DWORD tid, DWORD status ) { BOOL ret; + + if (status != DBG_EXCEPTION_NOT_HANDLED && status != DBG_CONTINUE) + { + FIXME("Unknown status %x\n", status); + return FALSE; + } + SERVER_START_REQ( continue_debug_event ) { req->pid = pid; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e8b481e703f..9cb9fc50d5d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -999,6 +999,7 @@ static void test_debugger(void) { continuestatus = DBG_CONTINUE; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); + ok(!ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef), "ContinueDebugEvent unexpectedly succeeded\n"); if (de.dwThreadId != pi.dwThreadId) { -- 2.25.0

2 4

[PATCH 1/5] server: Use STATUS_KERNEL_APC to indicate system APCs.
by Rémi Bernon 04 Feb '20

04 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This patch series is targetted around this specific status code to tell system APCs from user APCs, although it is not strictly necessary. We could already use the APC call type to tell the difference, but I believe using the specific status makes the logic clearer. dlls/ntdll/server.c | 2 +- dlls/ntdll/sync.c | 2 +- server/thread.c | 20 +++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 089eb3b89aa..73f4d86cf4d 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -624,7 +624,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } SERVER_END_REQ; if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC) break; + if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; if (invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c4885973b68..d09b90a9273 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2497,7 +2497,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size RtlLeaveCriticalSection( &addr_section ); if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); - if (ret != STATUS_USER_APC) break; + if (ret != STATUS_USER_APC && ret != STATUS_KERNEL_APC) break; if (invoke_apc( &call, &result )) { /* if we ran a user apc we have to check once more if additional apcs are queued, diff --git a/server/thread.c b/server/thread.c index aec4c1acf4e..d82463c6baf 100644 --- a/server/thread.c +++ b/server/thread.c @@ -749,7 +749,7 @@ static int check_wait( struct thread *thread ) assert( wait ); if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty( &thread->system_apc )) - return STATUS_USER_APC; + return STATUS_KERNEL_APC; /* Suspended threads may not acquire locks, but they can run system APCs */ if (thread->process->suspend + thread->suspend > 0) return -1; @@ -1083,12 +1083,11 @@ void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_ty } /* remove the head apc from the queue; the returned object must be released by the caller */ -static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ) +static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system ) { struct thread_apc *apc = NULL; - struct list *ptr = list_head( &thread->system_apc ); + struct list *ptr = list_head( system ? &thread->system_apc : &thread->user_apc ); - if (!ptr && !system_only) ptr = list_head( &thread->user_apc ); if (ptr) { apc = LIST_ENTRY( ptr, struct thread_apc, entry ); @@ -1585,7 +1584,7 @@ DECL_HANDLER(select) { for (;;) { - if (!(apc = thread_dequeue_apc( current, !(req->flags & SELECT_ALERTABLE) ))) + if (!(apc = thread_dequeue_apc( current, 0 ))) break; /* Optimization: ignore APC_NONE calls, they are only used to * wake up a thread, but since we got here the thread woke up already. @@ -1602,6 +1601,17 @@ DECL_HANDLER(select) release_object( apc ); } } + else if (get_error() == STATUS_KERNEL_APC) + { + if (!(apc = thread_dequeue_apc( current, 1 ))) + return; + + if (!(reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) + return; + + reply->call = apc->call; + release_object( apc ); + } } /* queue an APC for a thread or process */ -- 2.25.0

2 6

[PATCH] wbemuuid: Add library.
by Brendan Shanks 04 Feb '20

04 Feb '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 1 + dlls/wbemuuid/Makefile.in | 4 ++++ dlls/wbemuuid/wbemuuid.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 dlls/wbemuuid/Makefile.in create mode 100644 dlls/wbemuuid/wbemuuid.c diff --git a/configure.ac b/configure.ac index 36f65378a4..dcb33bb9bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3739,6 +3739,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp) WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) +WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in new file mode 100644 index 0000000000..449a0e68a8 --- /dev/null +++ b/dlls/wbemuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libwbemuuid.a + +C_SRCS = \ + wbemuuid.c diff --git a/dlls/wbemuuid/wbemuuid.c b/dlls/wbemuuid/wbemuuid.c new file mode 100644 index 0000000000..8fc3314d8d --- /dev/null +++ b/dlls/wbemuuid/wbemuuid.c @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +#include "dispex.h" +#include "objbase.h" +#include "oleauto.h" +#include "olectl.h" + +#include "initguid.h" + +#include "wbemcli.h" +#include "wbemprov.h" +#include "wbemdisp.h" -- 2.24.1

1 0

[PATCH] mshtml/tests: Get rid of is_prefix_wa.
by Jacek Caban 04 Feb '20

04 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-)

1 0

[PATCH] jscript: Add GetSourceLineText implementation.
by Jacek Caban 04 Feb '20

04 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 3 ++- dlls/jscript/error.c | 4 +++- dlls/jscript/jscript.c | 15 ++++++++++++--- dlls/jscript/parser.y | 18 +++++++++++++++--- dlls/jscript/tests/run.c | 9 +++++++-- 7 files changed, 41 insertions(+), 12 deletions(-)

1 0

[PATCH 3/3] widl: Check dispinterfaces for duplicated methods.
by Jacek Caban 04 Feb '20

04 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/parser.y | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

1 0

[PATCH 2/3] mshtml.idl: Fix IHTMLComputedStyle declaration.
by Jacek Caban 04 Feb '20

04 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)

1 0

[PATCH] kernel32: Export kernel32's FlushFileBuffers() implementation.
by Francois Gouget 04 Feb '20

04 Feb '20

kernel32 should export its own implementation now that it has been moved back from kernelbase. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9295dc3ee4..47c7d63761c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -516,7 +516,7 @@ @ stdcall -import FlsGetValue(long) @ stdcall -import FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) -@ stdcall -import FlushFileBuffers(long) +@ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) @ stdcall FlushProcessWriteBuffers() @ stdcall -import FlushViewOfFile(ptr long) -- 2.20.1

2 2

[PATCH] gdi32: Retry with hinting disabled if glyph load failed in hinted mode.
by Nikolay Sivov 04 Feb '20

04 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Freetype bug with test font is at https://savannah.nongnu.org/bugs/?57732. It doesn't seem practical to try and cherry pick specific error codes that might indicate hinting system problems. dlls/gdi32/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 10127bb77a..b806b62b77 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7620,6 +7620,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + if (err && !(load_flags & FT_LOAD_NO_HINTING)) + { + WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph_index, err); + load_flags |= FT_LOAD_NO_HINTING; + err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); + } if(err) { WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err); -- 2.24.1

2 1

[PATCH] testbot/web: Remove an unneeded import in Sessions.
by Francois Gouget 04 Feb '20

04 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 380d4b8f7d..8cd3c52fb7 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -31,8 +31,6 @@ WineTestBot::CGI::Session - A web user's session use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Utils; - sub InitializeNew($$) { my ($self, $Collection) = @_; -- 2.20.1

1 0

[PATCH] testbot: Simplify and speed up GenerateRandomString().
by Francois Gouget 04 Feb '20

04 Feb '20

Perl's rand() function can return random values greater than 2^16 nowadays. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index e8ba5162dc..27b222fd21 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -201,8 +201,8 @@ sub GenerateRandomString($) my $RandomString = ""; while (length($RandomString) < $Len) { - my $Part = "0000" . sprintf("%lx", int(rand(2 ** 16))); - $RandomString .= substr($Part, -4); + $RandomString .= sprintf("%08x", int(rand(2 ** 32))); + } return substr($RandomString, 0, $Len); -- 2.20.1

1 0

[PATCH] testbot/web: Use a cryptographically secure random number generator.
by Francois Gouget 04 Feb '20

04 Feb '20

Session ids should really be hard to guess so a user cannot take over another's session. This also fixes a bug where the session id length could be less than 32 characters. Note: * This introduces a dependency on the Bytes::Random::Secure Perl module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- libbytes-random-secure-perl is already installed so this should just take a web server restart. Perl documents rand() as being not cryptographically secure. That means an attacker could cycle through session ids for his own account and derive the random number generator internal state, thus allowing him to predict the session ids for other users' next login. Funnily enough the bug that caused session ids to not always have 32 characters could actually make this type of attack much harder: for this attack one needs the sequence of values returned by rand(), here groups of 4 hexadecimal characters. But because sprintf("%lx") does not 0-pad its result, a 31 charachter session id starting with '123456789ab...' could either be '123' + '4567' + '89ab', or '1234' + '567' + '89ab', or '1234' + '5678' + '9ab', etc. But not being a cryptographer and not knowing the internals of rand() I don't know how much harder this makes the attacks. So better safe than sorry. testbot/doc/INSTALL.txt | 1 + testbot/lib/WineTestBot/CGI/Sessions.pm | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 456ffe6957..4d430d9157 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -6,6 +6,7 @@ Dependencies: - MySQL - Perl DBD and DBI::mysql modules - Sendmail and Procmail +- Bytes::Random::Secure (libbytes-random-secure-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 8cd3c52fb7..4ca62ba76e 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -54,7 +54,9 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); +use Bytes::Random::Secure; use CGI::Cookie; + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Users; @@ -121,11 +123,7 @@ sub NewSession($$$) my $Id; while (defined($Existing)) { - $Id = ""; - foreach my $i (1..8) - { - $Id .= sprintf("%lx", int(rand(2 ** 16))); - } + $Id = Bytes::Random::Secure::random_bytes_hex(16); $Existing = $self->GetItem($Id); } $Session->Id($Id); -- 2.20.1

1 0

[PATCH] guiddef.h: Remove GUID_NULL declaration.
by Jacek Caban 04 Feb '20

04 Feb '20

It's declared in cguid.h with proper extern "C". Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This matches Windows SDK. dlls/msxml3/tests/schema.c | 1 + dlls/rpcrt4/ndr_contexthandle.c | 1 + dlls/setupapi/devinst.c | 1 + dlls/setupapi/tests/devinst.c | 1 + include/guiddef.h | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH] ole32: Silence noisy ERRs.
by Jacek Caban 04 Feb '20

04 Feb '20

Based on patch by Puetz Kevin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- ERR is definitely not the right here. In some cases, those messages indicate that Wine is missing marshalling support for system interfaces, so this could be a FIXME. However, in majority of cases, it's a false positive, so I think WARN will be better in this case. dlls/ole32/marshal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] vbscript: Return the named item itself from lookup_named_item.
by Gabriel Ivăncescu 04 Feb '20

04 Feb '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is be needed for the next patches in the series. dlls/vbscript/interp.c | 7 +++---- dlls/vbscript/vbscript.c | 16 ++++++++-------- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 906545c..b328674 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -114,7 +114,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ { ScriptDisp *script_obj = ctx->script->script_obj; named_item_t *item; - IDispatch *disp; unsigned i; DISPID id; HRESULT hres; @@ -196,10 +195,10 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - disp = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); - if(disp) { + item = lookup_named_item(ctx->script, name, SCRIPTITEM_ISVISIBLE); + if(item && item->disp) { ref->type = REF_OBJ; - ref->u.obj = disp; + ref->u.obj = item->disp; return S_OK; } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 2b691af..0bbff30 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -189,7 +189,7 @@ static void exec_queued_code(script_ctx_t *ctx) } } -IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) +named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flags) { named_item_t *item; HRESULT hres; @@ -214,7 +214,7 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag } } - return item->disp; + return item; } } @@ -870,7 +870,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); - IDispatch *context = NULL; + named_item_t *item = NULL; vbscode_t *code; HRESULT hres; @@ -882,9 +882,9 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, return E_UNEXPECTED; if(pstrItemName) { - context = lookup_named_item(This->ctx, pstrItemName, 0); - if(!context) { - WARN("Inknown context %s\n", debugstr_w(pstrItemName)); + item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(pstrItemName)); return E_INVALIDARG; } } @@ -893,8 +893,8 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(FAILED(hres)) return hres; - if(context) - IDispatch_AddRef(code->context = context); + if(item && item->disp) + IDispatch_AddRef(code->context = item->disp); if(!(dwFlags & SCRIPTTEXT_ISEXPRESSION) && !is_started(This)) { code->pending_exec = TRUE; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 33ecb45..a3f32fd 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -372,7 +372,7 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigne HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; -IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; +named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; -- 2.21.0

2 10

[PATCH] objbase.h: Add COWAIT_DEFAULT declaration.
by Jacek Caban 04 Feb '20

04 Feb '20

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/objbase.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] winex11.drv: Fix incorrect frequency for doublescan and interlaced modes.
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 930e0282be..454f6f2df2 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -478,6 +478,26 @@ static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resource return NULL; } +static DWORD get_frequency( const XRRModeInfo *mode ) +{ + if (mode->hTotal && mode->vTotal) + { + double v_total = mode->vTotal; + + if (mode->modeFlags & RR_DoubleScan) + v_total *= 2; + if (mode->modeFlags & RR_Interlace) + v_total /= 2; + + /* Adding 0.05 instead of 0.5 to round so that common frequencies like + * 59.94Hz and 23.976Hz become 59Hz and 24Hz. Using 0.5 would make + * 59.94Hz become 60Hz and would make it seem like there are two 60Hz modes */ + return mode->dotClock / (mode->hTotal * v_total) + 0.05; + } + + return 0; +} + static int xrandr12_init_modes(void) { unsigned int only_one_resolution = 1, mode_count; @@ -536,8 +556,7 @@ static int xrandr12_init_modes(void) if (mode->id == output_info->modes[i]) { - unsigned int dots = mode->hTotal * mode->vTotal; - unsigned int refresh = dots ? (mode->dotClock + dots / 2) / dots : 0; + unsigned int refresh = get_frequency(mode); TRACE("Adding mode %#lx: %ux%u(a)%u.\n", mode->id, mode->width, mode->height, refresh); X11DRV_Settings_AddOneMode( mode->width, mode->height, 0, refresh ); -- 2.20.1

3 3

[PATCH v3 2/3] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Daniel Lehman 04 Feb '20

04 Feb '20

2 1

[PATCH v3 1/3] msvcrt/tests: Add some wcstombs_s_l tests.
by Daniel Lehman 04 Feb '20

04 Feb '20

2 1

[PATCH] dwrite: Return static axis values for weight/width/italic properties.
by Nikolay Sivov 04 Feb '20

04 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 28 ++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 1 - 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fc0af3c79e..353282bbd4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -80,6 +80,8 @@ struct dwrite_font_data FONTSIGNATURE fontsig; UINT32 flags; /* enum font_flags */ struct dwrite_font_propvec propvec; + /* Static axis for weight/width/italic. */ + DWRITE_FONT_AXIS_VALUE axis[3]; DWRITE_FONT_METRICS1 metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG + 1]; @@ -2061,8 +2063,9 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr TRACE("%p, %p.\n", iface, reference); - return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)font->family->collection->factory, - font->data->file, font->data->face_index, font->data->simulations, reference); + return IDWriteFactory7_CreateFontFaceReference(font->family->collection->factory, font->data->file, + font->data->face_index, font->data->simulations, font->data->axis, ARRAY_SIZE(font->data->axis), + (IDWriteFontFaceReference1 **)reference); } static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) @@ -3857,6 +3860,20 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_font_data **ret) { + static const float width_axis_values[] = + { + 0.0f, /* DWRITE_FONT_STRETCH_UNDEFINED */ + 50.0f, /* DWRITE_FONT_STRETCH_ULTRA_CONDENSED */ + 62.5f, /* DWRITE_FONT_STRETCH_EXTRA_CONDENSED */ + 75.0f, /* DWRITE_FONT_STRETCH_CONDENSED */ + 87.5f, /* DWRITE_FONT_STRETCH_SEMI_CONDENSED */ + 100.0f, /* DWRITE_FONT_STRETCH_NORMAL */ + 112.5f, /* DWRITE_FONT_STRETCH_SEMI_EXPANDED */ + 125.0f, /* DWRITE_FONT_STRETCH_EXPANDED */ + 150.0f, /* DWRITE_FONT_STRETCH_EXTRA_EXPANDED */ + 200.0f, /* DWRITE_FONT_STRETCH_ULTRA_EXPANDED */ + }; + struct file_stream_desc stream_desc; struct dwrite_font_props props; struct dwrite_font_data *data; @@ -3910,6 +3927,13 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo init_font_prop_vec(data->weight, data->stretch, data->style, &data->propvec); + data->axis[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + data->axis[0].value = props.weight; + data->axis[1].axisTag = DWRITE_FONT_AXIS_TAG_WIDTH; + data->axis[1].value = width_axis_values[props.stretch]; + data->axis[2].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + data->axis[2].value = data->style == DWRITE_FONT_STYLE_ITALIC ? 1.0f : 0.0f; + *ret = data; return S_OK; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 60c9b9c742..d21326f7c9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7929,7 +7929,6 @@ todo_wine (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - todo_wine ok(axis_count > 0, "Unexpected axis value count.\n"); IDWriteFontFaceReference1_Release(ref2); } -- 2.24.1

1 0

[PATCH 2/2] user32/tests: Add more EnumDisplaySettings tests.
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 282 +++++++++++++++++++++++++++++++--- 1 file changed, 258 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 431b87cde1..cf12725a45 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3083,43 +3083,277 @@ static void test_metrics_for_dpi( int custom_dpi ) } } +static BOOL get_primary_adapter_name(CHAR *name) +{ + DISPLAY_DEVICEA dd; + DWORD adapter; + + dd.cb = sizeof(dd); + for (adapter = 0; EnumDisplayDevicesA(NULL, adapter, &dd, 0); ++adapter) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyA(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + +static BOOL CALLBACK test_enum_display_settings(HMONITOR hmonitor, HDC hdc, LPRECT rect, LPARAM lparam) +{ + CHAR primary_adapter[CCHDEVICENAME]; + INT width, height; + BOOL primary, ret; + MONITORINFOEXA mi; + DEVMODEA dm; + + memset(&mi, 0, sizeof(mi)); + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(hmonitor, (MONITORINFO *)&mi); + ok(ret, "GetMonitorInfoA failed, error %#x\n", GetLastError()); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(mi.szDevice, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + + todo_wine ok((dm.dmFields & (DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT)) == (DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT), + "Unexpected dmFields %#x.\n", dm.dmFields); + /* Wine currently reports primary adapter positions for all adapters, same for other todo_wines in this function */ + ret = get_primary_adapter_name(primary_adapter); + ok(ret, "get_primary_adapter_name failed\n"); + primary = !lstrcmpA(primary_adapter, mi.szDevice); + todo_wine_if(!primary && dm.dmPosition.x != mi.rcMonitor.left) + ok(dm.dmPosition.x == mi.rcMonitor.left, "Expect dmPosition.x %d, got %d\n", mi.rcMonitor.left, dm.dmPosition.x); + todo_wine_if(!primary && dm.dmPosition.y != mi.rcMonitor.top) + ok(dm.dmPosition.y == mi.rcMonitor.top, "Expect dmPosition.y %d, got %d\n", mi.rcMonitor.top, dm.dmPosition.y); + width = mi.rcMonitor.right - mi.rcMonitor.left; + todo_wine_if(!primary && dm.dmPelsWidth != width) + ok(dm.dmPelsWidth == width, "Expect dmPelsWidth %d, got %d\n", width, dm.dmPelsWidth); + height = mi.rcMonitor.bottom - mi.rcMonitor.top; + todo_wine_if(!primary && dm.dmPelsHeight != height) + ok(dm.dmPelsHeight == height, "Expect dmPelsHeight %d, got %d\n", height, dm.dmPelsHeight); + + return TRUE; +} + static void test_EnumDisplaySettings(void) { - DEVMODEA devmode; - DWORD val; + static const DWORD mode_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | + DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + static const DWORD setting_fields = mode_fields | DM_POSITION; + CHAR primary_adapter[CCHDEVICENAME]; + DPI_AWARENESS_CONTEXT ctx = NULL; + DWORD err, val, device, mode; + BOOL attached, ret; + DISPLAY_DEVICEA dd; + DEVMODEA dm, dm2; + DEVMODEW dmW; HDC hdc; - DWORD num; - memset(&devmode, 0, sizeof(devmode)); - EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); + /* Test invalid device names */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + ret = EnumDisplaySettingsA("invalid", ENUM_CURRENT_SETTINGS, &dm); + todo_wine ok(!ret, "EnumDisplaySettingsA succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "Expect error 0xdeadbeef, got %#x\n", GetLastError()); + todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + /* Monitor device names are invalid */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + ret = EnumDisplaySettingsA("\\\\.\\DISPLAY1\\Monitor0", ENUM_CURRENT_SETTINGS, &dm); + todo_wine ok(!ret, "EnumDisplaySettingsA succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "Expect error 0xdeadbeef, got %#x\n", GetLastError()); + todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + + /* Test that passing NULL to device name parameter means to use the primary adapter */ + memset(&dm, 0, sizeof(dm)); + memset(&dm2, 0, sizeof(dm2)); + dm.dmSize = sizeof(dm); + dm2.dmSize = sizeof(dm2); + ret = get_primary_adapter_name(primary_adapter); + ok(ret, "get_primary_adapter_name failed\n"); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ret = EnumDisplaySettingsA(primary_adapter, ENUM_CURRENT_SETTINGS, &dm2); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ok(!memcmp(&dm, &dm2, sizeof(dm)), "Expect NULL device is the primary device.\n"); + + /* Test dmSize */ + /* EnumDisplaySettingsA/W modify dmSize and don't check for insufficient dmSize */ + memset(&dm, 0, sizeof(dm)); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEA, dmICMMethod), dm.dmSize); + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dm.dmFields); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEA, dmICMMethod), dm.dmSize); + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dm.dmFields); + + memset(&dmW, 0, sizeof(dmW)); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(ret, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEW, dmICMMethod), dmW.dmSize); + todo_wine ok((dmW.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dmW.dmFields); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmSize = sizeof(dmW); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(ret, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmICMMethod), "Expect dmSize %u, got %u\n", + FIELD_OFFSET(DEVMODEW, dmICMMethod), dmW.dmSize); + todo_wine ok((dmW.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dmW.dmFields); + + /* EnumDisplaySettingsExA/W need dmSize to be at least FIELD_OFFSET(DEVMODEA/W, dmFields) + 1 to have valid dmFields */ + /* Crash on Windows when dmSize is zero */ + if (0) + { + memset(&dm, 0, sizeof(dm)); + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(!ret, "EnumDisplaySettingsExA succeed\n"); + + memset(&dmW, 0, sizeof(dmW)); + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &dmW, 0); + ok(!ret, "EnumDisplaySettingsExA succeed\n"); + } + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = FIELD_OFFSET(DEVMODEA, dmFields); + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(ret, "EnumDisplaySettingsExA failed, error %#x\n", GetLastError()); + todo_wine ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmFields), "Expect dmSize unchanged, got %u\n", dm.dmSize); + todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + 1; + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(ret, "EnumDisplaySettingsExA failed, error %#x\n", GetLastError()); + todo_wine ok(dm.dmSize == FIELD_OFFSET(DEVMODEA, dmFields) + 1, "Expect dmSize unchanged, got %u\n", dm.dmSize); + todo_wine ok((dm.dmFields & setting_fields) == (DM_POSITION | DM_DISPLAYORIENTATION), + "Expect dmFields to contain %#lx, got %#x\n", DM_POSITION | DM_DISPLAYORIENTATION, dm.dmFields); + /* Fields beyond dmSize don't get written */ + todo_wine ok(dm.dmPelsWidth == 0, "Expect dmPelsWidth unwritten\n"); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmFields); + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &dmW, 0); + ok(ret, "EnumDisplaySettingsExW failed, error %#x\n", GetLastError()); + todo_wine ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmFields), "Expect dmSize unchanged, got %u\n", dmW.dmSize); + todo_wine ok(dmW.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dmW.dmFields); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmFields) + 1; + ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &dmW, 0); + ok(ret, "EnumDisplaySettingsExW failed, error %#x\n", GetLastError()); + todo_wine ok(dmW.dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + 1, "Expect dmSize unchanged, got %u\n", dmW.dmSize); + todo_wine ok((dmW.dmFields & setting_fields) == (DM_POSITION | DM_DISPLAYORIENTATION), + "Expect dmFields to contain %#lx, got %#x\n", DM_POSITION | DM_DISPLAYORIENTATION, dmW.dmFields); + /* Fields beyond dmSize don't get written */ + todo_wine ok(dmW.dmPelsWidth == 0, "Expect dmPelsWidth unwritten\n"); + + /* Test dmBitsPerPel */ hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - ok(devmode.dmBitsPerPel == val, - "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", - val, devmode.dmBitsPerPel); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &dm, 0); + ok(ret, "EnumDisplaySettingsExA failed, error %#x\n", GetLastError()); + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, "Expect dmFields to contain %#x, got %#x\n", + setting_fields, dm.dmFields); + ok(dm.dmBitsPerPel == val, "Expect dmBitsPerPel %d, got %d\n", val, dm.dmBitsPerPel); val = GetDeviceCaps(hdc, NUMCOLORS); - if(devmode.dmBitsPerPel <= 8) { - ok(val == 256, "Screen bpp is %d, NUMCOLORS returned %d\n", devmode.dmBitsPerPel, val); - } else { - ok(val == -1, "Screen bpp is %d, NUMCOLORS returned %d\n", devmode.dmBitsPerPel, val); + if (dm.dmBitsPerPel <= 8) + { + ok(val == 256, "Screen bpp is %d, NUMCOLORS returned %d\n", dm.dmBitsPerPel, val); + } + else + { + ok(val == -1, "Screen bpp is %d, NUMCOLORS returned %d\n", dm.dmBitsPerPel, val); } ReleaseDC(0, hdc); - num = 1; - while (1) { - SetLastError (0xdeadbeef); - if (!EnumDisplaySettingsA(NULL, num, &devmode)) { - DWORD le = GetLastError(); - ok(le == ERROR_NO_MORE_FILES || - le == ERROR_MOD_NOT_FOUND /* Win8 */ || - le == 0xdeadbeef, /* XP, 2003 */ - "Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got %d for %d\n", le, num); - break; - } - num++; + /* Test dmPosition, dmPelsWidth and dmPelsHeight */ + /* Set DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE so that GetMonitorInfo() returns physical pixels */ + if (pSetThreadDpiAwarenessContext) + ctx = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + EnumDisplayMonitors(NULL, NULL, test_enum_display_settings, 0); + if (pSetThreadDpiAwarenessContext && ctx) + pSetThreadDpiAwarenessContext(ctx); + + /* Test mode enumeration and other fields */ + dd.cb = sizeof(dd); + for (device = 0; EnumDisplayDevicesA(NULL, device, &dd, 0); ++device) + { + INT number; + + /* Skip software devices */ + if (sscanf(dd.DeviceName, "\\\\.\\DISPLAY%d", &number) != 1) + continue; + + attached = dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + for (mode = ENUM_REGISTRY_SETTINGS; EnumDisplaySettingsA(dd.DeviceName, mode, &dm); ++mode) + { + if (mode == ENUM_CURRENT_SETTINGS) + { + todo_wine ok((dm.dmFields & setting_fields) == setting_fields, + "Expect dmFields to contain %#x, got %#x\n", setting_fields, dm.dmFields); + } + else + { + todo_wine ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", + mode_fields, dm.dmFields); + } + + ok(dm.dmDisplayOrientation == DMDO_DEFAULT, "Expect dmDisplayOrientation DMDO_DEFAULT, got %#x\n", + dm.dmDisplayOrientation); + ok(dm.dmDisplayFlags == 0, "Expect dmDisplayFlags zero\n"); + + if (mode == ENUM_CURRENT_SETTINGS && !attached) + { + todo_wine ok(dm.dmBitsPerPel == 0, "Expect dmBitsPerPel zero, got %u\n", dm.dmBitsPerPel); + todo_wine ok(dm.dmPelsWidth == 0, "Expect dmPelsWidth zero, got %u\n", dm.dmPelsWidth); + todo_wine ok(dm.dmPelsHeight == 0, "Expect dmPelsHeight zero, got %u\n", dm.dmPelsHeight); + todo_wine ok(dm.dmDisplayFrequency == 0, "Expect dmDisplayFrequency zero, got %u\n", dm.dmDisplayFrequency); + } + else if (mode != ENUM_REGISTRY_SETTINGS) + { + ok(dm.dmBitsPerPel, "Expect dmBitsPerPel not zero\n"); + ok(dm.dmPelsWidth, "Expect dmPelsWidth not zero\n"); + ok(dm.dmPelsHeight, "Expect dmPelsHeight not zero\n"); + ok(dm.dmDisplayFrequency, "Expect dmDisplayFrequency not zero\n"); + } + } + + ok(mode >= 1, "Expect at least one valid mode gets enumerated.\n"); + + err = GetLastError(); + ok(err == ERROR_NO_MORE_FILES || + err == ERROR_MOD_NOT_FOUND /* Win8 */ || + err == 0xdeadbeef, /* XP, 2003 */ + "Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got %#x\n", err); } } -- 2.20.1

2 2

[PATCH] winex11.drv: Calculate mask in X11DRV_resize_desktop().
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Calculate XReconfigureWMWindow() mask in X11DRV_resize_desktop() instead of doing it in EnumWindows() callback update_windows_on_desktop_resize() because the result is the same anyway. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d70b38b2b3..bde4841ed4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -321,26 +321,16 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) return TRUE; } - -struct desktop_resize_data -{ - RECT old_virtual_rect; - RECT new_virtual_rect; -}; - static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) { struct x11drv_win_data *data; - struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; - int mask = 0; + UINT mask = (UINT)lparam; if (!(data = get_win_data( hwnd ))) return TRUE; /* update the full screen state */ update_net_wm_states( data ); - if (resize_data->old_virtual_rect.left != resize_data->new_virtual_rect.left) mask |= CWX; - if (resize_data->old_virtual_rect.top != resize_data->new_virtual_rect.top) mask |= CWY; if (mask && data->whole_window) { POINT pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); @@ -399,14 +389,18 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) */ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { + RECT old_virtual_rect, new_virtual_rect; HWND hwnd = GetDesktopWindow(); - struct desktop_resize_data resize_data; + UINT mask = 0; - resize_data.old_virtual_rect = get_virtual_screen_rect(); + old_virtual_rect = get_virtual_screen_rect(); desktop_width = width; desktop_height = height; X11DRV_DisplayDevices_Init( TRUE ); - resize_data.new_virtual_rect = get_virtual_screen_rect(); + new_virtual_rect = get_virtual_screen_rect(); + + if (old_virtual_rect.left != new_virtual_rect.left) mask |= CWX; + if (old_virtual_rect.top != new_virtual_rect.top) mask |= CWY; if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) { @@ -416,14 +410,13 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); update_desktop_fullscreen( width, height ); - SetWindowPos( hwnd, 0, resize_data.new_virtual_rect.left, resize_data.new_virtual_rect.top, - resize_data.new_virtual_rect.right - resize_data.new_virtual_rect.left, - resize_data.new_virtual_rect.bottom - resize_data.new_virtual_rect.top, + SetWindowPos( hwnd, 0, new_virtual_rect.left, new_virtual_rect.top, + new_virtual_rect.right - new_virtual_rect.left, new_virtual_rect.bottom - new_virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); ungrab_clipping_window(); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } - EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); + EnumWindows( update_windows_on_desktop_resize, (LPARAM)mask ); } -- 2.20.1

1 0

[PATCH 1/2] user32/tests: Add more ChangeDisplaySettings tests.
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 587 ++++++++++++++++++++++++++++++++---- 1 file changed, 531 insertions(+), 56 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 47e01b1a6a..03fd6f3ec3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -24,6 +24,7 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "wine/heap.h" #include <stdio.h> static HMODULE hdll; @@ -252,82 +253,167 @@ static const struct vid_mode vid_modes_test[] = { */ }; +struct device_info +{ + DWORD index; + CHAR name[CCHDEVICENAME]; + DEVMODEA original_mode; +}; + +static BOOL get_primary_adapter(CHAR *name) +{ + DISPLAY_DEVICEA dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesA(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyA(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + +#define expect_dm(a, b, c) _expect_dm(__LINE__, a, b, c) +static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD test) +{ + CHAR primary_adapter[CCHDEVICENAME]; + BOOL is_primary; + DEVMODEA dm; + BOOL ret; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + SetLastError(0xdeadbeef); + ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); + /* On win10 TestBot, after many resolution changes, EnumDisplaySettingsA fails sometimes for unknown reasons */ + if (!ret) + { + win_skip_(__FILE__, line)("EnumDisplaySettingsA failed.\n"); + return; + } + ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); + + ok(get_primary_adapter(primary_adapter), "Failed to get primary adapter name.\n"); + is_primary = !lstrcmpA(primary_adapter, device); + + todo_wine_if(expected.dmFields & DM_POSITION) + ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, + "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); + /* Wine doesn't support changing color depth yet */ + todo_wine_if(expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) + ok_(__FILE__, line)(dm.dmBitsPerPel == expected.dmBitsPerPel, "Device %s test %d expect dmBitsPerPel %d, got %d\n", + device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); + /* Wine currently reports primary monitor settings for non-primary monitors */ + todo_wine_if(!is_primary && dm.dmPelsWidth != expected.dmPelsWidth) + ok_(__FILE__, line)(dm.dmPelsWidth == expected.dmPelsWidth, "Device %s test %d expect dmPelsWidth %d, got %d\n", + device, test, expected.dmPelsWidth, dm.dmPelsWidth); + todo_wine_if(!is_primary && dm.dmPelsHeight != expected.dmPelsHeight) + ok_(__FILE__, line)(dm.dmPelsHeight == expected.dmPelsHeight, "Device %s test %d expect dmPelsHeight %d, got %d\n", + device, test, expected.dmPelsHeight, dm.dmPelsHeight); + todo_wine_if(!is_primary && dm.dmPosition.x != expected.dmPosition.x) + ok_(__FILE__, line)(dm.dmPosition.x == expected.dmPosition.x, "Device %s test %d expect dmPosition.x %d, got %d\n", + device, test, expected.dmPosition.x, dm.dmPosition.x); + todo_wine_if(!is_primary && dm.dmPosition.y != expected.dmPosition.y) + ok_(__FILE__, line)(dm.dmPosition.y == expected.dmPosition.y, "Device %s test %d expect dmPosition.y %d, got %d\n", + device, test, expected.dmPosition.y, dm.dmPosition.y); + todo_wine_if(!is_primary && dm.dmDisplayFrequency != expected.dmDisplayFrequency) + ok_(__FILE__, line)(dm.dmDisplayFrequency == expected.dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %d, got %d\n", device, test, expected.dmDisplayFrequency, + dm.dmDisplayFrequency); + todo_wine_if(!is_primary && dm.dmDisplayOrientation != expected.dmDisplayOrientation) + ok_(__FILE__, line)(dm.dmDisplayOrientation == expected.dmDisplayOrientation, + "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, + dm.dmDisplayOrientation); +} + static void test_ChangeDisplaySettingsEx(void) { DPI_AWARENESS_CONTEXT context = NULL; - DEVMODEA dm; + UINT primary, device, side, mode; + UINT device_size, device_count; + struct device_info *devices; + INT count, old_count; + DISPLAY_DEVICEA dd; + DEVMODEA dm, dm2; + POINTL position; DEVMODEW dmW; - DWORD width; LONG res; int i; - SetLastError(0xdeadbeef); + /* Test dmDriverExtra */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); - ok(res, "EnumDisplaySettings error %u\n", GetLastError()); - - width = dm.dmPelsWidth; - - dm.dmDriverExtra = 1; - res = ChangeDisplaySettingsA(&dm, CDS_TEST); - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dm.dmDriverExtra == 0 || broken(dm.dmDriverExtra == 1) /* win9x */, - "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); - - /* crashes under XP SP3 for large dmDriverExtra values */ - dm.dmDriverExtra = 1; - res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); + ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); memset(&dmW, 0, sizeof(dmW)); dmW.dmSize = sizeof(dmW); - dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - dmW.dmPelsWidth = dm.dmPelsWidth; - dmW.dmPelsHeight = dm.dmPelsHeight; + res = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(res, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + + /* ChangeDisplaySettingsA/W reset dmDriverExtra to 0 */ + dm.dmDriverExtra = 1; + res = ChangeDisplaySettingsA(&dm, CDS_TEST); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA returned unexpected %d\n", res); + ok(dm.dmDriverExtra == 0, "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); + dmW.dmDriverExtra = 1; - SetLastError(0xdeadbeef); res = ChangeDisplaySettingsW(&dmW, CDS_TEST); - if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - { - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dmW.dmDriverExtra == 0, "ChangeDisplaySettingsW didn't reset dmDriverExtra to 0\n"); - } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW returned unexpected %d\n", res); + ok(dmW.dmDriverExtra == 0, "ChangeDisplaySettingsW didn't reset dmDriverExtra to 0\n"); + + /* ChangeDisplaySettingsExA/W do not modify dmDriverExtra */ + dm.dmDriverExtra = 1; + res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d\n", res); + ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't change dmDriverExtra\n"); - /* Apparently XP treats dmDriverExtra being != 0 as an error */ dmW.dmDriverExtra = 1; res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); - if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - { - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't reset dmDriverExtra to 0\n"); - } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW returned unexpected %d\n", res); + ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't change dmDriverExtra\n"); - /* the following 2 tests show that dm.dmSize being 0 is invalid, but - * ChangeDisplaySettingsExA still reports success. - */ + /* Test dmSize */ + /* ChangeDisplaySettingsA/ExA report success even if dmSize is 0 */ memset(&dm, 0, sizeof(dm)); - dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - dm.dmPelsWidth = width; - res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || - res == DISP_CHANGE_BADMODE || /* Win98, WinMe */ - res == DISP_CHANGE_FAILED, /* NT4 */ - "ChangeDisplaySettingsExA returned unexpected %d\n", res); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + dm.dmSize = 0; + res = ChangeDisplaySettingsA(&dm, CDS_TEST); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + dm.dmSize = 0; + res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d\n", res); + + /* dmSize for ChangeDisplaySettingsW/ExW needs to be at least FIELD_OFFSET(DEVMODEW, dmICMMethod) */ memset(&dmW, 0, sizeof(dmW)); - dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - dmW.dmPelsWidth = width; - SetLastError(0xdeadbeef); + dmW.dmSize = sizeof(dmW); + res = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dmW); + ok(res, "EnumDisplaySettingsW failed, error %#x\n", GetLastError()); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod) - 1; + res = ChangeDisplaySettingsW(&dmW, CDS_TEST); + todo_wine ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsW returned %d, expect DISP_CHANGE_BADMODE\n", res); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod) - 1; res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); - if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - ok(res == DISP_CHANGE_FAILED || - res == DISP_CHANGE_BADPARAM || /* NT4 */ - res == DISP_CHANGE_BADMODE /* XP SP3 */, - "ChangeDisplaySettingsExW returned %d\n", res); + todo_wine ok(res == DISP_CHANGE_BADMODE, "ChangeDisplaySettingsExW returned %d, expect DISP_CHANGE_BADMODE\n", res); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + res = ChangeDisplaySettingsW(&dmW, CDS_TEST); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW returned unexpected %d\n", res); + + dmW.dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + res = ChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW returned unexpected %d\n", res); /* Test clip rectangle after resolution changes */ /* GetClipCursor always returns result in physical pixels but GetSystemMetrics(SM_CX/CYVIRTUALSCREEN) are not. @@ -349,7 +435,7 @@ static void test_ChangeDisplaySettingsEx(void) (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), - "Unexpected ChangeDisplaySettingsEx() return code for resolution[%d]: %d\n", i, res); + "Unexpected ChangeDisplaySettingsExA() return code for vid_modes_test[%d]: %d\n", i, res); if (res == DISP_CHANGE_SUCCESSFUL) { @@ -394,6 +480,395 @@ static void test_ChangeDisplaySettingsEx(void) pSetThreadDpiAwarenessContext(context); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %d\n", res); + + /* Save the original mode for all devices so that they can be restored at the end of tests */ + device_count = 0; + device_size = 2; + devices = heap_calloc(device_size, sizeof(*devices)); + ok(devices != NULL, "Failed to allocate memory.\n"); + + primary = 0; + memset(&dd, 0, sizeof(dd)); + dd.cb = sizeof(dd); + for (device = 0; EnumDisplayDevicesA(NULL, device, &dd, 0); ++device) + { + INT number; + + /* Skip software devices */ + if (sscanf(dd.DeviceName, "\\\\.\\DISPLAY%d", &number) != 1) + continue; + + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + primary = device_count; + + if (device_count >= device_size) + { + device_size *= 2; + devices = heap_realloc(devices, device_size * sizeof(*devices)); + ok(devices != NULL, "Failed to reallocate memory.\n"); + } + + devices[device_count].index = device; + lstrcpyA(devices[device_count].name, dd.DeviceName); + devices[device_count].original_mode.dmSize = sizeof(devices[device_count].original_mode); + res = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devices[device_count].original_mode); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", dd.DeviceName, GetLastError()); + ++device_count; + } + + /* Make the primary adapter first */ + if (primary) + { + struct device_info tmp; + tmp = devices[0]; + devices[0] = devices[primary]; + devices[primary] = tmp; + } + + /* Test detaching adapters */ + /* Test that when there is only one adapter, it can't be detached */ + if (device_count == 1) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition = devices[0].original_mode.dmPosition; + res = ChangeDisplaySettingsExA(devices[0].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + + /* Check that the adapter is still attached */ + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[0].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[0].name, GetLastError()); + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect device %s still attached.\n", devices[0].name); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); + + /* Restore registry settings */ + res = ChangeDisplaySettingsExA(devices[0].name, &devices[0].original_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_BADPARAM) || /* win10 */ + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + } + + /* Test that only specifying DM_POSITION in dmFields is not enough to detach an adapter */ + if (device_count >= 2) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + /* MSDN says set dmFields to DM_POSITION to detach, but DM_PELSWIDTH and DM_PELSHEIGHT are needed actually. + * To successfully detach adapters, settings have to be saved to the registry first, and then call + * ChangeDisplaySettingsExA(device, NULL, NULL, 0, NULL) to update settings. Otherwise on some older versions + * of Windows, e.g., XP and Win7, the adapter doesn't get detached */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION; + dm.dmPosition = devices[1].original_mode.dmPosition; + res = ChangeDisplaySettingsExA(devices[1].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + res = ChangeDisplaySettingsExA(devices[1].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[1].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[1].name, GetLastError()); + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect device %s still attached.\n", devices[1].name); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); + } + + /* Detach all non-primary adapters to avoid position conflicts */ + for (device = 1; device < device_count; ++device) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition = devices[device].original_mode.dmPosition; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x\n", devices[device].name, GetLastError()); + todo_wine ok(!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP), "Expect device %s detached.\n", devices[device].name); + + count = GetSystemMetrics(SM_CMONITORS); + todo_wine ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); + } + + /* Test changing each adapter to every available mode */ + position.x = 0; + position.y = 0; + for (device = 0; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) + { + dm.dmPosition = position; + dm.dmFields |= DM_POSITION; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ + if (mode == 0 && device) + { + todo_wine ok(res == DISP_CHANGE_FAILED, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", + devices[device].name, mode, res); + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", + devices[device].name, mode, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + } + + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* TestBots using VGA driver can't change to some modes */ + "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", devices[device].name, mode, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change %s to mode %d.\n", devices[device].name, mode); + continue; + } + + expect_dm(dm, devices[device].name, mode); + } + + /* Restore settings */ + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + + /* Place the next adapter to the right so that there is no position conflict */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", + devices[device].name, GetLastError()); + if (!res) + { + win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + continue; + } + position.x = dm.dmPosition.x + dm.dmPelsWidth; + } + + /* Test changing modes by saving settings to the registry first */ + for (device = 0; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + if (!res) + { + win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + continue; + } + + /* Find a mode that's different from the current mode */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsA(devices[device].name, mode, &dm2); ++mode) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, "Failed to find a different mode.\n"); + + dm.dmPelsWidth = dm2.dmPelsWidth; + dm.dmPelsHeight = dm2.dmPelsHeight; + dm.dmDisplayFrequency = dm2.dmDisplayFrequency; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + res = ChangeDisplaySettingsExA(devices[device].name, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change mode for %s.\n", devices[device].name); + continue; + } + + expect_dm(dm, devices[device].name, 0); + } + + /* Test dmPosition */ + /* First detach all adapters except for the primary and secondary adapters to avoid position conflicts */ + if (device_count >= 3) + { + for (device = 2; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); + + dm.dmPelsWidth = 0; + dm.dmPelsHeight = 0; + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d\n", res); + } + + if (device_count >= 2) + { + /* Query the primary adapter settings */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[0].name, ENUM_CURRENT_SETTINGS, &dm); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); + + if (res) + { + /* Query the secondary adapter settings */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + } + + if (res) + { + /* Test position conflict */ + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y; + res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + + /* Position is not changed even if ChangeDisplaySettingsExA returned DISP_CHANGE_SUCCESSFUL */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x || broken(!res), "Expect position change not applied.\n"); + + /* Test position with extra space. The extra space will be removed */ + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; + dm2.dmPosition.y = dm.dmPosition.y; + res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); + + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + expect_dm(dm2, devices[1].name, 0); + + /* Test placing the secondary adapter to all sides of the primary adapter */ + for (side = 0; side < 4; ++side) + { + switch (side) + { + /* Bottom */ + case 0: + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; + break; + /* Left */ + case 1: + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y; + break; + /* Top */ + case 2: + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; + break; + /* Right */ + case 3: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y; + break; + } + + res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s side %d returned unexpected %d\n", + devices[1].name, side, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("ChangeDisplaySettingsExA %s side %d returned unexpected %d.\n", devices[1].name, side, res); + continue; + } + + expect_dm(dm2, devices[1].name, side); + } + + /* Test automatic position update when other adapters change resolution */ + /* Find a mode that's different from the current mode */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsA(devices[0].name, mode, &dm2); ++mode) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, "Failed to find a different mode.\n"); + + /* Change the primary adapter to a different mode */ + dm = dm2; + res = ChangeDisplaySettingsExA(devices[0].name, &dm, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[0].name, res); + + /* Now the position of the second adapter should be changed */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); + /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ + ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth || broken(!res), "Expect dmPosition.x %d, got %d\n", + dm.dmPelsWidth, dm2.dmPosition.x); + } + else + { + win_skip("EnumDisplaySettingsA failed\n"); + } + } + + /* Restore all adapters to their original settings */ + for (device = 0; device < device_count; ++device) + { + res = ChangeDisplaySettingsExA(devices[device].name, &devices[device].original_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[device].name, res); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || + broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ + "ChangeDisplaySettingsExA returned unexpected %d\n", res); + for (device = 0; device < device_count; ++device) + expect_dm(devices[device].original_mode, devices[device].name, 0); + + heap_free(devices); } static void test_monitors(void) -- 2.20.1

1 0

[PATCH] setupapi: Implement SetupDiOpenDeviceInterfaceRegKey().
by Zhiyi Zhang 04 Feb '20

04 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 25 +++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 60 +++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f8a4e93efc..f8197444d4 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3524,6 +3524,31 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA( return FALSE; } +/*********************************************************************** + * SetupDiOpenDeviceInterfaceRegKey (SETUPAPI.@) + */ +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO devinfo, PSP_DEVICE_INTERFACE_DATA iface_data, + DWORD reserved, REGSAM access) +{ + struct device_iface *iface; + LSTATUS lr; + HKEY key; + + TRACE("devinfo %p, iface_data %p, reserved %d, access %#x.\n", devinfo, iface_data, reserved, access); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return INVALID_HANDLE_VALUE; + + lr = RegOpenKeyExW(iface->refstr_key, DeviceParameters, 0, access, &key); + if (lr) + { + SetLastError(lr); + return INVALID_HANDLE_VALUE; + } + + return key; +} + /*********************************************************************** * SetupDiSetClassInstallParamsA (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 74c252c6fd..33ccc48097 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -380,7 +380,7 @@ @ stdcall SetupDiOpenDeviceInfoA(ptr str ptr long ptr) @ stdcall SetupDiOpenDeviceInfoW(ptr wstr ptr long ptr) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) -@ stub SetupDiOpenDeviceInterfaceRegKey +@ stdcall SetupDiOpenDeviceInterfaceRegKey(ptr ptr long long) @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a02752d2de..c01dcda65a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2010,6 +2010,7 @@ static void test_device_interface_key(void) ok(!ret, "key should exist: %u\n", ret); ret = RegSetValueA(key, NULL, REG_SZ, "test", 5); + ok(!ret, "RegSetValue failed: %u\n", ret); sz = sizeof(buffer); ret = RegQueryValueA(dikey, NULL, buffer, &sz); ok(!ret, "RegQueryValue failed: %u\n", ret); @@ -2030,6 +2031,64 @@ static void test_device_interface_key(void) SetupDiDestroyDeviceInfoList(set); } +static void test_open_device_interface_key(void) +{ + SP_DEVICE_INTERFACE_DATA iface; + SP_DEVINFO_DATA device; + CHAR buffer[5]; + HDEVINFO set; + LSTATUS lr; + LONG size; + HKEY key; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x\n", GetLastError()); + + device.cbSize = sizeof(device); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + iface.cbSize = sizeof(iface); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + /* Test open before creation */ + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key == INVALID_HANDLE_VALUE, "Expect open interface registry key failure\n"); + + /* Test opened key is from SetupDiCreateDeviceInterfaceRegKey */ + key = SetupDiCreateDeviceInterfaceRegKeyW(set, &iface, 0, KEY_ALL_ACCESS, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE, "Failed to create interface registry key, error %#x\n", GetLastError()); + + lr = RegSetValueA(key, NULL, REG_SZ, "test", 5); + ok(!lr, "RegSetValue failed, error %#x\n", lr); + + RegCloseKey(key); + + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key != INVALID_HANDLE_VALUE, "Failed to open interface registry key, error %#x\n", GetLastError()); + + size = sizeof(buffer); + lr = RegQueryValueA(key, NULL, buffer, &size); + ok(!lr, "RegQueryValue failed, error %#x\n", lr); + ok(!strcmp(buffer, "test"), "got wrong data %s\n", buffer); + + RegCloseKey(key); + + /* Test open after removal */ + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to remove device interface, error %#x.\n", GetLastError()); + + key = SetupDiOpenDeviceInterfaceRegKey(set, &iface, 0, KEY_ALL_ACCESS); + ok(key == INVALID_HANDLE_VALUE, "Expect open interface registry key failure\n"); + + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); +} + static void test_device_install_params(void) { SP_DEVINFO_DATA device = {sizeof(device)}; @@ -3141,6 +3200,7 @@ START_TEST(devinst) test_get_inf_class(); test_devnode(); test_device_interface_key(); + test_open_device_interface_key(); test_device_install_params(); test_driver_list(); test_call_class_installer(); -- 2.20.1

1 0

[PATCH 1/1] include: Add remaining MIB_TCP6 types
by Alex Henrie 04 Feb '20

04 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/tcpmib.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/tcpmib.h b/include/tcpmib.h index 477500c4fb..6576f8afa5 100644 --- a/include/tcpmib.h +++ b/include/tcpmib.h @@ -115,6 +115,24 @@ typedef struct _MIB_TCPTABLE_OWNER_PID MIB_TCPROW_OWNER_PID table[1]; } MIB_TCPTABLE_OWNER_PID, *PMIB_TCPTABLE_OWNER_PID; +typedef struct _MIB_TCP6ROW_OWNER_PID +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + UCHAR ucRemoteAddr[16]; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + DWORD dwState; + DWORD dwOwningPid; +} MIB_TCP6ROW_OWNER_PID, *PMIB_TCP6ROW_OWNER_PID; + +typedef struct _MIB_TCP6TABLE_OWNER_PID +{ + DWORD dwNumEntries; + MIB_TCP6ROW_OWNER_PID table[1]; +} MIB_TCP6TABLE_OWNER_PID, *PMIB_TCP6TABLE_OWNER_PID; + typedef struct _MIB_TCPROW_OWNER_MODULE { DWORD dwState; @@ -133,6 +151,26 @@ typedef struct _MIB_TCPTABLE_OWNER_MODULE MIB_TCPROW_OWNER_MODULE table[1]; } MIB_TCPTABLE_OWNER_MODULE, *PMIB_TCPTABLE_OWNER_MODULE; +typedef struct _MIB_TCP6ROW_OWNER_MODULE +{ + UCHAR ucLocalAddr[16]; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + UCHAR ucRemoteAddr[16]; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + DWORD dwState; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_TCP6ROW_OWNER_MODULE, *PMIB_TCP6ROW_OWNER_MODULE; + +typedef struct _MIB_TCP6TABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_TCP6ROW_OWNER_MODULE table[1]; +} MIB_TCP6TABLE_OWNER_MODULE, *PMIB_TCP6TABLE_OWNER_MODULE; + typedef struct _MIB_TCPROW2 { DWORD dwState; -- 2.25.0

1 0

[PATCH v3 4/8] msvcrt: Share ctype tables between threadlocinfo instances.
by Chip Davis 04 Feb '20

04 Feb '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v3: Fix a naive attempt at modifying a patch immediately before sending. --- dlls/msvcr90/tests/msvcr90.c | 16 +++++----- dlls/msvcrt/locale.c | 62 +++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 693b8a30c5c1..038e16a1d326 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -2120,10 +2120,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); @@ -2195,10 +2195,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); @@ -2276,10 +2276,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); @@ -2352,10 +2352,10 @@ static void test__get_current_locale(void) l->locinfo->lc_codepage, l2->locinfo->lc_codepage); ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", l->locinfo->lc_clike, l2->locinfo->lc_clike); + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); } - ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); todo_wine { - ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3723c14d483b..47f7c60a445c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -55,6 +55,9 @@ BOOL initial_locale = TRUE; #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 +static unsigned char cloc_clmap[256]; +static unsigned char cloc_cumap[256]; + static const MSVCRT_wchar_t sun[] = {'S','u','n',0}; static const MSVCRT_wchar_t mon[] = {'M','o','n',0}; static const MSVCRT_wchar_t tue[] = {'T','u','e',0}; @@ -163,6 +166,16 @@ static const char * const _country_synonyms[] = "spanish-modern", "esn" }; +static BOOL WINAPI init_cloc_casemap(PINIT_ONCE once, void *param, void **context) +{ + int i; + for(i=0; i<256; i++) { + cloc_clmap[i] = (i>='A' && i<='Z' ? i-'A'+'a' : i); + cloc_cumap[i] = (i>='a' && i<='z' ? i-'a'+'A' : i); + } + return TRUE; +} + /* INTERNAL: Map a synonym to an ISO code */ static void remap_synonym(char *name) { @@ -926,11 +939,13 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) MSVCRT_free(locinfo->lconv_mon_refcount); MSVCRT_free(locinfo->lconv); - MSVCRT_free(locinfo->ctype1_refcount); - MSVCRT_free(locinfo->ctype1); - - MSVCRT_free(locinfo->pclmap); - MSVCRT_free(locinfo->pcumap); + if(locinfo->ctype1_refcount + && !InterlockedDecrement(locinfo->ctype1_refcount)) { + MSVCRT_free(locinfo->ctype1_refcount); + MSVCRT_free(locinfo->ctype1); + MSVCRT_free(locinfo->pclmap); + MSVCRT_free(locinfo->pcumap); + } if(locinfo->lc_time_curr != &cloc_time_data) MSVCRT_free(locinfo->lc_time_curr); @@ -1198,13 +1213,6 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } memset(locinfo->lconv, 0, sizeof(struct MSVCRT_lconv)); - locinfo->pclmap = MSVCRT_malloc(sizeof(char[256])); - locinfo->pcumap = MSVCRT_malloc(sizeof(char[256])); - if(!locinfo->pclmap || !locinfo->pcumap) { - free_locinfo(locinfo); - return NULL; - } - if(locale_name[MSVCRT_LC_COLLATE] && !init_category_name(locale_name[MSVCRT_LC_COLLATE], locale_len[MSVCRT_LC_COLLATE], locinfo, MSVCRT_LC_COLLATE)) { @@ -1254,6 +1262,16 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, free_locinfo(locinfo); return NULL; } + locinfo->lc_codepage = old_locinfo->lc_codepage; + locinfo->lc_clike = old_locinfo->lc_clike; + locinfo->mb_cur_max = old_locinfo->mb_cur_max; + locinfo->ctype1 = old_locinfo->ctype1; + locinfo->ctype1_refcount = old_locinfo->ctype1_refcount; + locinfo->pctype = old_locinfo->pctype; + locinfo->pclmap = old_locinfo->pclmap; + locinfo->pcumap = old_locinfo->pcumap; + if(locinfo->ctype1_refcount) + InterlockedIncrement(locinfo->ctype1_refcount); } else if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) { CPINFO cp_info; int j; @@ -1274,7 +1292,9 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->ctype1_refcount = MSVCRT_malloc(sizeof(int)); locinfo->ctype1 = MSVCRT_malloc(sizeof(short[257])); - if(!locinfo->ctype1_refcount || !locinfo->ctype1) { + locinfo->pclmap = MSVCRT_malloc(sizeof(char[256])); + locinfo->pcumap = MSVCRT_malloc(sizeof(char[256])); + if(!locinfo->ctype1_refcount || !locinfo->ctype1 || !locinfo->pclmap || !locinfo->pcumap) { free_locinfo(locinfo); return NULL; } @@ -1315,7 +1335,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, buf, 256, (char*)locinfo->pcumap, 256); } else { - locinfo->lc_clike = 1; + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; locinfo->mb_cur_max = 1; locinfo->pctype = MSVCRT__ctype+1; if(!init_category_name("C", 1, locinfo, MSVCRT_LC_CTYPE)) { @@ -1323,17 +1343,9 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } - for(i=0; i<256; i++) { - if(locinfo->pctype[i] & MSVCRT__LEADBYTE) - buf[i] = ' '; - else - buf[i] = i; - } - - for(i=0; i<256; i++) { - locinfo->pclmap[i] = (i>='A' && i<='Z' ? i-'A'+'a' : i); - locinfo->pcumap[i] = (i>='a' && i<='z' ? i-'a'+'A' : i); - } + InitOnceExecuteOnce(&once, init_cloc_casemap, NULL, NULL); + locinfo->pclmap = cloc_clmap; + locinfo->pcumap = cloc_cumap; } if(locale_name[MSVCRT_LC_MONETARY] && -- 2.24.0

1 0

[PATCH v2] include: Add cdosys.idl
by Alistair Leslie-Hughes 04 Feb '20

04 Feb '20

v2: Added all interfaces, no just their forwards. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/cdosys.idl | 417 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 418 insertions(+) create mode 100644 include/cdosys.idl diff --git a/include/Makefile.in b/include/Makefile.in index b1e7d0084f..5f967b616d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -51,6 +51,7 @@ SOURCES = \ bluetoothapis.h \ bthsdpdef.h \ cderr.h \ + cdosys.idl \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cdosys.idl b/include/cdosys.idl new file mode 100644 index 0000000000..648ec0d8da --- /dev/null +++ b/include/cdosys.idl @@ -0,0 +1,417 @@ +/* + * Copyright (C) 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; +import "msado15_backcompat.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + uuid(cd000000-8b95-11d1-82db-00c04fb1625d), + version(1.0) +] +library CDO +{ + importlib("stdole2.tlb"); + + interface IBodyPart; + + typedef enum + { + cdoDSNDefault = 0, + cdoDSNNever = 1, + cdoDSNFailure = 2, + cdoDSNSuccess = 4, + cdoDSNDelay = 8, + cdoDSNSuccessFailOrDelay = 14 + } CdoDSNOptions; + + typedef enum + { + cdoRefTypeId = 0, + cdoRefTypeLocation = 1 + } CdoReferenceType; + + typedef enum + { + cdoSuppressNone = 0, + cdoSuppressImages = 1, + cdoSuppressBGSounds = 2, + cdoSuppressFrames = 4, + cdoSuppressObjects = 8, + cdoSuppressStyleSheets = 16, + cdoSuppressAll = 31 + } CdoMHTMLFlags; + + typedef enum + { + cdoDefaults = 0xffffffff, + cdoIIS = 1, + cdoOutlookExpress = 2 + } CdoConfigSource; + + [ + odl, + uuid(cd000029-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IDataSource : IDispatch + { + [id(0x000000cf), propget] + HRESULT SourceClass([out, retval] BSTR *source); + + [id(0x000000d0)] + HRESULT Source([out, retval] IUnknown **source); + + [id(0x000000d1), propget] + HRESULT IsDirty([out, retval] VARIANT_BOOL *dirty); + [id(0x000000d1), propput] + HRESULT IsDirty([in] VARIANT_BOOL dirty); + + [id(0x000000d2), propget] + HRESULT SourceURL([out, retval] BSTR *url); + + [id(0x000000d3), propget] + HRESULT ActiveConnection([out, retval] _Connection **connection); + + [id(0x000000fb)] + HRESULT SaveToObject([in] IUnknown *source, [in] BSTR iname); + + [id(0x000000fc)] + HRESULT OpenObject([in] IUnknown *source, [in] BSTR iname); + + [id(0x000000fd)] + HRESULT SaveTo([in] BSTR url, [in, optional, defaultvalue(NULL)] IDispatch *connection, + [in, optional] ConnectModeEnum mode, [in, optional] RecordCreateOptionsEnum create, + [in, optional] RecordOpenOptionsEnum options, [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(0x000000fe)] + HRESULT Open([in] BSTR url, [in, optional, defaultvalue(NULL)] IDispatch *connection, + [in, optional] ConnectModeEnum mode, [in, optional, defaultvalue(-1)] RecordCreateOptionsEnum create, + [in, optional] RecordOpenOptionsEnum options, [in, optional] BSTR username, + [in, optional] BSTR password); + + [id(0x000000ff)] + HRESULT Save(); + + [id(0x00000100)] + HRESULT SaveToContainer([in] BSTR url, [in, optional, defaultvalue(NULL)] IDispatch *connection, + [in, optional] ConnectModeEnum mode, [in, optional] RecordCreateOptionsEnum create, + [in, optional] RecordOpenOptionsEnum options, [in, optional] BSTR username, + [in, optional] BSTR password); + }; + + [ + odl, + uuid(cd000023-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IBodyParts : IDispatch + { + [id(0x00000001), propget] + HRESULT Count([out, retval] long *count); + + [id(00000000), propget] + HRESULT Item([in] long index, [out, retval] IBodyPart **body); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum([out, retval] IUnknown **retval); + + [id(0x00000002)] + HRESULT Delete([in] VARIANT bodypart); + + [id(0x00000003)] + HRESULT DeleteAll(); + + [id(0x00000004)] + HRESULT Add([in, optional, defaultvalue(-1)] long index, [out, retval] IBodyPart **bodypart); + }; + + [ + odl, + uuid(cd000021-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IBodyPart : IDispatch + { + [id(0x000000c8), propget] + HRESULT BodyParts([out, retval] IBodyParts **bodypart); + + [id(0x000000c9), propget] + HRESULT ContentTransferEncoding([out, retval] BSTR *encoding); + [id(0x000000c9), propput] + HRESULT ContentTransferEncoding([in] BSTR encoding); + + [id(0x000000ca), propget] + HRESULT ContentMediaType([out, retval] BSTR *mediatype); + [id(0x000000ca), propput] + HRESULT ContentMediaType([in] BSTR mediatype); + + [id(0x000000cb), propget] + HRESULT Fields([out, retval] Fields *fields); + + [id(0x000000cc), propget] + HRESULT Charset([out, retval] BSTR *charset); + [id(0x000000cc), propput] + HRESULT Charset([in] BSTR charset); + + [id(0x000000cd), propget] + HRESULT FileName([out, retval] BSTR *filename); + + [id(0x000000cf), propget] + HRESULT DataSource([out, retval] IDataSource *datasource); + + [id(0x000000d0), propget] + HRESULT ContentClass([out, retval] BSTR *content); + [id(0x000000d0), propput] + HRESULT ContentClass([in] BSTR content); + + [id(0x000000d1), propget] + HRESULT ContentClassName([out, retval] BSTR *name); + [id(0x000000d1), propput] + HRESULT ContentClassName([in] BSTR name); + + [id(0x000000d2), propget] + HRESULT Parent([out, retval] IBodyPart **parent); + + [id(0x000000fa)] + HRESULT AddBodyPart([in, optional, defaultvalue(-1)] long index, [out, retval] IBodyPart **bodypart); + + [id(0x000000fb)] + HRESULT SaveToFile([in] BSTR filename); + + [id(0x000000fc)] + HRESULT GetEncodedContentStream([out, retval] _Stream **stream); + + [id(0x000000fd)] + HRESULT GetDecodedContentStream([out, retval] _Stream **stream); + + [id(0x000000fe)] + HRESULT GetStream([out, retval] _Stream **stream); + + [id(0x000000ff)] + HRESULT GetFieldParameter([in] BSTR fieldname, [in] BSTR parameter, [out, retval] BSTR *streamalue); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR iface, [out, retval] IDispatch **unk); + }; + + [ + odl, + uuid(cd000022-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IConfiguration : IDispatch + { + [id(00000000), propget] + HRESULT Fields([out, retval] Fields **fields); + + [id(0x00000032)] + HRESULT Load([in] CdoConfigSource source, [in, optional] BSTR url); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR iname, [out, retval] IDispatch **unk); + }; + + [ + odl, + uuid(cd000020-8b95-11d1-82db-00c04fb1625d), + dual, + nonextensible, + oleautomation + ] + interface IMessage : IDispatch + { + [id(0x00000065), propget] + HRESULT BCC([out, retval] BSTR *bcc); + [id(0x00000065), propput] + HRESULT BCC([in] BSTR bcc); + + [id(0x00000067), propget] + HRESULT CC([out, retval] BSTR *cc); + [id(0x00000067), propput] + HRESULT CC([in] BSTR cc); + + [id(0x00000069), propget] + HRESULT FollowUpTo([out, retval] BSTR *follow); + [id(0x00000069), propput] + HRESULT FollowUpTo([in] BSTR follow); + + [id(0x0000006a), propget] + HRESULT From([out, retval] BSTR *from); + [id(0x0000006a), propput] + HRESULT From([in] BSTR from); + + [id(0x0000006b), propget] + HRESULT Keywords([out, retval] BSTR* keywords); + [id(0x0000006b), propput] + HRESULT Keywords([in] BSTR keywords); + + [id(0x0000006e), propget] + HRESULT MimeFormatted([out, retval] VARIANT_BOOL *formatted); + [id(0x0000006e), propput] + HRESULT MimeFormatted([in] VARIANT_BOOL formatted); + + [id(0x0000006f), propget] + HRESULT Newsgroups([out, retval] BSTR *newsgroups); + [id(0x0000006f), propput] + HRESULT Newsgroups([in] BSTR newsgroups); + [id(0x00000070), propget] + + HRESULT Organization([out, retval] BSTR *organization); + [id(0x00000070), propput] + HRESULT Organization([in] BSTR organization); + + [id(0x00000072), propget] + HRESULT ReceivedTime([out, retval] DATE *received); + + [id(0x00000073), propget] + HRESULT ReplyTo([out, retval] BSTR *reply); + [id(0x00000073), propput] + HRESULT ReplyTo([in] BSTR reply); + + [id(0x00000074), propget] + HRESULT DSNOptions([out, retval] CdoDSNOptions *options); + [id(0x00000074), propput] + HRESULT DSNOptions([in] CdoDSNOptions options); + + [id(0x00000077), propget] + HRESULT SentOn([out, retval] DATE *sent); + + [id(0x00000078), propget] + HRESULT Subject([out, retval] BSTR *subject); + [id(0x00000078), propput] + HRESULT Subject([in] BSTR subject); + + [id(0x00000079), propget] + HRESULT To([out, retval] BSTR *to); + [id(0x00000079), propput] + HRESULT To([in] BSTR to); + + [id(0x0000007b), propget] + HRESULT TextBody([out, retval] BSTR *body); + [id(0x0000007b), propput] + HRESULT TextBody([in] BSTR body); + + [id(0x0000007c)] + HRESULT HTMLBody([out, retval] BSTR* body); + [id(0x0000007c), propput] + HRESULT HTMLBody([in] BSTR body); + + [id(0x0000007d), propget] + HRESULT Attachments([out, retval] IBodyParts **attachments); + + [id(0x0000007e), propget] + HRESULT Sender([out, retval] BSTR *sender); + [id(0x0000007e), propput] + HRESULT Sender([in] BSTR sender); + + [id(0x0000007f), propget] + HRESULT Configuration([out, retval] IConfiguration **config); + [id(0x0000007f), propput] + HRESULT Configuration([in] IConfiguration *config); + [id(0x0000007f), propputref] + HRESULT Configuration([in] IConfiguration *config); + + [id(0x00000080), propget] + HRESULT AutoGenerateTextBody([out, retval] VARIANT_BOOL *body); + [id(0x00000080), propput] + HRESULT AutoGenerateTextBody([in] VARIANT_BOOL body); + + [id(0x00000081), propget] + HRESULT EnvelopeFields([out, retval] Fields **fields); + + [id(0x00000082), propget] + HRESULT TextBodyPart([out, retval] IBodyPart **body); + [id(0x00000083), propget] + HRESULT HTMLBodyPart([out, retval] IBodyPart **body); + + [id(0x00000084), propget] + HRESULT BodyPart([out, retval] IBodyPart ** part); + + [id(0x00000085), propget] + HRESULT DataSource([out, retval] IDataSource **datasource); + + [id(0x00000086), propget] + HRESULT Fields([out, retval] Fields **fields); + + [id(0x00000087), propget] + HRESULT MDNRequested([out, retval] VARIANT_BOOL* requested); + [id(0x00000087), propput] + HRESULT MDNRequested([in] VARIANT_BOOL requested); + + [id(0x00000096)] + HRESULT AddRelatedBodyPart([in] BSTR url, [in] BSTR Reference, [in] CdoReferenceType ReferenceType, + [in, optional] BSTR username, [in, optional] BSTR password, [out, retval] IBodyPart **body); + [id(0x00000097)] + HRESULT AddAttachment([in] BSTR url, [in, optional] BSTR username, + [in, optional] BSTR password, [out, retval] IBodyPart **body); + + [id(0x00000098)] + HRESULT CreateMHTMLBody([in] BSTR url, [in, optional, defaultvalue(0)] CdoMHTMLFlags flags, + [in, optional] BSTR username, [in, optional] BSTR password); + + [id(0x00000099)] + HRESULT Forward([out, retval] IMessage **msg); + + [id(0x0000009a)] + HRESULT Post(); + + [id(0x0000009b)] + HRESULT PostReply([out, retval] IMessage **msg); + + [id(0x0000009c)] + HRESULT Reply([out, retval] IMessage **msg); + + [id(0x0000009d)] + HRESULT ReplyAll([out, retval] IMessage **msg); + + [id(0x0000009e)] + HRESULT Send(); + + [id(0x0000009f)] + HRESULT GetStream([out, retval] _Stream **stream); + + [id(0x000000a0)] + HRESULT GetInterface([in] BSTR name, [out, retval] IDispatch **unknown); + }; + + [ + uuid(cd000001-8b95-11d1-82db-00c04fb1625d) + ] + coclass Message + { + [default] interface IMessage; + interface IDataSource; + interface IBodyPart; + }; +} -- 2.17.1

1 0

[PATCH v5 0/8] msvcrt: _locale_t object management overhaul
by Chip Davis 04 Feb '20

04 Feb '20

This patch series fixes management of _locale_t objects to align more with native. Some apps and libraries--most notably libc++--depend on this to behave properly. The first patch contains tests demonstrating the proper behavior of _locale_t objects and their various members. Patches 2 through 6 copy various portions of the threadlocinfo struct from old to new when they aren't updated. This is all to clear the way for patch 7, which updates the locale pointer in msvcrt itself instead of the contents of the threadlocinfo struct. The last patch fixes the reference counting behavior of _get_current_locale() to match native.

2 13

[PATCH] testbot: Do cosmetic cleanups in the patch handling code.
by Francois Gouget 04 Feb '20

04 Feb '20

Prefix unused variables with an underscore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 23 +++++++-------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 4 ++-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index ca8d57f90f..46b17e52a1 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -212,7 +212,7 @@ sub Submit($$$) $BuildStep->DebugLevel(0); # Save the build step so the others can reference it. - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) { $self->Disposition("Failed to submit build step"); @@ -308,7 +308,7 @@ sub Submit($$$) } # Save it all - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job"); @@ -325,7 +325,7 @@ sub Submit($$$) # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); $NewJob->Priority($Priority); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job (staging)"); @@ -470,9 +470,7 @@ sub NewPatch($$$) if ($Subject =~ m/\d+\/\d+/) { $Patch->Disposition("Checking series"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -482,9 +480,7 @@ sub NewPatch($$$) else { $Patch->Disposition("Checking patch"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -505,14 +501,11 @@ sub NewPatch($$$) { $PatchBody->purge(); } - + if (! defined($ErrMessage)) { - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage if (defined $ErrMessage); } return undef; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 5be39e4016..53395130e7 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -258,7 +258,7 @@ sub NewSubmission($$) $Part->Patch($Patch); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); if (defined($ErrMessage)) { $Patch->Disposition("Error occurred during series processing"); @@ -280,7 +280,7 @@ sub NewSubmission($$) $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); if (!defined $ErrMessage) { - (my $ErrProperty, $ErrMessage) = $Part->Patch->Save(); + ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); } } else -- 2.20.1

1 0

[PATCH 1/5] d3d9: Set the primary stateblock when executing draw calls.
by Zebediah Figura 04 Feb '20

04 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 88 ++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8122ab0a05..bb7f5ddd4a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2938,13 +2938,13 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); - wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); + wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3025,7 +3025,6 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3048,14 +3047,15 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); if (FAILED(hr)) goto done; d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3142,7 +3142,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -3187,20 +3186,21 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vertex_stride); if (FAILED(hr)) goto done; d3d9_generate_auto_mipmaps(device); - wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, - wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); + wined3d_stateblock_set_index_buffer(device->state, device->index_buffer, + wined3dformat_from_d3dformat(index_format)); + wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); - wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0); - wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); + wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -3217,17 +3217,17 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *dst_impl = unsafe_impl_from_IDirect3DVertexBuffer9(dst_buffer); struct d3d9_vertex_declaration *decl_impl = unsafe_impl_from_IDirect3DVertexDeclaration9(declaration); + const struct wined3d_stateblock_state *state; + const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *d3d9_buffer; - struct wined3d_buffer *wined3d_buffer; - unsigned int i, offset, stride, map; + unsigned int i, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, declaration %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, declaration, flags); wined3d_mutex_lock(); - - wined3d_device_apply_stateblock(device->wined3d_device, device->state); + state = wined3d_stateblock_get_state(device->state); /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we @@ -3238,16 +3238,15 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d9_buffer->wined3d_buffer, offset, stride))) + d3d9_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d9_buffer->wined3d_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst_impl->wined3d_buffer, decl_impl ? decl_impl->wined3d_declaration : NULL, flags, dst_impl->fvf); @@ -3256,13 +3255,11 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, while (map) { i = wined3d_bit_scan(&map); + stream = &state->streams[i]; - if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) - ERR("Failed to get stream source.\n"); - d3d9_buffer = wined3d_buffer_get_parent(wined3d_buffer); - if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, - i, d3d9_buffer->draw_buffer, offset, stride))) + d3d9_buffer = wined3d_buffer_get_parent(stream->buffer); + if (FAILED(wined3d_stateblock_set_stream_source(device->state, + i, d3d9_buffer->draw_buffer, stream->offset, stream->stride))) ERR("Failed to set stream source.\n"); } @@ -3663,8 +3660,12 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); if (!buffer_impl) - wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &offset, &stride); + { + const struct wined3d_stream_state *stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + wined3d_buffer = stream->buffer; + offset = stream->offset; + stride = stream->stride; + } if (!buffer_impl) wined3d_buffer = NULL; @@ -3695,9 +3696,8 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, UINT stream_idx, IDirect3DVertexBuffer9 **buffer, UINT *offset, UINT *stride) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + const struct wined3d_stream_state *stream; struct d3d9_vertexbuffer *buffer_impl; - struct wined3d_buffer *wined3d_buffer; - HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", iface, stream_idx, buffer, offset, stride); @@ -3705,23 +3705,28 @@ static HRESULT WINAPI d3d9_device_GetStreamSource(IDirect3DDevice9Ex *iface, if (!buffer) return D3DERR_INVALIDCALL; + if (stream_idx > WINED3D_MAX_STREAMS) + { + WARN("Stream index %u out of range.\n", stream_idx); + return WINED3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, offset, stride); - if (SUCCEEDED(hr) && wined3d_buffer) + stream = &wined3d_stateblock_get_state(device->state)->streams[stream_idx]; + if (stream->buffer) { - buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffer_impl = wined3d_buffer_get_parent(stream->buffer); *buffer = &buffer_impl->IDirect3DVertexBuffer9_iface; IDirect3DVertexBuffer9_AddRef(*buffer); } else - { - if (FAILED(hr)) - FIXME("Call to GetStreamSource failed %p %p\n", offset, stride); *buffer = NULL; - } + if (offset) + *offset = stream->offset; + *stride = stream->stride; wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetStreamSourceFreq(IDirect3DDevice9Ex *iface, UINT stream_idx, UINT freq) @@ -3784,7 +3789,6 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d9_indexbuffer *buffer_impl; @@ -3794,7 +3798,7 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, NULL))) + if ((wined3d_buffer = wined3d_stateblock_get_state(device->state)->index_buffer)) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; -- 2.25.0

2 7

[PATCH v4 0/8] msvcrt: _locale_t object management overhaul
by Chip Davis 03 Feb '20

03 Feb '20

This patch series fixes management of _locale_t objects to align more with native. Some apps and libraries--most notably libc++--depend on this to behave properly. The first patch contains tests demonstrating the proper behavior of _locale_t objects and their various members. Patches 2 through 6 copy various portions of the threadlocinfo struct from old to new when they aren't updated. This is all to clear the way for patch 7, which updates the locale pointer in msvcrt itself instead of the contents of the threadlocinfo struct. The last patch fixes the reference counting behavior of _get_current_locale() to match native.

1 8

[PATCH v3 3/3] msvcrt: Set return value on all paths in wcstombs_s_l.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH v2 1/8] msvcr90/tests: Test _get_current_locale()/setlocale() interaction.
by Chip Davis 03 Feb '20

03 Feb '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Bail if setlocale() fails. Mark a result as broken(). --- dlls/msvcr90/tests/msvcr90.c | 466 +++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f25492d..c81f4410d60b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -139,6 +139,22 @@ static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static _locale_t (__cdecl *p__get_current_locale)(void); + +struct __lc_time_data { + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; + LCID lcid; + int unk; + int refcount; +}; /* make sure we use the correct errno */ #undef errno @@ -408,6 +424,7 @@ static BOOL init(void) SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); SET(p__create_locale, "_create_locale"); SET(p__free_locale, "_free_locale"); + SET(p__get_current_locale, "_get_current_locale"); if (sizeof(void *) == 8) { @@ -1961,6 +1978,454 @@ static void test____mb_cur_max_l_func(void) p__free_locale(l); } +static void test__get_current_locale(void) +{ + _locale_t l = p__get_current_locale(), l2 = p__get_current_locale(); + int i; +#define lc_str(lc, s) \ + ok(!strcmp(l->locinfo->lc_category[lc].locale, s), #lc " = \"%s\"\n", \ + l->locinfo->lc_category[lc].locale) + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + + ok(l->locinfo->refcount == 3, "refcount = %d\n", l->locinfo->refcount); + + if(!p_setlocale(LC_ALL, "english")) { + win_skip("English locale not available\n"); + p__free_locale(l); + p__free_locale(l2); + return; + } + + todo_wine { + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + } +#undef lc_str + + todo_wine ok(l->locinfo->refcount == 2, "refcount = %d\n", l->locinfo->refcount); + ok(l->locinfo == l2->locinfo, "different locinfo pointers\n"); + ok(l->mbcinfo == l2->mbcinfo, "different mbcinfo pointers\n"); + + p__free_locale(l); + p__free_locale(l2); + + l = p__get_current_locale(); + p_setlocale(LC_COLLATE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + ok(l->locinfo->lc_category[LC_COLLATE].locale != l2->locinfo->lc_category[LC_COLLATE].locale, + "same locale name pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount != l2->locinfo->lc_category[LC_COLLATE].refcount, + "same refcount pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l->locinfo->lc_category[LC_COLLATE].refcount == 1, "refcount = %d\n", + *l->locinfo->lc_category[LC_COLLATE].refcount); + ok(l2->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l2->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l2->locinfo->lc_category[LC_COLLATE].refcount == 2, "refcount = %d\n", + *l2->locinfo->lc_category[LC_COLLATE].refcount); + } + for(i = LC_CTYPE; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage == l2->locinfo->lc_codepage, "different lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike == l2->locinfo->lc_clike, "different lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + /* The meaning of this member seems to be reversed--go figure */ + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(l->locinfo->ctype1 == l2->locinfo->ctype1, "different ctype1 pointers\n"); + ok(l->locinfo->pclmap == l2->locinfo->pclmap, "different clmap pointers\n"); + ok(l->locinfo->pcumap == l2->locinfo->pcumap, "different cumap pointers\n"); + ok(l->locinfo->ctype1_refcount == l2->locinfo->ctype1_refcount, "different ctype1_refcount pointers\n"); + todo_wine ok(*l->locinfo->ctype1_refcount == 3, "refcount = %d\n", *l->locinfo->ctype1_refcount); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_CTYPE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i < LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_MONETARY; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_MONETARY, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_NUMERIC; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + ok(l2->locinfo->lconv_intl_refcount, "null refcount pointer for C locale\n"); + if(l2->locinfo->lconv_intl_refcount) + ok(*l2->locinfo->lconv_intl_refcount == 2, "refcount = %d\n", *l2->locinfo->lconv_intl_refcount); + } + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_NUMERIC, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_NUMERIC; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + ok(l->locinfo->lc_category[LC_TIME].locale == l2->locinfo->lc_category[LC_TIME].locale, + "different locale name pointers for LC_TIME\n"); + ok(l->locinfo->lc_category[LC_TIME].refcount == l2->locinfo->lc_category[LC_TIME].refcount, + "different refcount pointers for LC_TIME\n"); + todo_wine ok(*l->locinfo->lc_category[LC_TIME].refcount == 3, "refcount = %d\n", + *l->locinfo->lc_category[LC_TIME].refcount); + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_TIME, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + for(i = LC_MIN+1; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine ok(l->locinfo->lc_time_curr != l2->locinfo->lc_time_curr, "same lc_time_curr pointers\n"); + ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); + todo_wine ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), + "refcount = %d\n", l2->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p__free_locale(l); + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr90) { if(!init()) @@ -2001,4 +2466,5 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); + test__get_current_locale(); } -- 2.24.0

3 15

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 03 Feb '20

03 Feb '20

2 1

[PATCH v5 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 03 Feb '20

03 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9b..2483c502f45 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

2 5

[PATCH] atlbase.h: Fix some declarations on win64.
by Jacek Caban 03 Feb '20

03 Feb '20

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/atl/atl.c | 2 +- dlls/atl/tests/module.c | 11 +++++++---- include/atlbase.h | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-)

1 0

[PATCH v3 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 03 Feb '20

03 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9b..2483c502f45 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

3 9

[PATCH v4 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 03 Feb '20

03 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9b..2483c502f45 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

2 6

[PATCH 2/2] wscript/tests: Get rid of mystrchr.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wscript/tests/run.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)

1 0

[PATCH 1/2] wscript/tests: Get rid of strcmp_wa.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wscript/tests/run.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)

1 0

[PATCH 3/3 v2] msvcrt: Set return value on all paths in wcstombs_s_l.
by Piotr Caban 03 Feb '20

03 Feb '20

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 20 ++++++++------------ dlls/msvcrt/wcs.c | 16 +++++++++++----- 2 files changed, 19 insertions(+), 17 deletions(-)

2 1

[PATCH v2] wldap32: Define a debug channel only when we are using it.
by Gerald Pfeifer 03 Feb '20

03 Feb '20

We only need this debug channel when we're later using it - and all uses in this file are guarded by #ifdef HAVE_LDAP, so use the same guard here as well. Thanks to Nikolay for this hint based on an earlier patch. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wldap32/add.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 0a24d95f32..f5796a6fd7 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif #ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; -- 2.25.0

2 3

[PATCH 2/3 v2] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Piotr Caban 03 Feb '20

03 Feb '20

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 4 ++-- dlls/msvcrt/wcs.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH 1/3 v2] msvcrt/tests: Add some wcstombs_s_l tests.
by Piotr Caban 03 Feb '20

03 Feb '20

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - check if _create_locale succeeded dlls/msvcrt/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)

3 3

[PATCH 3/3] vbscript: Silence QueryInterface FIXME.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/3] vbscript: Add SetScriptState(SCRIPTSTATE_CLOSED) implementation.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/vbscript.c | 71 ++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 5 ++- 2 files changed, 75 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 8 +++++--- dlls/vbscript/tests/lang.vbs | 7 ++++++- 3 files changed, 14 insertions(+), 7 deletions(-)

1 0

[PATCH] oleaut32: Use GetFinalPathNameByHandle to canonicalize file path.
by Jacek Caban 03 Feb '20

03 Feb '20

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Current canonicalization code assumes that the drive does not change, which may not be the case when, for example, z: path is used for paths inside drive_c, . dlls/oleaut32/typelib.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-)

1 0

[PATCH v2] msvcrt/tests: Be more explicit about sscanf() with %d/%hd/%hhd.
by Serge Gautherie 03 Feb '20

03 Feb '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Removed comments, added a cast. --- dlls/msvcrt/tests/scanf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 57d9cc0..60e1f6c 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -207,9 +207,14 @@ static void test_sscanf( void ) result = 0xdeadbeef; strcpy(buffer,"12345678"); - ret = p_sscanf(buffer, "%hd", &result); + ret = p_sscanf(buffer, "%d", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); + + result = 0xdeadbeef; + ret = p_sscanf(buffer, "%hd", (short *)&result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead614e, "Wrong number read (%08x)\n", result); result = 0xdeadbeef; strcpy(buffer,"12345678"); @@ -238,7 +243,7 @@ static void test_sscanf( void ) result = 0xdeadbeef; ret = p_sscanf(buffer, "%hhd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xbc614e, "Wrong number read (%x)\n", result); + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); strcpy(buffer,"12345678901234"); ret = p_sscanf(buffer, "%lld", &result64); -- 2.10.0.windows.1

2 1

[PATCH 3/3] msvcrt: Set return value on all paths in wcstombs_s_l.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH 2/3] msvcrt: Don't set error in wcstombs_s_l if no characters to convert.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH 1/3] msvcrt/tests: Add some wcstombs_s_l tests.
by Daniel Lehman 03 Feb '20

03 Feb '20

1 0

[PATCH resend 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself.
by Gabriel Ivăncescu 03 Feb '20

03 Feb '20

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- There's been some interest in this fix during the code freeze, affecting other apps' experience as well, so I sent it again now that it's over. dlls/kernel32/path.c | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c50b631..b4756bf 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -274,6 +274,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -455,6 +465,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -507,18 +518,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -528,6 +543,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -540,13 +556,53 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length / sizeof(WCHAR)) + 1; + nt_filename_len = nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - nt_filename; + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (num > 0 && !used_default) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.21.0

2 4

[v2 PATCH 1/2] dwrite: Do not create intermediate object to return face reference from family.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 507099b24e..a3d36a5206 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2429,21 +2429,19 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily2 *iface, UINT3 static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { - IDWriteFont3 *font; - HRESULT hr; + struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); + const struct dwrite_font_data *font; TRACE("%p, %u, %p.\n", iface, index, reference); *reference = NULL; - hr = IDWriteFontFamily2_GetFont(iface, index, &font); - if (FAILED(hr)) - return hr; - - hr = IDWriteFont3_GetFontFaceReference(font, reference); - IDWriteFont3_Release(font); + if (index >= family->data->count) + return E_FAIL; - return hr; + font = family->data->fonts[index]; + return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)family->collection->factory, + font->file, font->face_index, font->simulations, reference); } static HRESULT WINAPI dwritefontfamily2_GetMatchingFonts(IDWriteFontFamily2 *iface, -- 2.24.1

1 1

[PATCH 2/2 v2] dsound: Use an SRW lock for the buffer lock.
by Andrew Eikum 03 Feb '20

03 Feb '20

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Better match surrounding indent styles. dlls/dsound/buffer.c | 65 +++++++++++++----------------------- dlls/dsound/capture.c | 1 - dlls/dsound/dsound.c | 1 - dlls/dsound/dsound_convert.c | 1 - dlls/dsound/dsound_main.c | 1 - dlls/dsound/dsound_private.h | 2 +- dlls/dsound/duplex.c | 1 - dlls/dsound/mixer.c | 5 ++- dlls/dsound/primary.c | 5 ++- dlls/dsound/propset.c | 1 - dlls/dsound/sound3d.c | 1 - 11 files changed, 29 insertions(+), 55 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index d585a7605ef..8d4a3b92fa6 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "vfwmsgs.h" #include "wine/debug.h" #include "dsound.h" @@ -200,8 +199,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *ifac return DSERR_INVALIDPARAM; } - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) { oldVol = This->ds3db_lVolume; @@ -216,8 +214,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *ifac DSOUND_RecalcVolPan(&(This->volpan)); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -268,8 +265,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i return DSERR_INVALIDPARAM; } - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); oldFreq = This->freq; This->freq = freq; @@ -280,8 +276,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i DSOUND_RecalcFormat(This); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return DS_OK; } @@ -295,8 +290,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags); - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); This->playflags = flags; if (This->state == STATE_STOPPED) { @@ -309,8 +303,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW IMediaObject_Discontinuity(This->filters[i].obj, 0); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -322,8 +315,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) TRACE("(%p)\n",This); - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); if (This->state == STATE_PLAYING) This->state = STATE_STOPPING; @@ -333,8 +325,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) DSOUND_CheckEvent(This, 0, 0); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -382,7 +373,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff TRACE("(%p,%p,%p)\n",This,playpos,writepos); - RtlAcquireResourceShared(&This->lock, TRUE); + AcquireSRWLockShared(&This->lock); pos = This->sec_mixpos; @@ -403,7 +394,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition(IDirectSoundBuff *writepos %= This->buflen; } - RtlReleaseResource(&This->lock); + ReleaseSRWLockShared(&This->lock); TRACE("playpos = %d, writepos = %d, buflen=%d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, This->buflen, This, GetTickCount()); @@ -423,13 +414,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac } *status = 0; - RtlAcquireResourceShared(&This->lock, TRUE); + AcquireSRWLockShared(&This->lock); if ((This->state == STATE_STARTING) || (This->state == STATE_PLAYING)) { *status |= DSBSTATUS_PLAYING; if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } - RtlReleaseResource(&This->lock); + ReleaseSRWLockShared(&This->lock); TRACE("status=%x\n", *status); return DS_OK; @@ -509,8 +500,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW return DSERR_INVALIDPARAM; } - /* **** */ - RtlAcquireResourceShared(&This->lock, TRUE); + AcquireSRWLockShared(&This->lock); if (writecursor+writebytes <= This->buflen) { *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; @@ -543,8 +533,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockShared(&This->lock); return DS_OK; } @@ -557,8 +546,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff TRACE("(%p,%d)\n",This,newpos); - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); /* start mixing from this new location instead */ newpos %= This->buflen; @@ -568,8 +556,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff /* at this point, do not attempt to reset buffers, mess with primary mix position, or anything like that to reduce latency. The data already prebuffered cannot be changed */ - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -591,16 +578,14 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(IDirectSoundBuffer8 *iface, return DSERR_CONTROLUNAVAIL; } - /* **** */ - RtlAcquireResourceExclusive(&This->lock, TRUE); + AcquireSRWLockExclusive(&This->lock); if (This->volpan.lPan != pan) { This->volpan.lPan = pan; DSOUND_RecalcVolPan(&(This->volpan)); } - RtlReleaseResource(&This->lock); - /* **** */ + ReleaseSRWLockExclusive(&This->lock); return hres; } @@ -646,7 +631,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, AcquireSRWLockShared(&This->device->buffer_list_lock); LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry ) { - RtlAcquireResourceShared(&iter->lock, TRUE); + AcquireSRWLockShared(&iter->lock); if (x1) { if(x1 + (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory > iter->buflen) @@ -662,7 +647,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, else iter->buffer->lockedbytes -= x2; } - RtlReleaseResource(&iter->lock); + ReleaseSRWLockShared(&iter->lock); } ReleaseSRWLockShared(&This->device->buffer_list_lock); } @@ -1125,7 +1110,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds } else DSOUND_RecalcVolPan(&(dsb->volpan)); - RtlInitializeResource(&dsb->lock); + InitializeSRWLock(&dsb->lock); /* register buffer */ err = DirectSoundDevice_AddBuffer(device, dsb); @@ -1148,7 +1133,6 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) This->device->drvcaps.dwFreeHwMixingAllBuffers++; DirectSoundDevice_RemoveBuffer(This->device, This); - RtlDeleteResource(&This->lock); This->buffer->ref--; list_remove(&This->entry); @@ -1190,13 +1174,13 @@ HRESULT IDirectSoundBufferImpl_Duplicate( return DSERR_OUTOFMEMORY; } - RtlAcquireResourceShared(&pdsb->lock, TRUE); + AcquireSRWLockShared(&pdsb->lock); CopyMemory(dsb, pdsb, sizeof(*dsb)); dsb->pwfx = DSOUND_CopyFormat(pdsb->pwfx); - RtlReleaseResource(&pdsb->lock); + ReleaseSRWLockShared(&pdsb->lock); if (dsb->pwfx == NULL) { HeapFree(GetProcessHeap(),0,dsb); @@ -1218,12 +1202,11 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->device = device; DSOUND_RecalcFormat(dsb); - RtlInitializeResource(&dsb->lock); + InitializeSRWLock(&dsb->lock); /* register buffer */ hres = DirectSoundDevice_AddBuffer(device, dsb); if (hres != DS_OK) { - RtlDeleteResource(&dsb->lock); list_remove(&dsb->entry); dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 8fc27499998..10690f7df0d 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -34,7 +34,6 @@ #include "winuser.h" #include "mmsystem.h" #include "mmddk.h" -#include "winternl.h" #include "winnls.h" #include "wine/debug.h" #include "dsound.h" diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e7ab7922bb7..3085d86e5b5 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -30,7 +30,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winternl.h" #include "mmddk.h" #include "wingdi.h" #include "mmreg.h" diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 6181f04be73..4735178a9a8 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -41,7 +41,6 @@ #include "windef.h" #include "winbase.h" #include "mmsystem.h" -#include "winternl.h" #include "wine/debug.h" #include "dsound.h" #include "dsound_private.h" diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 4e752be6bae..3acee554ad9 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -43,7 +43,6 @@ #include "winnls.h" #include "winreg.h" #include "mmsystem.h" -#include "winternl.h" #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 5605bded905..bdb9ebee544 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -136,7 +136,7 @@ struct IDirectSoundBufferImpl LONG ref, refn, ref3D, refiks; /* IDirectSoundBufferImpl fields */ DirectSoundDevice* device; - RTL_RWLOCK lock; + SRWLOCK lock; PWAVEFORMATEX pwfx; BufferMemory* buffer; DWORD playflags,state,leadin; diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 4a88dd89b96..cccfeba0f06 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -28,7 +28,6 @@ #include "winuser.h" #include "mmsystem.h" #include "mmddk.h" -#include "winternl.h" #include "wine/debug.h" #include "dsound.h" #include "dsound_private.h" diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index c1bd3273f58..a6402b09eff 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -33,7 +33,6 @@ #include "mmsystem.h" #include "wingdi.h" #include "mmreg.h" -#include "winternl.h" #include "wine/debug.h" #include "dsound.h" #include "ks.h" @@ -593,7 +592,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff if (dsb->buflen && dsb->state) { TRACE("Checking %p, frames=%d\n", dsb, frames); - RtlAcquireResourceShared(&dsb->lock, TRUE); + AcquireSRWLockShared(&dsb->lock); /* if buffer is stopping it is stopped now */ if (dsb->state == STATE_STOPPING) { dsb->state = STATE_STOPPED; @@ -609,7 +608,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff *all_stopped = FALSE; } - RtlReleaseResource(&dsb->lock); + ReleaseSRWLockShared(&dsb->lock); } } } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 8d42fe0ed90..655f730b375 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -32,7 +32,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" @@ -274,9 +273,9 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, device->playpos = 0; for (i = 0; i < device->nrofbuffers; i++) { - RtlAcquireResourceExclusive(&dsb[i]->lock, TRUE); + AcquireSRWLockExclusive(&dsb[i]->lock); DSOUND_RecalcFormat(dsb[i]); - RtlReleaseResource(&dsb[i]->lock); + ReleaseSRWLockExclusive(&dsb[i]->lock); } return DS_OK; diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 92aae8fe0ad..dcb2b871783 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -28,7 +28,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "winnls.h" #include "vfwmsgs.h" #include "mmddk.h" diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 27fc416676f..06dbf58ca0b 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -44,7 +44,6 @@ #include "winbase.h" #include "winuser.h" #include "mmsystem.h" -#include "winternl.h" #include "mmddk.h" #include "wine/debug.h" #include "dsound.h" -- 2.25.0

1 0

[PATCH 1/2 v2] dsound: Use an SRW lock for buffer_list_lock.
by Andrew Eikum 03 Feb '20

03 Feb '20

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48408 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: No changes. dlls/dsound/buffer.c | 4 ++-- dlls/dsound/dsound.c | 15 +++++++-------- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index f6006529141..d585a7605ef 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (x1 || x2) { - RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE); + AcquireSRWLockShared(&This->device->buffer_list_lock); LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry ) { RtlAcquireResourceShared(&iter->lock, TRUE); @@ -664,7 +664,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, } RtlReleaseResource(&iter->lock); } - RtlReleaseResource(&This->device->buffer_list_lock); + ReleaseSRWLockShared(&This->device->buffer_list_lock); } return hres; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 8e2b839fe89..e7ab7922bb7 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -181,7 +181,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) InitializeCriticalSection(&(device->mixlock)); device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); - RtlInitializeResource(&(device->buffer_list_lock)); + InitializeSRWLock(&device->buffer_list_lock); *ppDevice = device; @@ -238,7 +238,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); - RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->mixlock); HeapFree(GetProcessHeap(),0,device); @@ -612,7 +611,7 @@ HRESULT DirectSoundDevice_AddBuffer( TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->buffers) newbuffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(IDirectSoundBufferImpl*)*(device->nrofbuffers+1)); @@ -629,7 +628,7 @@ HRESULT DirectSoundDevice_AddBuffer( hr = DSERR_OUTOFMEMORY; } - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } @@ -644,7 +643,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->nrofbuffers == 1) { assert(device->buffers[0] == pDSB); @@ -662,7 +661,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff device->nrofbuffers--; TRACE("buffer count is now %d\n", device->nrofbuffers); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); } /******************************************************************************* @@ -869,14 +868,14 @@ static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); } - RtlAcquireResourceExclusive(&device->buffer_list_lock, TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&device->mixlock); if ((level == DSSCL_WRITEPRIMARY) != (device->priolevel == DSSCL_WRITEPRIMARY)) hr = DSOUND_ReopenDevice(device, level == DSSCL_WRITEPRIMARY); if (SUCCEEDED(hr)) device->priolevel = level; LeaveCriticalSection(&device->mixlock); - RtlReleaseResource(&device->buffer_list_lock); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 930c3e92ec8..5605bded905 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -80,7 +80,7 @@ struct DirectSoundDevice DWORD writelead, buflen, ac_frames, frag_frames, playpos, pad, stopped; int nrofbuffers; IDirectSoundBufferImpl** buffers; - RTL_RWLOCK buffer_list_lock; + SRWLOCK buffer_list_lock; CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 05ca99b5df4..c1bd3273f58 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -767,9 +767,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p) if (!dev->ref) break; - RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); + AcquireSRWLockShared(&dev->buffer_list_lock); DSOUND_PerformMix(dev); - RtlReleaseResource(&(dev->buffer_list_lock)); + ReleaseSRWLockShared(&dev->buffer_list_lock); } return 0; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 852ec51b7ff..8d42fe0ed90 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -472,7 +472,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe } /* **** */ - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&(device->mixlock)); if (device->priolevel == DSSCL_WRITEPRIMARY) { @@ -508,7 +508,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe out: LeaveCriticalSection(&(device->mixlock)); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); /* **** */ return err; -- 2.25.0

1 0

[PATCH] mshtml: use ARRAY_SIZE instead of sizeof in MultiByteToWideChar
by Marcus Meissner 03 Feb '20

03 Feb '20

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1c4a54cf63..2b0a5cde95 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6370,7 +6370,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = ObtainUserAgentString(0, bufa, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); - MultiByteToWideChar(CP_ACP, 0, bufa, size, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, bufa, size, buf, ARRAY_SIZE(buf)); bstr = NULL; hres = IOmNavigator_get_userAgent(navigator, &bstr); @@ -6390,7 +6390,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, ua, sizeof(ua), 0); ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); - MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, ARRAY_SIZE(buf)); hres = IOmNavigator_get_appVersion(navigator, &bstr); ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); -- 2.25.0

2 1

[PATCH 1/2] dwrite: Do not create intermediate object to return face reference from family.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 507099b24e..a3d36a5206 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2429,21 +2429,19 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily2 *iface, UINT3 static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { - IDWriteFont3 *font; - HRESULT hr; + struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); + const struct dwrite_font_data *font; TRACE("%p, %u, %p.\n", iface, index, reference); *reference = NULL; - hr = IDWriteFontFamily2_GetFont(iface, index, &font); - if (FAILED(hr)) - return hr; - - hr = IDWriteFont3_GetFontFaceReference(font, reference); - IDWriteFont3_Release(font); + if (index >= family->data->count) + return E_FAIL; - return hr; + font = family->data->fonts[index]; + return IDWriteFactory5_CreateFontFaceReference_((IDWriteFactory5 *)family->collection->factory, + font->file, font->face_index, font->simulations, reference); } static HRESULT WINAPI dwritefontfamily2_GetMatchingFonts(IDWriteFontFamily2 *iface, -- 2.24.1

2 2

[PATCH 8/8] jscript: Add GetSourcePosition implementation.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 25 +++++++++++++++++++++---- dlls/jscript/tests/run.c | 3 --- 2 files changed, 21 insertions(+), 7 deletions(-)

1 0

[PATCH 7/8] jscript: Return error source and description from GetExceptionInfo.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 4 ++++ dlls/jscript/tests/run.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 6/8] jscript: Propagate compiler error location.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 5/8] jscript: Propagate parser error location.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 2 +- dlls/jscript/parser.h | 4 +++- dlls/jscript/parser.y | 29 ++++++++++++++++++----------- 3 files changed, 22 insertions(+), 13 deletions(-)

1 0

[PATCH 4/8] jscript: Delay error object creation for builtin errors with message string until it's needed.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 ++++++------ dlls/jscript/engine.c | 10 ++++------ dlls/jscript/error.c | 41 ++++++++--------------------------------- dlls/jscript/jscript.h | 2 +- 4 files changed, 19 insertions(+), 46 deletions(-)

1 0

[PATCH 3/8] jscript: Support propagating error message.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 2 ++ dlls/jscript/engine.c | 14 ++++++++++++-- dlls/jscript/engine.h | 1 + dlls/jscript/error.c | 4 +++- dlls/jscript/jscript.c | 4 ++++ 5 files changed, 22 insertions(+), 3 deletions(-)

1 0

[PATCH 2/8] jscript: Store error location in jsexcept_t.
by Jacek Caban 03 Feb '20

03 Feb '20

1 0

[PATCH 1/8] jscript: Propagate Invoke error code using jsexcept_t.
by Jacek Caban 03 Feb '20

03 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] dwrite/tests: Add traces to allow debugging font failures.
by Francois Gouget 03 Feb '20

03 Feb '20

Always trace the iteration counters so one can identify which iteration is failing. Also trace the family and font name so one can know which font is causing the failure. But only do so if extra debugging information is requested since there can be quite a lot of fonts. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dwrite/tests/font.c | 52 ++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index cdc41ec5a1d..a401ca910f8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7903,7 +7903,20 @@ todo_wine UINT32 font_count, j; hr = IDWriteFontCollection1_GetFontFamily(collection, i, &family); - ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); + ok(hr == S_OK, "%u Failed to get family, hr %#x.\n", i, hr); + + if (winetest_debug > 1) + { + IDWriteLocalizedStrings *names; + WCHAR familynameW[64]; + + hr = IDWriteFontFamily1_GetFamilyNames(family, &names); + ok(hr == S_OK, "%u got 0x%08x\n", i, hr); + + get_enus_string(names, familynameW, ARRAY_SIZE(familynameW)); + IDWriteLocalizedStrings_Release(names); + trace("%u family=%s\n", i, wine_dbgstr_w(familynameW)); + } font_count = IDWriteFontFamily1_GetFontCount(family); @@ -7912,17 +7925,30 @@ todo_wine IDWriteFontFaceReference1 *ref2; hr = IDWriteFontFamily1_GetFont(family, j, &font3); - ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get font, hr %#x.\n", i, j, hr); + + if (winetest_debug > 1) + { + IDWriteLocalizedStrings *names; + WCHAR facenameW[64]; + + hr = IDWriteFont3_GetFaceNames(font3, &names); + ok(hr == S_OK, "%u.%u got 0x%08x\n", i, j, hr); + + get_enus_string(names, facenameW, ARRAY_SIZE(facenameW)); + IDWriteLocalizedStrings_Release(names); + trace("%u.%u facename=%s\n", i, j, wine_dbgstr_w(facenameW)); + } hr = IDWriteFont3_GetFontFaceReference(font3, &ref); - ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get reference object, hr %#x.\n", i, j, hr); hr = IDWriteFont3_GetFontFaceReference(font3, &ref1); - ok(hr == S_OK, "Failed to get reference object, hr %#x.\n", hr); - ok(ref != ref1, "Unexpected reference object %p, %p.\n", ref1, ref); + ok(hr == S_OK, "%u.%u Failed to get reference object, hr %#x.\n", i, j, hr); + ok(ref != ref1, "%u.%u Unexpected reference object %p, %p.\n", i, j, ref1, ref); hr = IDWriteFont3_CreateFontFace(font3, &fontface); - ok(hr == S_OK, "Failed to create a fontface, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to create a fontface, hr %#x.\n", i, j, hr); /* Fonts present regular properties as axis values, for non-variable fonts too. Normally it would include weight/width/slant/italic, but could also contain optical size axis. */ @@ -7931,7 +7957,7 @@ todo_wine { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); todo_wine - ok(axis_count > 0, "Unexpected axis value count.\n"); + ok(axis_count > 0, "%u.%u Unexpected axis value count %d.\n", i, j, axis_count); IDWriteFontFaceReference1_Release(ref2); } @@ -7940,25 +7966,25 @@ todo_wine hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); todo_wine - ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get a reference, hr %#x.\n", i, j, hr); hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); todo_wine - ok(hr == S_OK, "Failed to get a reference, hr %#x.\n", hr); + ok(hr == S_OK, "%u.%u Failed to get a reference, hr %#x.\n", i, j, hr); if (hr == S_OK) - ok(ref == ref1, "Unexpected reference %p, %p.\n", ref1, ref); + ok(ref == ref1, "%u.%u Unexpected reference %p, %p.\n", i, j, ref1, ref); if (hr == S_OK) { hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); - ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); - ok(fontface1 == fontface, "Unexpected fontface %p, %p.\n", fontface1, fontface); + ok(hr == S_OK, "%u.%u Failed to create fontface, hr %#x.\n", i, j, hr); + ok(fontface1 == fontface, "%u.%u Unexpected fontface %p, %p.\n", i, j, fontface1, fontface); IDWriteFontFace3_Release(fontface1); if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - ok(!axis_count, "Unexpected axis value count.\n"); + ok(!axis_count, "%u.%u Unexpected axis value count %u.\n", i, j, axis_count); IDWriteFontFaceReference1_Release(ref2); } -- 2.20.1

2 3

[PATCH] bcrypt: Make format_gnutls_signature() static.
by Francois Gouget 03 Feb '20

03 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/bcrypt/gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 868f898bbbb..1d78b9f4d1f 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1141,8 +1141,8 @@ static unsigned int get_signature_length( enum alg_id id ) } } -NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, UCHAR *output, - ULONG output_len, ULONG *ret_len ) +static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, + UCHAR *output, ULONG output_len, ULONG *ret_len ) { switch (type) { -- 2.20.1

1 0

Almost unused functions in mountmgr.sys
by Francois Gouget 03 Feb '20

03 Feb '20

So I have a script telling me that, in mountmgr.sys, create_scsi_entry() and set_scsi_device_name() are not used. Looking into this it turns out that they are only used on macOS and on Linux distributions that still have libhal, which I expect most distributions have dropped in favor of libdbus-1. So are we missing code to use these on modern Linux machines that have libdbus-1 but not libhal? Or is there something else at play? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Un western sans indien c'est comme une police sans serif. -- John Wayne

1 0

RFC How to deal with tests that spam the report
by Francois Gouget 03 Feb '20

03 Feb '20

Some tests loop on system resources like fonts and issue todos, skips or even traces on every iteration. Depending on the machine configuration this can result in a lot of lines and push WineTest reports above the 1.5 MB limit. For instance the new Debian Testing VM has some extra fonts (though I did not manually add any extra font packages), resulting in some todo messages being repeated 772 times and dwrite:font generating 160 KB of traces. Same for gdi32:font. So of course the report exceeds the 1.5 MB. https://testbot.winehq.org/JobDetails.pl?Key=64300 It would be possible to uninstall some font packages to reduce this but that would mean accepting that test.winehq.org forces us to artificially limit the test coverage. Plus uninstalling fonts would not help with kernel32:virtual (90 KB), shell32:ebrowser (17 KB), etc. So when WINETEST_DEBUG=1 this patch automatically mutes the lines that generate more than 50 such messages. When it happens a message is issued so the developer knows what happened, and a count of silenced lines is given at the end. And setting WINETEST_DEBUG >= 2 disables this filtering. The rationale here is that after the first few repetitions additional lines don't really bring any new information: sure GetFontFaceReference() is unimplemented, there's no point saying so 772 times! In contrast other todo lines still bring new information. This is why this patch mutes individual lines rather than limiting the total number of non-essential lines in a test unit. The drawback is that some tests like ieframe:webbrowser have 10 lines that each generate between 15 and 26 lines of output. So they all fly under the 50 repeats threshold but still generate 14 KB all together. One option would be to lower the threshold from 50 to... 20, 15, 10? Or we could have each test unit count the non-essential lines and silence all of them after some threshold. But then any todo, skip or trace that comes after a spammer would be lost :-( Here are some commands to get a sense of things: wget -O wtbdebiant_win32.report \ 'https://testbot.winehq.org/GetTaskFile.pl?Job=64300&Step=1&Task=1&File=win3…' # Non-essential lines repeat counts egrep '^[a-z0-9]*\.c:[0-9]*: ' wtbdebiant_win32.report | \ egrep -v ': Test (failed|succeeded inside todo block):' | \ sed -e 's/^$[a-z0-9]*\.c:[0-9]*: Test[^:]*$:.*$/\1/' -e t \ -e 's/^$[a-z0-9]*\.c:[0-9]*:$.*$/\1 Trace/' | \ sort | uniq -c | sort -b -n -r | head -n 10 772 font.c:7947: Test marked todo 772 font.c:7943: Test marked todo 772 font.c:7934: Test marked todo 522 virtual.c:4056: Test marked todo 256 ebrowser.c:1659: Test marked todo 189 font.c:3238: Tests skipped 184 virtual.c:4015: Test marked todo 151 font.c:3940: Test marked todo 135 istream.c:274: Test marked todo 128 sock.c:1252: Test marked todo # Per test unit non-essential line counts egrep '^[a-z0-9]*\.c:[0-9]*: ' wtbdebiant_win32.report | \ egrep -v ': Test (failed|succeeded inside todo block):' | \ sed -e 's/^$[a-z0-9]*\.c$:[0-9]*:.*$/\1/' | \ sort | uniq -c | sort -b -n -r | head -n10 2988 font.c (yep, this mixes dwrite:font, gdi32:font and gdiplus:font) 916 virtual.c 485 msg.c 437 webbrowser.c 412 metafile.c 399 info.c 372 sock.c 351 security.c 327 graphics.c 316 file.c include/wine/test.h | 77 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 14 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index a919ce81d68..9f308b4c4ab 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -62,6 +62,9 @@ extern int winetest_interactive; /* report successful tests (BOOL) */ extern int winetest_report_success; +/* silence todos and skips above this threshold */ +extern int winetest_mute_threshold; + /* current platform */ extern const char *winetest_platform; @@ -211,6 +214,9 @@ const char *winetest_platform = "windows"; /* report successful tests (BOOL) */ int winetest_report_success = 0; +/* silence todos and skips above this threshold */ +int winetest_mute_threshold = 50; + /* passing arguments around */ static int winetest_argc; static char** winetest_argv; @@ -222,6 +228,12 @@ static LONG failures; /* number of failures */ static LONG skipped; /* number of skipped test chunks */ static LONG todo_successes; /* number of successful tests inside todo block */ static LONG todo_failures; /* number of failures inside todo block */ +static LONG muted_traces; /* number of silenced traces */ +static LONG muted_skipped; /* same as skipped but silent */ +static LONG muted_todo_successes; /* same as todo_successes but silent */ + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; /* The following data must be kept track of on a per-thread basis */ struct tls_data @@ -284,6 +296,25 @@ int broken( int condition ) return (strcmp(winetest_platform, "windows") == 0) && condition; } +static LONG winetest_add_line( void ) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) + return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement(line_counters + index) - 1; + if (count == winetest_mute_threshold) + printf( "%s:%d Line has been silenced after %d occurences\n", + data->current_file, data->current_line, + winetest_mute_threshold); + + return count; +} + /* * Checks condition. * Parameters: @@ -310,13 +341,19 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) } else { - if (winetest_debug > 0) + if (!winetest_debug || + winetest_add_line() < winetest_mute_threshold) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); - vprintf(msg, args); + if (winetest_debug > 0) + { + printf( "%s:%d Test marked todo: ", + data->current_file, data->current_line ); + vprintf(msg, args); + } + InterlockedIncrement(&todo_successes); } - InterlockedIncrement(&todo_successes); + else + InterlockedIncrement(&muted_todo_successes); return 1; } } @@ -353,24 +390,32 @@ void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) void __winetest_cdecl winetest_trace( const char *msg, ... ) { __winetest_va_list valist; - struct tls_data *data = get_tls_data(); - if (winetest_debug > 0) + if (!winetest_debug) + return; + if (winetest_add_line() < winetest_mute_threshold) { - printf( "%s:%d: ", data->current_file, data->current_line ); + struct tls_data *data = get_tls_data(); + printf( "%s:%d ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); } + else + InterlockedIncrement(&muted_traces); } void winetest_vskip( const char *msg, __winetest_va_list args ) { - struct tls_data *data = get_tls_data(); - - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); - vprintf(msg, args); - skipped++; + if (winetest_add_line() < winetest_mute_threshold) + { + struct tls_data *data = get_tls_data(); + printf( "%s:%d Tests skipped: ", data->current_file, data->current_line ); + vprintf(msg, args); + InterlockedIncrement(&skipped); + } + else + InterlockedIncrement(&muted_skipped); } void __winetest_cdecl winetest_skip( const char *msg, ... ) @@ -505,7 +550,11 @@ static int run_test( const char *name ) if (winetest_debug) { - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + if (muted_todo_successes || muted_skipped || muted_traces) + printf( "%04x:%s Silenced %d todos, %d skips and %d traces.\n", + GetCurrentProcessId(), test->name, + muted_todo_successes, muted_skipped, muted_traces); + printf( "%04x:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", GetCurrentProcessId(), test->name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, -- 2.20.1

1 1

[PATCH] winex11.drv: Use raw value for raw motion event.
by Ziqing Hui 03 Feb '20

03 Feb '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] dwrite: Fix potential strings object leak (Coverity).
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0aa1b10460..9813676ab0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2166,10 +2166,6 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc *ret = NULL; - hr = create_localizedstrings(&strings); - if (FAILED(hr)) - return hr; - switch (id) { case DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG: @@ -2183,6 +2179,9 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc return S_OK; } + if (FAILED(hr = create_localizedstrings(&strings))) + return hr; + opentype_get_font_table(stream_desc, MS_META_TAG, &meta); if (meta.data) -- 2.24.1

1 0

[PATCH 1/2] ole32/tests: Add some tests for MonikerCommonPrefixWith().
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 117 +++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d485360215..4c8d013e42 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -92,6 +92,24 @@ todo_wine_if(todo) ok_(__FILE__, line)(type2 == type, "Unexpected moniker type %d.\n", type2); } +#define TEST_DISPLAY_NAME(m,name) _test_moniker_name(m, name, __LINE__) +static void _test_moniker_name(IMoniker *moniker, const WCHAR *name, int line) +{ + WCHAR *display_name; + IBindCtx *pbc; + HRESULT hr; + + hr = CreateBindCtx(0, &pbc); + ok_(__FILE__, line)(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, pbc, NULL, &display_name); + ok_(__FILE__, line)(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); + ok_(__FILE__, line)(!lstrcmpW(display_name, name), "Unexpected display name %s.\n", wine_dbgstr_w(display_name)); + + CoTaskMemFree(display_name); + IBindCtx_Release(pbc); +} + static IMoniker *create_antimoniker(DWORD level) { LARGE_INTEGER pos; @@ -3221,6 +3239,104 @@ static void test_save_load_filemoniker(void) IStream_Release(pStm); } +static void test_MonikerCommonPrefixWith(void) +{ + IMoniker *moniker, *item, *file1, *file2, *composite, *composite2; + HRESULT hr; + + moniker = (void *)0xdeadbeef; + hr = MonikerCommonPrefixWith(NULL, NULL, &moniker); +todo_wine { + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer.\n"); +} + if (hr == E_NOTIMPL) + return; + + hr = CreateItemMoniker(L"!", L"Item", &item); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(item, item, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\test.txt", &file1); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(file1, NULL, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = MonikerCommonPrefixWith(NULL, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + /* F x F */ + hr = MonikerCommonPrefixWith(file1, file1, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateFileMoniker(L"C:\\a\\test.txt", &file2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F1 x F2 */ + hr = MonikerCommonPrefixWith(file1, file2, &moniker); + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + + hr = CreateGenericComposite(file1, item, &composite); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = CreateGenericComposite(file2, item, &composite2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + /* F x (F,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite, &moniker); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* F1 x (F2,I) -> F */ + hr = MonikerCommonPrefixWith(file1, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F2,I) x F1 -> F */ + hr = MonikerCommonPrefixWith(composite2, file1, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_FILEMONIKER); + TEST_DISPLAY_NAME(moniker, L"C:\\"); + IMoniker_Release(moniker); + + /* (F,I) x (F) -> F */ + hr = MonikerCommonPrefixWith(composite, file1, &moniker); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker == file1, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F,I) x (F,I) -> (F,I) */ + hr = MonikerCommonPrefixWith(composite, composite, &moniker); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); + TEST_DISPLAY_NAME(moniker, L"C:\\test.txt!Item"); + ok(moniker != composite, "Unexpected pointer.\n"); + IMoniker_Release(moniker); + + /* (F1,I) x (F2,I) -> () */ + hr = MonikerCommonPrefixWith(composite, composite2, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!moniker, "Unexpected pointer %p.\n", moniker); + + IMoniker_Release(composite2); + IMoniker_Release(composite); + IMoniker_Release(file2); + IMoniker_Release(file1); + IMoniker_Release(item); +} + START_TEST(moniker) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -3235,6 +3351,7 @@ START_TEST(moniker) test_generic_composite_moniker(); test_pointer_moniker(); test_save_load_filemoniker(); + test_MonikerCommonPrefixWith(); /* FIXME: test moniker creation funcs and parsing other moniker formats */ -- 2.24.1

1 1

[PATCH] include: Add some newer Edit messages.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 700b335fbb..b503f9ef24 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5346,6 +5346,24 @@ typedef struct _tagEDITBALLOONTIP #define EM_GETHILITE (ECM_FIRST + 6) #define EM_NOSETFOCUS (ECM_FIRST + 7) #define EM_TAKEFOCUS (ECM_FIRST + 8) +#define EM_SETEXTENDEDSTYLE (ECM_FIRST + 10) +#define EM_GETEXTENDEDSTYLE (ECM_FIRST + 11) +#define EM_SETENDOFLINE (ECM_FIRST + 12) +#define EM_GETENDOFLINE (ECM_FIRST + 13) +#define EM_ENABLESEARCHWEB (ECM_FIRST + 14) +#define EM_SEARCHWEB (ECM_FIRST + 15) +#define EM_SETCARETINDEX (ECM_FIRST + 17) +#define EM_GETCARETINDEX (ECM_FIRST + 18) +#define EM_FILELINEFROMCHAR (ECM_FIRST + 19) +#define EM_FILELINEINDEX (ECM_FIRST + 20) +#define EM_FILELINELENGTH (ECM_FIRST + 21) +#define EM_GETFILELINE (ECM_FIRST + 22) +#define EM_GETFILELINECOUNT (ECM_FIRST + 23) + +#define EM_GETZOOM (WM_USER + 224) +#define EM_SETZOOM (WM_USER + 225) + +#define EN_SEARCHWEB (EN_FIRST) #define Edit_SetCueBannerText(hwnd, text) \ (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, 0, (LPARAM)(text)) -- 2.24.1

1 0

[PATCH 1/5] shdocvw: Forward WhichPlatform() to shlwapi.
by Nikolay Sivov 03 Feb '20

03 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 11 ----------- include/shlwapi.h | 8 +++++++- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 485d1608db..aa1b5e0c96 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -2,7 +2,7 @@ 101 stdcall -noname IEWinMain(str long) 102 stub -noname CreateShortcutInDirA 103 stub -noname CreateShortcutInDirW -104 stdcall -noname WhichPlatformFORWARD() +104 stdcall -noname WhichPlatform() shlwapi.WhichPlatform 105 stub -noname CreateShortcutInDirEx 106 stub HlinkFindFrame 107 stub SetShellOfflineState diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 98d0d2cde2..ac3913dd23 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -283,17 +283,6 @@ static void* fetch_shlwapi_ordinal(UINT_PTR ord) return (void*)GetProcAddress(h, (const char*)ord); } -/****************************************************************** - * WhichPlatformFORWARD (SHDOCVW.@) - */ -DWORD WINAPI WhichPlatformFORWARD(void) -{ - static DWORD (WINAPI *p)(void); - - if (p || (p = fetch_shlwapi_ordinal(276))) return p(); - return 1; /* not integrated, see shlwapi.WhichPlatform */ -} - /****************************************************************** * StopWatchModeFORWARD (SHDOCVW.@) */ diff --git a/include/shlwapi.h b/include/shlwapi.h index 8d6801a94d..2bfca0bc90 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1135,7 +1135,6 @@ BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 - typedef struct { const IID *piid; @@ -1144,6 +1143,13 @@ typedef struct HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); +#define PLATFORM_UNKNOWN 0 +#define PLATFORM_IE3 1 +#define PLATFORM_BROWSERONLY 1 +#define PLATFORM_INTEGRATED 2 + +UINT WINAPI WhichPlatform(void); + #include <poppack.h> #ifdef __cplusplus -- 2.24.1

1 4

[PATCH] d3dx9_36: Implement D3DXCreateKeyframedAnimationSet
by Alistair Leslie-Hughes 03 Feb '20

03 Feb '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45481 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_36/animation.c | 388 ++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 27 +++ 2 files changed, 412 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index de6d69d383..c916be976b 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -468,14 +468,396 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, return D3D_OK; } +struct d3dx9_animation_frame_set +{ + ID3DXKeyframedAnimationSet ID3DXKeyframedAnimationSet_iface; + LONG ref; + + char *name; + double ticks_per_second; + D3DXPLAYBACK_TYPE playback_type; + UINT animation_count; + UINT callback_key_count; + const D3DXKEY_CALLBACK *callback_keys; +}; + +static inline struct d3dx9_animation_frame_set *impl_from_ID3DXKeyframedAnimationSet(ID3DXKeyframedAnimationSet *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_animation_frame_set, ID3DXKeyframedAnimationSet_iface); +} + +static HRESULT WINAPI d3dx9_animation_framed_QueryInterface(ID3DXKeyframedAnimationSet *iface, REFIID riid, void **obj) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXAnimationSet) || + IsEqualGUID(riid, &IID_ID3DXKeyframedAnimationSet)) + { + iface->lpVtbl->AddRef(iface); + *obj = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_animation_framed_AddRef(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + ULONG refcount = InterlockedIncrement(&framed->ref); + + TRACE("%p increasing refcount to %u.\n", framed, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_animation_framed_Release(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + ULONG refcount = InterlockedDecrement(&framed->ref); + + TRACE("%p decreasing refcount to %u.\n", framed, refcount); + + if (!refcount) + { + heap_free(framed->name); + HeapFree(GetProcessHeap(), 0, framed); + } + + return refcount; +} + +static const char * WINAPI d3dx9_animation_framed_GetName(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + TRACE("framed %p.\n", framed); + return framed->name; +} + +static DOUBLE WINAPI d3dx9_animation_framed_GetPeriod(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return 0.0f; +} + +static DOUBLE WINAPI d3dx9_animation_framed_GetPeriodicPosition(ID3DXKeyframedAnimationSet *iface, DOUBLE position) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return 0.0f; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumAnimations(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return 0; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetAnimationNameByIndex(ID3DXKeyframedAnimationSet *iface, UINT index, + const char **name) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, name %p stub.\n", framed, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetAnimationIndexByName(ID3DXKeyframedAnimationSet *iface, + const char *name, UINT *index) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, name %s, index %p stub.\n", framed, debugstr_a(name), index); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetSRT(ID3DXKeyframedAnimationSet *iface, DOUBLE periodic_position, + UINT animation, D3DXVECTOR3 *scale, + D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, periodic_position %f, animation %u, scale %p rotation %p translation %p stub.\n", + framed, periodic_position, animation, scale, rotation, translation); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetCallback(ID3DXKeyframedAnimationSet *iface, double position, + DWORD flags, double *callback_position, void **callback_data) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, position %f, flags 0x%08x, callback_position %p, callback_data %p stub.\n", + framed, position, flags, callback_position, callback_data); + return E_NOTIMPL; +} + +static D3DXPLAYBACK_TYPE WINAPI d3dx9_animation_framed_GetPlaybackType(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + TRACE("framed %p.\n", framed); + return framed->playback_type; +} + +static DOUBLE WINAPI d3dx9_animation_framed_GetSourceTicksPerSecond(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + TRACE("framed %p.\n", framed); + return framed->ticks_per_second; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumScaleKeys(ID3DXKeyframedAnimationSet *iface, UINT keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, keys %u stub.\n", framed, keys); + return 0; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetScaleKeys(ID3DXKeyframedAnimationSet *iface, UINT animation, + D3DXKEY_VECTOR3 *scale_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, scale_keys %p stub.\n", framed, animation, scale_keys); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetScaleKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *scale_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, scale_key %p stub.\n", framed, animation, key, scale_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetScaleKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *scale_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, scale_key %p stub.\n", framed, animation, key, scale_key); + return E_NOTIMPL; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumRotationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u stub.\n", framed, animation); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetRotationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation, + D3DXKEY_QUATERNION *rotation_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, rotation_keys %p stub.\n", framed, animation, rotation_keys); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetRotationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, UINT key, + D3DXKEY_QUATERNION *rotation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, rotation_key %p stub.\n", framed, animation, key, rotation_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetRotationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, UINT key, + D3DXKEY_QUATERNION *rotation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, rotation_key %p stub.\n", framed, animation, key, rotation_key); + return E_NOTIMPL; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumTranslationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u stub.\n", framed, animation); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetTranslationKeys(ID3DXKeyframedAnimationSet *iface, UINT animation, + D3DXKEY_VECTOR3 *translation_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, rotation_key %p stub.\n", framed, animation, translation_keys); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetTranslationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *translation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, translation_key %p stub.\n", framed, animation, key, translation_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetTranslationKey(ID3DXKeyframedAnimationSet *iface, UINT animation, + UINT key, D3DXKEY_VECTOR3 *translation_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u, translation_key %p stub.\n", framed, animation, key, translation_key); + return E_NOTIMPL; +} + +static UINT WINAPI d3dx9_animation_framed_GetNumCallbackKeys(ID3DXKeyframedAnimationSet *iface) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p stub.\n", framed); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetCallbackKeys(ID3DXKeyframedAnimationSet *iface, + D3DXKEY_CALLBACK *callback_keys) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, callback_keys %p stub.\n", framed, callback_keys); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_GetCallbackKey(ID3DXKeyframedAnimationSet *iface, UINT key, + D3DXKEY_CALLBACK *callback_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, key %u, callback_key %p stub.\n", framed, key, callback_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_SetCallbackKey(ID3DXKeyframedAnimationSet *iface, UINT key, + D3DXKEY_CALLBACK *callback_key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, key %u, callback_key %p stub.\n", framed, key, callback_key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterScaleKey(ID3DXKeyframedAnimationSet *iface, + UINT animation, UINT key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u stub.\n", framed, animation, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterRotationKey(ID3DXKeyframedAnimationSet *iface, + UINT animation, UINT key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u stub.\n", framed, animation, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterTranslationKey(ID3DXKeyframedAnimationSet *iface, + UINT animation, UINT key) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, animation %u, key %u stub.\n", framed, animation, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_RegisterAnimationSRTKeys(ID3DXKeyframedAnimationSet *iface, + const char *name, UINT num_scale_keys, UINT num_rotation_keys, UINT num_translation_keys, + const D3DXKEY_VECTOR3 *scale_keys, const D3DXKEY_QUATERNION *rotation_keys, + const D3DXKEY_VECTOR3 *translation_keys, DWORD *animation_index) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, name %s, num_scale_keys %u, num_rotation_keys %u, rotation_keys %p, num_translation_keys %u, " + " scale_keys %p, rotation_keys %p, translation_keys %p, animation_index %p stub.\n", + framed, debugstr_a(name), num_scale_keys, num_rotation_keys, rotation_keys, num_translation_keys, scale_keys, + rotation_keys, translation_keys, animation_index); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_Compress(ID3DXKeyframedAnimationSet *iface, DWORD flags, float lossiness, + D3DXFRAME *hierarchy, ID3DXBuffer **compressed_data) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, flags 0x%08x, lossiness %f, hierarchy %p, compressed_data %p stub.\n", framed, flags, lossiness, + hierarchy, compressed_data); + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_animation_framed_UnregisterAnimation(ID3DXKeyframedAnimationSet *iface, UINT index) +{ + struct d3dx9_animation_frame_set *framed = impl_from_ID3DXKeyframedAnimationSet(iface); + FIXME("framed %p, index %u stub.\n", framed, index); + return E_NOTIMPL; +} + +static const struct ID3DXKeyframedAnimationSetVtbl d3dx9_animation_framed_vtbl = +{ + d3dx9_animation_framed_QueryInterface, + d3dx9_animation_framed_AddRef, + d3dx9_animation_framed_Release, + d3dx9_animation_framed_GetName, + d3dx9_animation_framed_GetPeriod, + d3dx9_animation_framed_GetPeriodicPosition, + d3dx9_animation_framed_GetNumAnimations, + d3dx9_animation_framed_GetAnimationNameByIndex, + d3dx9_animation_framed_GetAnimationIndexByName, + d3dx9_animation_framed_GetSRT, + d3dx9_animation_framed_GetCallback, + d3dx9_animation_framed_GetPlaybackType, + d3dx9_animation_framed_GetSourceTicksPerSecond, + d3dx9_animation_framed_GetNumScaleKeys, + d3dx9_animation_framed_GetScaleKeys, + d3dx9_animation_framed_GetScaleKey, + d3dx9_animation_framed_SetScaleKey, + d3dx9_animation_framed_GetNumRotationKeys, + d3dx9_animation_framed_GetRotationKeys, + d3dx9_animation_framed_GetRotationKey, + d3dx9_animation_framed_SetRotationKey, + d3dx9_animation_framed_GetNumTranslationKeys, + d3dx9_animation_framed_GetTranslationKeys, + d3dx9_animation_framed_GetTranslationKey, + d3dx9_animation_framed_SetTranslationKey, + d3dx9_animation_framed_GetNumCallbackKeys, + d3dx9_animation_framed_GetCallbackKeys, + d3dx9_animation_framed_GetCallbackKey, + d3dx9_animation_framed_SetCallbackKey, + d3dx9_animation_framed_UnregisterScaleKey, + d3dx9_animation_framed_UnregisterRotationKey, + d3dx9_animation_framed_UnregisterTranslationKey, + d3dx9_animation_framed_RegisterAnimationSRTKeys, + d3dx9_animation_framed_Compress, + d3dx9_animation_framed_UnregisterAnimation +}; + HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set) { - FIXME("name %s, ticks_per_second %.16e, playback_type %u, animation_count %u, " - "callback_key_count %u, callback_keys %p, animation_set %p stub.\n", + struct d3dx9_animation_frame_set *object; + + TRACE("name %s, ticks_per_second %.16e, playback_type %u, animation_count %u, " + "callback_key_count %u, callback_keys %p, animation_set %p.\n", debugstr_a(name), ticks_per_second, playback_type, animation_count, callback_key_count, callback_keys, animation_set); - return E_NOTIMPL; + if(!animation_count) + return D3DERR_INVALIDCALL; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXKeyframedAnimationSet_iface.lpVtbl = &d3dx9_animation_framed_vtbl; + object->ref = 1; + object->name = heap_alloc( strlen(name)+1 ); + if(!object->name) + { + heap_free(object); + return E_OUTOFMEMORY; + } + strcpy(object->name, name); + object->ticks_per_second = ticks_per_second; + object->playback_type = playback_type; + object->animation_count = animation_count; + object->callback_key_count = callback_key_count; + object->callback_keys = callback_keys; + + *animation_set = &object->ID3DXKeyframedAnimationSet_iface; + + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3882bb404a..fc07ac1228 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11119,6 +11119,32 @@ static void D3DXCreateAnimationControllerTest(void) animation->lpVtbl->Release(animation); } +static void D3DXCreateKeyframedAnimationSetTest(void) +{ + ID3DXKeyframedAnimationSet *framed; + HRESULT hr; + const char *name; + D3DXPLAYBACK_TYPE playtype; + UINT count; + + hr = D3DXCreateKeyframedAnimationSet("wine_bottle", 5.0, D3DXPLAY_LOOP, 0, 0, NULL, &framed); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr returned %#x.\n", hr); + + hr = D3DXCreateKeyframedAnimationSet("wine_bottle", 5.0, D3DXPLAY_LOOP, 10, 0, NULL, &framed); + ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr); + + name = framed->lpVtbl->GetName(framed); + ok(!strcmp(name, "wine_bottle"), "unexpected name (%s)\n", name); + + playtype = framed->lpVtbl->GetPlaybackType(framed); + ok(playtype == D3DXPLAY_LOOP, "unexpected value, got %d\n", playtype); + + count = framed->lpVtbl->GetNumAnimations(framed); + ok(count == 0, "unexpected value, got %d\n", count); + + framed->lpVtbl->Release(framed); +} + static void test_D3DXFrameFind(void) { static char n1[] = "name1"; @@ -11387,6 +11413,7 @@ START_TEST(mesh) D3DXCreateTextTest(); D3DXCreateTorusTest(); D3DXCreateAnimationControllerTest(); + D3DXCreateKeyframedAnimationSetTest(); test_get_decl_length(); test_get_decl_vertex_size(); test_fvf_decl_conversion(); -- 2.17.1

1 0

[PATCH] oledb32: DataLink Dialog - Add page for ODBC Connections.
by Alistair Leslie-Hughes 03 Feb '20

03 Feb '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 113 ++++++++++++++++++++++++++++++++++++--- dlls/oledb32/resource.h | 20 +++++++ dlls/oledb32/version.rc | 26 +++++++++ 3 files changed, 151 insertions(+), 8 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 26ee12de53..556390fdf8 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -289,11 +289,102 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA return 0; } +static void connection_fill_odbc_list(HWND parent) +{ + LONG res; + HKEY key; + DWORD index = 0; + WCHAR name[MAX_PATH]; + DWORD nameLen; + + HWND combo = GetDlgItem(parent, IDC_CBO_NAMES); + if (!combo) + return; + + res = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, KEY_READ, &key); + if (res == ERROR_FILE_NOT_FOUND) + return; + + SendMessageW (combo, CB_RESETCONTENT, 0, 0); + + for(;; index++) + { + nameLen = MAX_PATH; + if (RegEnumValueW(key, index, name, &nameLen, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + SendMessageW(combo, CB_ADDSTRING, 0, (LPARAM)name); + } + + RegCloseKey(key); +} + +static void connection_initialize_controls(HWND parent) +{ + HWND hwnd = GetDlgItem(parent, IDC_RDO_SRC_NAME); + if (hwnd) + SendMessageA(hwnd, BM_SETCHECK, BST_CHECKED, 0); +} + +static void connection_toggle_controls(HWND parent) +{ + BOOL checked = TRUE; + HWND hwnd = GetDlgItem(parent, IDC_RDO_SRC_NAME); + if (hwnd) + checked = SendMessageA(hwnd, BM_GETCHECK, 0, 0); + + EnableWindow(GetDlgItem(parent, IDC_CBO_NAMES), checked); + EnableWindow(GetDlgItem(parent, IDC_BTN_REFRESH), checked); + + EnableWindow(GetDlgItem(parent, IDC_LBL_CONNECTION), !checked); + EnableWindow(GetDlgItem(parent, IDC_EDT_CONNECTION), !checked); + EnableWindow(GetDlgItem(parent, IDC_BTN_BUILD), !checked); +} + +static LRESULT CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + { + connection_initialize_controls(hwnd); + connection_fill_odbc_list(hwnd); + connection_toggle_controls(hwnd); + break; + } + case WM_COMMAND: + { + switch LOWORD(wp) + { + case IDC_RDO_SRC_NAME: + case IDC_BTN_CONNECTION: + connection_toggle_controls(hwnd); + break; + case IDC_BTN_REFRESH: + connection_fill_odbc_list(hwnd); + break; + case IDC_BTN_BUILD: + case IDC_BTN_TEST: + /* TODO: Implement dialogs */ + MessageBoxA(hwnd, "Not implemented yet.", "Error", MB_OK | MB_ICONEXCLAMATION); + break; + } + + break; + } + default: + break; + } + return 0; +} + static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **connection) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); PROPSHEETHEADERW hdr; - PROPSHEETPAGEW page; + PROPSHEETPAGEW pages[2]; INT_PTR ret; FIXME("(%p, %p) Semi-stub\n", iface, connection); @@ -303,11 +394,17 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * *connection = NULL; - memset(&page, 0, sizeof(PROPSHEETPAGEW)); - page.dwSize = sizeof(page); - page.hInstance = instance; - page.u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); - page.pfnDlgProc = data_link_properties_dlg_proc; + memset(&pages, 0, sizeof(pages)); + + pages[0].dwSize = sizeof(PROPSHEETPAGEW); + pages[0].hInstance = instance; + pages[0].u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); + pages[0].pfnDlgProc = data_link_properties_dlg_proc; + + pages[1].dwSize = sizeof(PROPSHEETPAGEW); + pages[1].hInstance = instance; + pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); + pages[1].pfnDlgProc = data_link_connection_dlg_proc; memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); @@ -315,8 +412,8 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * hdr.dwFlags = PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE; hdr.hInstance = instance; hdr.pszCaption = MAKEINTRESOURCEW(IDS_PROPSHEET_TITLE); - hdr.u3.ppsp = &page; - hdr.nPages = 1; + hdr.u3.ppsp = pages; + hdr.nPages = ARRAY_SIZE(pages); ret = PropertySheetW(&hdr); return ret ? S_OK : S_FALSE; diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index df88a10829..7944e42cc4 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -22,3 +22,23 @@ #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 + +#define IDD_CONNECTION 3000 +#define IDC_BTN_EDIT 3001 +#define IDC_RDO_SRC_NAME 3002 +#define IDC_CBO_NAMES 3003 +#define IDC_BTN_REFRESH 3004 +#define IDC_BTN_CONNECTION 3005 +#define IDC_EDT_CONNECTION 3006 +#define IDC_BTN_BUILD 3007 +#define IDC_EDT_NAME 3008 +#define IDC_EDT_PASSWORD 3009 +#define IDC_CHK_BLANK 3010 +#define IDC_CHK_SAVE_PASS 3011 +#define IDC_CBO_INITIAL 3012 +#define IDC_BTN_TEST 3013 +#define IDC_LBL_SOURCE 3014 +#define IDC_LBL_LOGIN 3015 +#define IDC_LBL_INITIAL 3016 +#define IDC_LBL_CONNECTION 3017 + diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 3a200d1cd6..63d1d6c002 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -46,3 +46,29 @@ BEGIN CONTROL "",IDC_LST_CONNECTIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,14,20,206,162 PUSHBUTTON "&Next >",IDC_BTN_NEXT,170,194,50,14 END + +IDD_CONNECTION DIALOG 0, 0, 227, 225 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Connection" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the following to connect to ODBC data:",-1,7,7,213,8 + LTEXT "1. Specify the source of data:",IDC_LBL_SOURCE,14,18,206,8 + CONTROL "Use &data source name",IDC_RDO_SRC_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,29,29,192,10 + COMBOBOX IDC_CBO_NAMES,36,40,150,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,189,39,31,14 + CONTROL "Use c&onnection string",IDC_BTN_CONNECTION,"Button",BS_AUTORADIOBUTTON,29,57,192,10 + LTEXT "&Connection string:",IDC_LBL_CONNECTION,36,68,182,8 + EDITTEXT IDC_EDT_CONNECTION,36,78,148,12,ES_AUTOHSCROLL + PUSHBUTTON "B&uild...",IDC_BTN_BUILD,189,77,31,14 + LTEXT "2. Enter information to log on to the server",IDC_LBL_LOGIN,14,98,206,8 + LTEXT "User &name:",-1,29,110,38,8 + EDITTEXT IDC_EDT_NAME,67,108,153,12,ES_AUTOHSCROLL + LTEXT "&Password:",-1,29,126,34,8 + EDITTEXT IDC_EDT_PASSWORD,67,124,153,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Blank password",IDC_CHK_BLANK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,29,140,69,10 + CONTROL "Allow &saving password",IDC_CHK_SAVE_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,140,103,10 + LTEXT "3. Enter the &initial catalog to use:",IDC_LBL_INITIAL,14,159,206,8 + COMBOBOX IDC_CBO_INITIAL,29,170,191,64,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Test Connection",IDC_BTN_TEST,140,194,81,14,WS_GROUP +END -- 2.17.1

1 0

[PATCH] configure: Fix a typo in a comment.
by Francois Gouget 03 Feb '20

03 Feb '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 36f65378a44..f9ca95ce496 100644 --- a/configure.ac +++ b/configure.ac @@ -1686,7 +1686,7 @@ fi WINE_NOTICE_WITH(udev,[test "x$UDEV_LIBS" = "x"], [libudev ${notice_platform}development files not found, plug and play won't be supported.]) -dnl **** Check for libuwind **** +dnl **** Check for libunwind **** if test "x$with_unwind" != xno then WINE_PACKAGE_FLAGS(UNWIND,[libunwind],[-lunwind],,, -- 2.20.1

1 0

[PATCH v2 resend 1/8] msvcr90/tests: Test _get_current_locale()/setlocale() interaction.
by Chip Davis 03 Feb '20

03 Feb '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Bail if setlocale() fails. Mark a result as broken(). --- dlls/msvcr90/tests/msvcr90.c | 466 +++++++++++++++++++++++++++++++++++ 1 file changed, 466 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f25492d..c81f4410d60b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -139,6 +139,22 @@ static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static _locale_t (__cdecl *p__get_current_locale)(void); + +struct __lc_time_data { + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; + LCID lcid; + int unk; + int refcount; +}; /* make sure we use the correct errno */ #undef errno @@ -408,6 +424,7 @@ static BOOL init(void) SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); SET(p__create_locale, "_create_locale"); SET(p__free_locale, "_free_locale"); + SET(p__get_current_locale, "_get_current_locale"); if (sizeof(void *) == 8) { @@ -1961,6 +1978,454 @@ static void test____mb_cur_max_l_func(void) p__free_locale(l); } +static void test__get_current_locale(void) +{ + _locale_t l = p__get_current_locale(), l2 = p__get_current_locale(); + int i; +#define lc_str(lc, s) \ + ok(!strcmp(l->locinfo->lc_category[lc].locale, s), #lc " = \"%s\"\n", \ + l->locinfo->lc_category[lc].locale) + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + + ok(l->locinfo->refcount == 3, "refcount = %d\n", l->locinfo->refcount); + + if(!p_setlocale(LC_ALL, "english")) { + win_skip("English locale not available\n"); + p__free_locale(l); + p__free_locale(l2); + return; + } + + todo_wine { + lc_str(LC_COLLATE, "C"); + lc_str(LC_CTYPE, "C"); + lc_str(LC_MONETARY, "C"); + lc_str(LC_NUMERIC, "C"); + lc_str(LC_TIME, "C"); + } +#undef lc_str + + todo_wine ok(l->locinfo->refcount == 2, "refcount = %d\n", l->locinfo->refcount); + ok(l->locinfo == l2->locinfo, "different locinfo pointers\n"); + ok(l->mbcinfo == l2->mbcinfo, "different mbcinfo pointers\n"); + + p__free_locale(l); + p__free_locale(l2); + + l = p__get_current_locale(); + p_setlocale(LC_COLLATE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + ok(l->locinfo->lc_category[LC_COLLATE].locale != l2->locinfo->lc_category[LC_COLLATE].locale, + "same locale name pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount != l2->locinfo->lc_category[LC_COLLATE].refcount, + "same refcount pointers for LC_COLLATE\n"); + ok(l->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l->locinfo->lc_category[LC_COLLATE].refcount == 1, "refcount = %d\n", + *l->locinfo->lc_category[LC_COLLATE].refcount); + ok(l2->locinfo->lc_category[LC_COLLATE].refcount, "null refcount pointer for LC_COLLATE\n"); + if(l2->locinfo->lc_category[LC_COLLATE].refcount) + ok(*l2->locinfo->lc_category[LC_COLLATE].refcount == 2, "refcount = %d\n", + *l2->locinfo->lc_category[LC_COLLATE].refcount); + } + for(i = LC_CTYPE; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage == l2->locinfo->lc_codepage, "different lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike == l2->locinfo->lc_clike, "different lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + /* The meaning of this member seems to be reversed--go figure */ + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + ok(l->locinfo->ctype1 == l2->locinfo->ctype1, "different ctype1 pointers\n"); + ok(l->locinfo->pclmap == l2->locinfo->pclmap, "different clmap pointers\n"); + ok(l->locinfo->pcumap == l2->locinfo->pcumap, "different cumap pointers\n"); + ok(l->locinfo->ctype1_refcount == l2->locinfo->ctype1_refcount, "different ctype1_refcount pointers\n"); + todo_wine ok(*l->locinfo->ctype1_refcount == 3, "refcount = %d\n", *l->locinfo->ctype1_refcount); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_CTYPE, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i < LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_MONETARY; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lconv == l2->locinfo->lconv, "different lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount == l2->locinfo->lconv_intl_refcount, "different lconv_intl_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + todo_wine ok(*l->locinfo->lconv_intl_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + ok(l->locinfo->lconv->currency_symbol == l2->locinfo->lconv->currency_symbol, "different LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount == l2->locinfo->lconv_mon_refcount, "different lconv_mon_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + todo_wine ok(*l->locinfo->lconv_mon_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_MONETARY, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_MONETARY; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + for(i = LC_NUMERIC; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale == l2->locinfo->lc_category[i].locale, + "different locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount == l2->locinfo->lc_category[i].refcount, + "different refcount pointers for category %d\n", i); + todo_wine ok(*l->locinfo->lc_category[i].refcount == 3, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + ok(l2->locinfo->lconv_intl_refcount, "null refcount pointer for C locale\n"); + if(l2->locinfo->lconv_intl_refcount) + ok(*l2->locinfo->lconv_intl_refcount == 2, "refcount = %d\n", *l2->locinfo->lconv_intl_refcount); + } + + ok(l->locinfo->lconv->decimal_point == l2->locinfo->lconv->decimal_point, "different LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount == l2->locinfo->lconv_num_refcount, "different lconv_num_refcount pointers\n"); + todo_wine ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + todo_wine ok(*l->locinfo->lconv_num_refcount == 3, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_NUMERIC, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + for(i = LC_COLLATE; i <= LC_NUMERIC; i++) { + todo_wine { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + ok(l->locinfo->lc_category[LC_TIME].locale == l2->locinfo->lc_category[LC_TIME].locale, + "different locale name pointers for LC_TIME\n"); + ok(l->locinfo->lc_category[LC_TIME].refcount == l2->locinfo->lc_category[LC_TIME].refcount, + "different refcount pointers for LC_TIME\n"); + todo_wine ok(*l->locinfo->lc_category[LC_TIME].refcount == 3, "refcount = %d\n", + *l->locinfo->lc_category[LC_TIME].refcount); + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + ok(l->locinfo->lc_time_curr == l2->locinfo->lc_time_curr, "different lc_time_curr pointers\n"); + todo_wine ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 3, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p_setlocale(LC_TIME, "C"); + l2 = p__get_current_locale(); + + todo_wine { + ok(l->locinfo->refcount == 1, "refcount = %d\n", l->locinfo->refcount); + ok(l2->locinfo->refcount == 2, "refcount = %d\n", l2->locinfo->refcount); + } + + todo_wine { + for(i = LC_MIN+1; i <= LC_MAX; i++) { + ok(l->locinfo->lc_category[i].locale != l2->locinfo->lc_category[i].locale, + "same locale name pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount != l2->locinfo->lc_category[i].refcount, + "same refcount pointers for category %d\n", i); + ok(l->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l->locinfo->lc_category[i].refcount) + ok(*l->locinfo->lc_category[i].refcount == 1, "refcount = %d for category %d\n", + *l->locinfo->lc_category[i].refcount, i); + ok(l2->locinfo->lc_category[i].refcount, "null refcount pointer for category %d\n", i); + if(l2->locinfo->lc_category[i].refcount) + ok(*l2->locinfo->lc_category[i].refcount == 2, "refcount = %d for category %d\n", + *l2->locinfo->lc_category[i].refcount, i); + } + } + + todo_wine { + ok(l->locinfo->lc_collate_cp != l2->locinfo->lc_collate_cp, "same lc_collate_cp %u, %u\n", + l->locinfo->lc_collate_cp, l2->locinfo->lc_collate_cp); + + ok(l->locinfo->lc_codepage != l2->locinfo->lc_codepage, "same lc_codepages %u, %u\n", + l->locinfo->lc_codepage, l2->locinfo->lc_codepage); + ok(l->locinfo->lc_clike != l2->locinfo->lc_clike, "same lc_clike values %d, %d\n", + l->locinfo->lc_clike, l2->locinfo->lc_clike); + } + ok(l->locinfo->lc_clike, "non-C locale is C-like\n"); + todo_wine { + ok(!l2->locinfo->lc_clike, "C locale is not C-like\n"); + ok(l->locinfo->ctype1 != l2->locinfo->ctype1, "same ctype1 pointers\n"); + ok(l->locinfo->pclmap != l2->locinfo->pclmap, "same clmap pointers\n"); + ok(l->locinfo->pcumap != l2->locinfo->pcumap, "same cumap pointers\n"); + ok(l->locinfo->ctype1_refcount != l2->locinfo->ctype1_refcount, "same ctype1_refcount pointers\n"); + ok(l->locinfo->ctype1_refcount, "null refcount pointer for non-C locale\n"); + if(l->locinfo->ctype1_refcount) + ok(*l->locinfo->ctype1_refcount == 1, "refcount = %d\n", *l->locinfo->ctype1_refcount); + } + ok(!l2->locinfo->ctype1_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv != l2->locinfo->lconv, "same lconv pointers\n"); + ok(l->locinfo->lconv_intl_refcount != l2->locinfo->lconv_intl_refcount, "same lconv_intl_refcount pointers\n"); + ok(l->locinfo->lconv_intl_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_intl_refcount) + ok(*l->locinfo->lconv_intl_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_intl_refcount); + } + ok(!l2->locinfo->lconv_intl_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->decimal_point != l2->locinfo->lconv->decimal_point, "same LC_NUMERIC pointers\n"); + ok(l->locinfo->lconv_num_refcount != l2->locinfo->lconv_num_refcount, "same lconv_num_refcount pointers\n"); + ok(l->locinfo->lconv_num_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_num_refcount) + ok(*l->locinfo->lconv_num_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_num_refcount); + } + ok(!l2->locinfo->lconv_num_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine { + ok(l->locinfo->lconv->currency_symbol != l2->locinfo->lconv->currency_symbol, "same LC_MONETARY pointers\n"); + ok(l->locinfo->lconv_mon_refcount != l2->locinfo->lconv_mon_refcount, "same lconv_mon_refcount pointers\n"); + ok(l->locinfo->lconv_mon_refcount, "null refcount pointer in non-C locale\n"); + if(l->locinfo->lconv_mon_refcount) + ok(*l->locinfo->lconv_mon_refcount == 1, "refcount = %d\n", *l->locinfo->lconv_mon_refcount); + } + ok(!l2->locinfo->lconv_mon_refcount, "nonnull refcount pointer for C locale\n"); + + todo_wine ok(l->locinfo->lc_time_curr != l2->locinfo->lc_time_curr, "same lc_time_curr pointers\n"); + ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); + todo_wine ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); + ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); + todo_wine ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), + "refcount = %d\n", l2->locinfo->lc_time_curr->refcount); + + p__free_locale(l2); + + p__free_locale(l); + p_setlocale(LC_ALL, "C"); +} + START_TEST(msvcr90) { if(!init()) @@ -2001,4 +2466,5 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); + test__get_current_locale(); } -- 2.24.0

1 7

[PATCH] tests: Don't initialize static variables to 0.
by Francois Gouget 03 Feb '20

03 Feb '20

Static variables are initialized to 0 by default anyway. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I don't really mind initializing them but with the current code not all of them are initialized : skipped is missing. The inconsistency makes this a bit confusing so I propose to standardize on using the fact that the compiler will automatically initialize those to 0. include/wine/test.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 9f308b4c4ab..827d1cba226 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -543,7 +543,6 @@ static int run_test( const char *name ) printf( "Fatal: test '%s' does not exist.\n", name ); exit_process(1); } - successes = failures = todo_successes = todo_failures = 0; tls_index=TlsAlloc(); current_test = test; test->func(); -- 2.20.1

1 0

[PATCH v2 1/5] quartz/filtergraph: Get rid of tracing for outer IUnknown methods.
by Zebediah Figura 02 Feb '20

02 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 207 ++++++++++++-------------------------- 1 file changed, 63 insertions(+), 144 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 161b0e9f900..c29bb3e95d8 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -527,31 +527,22 @@ static inline IFilterGraphImpl *impl_from_IFilterGraph2(IFilterGraph2 *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IFilterGraph2_iface); } -static HRESULT WINAPI FilterGraph2_QueryInterface(IFilterGraph2 *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI FilterGraph2_QueryInterface(IFilterGraph2 *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI FilterGraph2_AddRef(IFilterGraph2 *iface) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI FilterGraph2_Release(IFilterGraph2 *iface) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + return IUnknown_Release(graph->outer_unk); } static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *name) @@ -2005,31 +1996,22 @@ static inline IFilterGraphImpl *impl_from_IMediaControl(IMediaControl *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaControl_iface); } -static HRESULT WINAPI MediaControl_QueryInterface(IMediaControl *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI MediaControl_QueryInterface(IMediaControl *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaControl_AddRef(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaControl_Release(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); + return IUnknown_Release(graph->outer_unk); } @@ -2178,31 +2160,22 @@ static inline IFilterGraphImpl *impl_from_IMediaSeeking(IMediaSeeking *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaSeeking_iface); } -static HRESULT WINAPI MediaSeeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI MediaSeeking_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaSeeking_AddRef(IMediaSeeking *iface) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaSeeking_Release(IMediaSeeking *iface) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + return IUnknown_Release(graph->outer_unk); } typedef HRESULT (WINAPI *fnFoundSeek)(IFilterGraphImpl *This, IMediaSeeking*, DWORD_PTR arg); @@ -2660,31 +2633,22 @@ static inline IFilterGraphImpl *impl_from_IMediaPosition(IMediaPosition *iface) } /*** IUnknown methods ***/ -static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj) +static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaPosition(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface) { - IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaPosition(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface) { - IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaPosition(iface); + return IUnknown_Release(graph->outer_unk); } /*** IDispatch methods ***/ @@ -2872,31 +2836,22 @@ static inline IFilterGraphImpl *impl_from_IObjectWithSite(IObjectWithSite *iface } /*** IUnknown methods ***/ -static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite* iface, REFIID riid, void** ppvObj) +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) { - IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) { - IFilterGraphImpl *This = impl_from_IObjectWithSite( iface ); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IObjectWithSite(iface); + return IUnknown_Release(graph->outer_unk); } /*** IObjectWithSite methods ***/ @@ -2984,31 +2939,22 @@ static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicAudio_iface); } -static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IBasicAudio(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicAudio(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) { - IFilterGraphImpl *This = impl_from_IBasicAudio(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicAudio(iface); + return IUnknown_Release(graph->outer_unk); } static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *count) @@ -3160,31 +3106,22 @@ static inline IFilterGraphImpl *impl_from_IBasicVideo2(IBasicVideo2 *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicVideo2_iface); } -static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo2 *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo2 *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI BasicVideo_AddRef(IBasicVideo2 *iface) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI BasicVideo_Release(IBasicVideo2 *iface) { - IFilterGraphImpl *This = impl_from_IBasicVideo2(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IBasicVideo2(iface); + return IUnknown_Release(graph->outer_unk); } static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *count) @@ -3953,31 +3890,22 @@ static inline IFilterGraphImpl *impl_from_IVideoWindow(IVideoWindow *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoWindow_iface); } -static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IVideoWindow(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IVideoWindow(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) { - IFilterGraphImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IVideoWindow(iface); + return IUnknown_Release(graph->outer_unk); } HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *count) @@ -4872,31 +4800,22 @@ static inline IFilterGraphImpl *impl_from_IMediaEventEx(IMediaEventEx *iface) return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaEventEx_iface); } -static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, REFIID riid, void **ppvObj) +static HRESULT WINAPI MediaEvent_QueryInterface(IMediaEventEx *iface, REFIID iid, void **out) { - IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); } static ULONG WINAPI MediaEvent_AddRef(IMediaEventEx *iface) { - IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface); + return IUnknown_AddRef(graph->outer_unk); } static ULONG WINAPI MediaEvent_Release(IMediaEventEx *iface) { - IFilterGraphImpl *This = impl_from_IMediaEventEx(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->outer_unk); + IFilterGraphImpl *graph = impl_from_IMediaEventEx(iface); + return IUnknown_Release(graph->outer_unk); } /*** IDispatch methods ***/ -- 2.25.0

1 5

[PATCH 1/5] quartz/tests: Add tests for IFilterGraph::Reconnect().
by Zebediah Figura 02 Feb '20

02 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 110693185fd..decea5d94cb 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2915,6 +2915,37 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* ConnectDirect() protects against cyclical connections. */ hr = IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); @@ -2953,6 +2984,8 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); -- 2.25.0

2 9

Wine staging 5.1 release
by Alistair Leslie-Hughes 02 Feb '20

02 Feb '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.1 (860 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * include: Add directmanipulation.idl * include: Add DCompManipulationCompositor coclass and supporting interfaces. * include: Add IDirectManipulationViewport2 interface. * include: Add IDirectManipulationPrimaryContent interface. * include/winternl.h: Add Vista+ PEB_LDR_DATA structure fields. * gdiplus: GdipCreateBitmapFromHBITMAP should use palette from the GDI bitmap. * gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP. * gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images. * kernelbase: Implement ReOpenFile(). * advapi32: Fallback to Sid string when LookupAccountSid fails. * advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS. * gdiplus: Use refcounting for GpFontFamily instead of cloning. Added: * None Updated: * dxva2-Video_Decoder * oleaut32-CreateTypeLib * ntdll-RtlIpv4StringToAddress * d3dx9_36-D3DXCreateKeyframedAnimationSet * wined3d-SWVP-shaders Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] wldap32: Remove unused debug channel.
by Gerald Pfeifer 02 Feb '20

02 Feb '20

This led to the definition of a static variable which then was not used, so wasting space and/or triggering a compiler warning. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wldap32/add.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 0a24d95f32..d28ad961e1 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -34,8 +34,6 @@ #include "wldap32.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); - #ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; #endif -- 2.25.0

3 3

Call for WineConf Hosts
by Ulrich Czekalla 02 Feb '20

02 Feb '20

Hi All, During the last WineConf it was decided that we needed a more formal process for choosing the next WineConf host. It was also decided that we need to help current and future hosts by by putting together a support WineConf committee along with a checklist to help guide the host. To that end, we have started a Organising WineConf [1] wiki page. It's by no means complete so I encourage all past hosts to review and edit the page to make it more helpful to potential hosts. Thanks to Henri for providing most of the current content. This is also a call for proposals to host the next WineConf sometime this year. Ideally proposals would present; Proposed dates Proposed city Information on potential venues and travel We'll need to choose a host relatively quickly as it does take time to plan and book the event. I'm hoping we can settle on a host by the end of February but ultimately that decision goes to the Wine Committee. Questions, comments, concerns can be posted on the mailing list. Thanks, -Ulrich 1. http://wiki.winehq.org/Organising_WineConf

1 0

[PATCH v2] iphlpapi: Consolidate append_*_row functions
by Alex Henrie 01 Feb '20

01 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Minor whitespace fix --- dlls/iphlpapi/ipstats.c | 151 +++++++++------------------------------- 1 file changed, 32 insertions(+), 119 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index dd6a57015f..83259f4743 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1326,24 +1326,24 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) return GetUdpStatisticsEx(stats, WS_AF_INET); } -static MIB_IPFORWARDTABLE *append_ipforward_row( HANDLE heap, DWORD flags, MIB_IPFORWARDTABLE *table, - DWORD *count, const MIB_IPFORWARDROW *row ) +static void *append_table_row( HANDLE heap, DWORD flags, void *table, DWORD *table_size, DWORD *table_capacity, + const void *row, DWORD row_size ) { - if (table->dwNumEntries >= *count) + DWORD *num_entries = table; /* this must be the first field */ + if (*num_entries == *table_capacity) { - MIB_IPFORWARDTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPFORWARDTABLE, table[new_count] )))) + void *new_table; + *table_size += *table_capacity * row_size; + if (!(new_table = HeapReAlloc( heap, flags, table, *table_size ))) { HeapFree( heap, 0, table ); return NULL; } - *count = new_count; - table = new_table; + num_entries = table = new_table; + *table_capacity *= 2; } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); + memcpy( (char *)table + *table_size - (*table_capacity - *num_entries) * row_size, row, row_size ); + (*num_entries)++; return table; } @@ -1381,13 +1381,13 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw { MIB_IPFORWARDTABLE *table; MIB_IPFORWARDROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpForwardTable, bOrder, heap, flags); if (!ppIpForwardTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPFORWARDTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size ))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1428,7 +1428,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw * route is typically set with MIB_IPPROTO_NETMGMT instead */ row.u2.ForwardProto = MIB_IPPROTO_LOCAL; - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1465,7 +1465,8 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw memcpy( name, entry->ipRouteIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwForwardIfIndex ); - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1573,7 +1574,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw } } - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } done: @@ -1596,27 +1597,6 @@ done: return ret; } -static MIB_IPNETTABLE *append_ipnet_row( HANDLE heap, DWORD flags, MIB_IPNETTABLE *table, - DWORD *count, const MIB_IPNETROW *row ) -{ - if (table->dwNumEntries >= *count) - { - MIB_IPNETTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPNETTABLE, table[new_count] )))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); - return table; -} - static int compare_ipnet_rows(const void *a, const void *b) { const MIB_IPNETROW *rowA = a; @@ -1648,13 +1628,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO { MIB_IPNETTABLE *table; MIB_IPNETROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPNETTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpNetTable, bOrder, heap, flags); if (!ppIpNetTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPNETTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size ))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1700,7 +1680,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO while (*ptr && isspace(*ptr)) ptr++; getInterfaceIndexByName(ptr, &row.dwIndex); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1728,7 +1708,8 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO memcpy( name, entry->ipNetToMediaIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwIndex ); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1784,7 +1765,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO else if(rtm->rtm_rmx.rmx_expire != 0) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; else row.u.Type = MIB_IPNET_TYPE_INVALID; - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } next += rtm->rtm_msglen; @@ -1846,30 +1827,6 @@ static DWORD get_tcp_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_TCPTABLE *append_tcp_row( TCP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_TCPTABLE *table, DWORD *count, - const MIB_TCPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_TCPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_tcp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - - /* Why not a lookup table? Because the TCPS_* constants are different on different platforms */ static inline MIB_TCP_STATE TCPStateToMIBState (int state) @@ -2156,7 +2113,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2182,7 +2139,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemotePort = htons( entry->tcpConnRemPort ); row.dwState = entry->tcpConnState; if (!match_class( class, row.dwState )) continue; - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, data ); @@ -2276,7 +2233,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } @@ -2395,29 +2352,6 @@ static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDPTABLE *append_udp_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDPTABLE *table, DWORD *count, - const MIB_UDPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp_rows(const void *a, const void *b) { const MIB_UDPROW *rowA = a; @@ -2474,7 +2408,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2496,7 +2430,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { row.dwLocalAddr = entry->udpLocalAddress; row.dwLocalPort = htons( entry->udpLocalPort ); - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -2584,7 +2519,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } done: @@ -2640,29 +2576,6 @@ static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDP6TABLE *table, DWORD *count, - const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDP6TABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp6_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp6_rows(const void *a, const void *b) { const MIB_UDP6ROW *rowA = a; @@ -2824,7 +2737,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); -- 2.25.0

1 0

[PATCH] iphlpapi: Consolidate append_*_row functions
by Alex Henrie 01 Feb '20

01 Feb '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/iphlpapi/ipstats.c | 151 +++++++++------------------------------- 1 file changed, 32 insertions(+), 119 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index dd6a57015f..88e338493c 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1326,24 +1326,24 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) return GetUdpStatisticsEx(stats, WS_AF_INET); } -static MIB_IPFORWARDTABLE *append_ipforward_row( HANDLE heap, DWORD flags, MIB_IPFORWARDTABLE *table, - DWORD *count, const MIB_IPFORWARDROW *row ) +static void *append_table_row( HANDLE heap, DWORD flags, void *table, DWORD *table_size, DWORD *table_capacity, + const void *row, DWORD row_size ) { - if (table->dwNumEntries >= *count) + DWORD *num_entries = table; /* this must be the first field */ + if (*num_entries == *table_capacity) { - MIB_IPFORWARDTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPFORWARDTABLE, table[new_count] )))) + void *new_table; + *table_size += *table_capacity * row_size; + if (!(new_table = HeapReAlloc( heap, flags, table, *table_size ))) { HeapFree( heap, 0, table ); return NULL; } - *count = new_count; - table = new_table; + num_entries = table = new_table; + *table_capacity *= 2; } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); + memcpy( (char *)table + *table_size - (*table_capacity - *num_entries) * row_size, row, row_size ); + (*num_entries)++; return table; } @@ -1381,13 +1381,13 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw { MIB_IPFORWARDTABLE *table; MIB_IPFORWARDROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpForwardTable, bOrder, heap, flags); if (!ppIpForwardTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPFORWARDTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1428,7 +1428,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw * route is typically set with MIB_IPPROTO_NETMGMT instead */ row.u2.ForwardProto = MIB_IPPROTO_LOCAL; - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1465,7 +1465,8 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw memcpy( name, entry->ipRouteIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwForwardIfIndex ); - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1573,7 +1574,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw } } - if (!(table = append_ipforward_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } done: @@ -1596,27 +1597,6 @@ done: return ret; } -static MIB_IPNETTABLE *append_ipnet_row( HANDLE heap, DWORD flags, MIB_IPNETTABLE *table, - DWORD *count, const MIB_IPNETROW *row ) -{ - if (table->dwNumEntries >= *count) - { - MIB_IPNETTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2; - - if (!(new_table = HeapReAlloc( heap, flags, table, - FIELD_OFFSET(MIB_IPNETTABLE, table[new_count] )))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); - return table; -} - static int compare_ipnet_rows(const void *a, const void *b) { const MIB_IPNETROW *rowA = a; @@ -1648,13 +1628,13 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO { MIB_IPNETTABLE *table; MIB_IPNETROW row; - DWORD ret = NO_ERROR, count = 16; + DWORD ret = NO_ERROR, count = 16, table_size = FIELD_OFFSET( MIB_IPNETTABLE, table[count] ); TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpNetTable, bOrder, heap, flags); if (!ppIpNetTable) return ERROR_INVALID_PARAMETER; - if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPNETTABLE, table[count] )))) + if (!(table = HeapAlloc( heap, flags, table_size ))) return ERROR_OUTOFMEMORY; table->dwNumEntries = 0; @@ -1700,7 +1680,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO while (*ptr && isspace(*ptr)) ptr++; getInterfaceIndexByName(ptr, &row.dwIndex); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } fclose(fp); @@ -1728,7 +1708,8 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO memcpy( name, entry->ipNetToMediaIfIndex.o_bytes, namelen ); name[namelen] = 0; getInterfaceIndexByName( name, &row.dwIndex ); - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -1784,7 +1765,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO else if(rtm->rtm_rmx.rmx_expire != 0) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; else row.u.Type = MIB_IPNET_TYPE_INVALID; - if (!(table = append_ipnet_row( heap, flags, table, &count, &row ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, sizeof(row) ))) break; } next += rtm->rtm_msglen; @@ -1846,30 +1827,6 @@ static DWORD get_tcp_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_TCPTABLE *append_tcp_row( TCP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_TCPTABLE *table, DWORD *count, - const MIB_TCPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_TCPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_tcp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - - /* Why not a lookup table? Because the TCPS_* constants are different on different platforms */ static inline MIB_TCP_STATE TCPStateToMIBState (int state) @@ -2156,7 +2113,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2182,7 +2139,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemotePort = htons( entry->tcpConnRemPort ); row.dwState = entry->tcpConnState; if (!match_class( class, row.dwState )) continue; - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, data ); @@ -2276,7 +2233,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.liCreateTimestamp.QuadPart = 0; /* FIXME */ memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } @@ -2395,29 +2352,6 @@ static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDPTABLE *append_udp_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDPTABLE *table, DWORD *count, - const MIB_UDPROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDPTABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp_rows(const void *a, const void *b) { const MIB_UDPROW *rowA = a; @@ -2474,7 +2408,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); @@ -2496,7 +2430,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { row.dwLocalAddr = entry->udpLocalAddress; row.dwLocalPort = htons( entry->udpLocalPort ); - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } HeapFree( GetProcessHeap(), 0, data ); } @@ -2584,7 +2519,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) + break; } done: @@ -2640,29 +2576,6 @@ static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD return table_size; } -static MIB_UDP6TABLE *append_udp6_row( UDP_TABLE_CLASS class, HANDLE heap, DWORD flags, - MIB_UDP6TABLE *table, DWORD *count, - const MIB_UDP6ROW_OWNER_MODULE *row, DWORD row_size ) -{ - if (table->dwNumEntries >= *count) - { - MIB_UDP6TABLE *new_table; - DWORD new_count = table->dwNumEntries * 2, new_table_size; - - new_table_size = get_udp6_table_sizes( class, new_count, NULL ); - if (!(new_table = HeapReAlloc( heap, flags, table, new_table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - *count = new_count; - table = new_table; - } - memcpy( (char *)table->table + (table->dwNumEntries * row_size), row, row_size ); - table->dwNumEntries++; - return table; -} - static int compare_udp6_rows(const void *a, const void *b) { const MIB_UDP6ROW *rowA = a; @@ -2824,7 +2737,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.u.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } - if (!(table = append_udp6_row( class, heap, flags, table, &count, &row, row_size ))) + if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) break; } HeapFree( GetProcessHeap(), 0, map ); -- 2.25.0

1 0

[PATCH] advapi32: Fix the name and use of DOMAIN_GROUP_RID_USERS.
by Zebediah Figura 01 Feb '20

01 Feb '20

From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I know of no application that requires this. The patch was originally sent as part of a set in which some patches were labeled as for Cygwin: https://www.winehq.org/pipermail/wine-patches/2015-April/138518.html However, Cygwin is currently too broken in Wine to test. dlls/advapi32/security.c | 5 +++-- dlls/advapi32/tests/security.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a7707f15d39..700ee7d8eae 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -187,7 +187,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m',' static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; -static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; +static const WCHAR None[] = { 'N','o','n','e',0 }; static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; @@ -1185,7 +1185,8 @@ LookupAccountSidW( ac = Domain_Admins; break; case DOMAIN_GROUP_RID_USERS: - ac = Domain_Users; + ac = None; + use = SidTypeGroup; break; case DOMAIN_GROUP_RID_GUESTS: ac = Domain_Guests; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6d73300c1d4..afcdb6328e0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2928,11 +2928,11 @@ static void test_process_security(void) dom_size = sizeof(domain); ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); ok(ret, "LookupAccountSid failed with %d\n", ret); - todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); + ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) skip("Non-English locale (test with hardcoded 'None')\n"); else - todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + ok(!strcmp(account, "None"), "expect None, got %s\n", account); res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res); -- 2.25.0

1 0

[PATCH 1/2] advapi32/tests: Clean up and expand tests for LsaLookupSids().
by Zebediah Figura 01 Feb '20

01 Feb '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/lsa.c | 83 ++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 451bee92e93..7b8f6b8e849 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -319,74 +319,93 @@ static void test_LsaLookupNames2(void) ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08x\n", status); } +static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, const WCHAR *expect) +{ + ok_(__FILE__, line)(string->Length == wcslen(string->Buffer) * sizeof(WCHAR), + "expected %u, got %u\n", wcslen(string->Buffer) * sizeof(WCHAR), string->Length); + ok_(__FILE__, line)(string->MaximumLength == string->Length + sizeof(WCHAR), + "expected %u, got %u\n", string->Length + sizeof(WCHAR), string->MaximumLength); + ok_(__FILE__, line)(!wcsicmp(string->Buffer, expect), "expected %s, got %s\n", + debugstr_w(expect), debugstr_w(string->Buffer)); +} +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) + static void test_LsaLookupSids(void) { + char user_buffer[64]; + LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; + TOKEN_USER *user = (TOKEN_USER *)user_buffer; + WCHAR computer_name[64], user_name[64]; LSA_REFERENCED_DOMAIN_LIST *list; - LSA_OBJECT_ATTRIBUTES attrs; LSA_TRANSLATED_NAME *names; LSA_HANDLE policy; - TOKEN_USER *user; NTSTATUS status; HANDLE token; DWORD size; BOOL ret; PSID sid; - memset(&attrs, 0, sizeof(attrs)); - attrs.Length = sizeof(attrs); - status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); - ok(ret, "got %d\n", ret); + ok(ret, "OpenProcessToken() failed, error %u\n", GetLastError()); + + ret = GetTokenInformation(token, TokenUser, user, sizeof(user_buffer), &size); + ok(ret, "GetTokenInformation() failed, error %u\n", GetLastError()); - ret = GetTokenInformation(token, TokenUser, NULL, 0, &size); - ok(!ret, "got %d\n", ret); + size = ARRAY_SIZE(computer_name); + ret = GetComputerNameW(computer_name, &size); + ok(ret, "GetComputerName() failed, error %u\n", GetLastError()); - user = HeapAlloc(GetProcessHeap(), 0, size); - ret = GetTokenInformation(token, TokenUser, user, size, &size); - ok(ret, "got %d\n", ret); + size = ARRAY_SIZE(user_name); + ret = GetUserNameW(user_name, &size); + ok(ret, "GetUserName() failed, error %u\n", GetLastError()); status = LsaLookupSids(policy, 1, &user->User.Sid, &list, &names); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(list->Entries > 0, "got %d\n", list->Entries); - if (list->Entries) - { - ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); - ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); - ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, - list->Domains[0].Name.Length); - } + ok(list->Entries == 1, "got %d\n", list->Entries); + check_unicode_string(&list->Domains[0].Name, computer_name); + + ok(names[0].Use == SidTypeUser, "got type %u\n", names[0].Use); + ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, user_name); LsaFreeMemory(names); LsaFreeMemory(list); - - HeapFree(GetProcessHeap(), 0, user); - CloseHandle(token); ret = ConvertStringSidToSidA("S-1-1-0", &sid); - ok(ret == TRUE, "ConvertStringSidToSidA returned false\n"); + ok(ret, "ConvertStringSidToSidA() failed, error %u\n", GetLastError()); status = LsaLookupSids(policy, 1, &sid, &list, &names); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(list->Entries > 0, "got %d\n", list->Entries); + ok(list->Entries == 1, "got %d\n", list->Entries); + check_unicode_string(&list->Domains[0].Name, L""); - if (list->Entries) - { - ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); - ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); - ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, - list->Domains[0].Name.Length); - ok(list->Domains[0].Name.Buffer != NULL, "domain[0] name buffer is null\n"); - } + ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); + ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, L"Everyone"); LsaFreeMemory(names); LsaFreeMemory(list); + FreeSid(sid); + + ret = ConvertStringSidToSidA("S-1-1234-5678-1234-5678", &sid); + ok(ret, "ConvertStringSidToSidA() failed, error %u\n", GetLastError()); + status = LsaLookupSids(policy, 1, &sid, &list, &names); + ok(status == STATUS_NONE_MAPPED, "got 0x%08x\n", status); + + ok(!list->Entries, "got %d\n", list->Entries); + + ok(names[0].Use == SidTypeUnknown, "got type %u\n", names[0].Use); + ok(names[0].DomainIndex == -1, "got index %u\n", names[0].DomainIndex); + + LsaFreeMemory(names); + LsaFreeMemory(list); FreeSid(sid); status = LsaClose(policy); -- 2.25.0

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2020