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

Matteo Bruni : wined3d: Check BO existence before trying to update its fence counter.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: d84fb82950dad32c6fda3266543a25be43a9f19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d84fb82950dad32c6fda3266… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 27 13:21:57 2022 +0200 wined3d: Check BO existence before trying to update its fence counter. 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/wined3d_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 11da88aff8a..3a12f5ef261 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6744,7 +6744,8 @@ static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *co static inline void wined3d_context_gl_reference_buffer(struct wined3d_context_gl *context_gl, struct wined3d_buffer *buffer) { - wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(buffer->buffer_object)); + if (buffer->buffer_object) + wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(buffer->buffer_object)); } static inline bool wined3d_map_persistent(void)

1 0

Rémi Bernon : windows.media.speech: Return operation error from IAsyncOperation_GetResults.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 4a7ebca3193c093b4cb9e5ae07a65fde60228fb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a7ebca3193c093b4cb9e5ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 17:29:13 2022 +0200 windows.media.speech: Return operation error from IAsyncOperation_GetResults. And E_ILLEGAL_METHOD_CALL if called when status isn't Completed or Error. 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 | 10 +++++----- dlls/windows.media.speech/tests/speech.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 1e6dd336c84..3d3db840fa0 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -201,16 +201,16 @@ static HRESULT WINAPI async_operation_GetResults( IAsyncOperation_IInspectable * TRACE("iface %p, results %p.\n", iface, results); EnterCriticalSection(&impl->cs); - if (impl->status == Closed) + if (impl->status != Completed && impl->status != Error) hr = E_ILLEGAL_METHOD_CALL; - else if (impl->status > Started && impl->result) + else if (!impl->result) + hr = E_UNEXPECTED; + else { *results = impl->result; impl->result = NULL; /* NOTE: AsyncOperation gives up it's reference to result here! */ - hr = S_OK; + hr = impl->hr; } - else - hr = E_UNEXPECTED; LeaveCriticalSection(&impl->cs); return hr; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 051b38ce0f9..e6120afdad0 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -988,7 +988,7 @@ static void test_SpeechRecognizer(void) compilation_result = (void*)0xdeadbeef; hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - todo_wine ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); + ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); ok(compilation_result == (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler.IAsyncHandler_Compilation_iface);

1 0

Rémi Bernon : windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 77632af839a75254faf613ac460ce230db623888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77632af839a75254faf613ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 25 17:31:44 2022 +0200 windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. When async operation status is Closed. 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 | 9 +++++++-- dlls/windows.media.speech/tests/speech.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 3d3db840fa0..bc5d4fa40ed 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -268,13 +268,18 @@ static HRESULT WINAPI async_operation_info_get_Status( IAsyncInfo *iface, AsyncS static HRESULT WINAPI async_operation_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) { struct async_operation *impl = impl_from_IAsyncInfo(iface); + HRESULT hr = S_OK; + TRACE("iface %p, error_code %p.\n", iface, error_code); EnterCriticalSection(&impl->cs); - *error_code = impl->hr; + if (impl->status == Closed) + *error_code = hr = E_ILLEGAL_METHOD_CALL; + else + *error_code = impl->hr; LeaveCriticalSection(&impl->cs); - return S_OK; + return hr; } static HRESULT WINAPI async_operation_info_Cancel( IAsyncInfo *iface ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index e6120afdad0..9ef49b160cd 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -858,7 +858,7 @@ static void test_SpeechRecognizer(void) AsyncStatus async_status; HSTRING hstr, hstr_lang; HANDLE blocked_thread; - HRESULT hr; + HRESULT hr, error_code; UINT32 id; LONG ref; @@ -1032,6 +1032,11 @@ static void test_SpeechRecognizer(void) ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); ok(async_status == Completed, "Status was %#x.\n", async_status); + error_code = 0xdeadbeef; + hr = IAsyncInfo_get_ErrorCode(info, &error_code); + ok(hr == S_OK, "IAsyncInfo_get_ErrorCode failed, hr %#lx.\n", hr); + ok(error_code == S_OK, "ErrorCode was %#lx.\n", error_code); + hr = IAsyncInfo_Cancel(info); ok(hr == S_OK, "IAsyncInfo_Cancel failed, hr %#lx.\n", hr); @@ -1050,6 +1055,11 @@ static void test_SpeechRecognizer(void) ok(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); ok(async_status == AsyncStatus_Closed, "Status was %#x.\n", async_status); + error_code = 0xdeadbeef; + hr = IAsyncInfo_get_ErrorCode(info, &error_code); + ok(hr == E_ILLEGAL_METHOD_CALL, "IAsyncInfo_get_ErrorCode failed, hr %#lx.\n", hr); + ok(error_code == E_ILLEGAL_METHOD_CALL, "ErrorCode was %#lx.\n", error_code); + ref = IAsyncInfo_Release(info); ok(ref == 1, "Got unexpected ref %lu.\n", ref);

1 0

Rémi Bernon : windows.media.speech: Initialize HRESULT variables consistently.
by Alexandre Julliard 27 Apr '22

27 Apr '22

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

Huw Davies : wineoss: Move MIDM_STOP to the unixlib.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 38e3f3f3eb60fc319b1726e3acfcd9b756ed5519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38e3f3f3eb60fc319b1726e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 27 08:03:20 2022 +0100 wineoss: Move MIDM_STOP to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 16 ---------------- dlls/wineoss.drv/ossmidi.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 9df97530865..fe73d97f5ab 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,20 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStop [internal] - */ -static DWORD midStop(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -529,8 +515,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_STOP: - return midStop(wDevID); } params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 091eccd6d53..86d766eceaf 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1225,6 +1225,20 @@ static UINT midi_in_start(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_stop(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 0; + return MMSYSERR_NOERROR; +} + static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1340,6 +1354,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_START: *params->err = midi_in_start(params->dev_id); break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break;

1 0

Joachim Priesner : windowscodecs: BitmapScaler_CopyPixels: Do not demand a larger buffer than necessary.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: cdb9a2748ba62891bfcd342cb3da82c204f896d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb9a2748ba62891bfcd342c… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Tue Apr 26 19:16:15 2022 +0200 windowscodecs: BitmapScaler_CopyPixels: Do not demand a larger buffer than necessary. Only `bytesperrow` bytes are written to each row of the output rect. Therefore the last row need not be padded to `cbStride` bytes. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index f8f81c0a990..c31aac79861 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -251,7 +251,7 @@ static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, goto end; } - if ((cbStride * dest_rect.Height) > cbBufferSize) + if (cbStride * (dest_rect.Height - 1) + bytesperrow > cbBufferSize) { hr = E_INVALIDARG; goto end; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 0d0d27e2707..3ddd3bbdbae 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1151,7 +1151,7 @@ static void test_bitmap_scaler(void) double res_x, res_y; IWICBitmap *bitmap; UINT width, height; - BYTE buf[16]; + BYTE buf[93]; /* capable of holding a 7*4px, 24bpp image with stride 24 -> buffer size = 3*24+21 */ HRESULT hr; hr = IWICImagingFactory_CreateBitmap(factory, 4, 2, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); @@ -1243,7 +1243,7 @@ static void test_bitmap_scaler(void) WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Failed to initialize bitmap scaler, hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == S_OK, "Failed to initialize bitmap scaler, hr %#lx.\n", hr); @@ -1251,20 +1251,20 @@ static void test_bitmap_scaler(void) WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 0, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IWICBitmapScaler_Initialize(scaler, NULL, 8, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == WINCODEC_ERR_WRONGSTATE, "Unexpected hr %#lx.\n", hr); hr = IWICBitmapScaler_GetSize(scaler, &width, &height); ok(hr == S_OK, "Failed to get scaler size, hr %#lx.\n", hr); - ok(width == 8, "Unexpected width %u.\n", width); + ok(width == 7, "Unexpected width %u.\n", width); ok(height == 4, "Unexpected height %u.\n", height); hr = IWICBitmapScaler_GetSize(scaler, NULL, &height); @@ -1307,6 +1307,9 @@ static void test_bitmap_scaler(void) ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#lx.\n", hr); IWICPalette_Release(palette); + hr = IWICBitmapScaler_CopyPixels(scaler, NULL, /*cbStride=*/24, sizeof(buf), buf); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap);

1 0

Francois Gouget : gdi32/tests: Trace the invalid height in test_max_height().
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 0519aec31019bfabdf5f1aa183e9049c5a376676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0519aec31019bfabdf5f1aa1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:20:03 2022 +0200 gdi32/tests: Trace the invalid height in test_max_height(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9c616e6a30b..76d787c1440 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6523,6 +6523,7 @@ static void test_max_height(void) /* test an invalid value */ for (i = 0; i < ARRAY_SIZE(invalid_height); i++) { + winetest_push_context("height=%ld", invalid_height[i]); lf.lfHeight = invalid_height[i]; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -6534,6 +6535,7 @@ static void test_max_height(void) ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); DeleteObject(SelectObject(hdc, hfont_old)); + winetest_pop_context(); } ReleaseDC(NULL, hdc);

1 0

Francois Gouget : kernel32/tests: Remove a couple of unnecessary NULL casts.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 84bce45eba46e91d13c8f4808276cabd52a97936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84bce45eba46e91d13c8f480… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:20:13 2022 +0200 kernel32/tests: Remove a couple of unnecessary NULL casts. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e3c75fbfe0a..36649e901a1 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1915,7 +1915,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xc00, "got flags %#lx\n", tmp_flags ); @@ -1923,7 +1923,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr1, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0x200, "got flags %#lx\n", tmp_flags );

1 0

Francois Gouget : comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size().
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: b6b0bc7c9f4b7e8aabad83712de112f1ecc206aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b0bc7c9f4b7e8aabad8371… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:20:41 2022 +0200 comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 0dd05befa06..3eceeb55bd5 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1272,6 +1272,7 @@ static void test_combo_dropdown_size(DWORD style) RECT rect_list_client; int min_visible_expected; + winetest_push_context("Test %d", test); hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100, info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); @@ -1297,8 +1298,8 @@ static void test_combo_dropdown_size(DWORD style) ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); ok(ret, "Failed to set visible limit.\n"); min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); - ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n", - test, min_visible_actual); + ok(min_visible_expected == min_visible_actual, "unexpected number of items %d.\n", + min_visible_actual); } ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0); @@ -1333,18 +1334,19 @@ static void test_combo_dropdown_size(DWORD style) if (expected_height_list < 0) expected_height_list = 0; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } else { expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } DestroyWindow(hCombo); + winetest_pop_context(); } }

1 0

Francois Gouget : oleau32/tests: Show that spaces are not allowed before exponents.
by Alexandre Julliard 27 Apr '22

27 Apr '22

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