wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Henri Verbeet : wined3d: Respect the BO memory offset in wined3d_context_gl_map_bo_address().
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: c590681e71c444116db71d57243708188e42f70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c590681e71c444116db71d57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:22 2021 -0600 wined3d: Respect the BO memory offset in wined3d_context_gl_map_bo_address(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0c8ee0f605b..f02a0f400a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2739,7 +2739,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return NULL; } - return (uint8_t *)map_ptr + (uintptr_t)data->addr; + return (uint8_t *)map_ptr + bo->buffer_offset + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data, @@ -2771,7 +2771,7 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct for (i = 0; i < range_count; ++i) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, - (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } }

1 0

Henri Verbeet : wined3d: Do not pass an offset and size to wined3d_bo_gl_map().
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 45fc3cbf1263ac705f752601a30b07237ab230dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=45fc3cbf1263ac705f752601… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:21 2021 -0600 wined3d: Do not pass an offset and size to wined3d_bo_gl_map(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 700ccace2e5..0c8ee0f605b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2669,8 +2669,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ wined3d_context_gl_poll_fences(context_gl); } -static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, - struct wined3d_context_gl *context_gl, size_t offset, size_t size, uint32_t flags) +static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info; @@ -2712,13 +2711,11 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } else { - if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); @@ -2736,10 +2733,13 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, if (!(bo = data->buffer_object)) return data->addr; - if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, (uintptr_t)data->addr, size, flags))) + if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, flags))) + { ERR("Failed to map bo.\n"); + return NULL; + } - return map_ptr; + return (uint8_t *)map_ptr + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data,

1 0

Henri Verbeet : wined3d: Always map the whole OpenGL buffer.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 793ac83d5b7fc0bc440714b218d607ad464a4f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=793ac83d5b7fc0bc440714b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:20 2021 -0600 wined3d: Always map the whole OpenGL buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 675c26ac6fe..700ccace2e5 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2712,7 +2712,8 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(bo, flags))); + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) + map_ptr += offset; } else { @@ -2757,11 +2758,12 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { + /* The offset passed to glFlushMappedBufferRange() is relative to the + * mapped range, but we map the whole buffer anyway. */ for (i = 0; i < range_count; ++i) { - /* The offset passed to glFlushMappedBufferRange() is relative to - * the mapped range, so don't add data->addr in this case. */ - GL_EXTCALL(glFlushMappedBufferRange(bo->binding, ranges[i].offset, ranges[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); } } else if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE])

1 0

Henri Verbeet : wined3d: Don't return the BO address offset if glMapBuffer() fails.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 4ff480b2a2c838b968abf8e2d4f07e63988b8437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ff480b2a2c838b968abf8e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 30 17:55:19 2021 -0600 wined3d: Don't return the BO address offset if glMapBuffer() fails. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0b0d594b4b1..675c26ac6fe 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2716,8 +2716,8 @@ map: } else { - map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); - map_ptr += offset; + if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) + map_ptr += offset; } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0);

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in glsl_blitter_upload_palette().
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 669360152ebb2d0e0b9a0c0fa6f4bf044363b40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=669360152ebb2d0e0b9a0c0f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 30 17:55:18 2021 -0600 wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in glsl_blitter_upload_palette(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e51402f1cf..327e73796c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12956,6 +12956,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + if (palette) { gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_BGRA,

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage().
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 21481acaf3ee902705f2a5210d22e73566b77bc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21481acaf3ee902705f2a521… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 30 17:55:17 2021 -0600 wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4c7082912b..f0ef42065d3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -930,6 +930,9 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g else layer_count = texture_gl->t.layer_count; + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (layer = 0; layer < layer_count; ++layer) { target = wined3d_texture_gl_get_sub_resource_target(texture_gl, layer * level_count);

1 0

Mohamad Al-Jaf : uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 84794b40dd5f9ec562d64b57213c8ef4016c9151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84794b40dd5f9ec562d64b57… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 29 23:32:57 2021 -0500 uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub. Enable Microsoft Edge to run in Windows 10 mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51437 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 44fd42742d9..f1cf06ed4f5 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -324,6 +324,15 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN return S_OK; } +/*********************************************************************** + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +{ + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + return S_OK; +} + void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) { FIXME("(%p): stub\n", callback); diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 656641c4bad..82071bd2317 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -86,7 +86,7 @@ #@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) -@ stub UiaRaiseAutomationPropertyChangedEvent +@ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..563d5c602bd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -66,6 +66,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Zhiyi Zhang : uxtheme: Call DefDlgProc() if drawing tab body in a dialog fails.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 5cdbcb0f59241d903da00bd0bbd642e224f0bdde URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cdbcb0f59241d903da00bd0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 30 14:50:40 2021 +0800 uxtheme: Call DefDlgProc() if drawing tab body in a dialog fails. Some third party themes have tab body part defined but with its ImageSelectType set to IST_NONE. In this case, DrawThemeBackground() will fail to draw the background. Fix track bar black background in winecfg when using VLT theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/dialog.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index a949bfc6579..d0055e013a0 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -38,8 +38,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa static const WCHAR themeClass[] = L"Window"; BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); BOOL doTheming = themingActive && (theme != NULL); + HRESULT hr = E_FAIL; LRESULT result; - + switch (msg) { case WM_CREATE: @@ -78,13 +79,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa NULL); #endif return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - else - /* We might have gotten a TAB theme class, so check if we can - * draw as a tab page. */ - if (IsThemePartDefined (theme, TABP_BODY, 0)) - DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, - NULL); - else + /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ + else if (IsThemePartDefined(theme, TABP_BODY, 0)) + hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); + + if (FAILED(hr)) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return 1;

