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

Jacek Caban : mshtml: Fix navigator.toString() in IE9+ compat modes.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 4238faa0a01548c22451c32c0fa892ce36277d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4238faa0a01548c22451c32c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:34:06 2021 +0100 mshtml: Fix navigator.toString() in IE9+ compat modes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index a98f6293d29..94616a7db78 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1315,7 +1315,8 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) if(!String) return E_INVALIDARG; - *String = SysAllocString(L"[object]"); + *String = SysAllocString(dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 + ? L"[object]" : L"[object Navigator]"); return *String ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c97e1b4f276..ec23ab8d494 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -375,4 +375,6 @@ sync_test("navigator", function() { ok(navigator.appCodeName === "Mozilla", "appCodeName = " + navigator.appCodeName); ok(navigator.appName === (v < 11 ? "Microsoft Internet Explorer" : "Netscape"), "appName = " + navigator.appName); + ok(navigator.toString() === (v < 9 ? "[object]" : "[object Navigator]"), + "navigator.toString() = " + navigator.toString()); });

1 0

Jan Sikorski : wined3d: Handle different slice pitches in compressed texture updates.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: e42f89b5430899496852cb13eaaadea6f32ed998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e42f89b5430899496852cb13… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 26 14:21:47 2021 +0100 wined3d: Handle different slice pitches in compressed texture updates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 22bd8cc34b7..4db62b198eb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2169,43 +2169,44 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format GL_EXTCALL(glCompressedTexSubImage1D(target, level, dst_x, update_w, internal, dst_row_pitch, addr)); } - else if (dst_row_pitch == src_row_pitch) + else { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + unsigned int row, y, slice, slice_count = 1, row_count = 1; + + /* glCompressedTexSubImage2D() ignores pixel store state, so we + * can't use the unpack row length like for glTexSubImage2D. */ + if (dst_row_pitch != src_row_pitch) { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, dst_z, - update_w, update_h, update_d, internal, dst_slice_pitch * update_d, addr)); + row_count = (update_h + src_format->block_height - 1) / src_format->block_height; + update_h = src_format->block_height; + wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, + &dst_row_pitch, &dst_slice_pitch); } - else + + if (dst_slice_pitch != src_slice_pitch) { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, internal, dst_slice_pitch, addr)); + slice_count = update_d; + update_d = 1; } - } - else - { - unsigned int row_count = (update_h + src_format->block_height - 1) / src_format->block_height; - unsigned int row, y, z; - /* glCompressedTexSubImage2D() ignores pixel store state, so we - * can't use the unpack row length like for glTexSubImage2D. */ - for (z = dst_z; z < dst_z + update_d; ++z) + for (slice = 0; slice < slice_count; ++slice) { for (row = 0, y = dst_y; row < row_count; ++row) { + const BYTE *upload_addr = &addr[slice * src_slice_pitch + row * src_row_pitch]; + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, z, - update_w, src_format->block_height, 1, internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, dst_z + slice, update_w, + update_h, update_d, internal, update_d * dst_slice_pitch, upload_addr)); } else { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, - update_w, src_format->block_height, internal, dst_row_pitch, addr)); + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, update_w, + update_h, internal, dst_slice_pitch, upload_addr)); } y += src_format->block_height; - addr += src_row_pitch; } } }

1 0

