April 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : windows.media.speech: Initialize HRESULT variables consistently.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 8992e20898190d7db0452589cbf20624bd15e416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8992e20898190d7db0452589… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 17:33:02 2022 +0200 windows.media.speech: Initialize HRESULT variables consistently. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index bc5d4fa40ed..3b532502ea2 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -176,16 +176,13 @@ static HRESULT WINAPI async_operation_get_Completed( IAsyncOperation_IInspectabl IAsyncOperationCompletedHandler_IInspectable **handler ) { struct async_operation *impl = impl_from_IAsyncOperation_IInspectable(iface); - HRESULT hr; + HRESULT hr = S_OK; FIXME("iface %p, handler %p semi stub!\n", iface, handler); EnterCriticalSection(&impl->cs); if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; - else - hr = S_OK; - *handler = (impl->handler != HANDLER_NOT_SET) ? impl->handler : NULL; LeaveCriticalSection(&impl->cs); @@ -249,16 +246,13 @@ static HRESULT WINAPI async_operation_info_get_Id( IAsyncInfo *iface, UINT32 *id static HRESULT WINAPI async_operation_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) { struct async_operation *impl = impl_from_IAsyncInfo(iface); - HRESULT hr; + HRESULT hr = S_OK; TRACE("iface %p, status %p.\n", iface, status); EnterCriticalSection(&impl->cs); if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; - else - hr = S_OK; - *status = impl->status; LeaveCriticalSection(&impl->cs); @@ -285,10 +279,9 @@ static HRESULT WINAPI async_operation_info_get_ErrorCode( IAsyncInfo *iface, HRE static HRESULT WINAPI async_operation_info_Cancel( IAsyncInfo *iface ) { struct async_operation *impl = impl_from_IAsyncInfo(iface); - HRESULT hr; + HRESULT hr = S_OK; TRACE("iface %p.\n", iface); - hr = S_OK; EnterCriticalSection(&impl->cs); if (impl->status == Closed)

1 0

Rémi Bernon : windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 3276ab4aebb30c97af4e52bbf25299d86564c3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3276ab4aebb30c97af4e52bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 17:26:57 2022 +0200 windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. Unless it's closed already. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 418e903476e..64a095a0134 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -296,26 +296,22 @@ static HRESULT WINAPI async_operation_info_Cancel( IAsyncInfo *iface ) static HRESULT WINAPI async_operation_info_Close( IAsyncInfo *iface ) { struct async_operation *impl = impl_from_IAsyncInfo(iface); + HRESULT hr = S_OK; TRACE("iface %p.\n", iface); EnterCriticalSection(&impl->cs); if (impl->status == Started) - { - LeaveCriticalSection(&impl->cs); - return E_ILLEGAL_STATE_CHANGE; - } - - if (impl->async_run_work) + hr = E_ILLEGAL_STATE_CHANGE; + else if (impl->status != Closed) { CloseThreadpoolWork(impl->async_run_work); impl->async_run_work = NULL; + impl->status = Closed; } - - impl->status = Closed; LeaveCriticalSection(&impl->cs); - return S_OK; + return hr; } static const struct IAsyncInfoVtbl async_operation_info_vtbl =

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder GetOutputCurrentType.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: a7c60623158b048244701f104ca4daeb739637a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c60623158b048244701f10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 10:30:53 2022 +0200 winegstreamer: Implement H264 decoder GetOutputCurrentType. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 8 -------- dlls/winegstreamer/h264_decoder.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6e2c9d7b429..dd00207d311 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6659,7 +6659,6 @@ static void test_h264_decoder(void) hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#lx\n", hr); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputCurrentType returned %#lx\n", hr); /* setting output media type first doesn't work */ @@ -6783,14 +6782,10 @@ static void test_h264_decoder(void) ok(ret == 1, "Release returned %lu\n", ret); hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); - todo_wine ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr); - if (hr != S_OK) MFCreateMediaType(&media_type); - todo_wine check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); - flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); @@ -6918,10 +6913,7 @@ static void test_h264_decoder(void) /* current output type is still the one we selected */ hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); - todo_wine ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr); - if (hr != S_OK) MFCreateMediaType(&media_type); - todo_wine check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); hr = IMFMediaType_GetItemType(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL); ok(hr == MF_E_ATTRIBUTENOTFOUND, "GetItemType returned %#lx\n", hr); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 8bfa15529db..1c7bf391bf7 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -460,8 +460,18 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + HRESULT hr; + FIXME("iface %p, id %#lx, type %p stub!\n", iface, id, type); - return E_NOTIMPL; + + if (!decoder->output_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = MFCreateMediaType(type))) + return hr; + + return IMFMediaType_CopyAllItems(decoder->output_type, (IMFAttributes *)*type); } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0

Matteo Bruni : wined3d: Don't use fences on GL context cleanup when they are not supported.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: ab72e336411a17e0108eb0fbc927e2c1ffb98978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab72e336411a17e0108eb0fb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 27 13:21:55 2022 +0200 wined3d: Don't use fences on GL context cleanup when they are not supported. Signed-off-by: Matteo Bruni <mbruni(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 | 9 ++++++--- dlls/wined3d/device.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index bb4157c0501..0a731dc85f0 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1393,13 +1393,16 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { /* If we're here because we're switching away from a previously * destroyed context, acquiring a context in order to submit a fence - * is problematic. (In particular, we'd end up back here again in the - * process of switching to the newly acquired context.) */ + * is problematic. In particular, we'd end up back here again in the + * process of switching to the newly acquired context. + * + * If fences aren't supported there should be nothing to wait for + * anyway, so just do nothing in that case. */ if (context_gl->c.destroyed) { gl_info->gl_ops.gl.p_glFinish(); } - else + else if (context_gl->c.d3d_info->fences) { wined3d_context_gl_submit_command_fence(context_gl); wined3d_context_gl_wait_command_fence(context_gl, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d14b40d8e3e..8937c7fc0fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1201,9 +1201,12 @@ void wined3d_device_gl_delete_opengl_contexts_cs(void *object) device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); - wined3d_context_gl_submit_command_fence(context_gl); - wined3d_context_gl_wait_command_fence(context_gl, - wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + if (context_gl->c.d3d_info->fences) + { + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, + wined3d_device_gl(context_gl->c.device)->current_fence_id - 1); + } wined3d_allocator_cleanup(&device_gl->allocator); context_release(context);

1 0

Ziqing Hui : include: Add defines for ID2D1Transform.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 6b77ceee871e8b1174debdf8ee58f614eb19a551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b77ceee871e8b1174debdf8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 27 12:24:38 2022 +0800 include: Add defines for ID2D1Transform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 162 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index cec7de8c311..6838492c498 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -258,3 +258,165 @@ interface ID2D1TransformGraph : IUnknown [in] UINT32 index ); } + +[ + object, + uuid(ef1a287d-342a-4f76-8fdb-da0d6ea9f92b), + local, +] +interface ID2D1Transform : ID2D1TransformNode +{ + HRESULT MapOutputRectToInputRects( + [in] const D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *input_rects, + [in] UINT32 input_rects_count + ); + HRESULT MapInputRectsToOutputRect( + [in] const D2D1_RECT_L *input_rects, + [in] const D2D1_RECT_L *input_opaque_rects, + [in] UINT32 input_rect_count, + [out] D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *output_opaque_rect + ); + HRESULT MapInvalidRect( + [in] UINT32 index, + [in] D2D1_RECT_L input_rect, + [out] D2D1_RECT_L *output_rect + ); +} + +[ + object, + uuid(36bfdcb6-9739-435d-a30d-a653beff6a6f), + local, +] +interface ID2D1DrawTransform : ID2D1Transform +{ + HRESULT SetDrawInfo( + [in] ID2D1DrawInfo *info + ); +} + +[ + object, + uuid(0d85573c-01e3-4f7d-bfd9-0d60608bf3c3), + local, +] +interface ID2D1ComputeTransform : ID2D1Transform +{ + HRESULT SetComputeInfo( + [in] ID2D1ComputeInfo *info + ); + HRESULT CalculateThreadgroups( + [in] const D2D1_RECT_L *output_rect, + [out] UINT32 *dimension_x, + [out] UINT32 *dimension_y, + [out] UINT32 *dimension_z + ); +} + +[ + object, + uuid(0359dc30-95e6-4568-9055-27720d130e93), + local, +] +interface ID2D1AnalysisTransform : IUnknown +{ + HRESULT ProcessAnalysisResults( + [in] const BYTE *data, + [in] UINT32 size + ); +} + +[ + object, + uuid(db1800dd-0c34-4cf9-be90-31cc0a5653e1), + local, +] +interface ID2D1SourceTransform : ID2D1Transform +{ + HRESULT SetRenderInfo( + [in] ID2D1RenderInfo *info + ); + HRESULT Draw( + [in] ID2D1Bitmap1 *target, + [in] const D2D1_RECT_L *draw_rect, + [in] D2D1_POINT_2U target_origin + ); +} + +[ + object, + uuid(1a799d8a-69f7-4e4c-9fed-437ccc6684cc), + local, +] +interface ID2D1ConcreteTransform : ID2D1TransformNode +{ + HRESULT SetOutputBuffer( + [in] D2D1_BUFFER_PRECISION precision, + [in] D2D1_CHANNEL_DEPTH depth + ); + void SetCached( + [in] BOOL is_cached + ); +} + +[ + object, + uuid(63ac0b32-ba44-450f-8806-7f4ca1ff2f1b), + local, +] +interface ID2D1BlendTransform : ID2D1ConcreteTransform +{ + void SetDescription( + [in] const D2D1_BLEND_DESCRIPTION *description + ); + void GetDescription( + [out] D2D1_BLEND_DESCRIPTION *description + ); +} + +[ + object, + uuid(4998735c-3a19-473c-9781-656847e3a347), + local, +] +interface ID2D1BorderTransform : ID2D1ConcreteTransform +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); +} + +[ + object, + uuid(3fe6adea-7643-4f53-bd14-a0ce63f24042), + local, +] +interface ID2D1OffsetTransform : ID2D1TransformNode +{ + void SetOffset( + [in] D2D1_POINT_2L offset + ); + D2D1_POINT_2L GetOffset(); +} + +[ + object, + uuid(90f732e2-5092-4606-a819-8651970baccd), + local, +] +interface ID2D1BoundsAdjustmentTransform : ID2D1TransformNode +{ + void SetOutputBounds( + [in] const D2D1_RECT_L *bounds + ); + void GetOutputBounds( + [out] D2D1_RECT_L *bounds + ); +}

1 0

Francois Gouget : po: Fix a typo in the Asturian translation.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: b13143d0fd6161d165ebdae8c1d9f276792d7421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13143d0fd6161d165ebdae8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:28:18 2022 +0200 po: Fix a typo in the Asturian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ast.po b/po/ast.po index 0fa3764c58c..dcc15692f70 100644 --- a/po/ast.po +++ b/po/ast.po @@ -18462,7 +18462,7 @@ msgid "" "The command is invalid.\n" msgstr "" "wineconsole: Falló l'aniciu del programa %s.\n" -"El comandu nun ye válidu.s\n" +"El comandu nun ye válidu.\n" #: programs/winedbg/winedbg.rc:50 programs/winedbg/winedbg.rc:38 msgid "Program Error"

1 0

Francois Gouget : user32/tests: Trace monitor information with 'monitor info'.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 57b38565967510b8f43436613952a1c787b91fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b38565967510b8f4343661… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:22:32 2022 +0200 user32/tests: Trace monitor information with 'monitor info'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 02bc6651dd3..94cb7e60382 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2530,9 +2530,38 @@ static void test_display_dc(void) } } +BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, + LPRECT lprcMonitor, LPARAM dwData) +{ + MONITORINFOEXW info; + static int index; + + info.cbSize = sizeof(info); + if (GetMonitorInfoW(hMonitor, (MONITORINFO*)&info)) + { + printf("Monitor %d %7s [%02lx] %s %s\n", index, + (info.dwFlags & MONITORINFOF_PRIMARY) ? "primary" : "", + info.dwFlags, wine_dbgstr_rect(&info.rcMonitor), + wine_dbgstr_w(info.szDevice)); + } + index++; + return TRUE; +} + START_TEST(monitor) { + char** myARGV; + int myARGC = winetest_get_mainargs(&myARGV); + init_function_pointers(); + + if (myARGC >= 3 && strcmp(myARGV[2], "info") == 0) + { + printf("Monitor information:\n"); + EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, 0); + return; + } + test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigSetDeviceInfo();

