wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Nikolay Sivov : include: Add IMFFinalizableMediaSink definition.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 774a6bd15c0263deac5e9d64a9438e8f183270d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=774a6bd15c0263deac5e9d64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 2 13:33:12 2020 +0300 include: Add IMFFinalizableMediaSink definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index b1568b9b56..7d3dae0cbb 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -715,6 +715,20 @@ interface IMFMediaSink : IUnknown HRESULT Shutdown(); } +[ + object, + uuid(eaecb74a-9a50-42ce-9541-6a7f57aa4ad7), + local +] +interface IMFFinalizableMediaSink : IMFMediaSink +{ + HRESULT BeginFinalize( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state); + + HRESULT EndFinalize([in] IMFAsyncResult *result); +} + [ object, uuid(0a97b3cf-8e7c-4a3d-8f8c-0c843dc247fb),

1 0

Nikolay Sivov : mf: Fix GetClock() for shutdown state.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: de95a030292324ac199ae014d40fd85a9c6dbed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de95a030292324ac199ae014… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 2 13:31:07 2020 +0300 mf: Fix GetClock() for shutdown state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 12 +++++++++--- dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0c7e1fbf01..a2a2ba6fe5 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1364,13 +1364,19 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) { struct media_session *session = impl_from_IMFMediaSession(iface); + HRESULT hr; TRACE("%p, %p.\n", iface, clock); - *clock = (IMFClock *)session->clock; - IMFClock_AddRef(*clock); + EnterCriticalSection(&session->cs); + if (SUCCEEDED(hr = session_is_shut_down(session))) + { + *clock = (IMFClock *)session->clock; + IMFClock_AddRef(*clock); + } + LeaveCriticalSection(&session->cs); - return S_OK; + return hr; } static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8f3a80360f..5f3114da32 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1100,6 +1100,7 @@ todo_wine hr = IMFClock_GetProperties(clock, &clock_props); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + IMFClock_Release(clock); IMFRateControl_Release(rate_control); IMFRateSupport_Release(rate_support); @@ -1117,6 +1118,9 @@ todo_wine hr = IMFMediaSession_Close(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSession_Release(session); /* Custom topology loader, GUID is not registered. */

1 0

Nikolay Sivov : mf: Add a helper to check for session shutdown state.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 5ec5eb0790b5d5daf479cac99eb9ec316de12811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec5eb0790b5d5daf479cac9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 2 13:31:06 2020 +0300 mf: Add a helper to check for session shutdown state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8edab28935..0c7e1fbf01 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -454,14 +454,17 @@ static HRESULT create_session_op(enum session_command command, struct session_op return S_OK; } +static HRESULT session_is_shut_down(struct media_session *session) +{ + return session->state == SESSION_STATE_SHUT_DOWN ? MF_E_SHUTDOWN : S_OK; +} + static HRESULT session_submit_command(struct media_session *session, struct session_op *op) { HRESULT hr; EnterCriticalSection(&session->cs); - if (session->state == SESSION_STATE_SHUT_DOWN) - hr = MF_E_SHUTDOWN; - else + if (SUCCEEDED(hr = session_is_shut_down(session))) hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface); LeaveCriticalSection(&session->cs); @@ -707,7 +710,6 @@ static void session_stop(struct media_session *session) LeaveCriticalSection(&session->cs); } - static struct media_source *session_get_media_source(struct media_session *session, IMFMediaSource *source) { struct media_source *cur; @@ -1347,9 +1349,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) FIXME("%p.\n", iface); EnterCriticalSection(&session->cs); - if (session->state == SESSION_STATE_SHUT_DOWN) - hr = MF_E_SHUTDOWN; - else + if (SUCCEEDED(hr = session_is_shut_down(session))) { session->state = SESSION_STATE_SHUT_DOWN; IMFMediaEventQueue_Shutdown(session->event_queue); @@ -1384,9 +1384,7 @@ static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, D return E_POINTER; EnterCriticalSection(&session->cs); - if (session->state == SESSION_STATE_SHUT_DOWN) - hr = MF_E_SHUTDOWN; - else + if (SUCCEEDED(hr = session_is_shut_down(session))) *caps = session->caps; LeaveCriticalSection(&session->cs);

1 0

Nikolay Sivov : mf: Implement GetFullTopology().
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 0b4e460184da4ed6d2f771d6047ab1e60c6f3bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b4e460184da4ed6d2f771d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 2 13:31:05 2020 +0300 mf: Implement GetFullTopology(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 76310040ee..8edab28935 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1395,9 +1395,42 @@ static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, D static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) { - FIXME("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); + struct media_session *session = impl_from_IMFMediaSession(iface); + struct queued_topology *queued; + HRESULT hr = S_OK; + TOPOID topo_id; - return E_NOTIMPL; + TRACE("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); + + *topology = NULL; + + EnterCriticalSection(&session->cs); + + if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + { + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + *topology = session->presentation.current_topology; + else + hr = MF_E_INVALIDREQUEST; + } + else + { + LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) + { + if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + { + *topology = queued->topology; + break; + } + } + } + + if (*topology) + IMFTopology_AddRef(*topology); + + LeaveCriticalSection(&session->cs); + + return hr; } static const IMFMediaSessionVtbl mfmediasessionvtbl =