Jan Sikorski : wined3d: Handle different slice pitches in uncompressed texture updates.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: fc29f2a6767005eed7686a1f312a1a0d8aecba16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc29f2a6767005eed7686a1f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 26 14:21:46 2021 +0100 wined3d: Handle different slice pitches in uncompressed texture updates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 72 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 752b6b4cf9b..22bd8cc34b7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2137,10 +2137,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format, GLenum target, - unsigned int level, unsigned int src_row_pitch, unsigned int dst_x, unsigned int dst_y, - unsigned int dst_z, unsigned int update_w, unsigned int update_h, unsigned int update_d, - const BYTE *addr, BOOL srgb, struct wined3d_texture *dst_texture, - const struct wined3d_gl_info *gl_info) + unsigned int level, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, unsigned int update_w, + unsigned int update_h, unsigned int update_d, const BYTE *addr, BOOL srgb, + struct wined3d_texture *dst_texture, const struct wined3d_gl_info *gl_info) { const struct wined3d_format_gl *format_gl = wined3d_format_gl(src_format); @@ -2213,17 +2213,19 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format } else { - unsigned int y, y_count; + unsigned int y, y_count, z, z_count; + bool unpacking_rows = false; TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", target, level, dst_x, dst_y, dst_z, update_w, update_h, update_d, format_gl->format, format_gl->type, addr); - if (src_row_pitch) + if (src_row_pitch && !(src_row_pitch % src_format->byte_count)) { gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); y_count = 1; + unpacking_rows = true; } else { @@ -2231,25 +2233,47 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format update_h = 1; } - for (y = 0; y < y_count; ++y) + if (src_slice_pitch && unpacking_rows && !(src_slice_pitch % src_row_pitch)) { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) - { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z, - update_w, update_h, update_d, format_gl->format, format_gl->type, addr)); - } - else if (target == GL_TEXTURE_1D) - { - gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, - update_w, format_gl->format, format_gl->type, addr); - } - else + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, src_slice_pitch / src_row_pitch); + z_count = 1; + } + else if (src_slice_pitch && !unpacking_rows && !(src_slice_pitch % (update_w * src_format->byte_count))) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, + src_slice_pitch / (update_w * src_format->byte_count)); + z_count = 1; + } + else + { + z_count = update_d; + update_d = 1; + } + + for (z = 0; z < z_count; ++z) + { + for (y = 0; y < y_count; ++y) { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, - update_w, update_h, format_gl->format, format_gl->type, addr); + const BYTE *upload_addr = &addr[z * src_slice_pitch + y * src_row_pitch]; + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z + z, update_w, + update_h, update_d, format_gl->format, format_gl->type, upload_addr)); + } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, + update_w, format_gl->format, format_gl->type, upload_addr); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, + update_w, update_h, format_gl->format, format_gl->type, upload_addr); + } } } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0); checkGLcall("Upload texture data"); } } @@ -2462,8 +2486,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); - wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_x, dst_y, - dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_slice_pitch, dst_x, + dst_y, dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); } wined3d_context_gl_unmap_bo_address(context_gl, &bo, 0, NULL); @@ -2477,8 +2501,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); } - wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, - dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, src_slice_pitch, dst_x, + dst_y, dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); if (bo.buffer_object) {

1 0

Paul Gofman : ddraw: Allow texture without DDSCAPS_TEXTURE for ddraw4 and earlier on software device.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 13ffebc7285198fe690aa44a5f70eb0c8fd3fa80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ffebc7285198fe690aa44a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 26 16:18:01 2021 +0300 ddraw: Allow texture without DDSCAPS_TEXTURE for ddraw4 and earlier on software device. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 8 ++-- dlls/ddraw/tests/ddraw1.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 96 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++++++++++ 5 files changed, 418 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13ffebc7285198fe690a…

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_stream_output().
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: f2d4714c8b513da41ca87ef96aa010321f80dc9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d4714c8b513da41ca87ef9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:51 2021 -0500 d3d11: Use wined3d_device_context_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 67781c57ef5..5b52eba859a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1053,7 +1053,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext1 *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int count, i; TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); @@ -1064,12 +1064,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceC { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_set_stream_output(device->wined3d_device, i, + wined3d_device_context_set_stream_output(context->wined3d_context, i, buffer ? buffer->wined3d_buffer : NULL, offsets ? offsets[i] : 0); } for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) { - wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); } wined3d_mutex_unlock(); } @@ -2635,7 +2635,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon ID3D11DeviceContext1_RSSetState(iface, NULL); for (i = 0; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) { - wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); } wined3d_device_context_set_predication(context->wined3d_context, NULL, FALSE); wined3d_mutex_unlock();

1 0