1 0

Floris Renaud : po: Add missing examples in Dutch translation.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: c68bd28981b5f3a389e64d7e718e6da944ba878f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c68bd28981b5f3a389e64d7e… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Apr 27 16:46:04 2022 +0200 po: Add missing examples in Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/nl.po b/po/nl.po index 8318d5fc54c..c1c3f35c650 100644 --- a/po/nl.po +++ b/po/nl.po @@ -16761,6 +16761,10 @@ msgstr "" " plek aan waar het register informatie wordt geëxporteerd.\n" " [sleutel] De te wijzigen registersleutel.\n" "\n" +"Bijvoorbeeld:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Sleutel\\Pad\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n"

1 0

Francois Gouget : kernel32/tests: Fix the spelling of a comment.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: c6c3cdc6978d007df7355cb390b9fccef5923824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6c3cdc6978d007df7355cb3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:22:38 2022 +0200 kernel32/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 36649e901a1..fded1c69f1e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -338,7 +338,7 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + /* threshold between failure and success varies, and w7pro64 has a much larger overhead. */ ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() );

1 0

Francois Gouget : oleau32/tests: Show that spaces are not allowed before exponents.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: cf33a13d35cd3ed1f500db6d8e898b45920ab19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf33a13d35cd3ed1f500db6d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:21:13 2022 +0200 oleau32/tests: Show that spaces are not allowed before exponents. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9456b56eb26..4fc0e4e0221 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1837,6 +1837,11 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,3,0,1); EXPECT2(1,FAILDIG); + /* Spaces are not allowed before the exponent */ + CONVERT("1 e1", NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE); + EXPECT(1,NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE,NUMPRS_TRAILING_WHITE,2,0,0); + EXPECT2(1,FAILDIG); + /* With flag, incompatible with NUMPRS_HEX_OCT */ CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); @@ -2013,6 +2018,11 @@ static void test_VarParseNumFromStrFr(void) EXPECTFAIL; } + /* No space of any type is allowed before the exponent... */ + wsprintfW(wstr, L"1%ce1", spaces[i]); + WCONVERT(wstr, NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL); + EXPECTFAIL; + winetest_pop_context(); }

1 0