1 0

Alistair Leslie-Hughes : oledb32: Initialize all DBGUID values.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: ce434a8a146ffe2cae4586e0f54c856d0098aa9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce434a8a146ffe2cae4586e0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 2 06:37:53 2020 +0000 oledb32: Initialize all DBGUID values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 2acd23ea08..130fb626ea 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -34,7 +34,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); typedef struct datainit {

1 0

Dmitry Timoshkov : kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 081737379a827bfac31efcc684591ef1f4860392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081737379a827bfac31efcc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:42 2020 +0800 kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 98f9efa1b6..63b27f9453 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -112,6 +112,7 @@ static BOOL get_dummy_preferred_ui_language( DWORD flags, ULONG *count, WCHAR *b if (lsize > *size) { + *size = lsize; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index eff6c88b9e..fa067b7301 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5477,7 +5477,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; @@ -5487,7 +5486,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; @@ -5497,7 +5495,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); @@ -5550,7 +5547,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 1; @@ -5559,7 +5555,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 2;

1 0

Dmitry Timoshkov : kernel32/tests: Add more tests for Get[*]PreferredUILanguages APIs.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: cac04651637f339720cfde3c0c58672477c777c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cac04651637f339720cfde3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:40 2020 +0800 kernel32/tests: Add more tests for Get[*]PreferredUILanguages APIs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 63 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 8ff630a1eb..eff6c88b9e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5461,12 +5461,24 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); +todo_wine + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); +todo_wine + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5475,6 +5487,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5483,6 +5497,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); } @@ -5490,7 +5506,7 @@ static void test_GetSystemPreferredUILanguages(void) static void test_GetThreadPreferredUILanguages(void) { BOOL ret; - ULONG count, size; + ULONG count, size, size_id; WCHAR *buf; if (!pGetThreadPreferredUILanguages) @@ -5510,6 +5526,51 @@ static void test_GetThreadPreferredUILanguages(void) ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, buf, &size); ok(ret, "got %u\n", GetLastError()); ok(count, "expected count > 0\n"); + + size_id = count = 0; + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + ok(size_id, "expected size > 0\n"); + ok(size_id <= size, "expected size > 0\n"); + + size = 0; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); +todo_wine + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); +todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 2; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(0, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id || size == size_id - 1 /* before win10 1809 */, "expected %u, got %u\n", size_id, size); + HeapFree(GetProcessHeap(), 0, buf); }

1 0

Dmitry Timoshkov : kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 9870f9325af50bf4fc762266a97c663f587e8a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9870f9325af50bf4fc762266… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:37 2020 +0800 kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9870f9325af50bf4fc76…

1 0

Dmitry Timoshkov : kernel32/tests: Fix locale.c compilation with Visual Studio 14.0.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 7c461d6302b6820acad10c8e0ff320d2095927d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c461d6302b6820acad10c8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:35 2020 +0800 kernel32/tests: Fix locale.c compilation with Visual Studio 14.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1df3c0dcd6..31add74e4e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -25,6 +25,8 @@ * the control panel i8n page), we will still get the expected results. */ +#define _CRT_NON_CONFORMING_WCSTOK + #include <assert.h> #include <stdlib.h> #include <stdarg.h> @@ -4197,7 +4199,7 @@ static void test_GetCPInfo(void) for (i = 0; i <= sizeof(buf); i++) { memset( wbuf, 0xcc, sizeof(wbuf) ); - RtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); + pRtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); for (j = 0; j < 4; j++) if (expect[i][j] == 0xcccc) break; ok( reslen == j * sizeof(WCHAR), "%u: wrong len %u\n", i, reslen ); for (j = 0; j < 4; j++)

1 0

Dmitry Timoshkov : include/sal.h: Add _Ret_writes_z_ for Visual Studio 14.0.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 2703827f9bb4a0437f1e82407fef31217fb4f129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2703827f9bb4a0437f1e8240… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:27:09 2020 +0800 include/sal.h: Add _Ret_writes_z_ for Visual Studio 14.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 81a828dd97..ca8b824f1b 100644 --- a/include/sal.h +++ b/include/sal.h @@ -217,6 +217,7 @@ #define _Ret_opt_z_cap_(count) #define _Ret_range_(exp,exp2) #define _Ret_writes_bytes_maybenull_(count) +#define _Ret_writes_z_(count) #define _Ret_z_ #define _Return_type_success_(count)

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 March 2020