Huw Davies : riched20: Retrieve the window from the host.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: f83a52788f60101f2e6e44ac9b4d029bef2011a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83a52788f60101f2e6e44ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 26 09:08:04 2021 +0000 riched20: Retrieve the window from the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b8b081fc916..b652d5a753a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1195,20 +1195,19 @@ static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) return IOleClientSite_Release(&This->IOleClientSite_iface); } -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow( IOleInPlaceSite *iface, HWND *window ) { IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - TRACE("(%p)->(%p)\n", This, phwnd); + TRACE( "(%p)->(%p)\n", This, window ); if (!This->child.reole) return CO_E_RELEASED; - if (!phwnd) - return E_INVALIDARG; + if (!window) return E_INVALIDARG; - *phwnd = This->child.reole->editor->hWnd; - return S_OK; + if (!This->child.reole->editor->have_texthost2) return E_NOTIMPL; + return ITextHost2_TxGetWindow( This->child.reole->editor->texthost, window ); } static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode)

1 0

Jacek Caban : mshtml/tests: Allow error when loading an image in events.html.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 8979458f45aac9e7b39597497411a377f9bc818c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8979458f45aac9e7b3959749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:08 2021 +0100 mshtml/tests: Allow error when loading an image in events.html. Fixes tests on win8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index a58b0e361d6..955e4853b92 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -323,6 +323,10 @@ img.onload = function() { trace("img.onload"); img_onload_called = true; } +img.onerror = function() { + trace("img.onerror"); + img_onload_called = true; +} </script> </head> <body>

1 0