1 0

Zhiyi Zhang : uxtheme: Use StretchBlt() when resizing a source image for tiling.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: bcbe1bcff33d9c49e3c20adcc00c84c179a5e7cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbe1bcff33d9c49e3c20adc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 30 14:50:33 2021 +0800 uxtheme: Use StretchBlt() when resizing a source image for tiling. For example, when a theme part has a source image with 0xff00ff as transparent pixels and the sizing margin is larger than the destination, the source image is first resized to fit the destination, during which, StretchBlt() should be used instead of TransparentBlt() because the image should not be blended with the temporary memory device context. Fix group box background may be drawn in black. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index bf294ed3cc8..04ea1e79df9 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -779,8 +779,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); SelectObject(hdcSrc, bmpSrcResized); + /* Use ALPHABLEND_NONE because the image is getting resized, rather than blended with the target */ UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, ALPHABLEND_NONE, 0); rcSrc.left = 0; rcSrc.top = 0;

1 0

Jinoh Kang : kernelbase: Fix infinite loop in Internal_EnumCalendarInfo.
by Alexandre Julliard 01 Dec '21

01 Dec '21

Module: wine Branch: master Commit: 9c5fa40ebdb1fc0616839560d318bea7e40c63a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c5fa40ebdb1fc0616839560… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Nov 30 11:36:36 2021 +0900 kernelbase: Fix infinite loop in Internal_EnumCalendarInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52129 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 24 ------------------------ dlls/kernelbase/locale.c | 13 ++++++------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a5c2ad1068d..94c9ce3ad1b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7045,12 +7045,6 @@ static void test_EnumCalendarInfoA(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoA( calinfo_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7079,12 +7073,6 @@ static void test_EnumCalendarInfoW(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoW( calinfo_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7114,12 +7102,6 @@ static void test_EnumCalendarInfoExA(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoExA( calinfoex_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, @@ -7149,12 +7131,6 @@ static void test_EnumCalendarInfoExW(void) { INT i; - if (!strcmp(winetest_platform, "wine")) - { - skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); - return; - } - ok( EnumCalendarInfoExW( calinfoex_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 10f3b2698b5..667d1a4dc65 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2727,8 +2727,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, BOOL exex, LPARAM lparam ) { WCHAR buffer[256]; - DWORD optional = 0; - INT ret; + CALID calendars[2] = { id }; + INT ret, i; if (!proc) { @@ -2739,13 +2739,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, if (id == ENUM_ALL_CALENDARS) { if (!GetLocaleInfoW( lcid, LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER, - (WCHAR *)&id, sizeof(id) / sizeof(WCHAR) )) return FALSE; + (WCHAR *)&calendars[0], sizeof(calendars[0]) / sizeof(WCHAR) )) return FALSE; if (!GetLocaleInfoW( lcid, LOCALE_IOPTIONALCALENDAR | LOCALE_RETURN_NUMBER, - (WCHAR *)&optional, sizeof(optional) / sizeof(WCHAR) )) optional = 0; + (WCHAR *)&calendars[1], sizeof(calendars[1]) / sizeof(WCHAR) )) calendars[1] = 0; } - for (;;) + for (i = 0; i < ARRAY_SIZE(calendars) && calendars[i]; i++) { + id = calendars[i]; if (type & CAL_RETURN_NUMBER) ret = GetCalendarInfoW( lcid, id, type, NULL, 0, (LPDWORD)buffer ); else if (unicode) @@ -2764,8 +2765,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumCalendarInfo( CALINFO_ENUMPROCW proc, else ret = proc( buffer ); } if (!ret) break; - if (!optional) break; - id = optional; } return TRUE; }

1 0

Jump to page:

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-commits December 2021