Jacek Caban : mshtml/tests: Allow typeof(localStorage) to be unknown.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: f2e50eedb98105a6f51088052497d4ac2036519f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e50eedb98105a6f5108805… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:14 2021 +0100 mshtml/tests: Allow typeof(localStorage) to be unknown. Fixes tests on some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index e1c60d6ea53..a18ce409a9b 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -398,7 +398,7 @@ sync_test("stylesheets", function() { sync_test("storage", function() { ok(typeof(window.sessionStorage) === "object", "typeof(window.sessionStorage) = " + typeof(window.sessionStorage)); - ok(typeof(window.localStorage) === "object", + ok(typeof(window.localStorage) === "object" || typeof(window.localStorage) === "unknown", "typeof(window.localStorage) = " + typeof(window.localStorage)); });

1 0

Rémi Bernon : windows.globalization: Fake empty IGlobalizationPreferencesStatics properties.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 6c7db4ba5e1bf0eb78f026e8d9403d83a1852e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c7db4ba5e1bf0eb78f026e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 26 10:24:59 2021 +0100 windows.globalization: Fake empty IGlobalizationPreferencesStatics properties. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/main.c | 6 ++-- dlls/windows.globalization/tests/globalization.c | 36 +++++++++++++++++++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 9aa07700310..1c41e77d41b 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -375,21 +375,21 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Calendars( IGlobalizationPreferencesStatics *iface, IVectorView_HSTRING **out) { FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + return hstring_vector_create(NULL, 0, out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Clocks( IGlobalizationPreferencesStatics *iface, IVectorView_HSTRING **out) { FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + return hstring_vector_create(NULL, 0, out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Currencies( IGlobalizationPreferencesStatics *iface, IVectorView_HSTRING **out) { FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + return hstring_vector_create(NULL, 0, out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index a2b47e53be5..b824cfdf8ae 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -47,7 +47,7 @@ static void test_GlobalizationPreferences(void) static const WCHAR *class_name = L"Windows.System.UserProfile.GlobalizationPreferences"; IGlobalizationPreferencesStatics *preferences_statics = NULL; - IVectorView_HSTRING *languages = NULL; + IVectorView_HSTRING *languages = NULL, *calendars, *clocks, *currencies; IActivationFactory *factory = NULL; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; @@ -178,6 +178,40 @@ static void test_GlobalizationPreferences(void) IVectorView_HSTRING_Release(languages); + + hr = IGlobalizationPreferencesStatics_get_Calendars(preferences_statics, &calendars); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Calendars failed, hr %#x\n", hr); + + size = 0xdeadbeef; + hr = IVectorView_HSTRING_get_Size(calendars, &size); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); + + IVectorView_HSTRING_Release(calendars); + + + hr = IGlobalizationPreferencesStatics_get_Clocks(preferences_statics, &clocks); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Clocks failed, hr %#x\n", hr); + + size = 0xdeadbeef; + hr = IVectorView_HSTRING_get_Size(clocks, &size); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); + + IVectorView_HSTRING_Release(clocks); + + + hr = IGlobalizationPreferencesStatics_get_Currencies(preferences_statics, &currencies); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Currencies failed, hr %#x\n", hr); + + size = 0xdeadbeef; + hr = IVectorView_HSTRING_get_Size(currencies, &size); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); + + IVectorView_HSTRING_Release(currencies); + + IGlobalizationPreferencesStatics_Release(preferences_statics); IAgileObject_Release(agile_object);

1 0

Rémi Bernon : windows.globalization: Implement IGlobalizationPreferencesStatics::Languages.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 6302df9dc7b277ec30fd12c5a0fe2e4b8f933b1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6302df9dc7b277ec30fd12c5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 26 10:24:58 2021 +0100 windows.globalization: Implement IGlobalizationPreferencesStatics::Languages. Returning user default language in a 1-element HSTRING vector. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/main.c | 194 ++++++++++++++++++++++- dlls/windows.globalization/tests/globalization.c | 33 +++- 2 files changed, 222 insertions(+), 5 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 84813152047..9aa07700310 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -48,6 +48,183 @@ static const char *debugstr_hstring(HSTRING hstr) return wine_dbgstr_wn(str, len); } +struct hstring_vector +{ + IVectorView_HSTRING IVectorView_HSTRING_iface; + LONG ref; + + ULONG count; + HSTRING values[1]; +}; + +static inline struct hstring_vector *impl_from_IVectorView_HSTRING(IVectorView_HSTRING *iface) +{ + return CONTAINING_RECORD(iface, struct hstring_vector, IVectorView_HSTRING_iface); +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_QueryInterface(IVectorView_HSTRING *iface, + REFIID iid, void **out) +{ + struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVectorView_HSTRING)) + { + IUnknown_AddRef(iface); + *out = &impl->IVectorView_HSTRING_iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE hstring_vector_AddRef(IVectorView_HSTRING *iface) +{ + struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE hstring_vector_Release(IVectorView_HSTRING *iface) +{ + struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + if (ref == 0) + { + while (impl->count--) WindowsDeleteString(impl->values[impl->count]); + free(impl); + } + return ref; +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_GetIids(IVectorView_HSTRING *iface, + ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_GetRuntimeClassName(IVectorView_HSTRING *iface, + HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_GetTrustLevel(IVectorView_HSTRING *iface, + TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_GetAt(IVectorView_HSTRING *iface, + ULONG index, HSTRING *value) +{ + struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); + + TRACE("iface %p, index %#x, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->count) return E_BOUNDS; + return WindowsDuplicateString(impl->values[index], value); +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_get_Size(IVectorView_HSTRING *iface, + ULONG *value) +{ + struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + *value = impl->count; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_IndexOf(IVectorView_HSTRING *iface, + HSTRING element, ULONG *index, BOOLEAN *found) +{ + struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); + INT32 i, order; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->count; ++i) + if (SUCCEEDED(WindowsCompareStringOrdinal(impl->values[i], element, &order)) && order == 0) + break; + + if (i < impl->count) + { + *found = TRUE; + *index = i; + } + else + { + *found = FALSE; + *index = 0; + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE hstring_vector_GetMany(IVectorView_HSTRING *iface, + ULONG start_index, ULONG items_size, HSTRING *items, UINT *count) +{ + struct hstring_vector *impl = impl_from_IVectorView_HSTRING(iface); + HRESULT hr = S_OK; + ULONG i; + + TRACE("iface %p, start_index %#x, items %p, count %p.\n", iface, start_index, items, count); + + memset(items, 0, items_size * sizeof(HSTRING *)); + + for (i = start_index; i < impl->count && i < start_index + items_size; ++i) + if (FAILED(hr = WindowsDuplicateString(impl->values[i], items + i - start_index))) + break; + + if (FAILED(hr)) while (i-- > start_index) WindowsDeleteString(items[i - start_index]); + *count = i - start_index; + return hr; +} + +static const struct IVectorView_HSTRINGVtbl hstring_vector_vtbl = +{ + hstring_vector_QueryInterface, + hstring_vector_AddRef, + hstring_vector_Release, + /* IInspectable methods */ + hstring_vector_GetIids, + hstring_vector_GetRuntimeClassName, + hstring_vector_GetTrustLevel, + /* IVectorView<HSTRING> methods */ + hstring_vector_GetAt, + hstring_vector_get_Size, + hstring_vector_IndexOf, + hstring_vector_GetMany, +}; + +static HRESULT hstring_vector_create(HSTRING *values, SIZE_T count, IVectorView_HSTRING **out) +{ + struct hstring_vector *impl; + + if (!(impl = malloc(offsetof(struct hstring_vector, values[count])))) return E_OUTOFMEMORY; + impl->ref = 1; + + impl->IVectorView_HSTRING_iface.lpVtbl = &hstring_vector_vtbl; + impl->count = count; + memcpy(impl->values, values, count * sizeof(HSTRING)); + + *out = &impl->IVectorView_HSTRING_iface; + return S_OK; +} + struct windows_globalization { IActivationFactory IActivationFactory_iface; @@ -218,8 +395,21 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Currencies( static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( IGlobalizationPreferencesStatics *iface, IVectorView_HSTRING **out) { - FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + HSTRING hstring; + HRESULT hr; + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH)) + return E_FAIL; + + TRACE("returning language %s\n", debugstr_w(locale)); + + if (FAILED(hr = WindowsCreateString(locale, wcslen(locale), &hstring))) + return hr; + + return hstring_vector_create(&hstring, 1, out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_HomeGeographicRegion( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 00d9cee5b0d..a2b47e53be5 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -108,8 +108,7 @@ static void test_GlobalizationPreferences(void) pWindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); - todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); @@ -143,14 +142,42 @@ static void test_GlobalizationPreferences(void) pWindowsDeleteString(tmp_str); + hr = pWindowsCreateString(L"deadbeef", 8, &tmp_str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + + i = 0xdeadbeef; + found = TRUE; + hr = IVectorView_HSTRING_IndexOf(languages, tmp_str, &i, &found); + ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); + ok(i == 0 && found == FALSE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); + + pWindowsDeleteString(tmp_str); + tmp_str = (HSTRING)0xdeadbeef; hr = IVectorView_HSTRING_GetAt(languages, size, &tmp_str); ok(hr == E_BOUNDS, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); ok(tmp_str == NULL, "IVectorView_HSTRING_GetAt returned %p\n", tmp_str); + tmp_str = (HSTRING)0xdeadbeef; + hr = IVectorView_HSTRING_GetMany(languages, size, 1, &tmp_str, &i); + ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + ok(i == 0 && tmp_str == NULL, "IVectorView_HSTRING_GetMany returned count %u, str %p\n", i, tmp_str); + + hr = IVectorView_HSTRING_GetMany(languages, 0, 1, &tmp_str, &i); + ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + ok(i == 1, "IVectorView_HSTRING_GetMany returned count %u, expected 1\n", i); + + buf = pWindowsGetStringRawBuffer(tmp_str, &len); + ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); + + ok(wcslen(locale) == len && !memcmp(buf, locale, len), + "IGlobalizationPreferencesStatics_get_Languages 0 returned len %u, str %s, expected %s\n", + len, wine_dbgstr_w(buf), wine_dbgstr_w(locale)); + + pWindowsDeleteString(tmp_str); + IVectorView_HSTRING_Release(languages); -done: IGlobalizationPreferencesStatics_Release(preferences_statics); IAgileObject_Release(agile_object);

1 0