October 2019 - Wine-Commits

Zebediah Figura : advapi32/tests: Use unique service names in test_wow64().
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: fec26c87ffa9d8efe6cf971e53c69bfceace8c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fec26c87ffa9d8efe6cf971e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 22:02:29 2019 -0500 advapi32/tests: Use unique service names in test_wow64(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47891 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9dad710490..83c0a9b257 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1806,7 +1806,7 @@ static void test_wow64(void) ok(ret, "Failed to delete service, error %u.\n", GetLastError()); CloseServiceHandle(service); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc2", "winetestsvc2", SERVICE_START | DELETE, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError()); @@ -1825,7 +1825,7 @@ static void test_wow64(void) 0, NULL, CREATE_ALWAYS, 0, NULL); CloseHandle(file); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc3", "winetestsvc3", SERVICE_START | DELETE, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe service serve", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError()); @@ -1837,7 +1837,7 @@ static void test_wow64(void) ok(ret, "Failed to delete service, error %u.\n", GetLastError()); CloseServiceHandle(service); - service = CreateServiceA(manager, "winetestsvc", "winetestsvc", SERVICE_START | DELETE, + service = CreateServiceA(manager, "winetestsvc4", "winetestsvc4", SERVICE_START | DELETE, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\windows\\system32\\winetestsvc.exe", NULL, NULL, NULL, NULL, NULL); ok(!!service, "Failed to create service, error %u.\n", GetLastError());

1 0

Sven Baars : wbemprox/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: ffb9bd9e6c99677572b695d453c9b5c87a7162f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb9bd9e6c99677572b695d4… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 4 21:58:40 2019 +0200 wbemprox/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index cdbbc02820..1c6ffcaf8d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1654,6 +1654,7 @@ static void test_Win32_PnPEntity( IWbemServices *services ) VariantClear( &val ); } } + IWbemClassObject_Release( obj ); } SysFreeString( bstr );

1 0

Alexandre Julliard : make_unicode: Avoid duplicate lead bytes.
by Alexandre Julliard Oct. 7, 2019

Oct. 7, 2019

Module: wine Branch: master Commit: a9285c51315d5c669349697148155769a37b126a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9285c51315d5c6693496971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 6 13:39:53 2019 +0200 make_unicode: Avoid duplicate lead bytes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/c_10001.c | 1503 +-------------------------------------------------- tools/make_unicode | 6 +- 2 files changed, 11 insertions(+), 1498 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9285c51315d5c669349…

1 0

Jeremy Newman : fix outdated ereg() calls
by Jeremy Newman Oct. 7, 2019

Oct. 7, 2019

Module: appdb Branch: master Commit: ba9f80fe7c014fcbefb7fdbd9d6a77bbd0289b77 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=ba9f80fe7c014fcbefb7fdb… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 7 09:22:38 2019 -0500 fix outdated ereg() calls --- include/tableve.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/include/tableve.php b/include/tableve.php index f9828c6..4ca7c36 100644 --- a/include/tableve.php +++ b/include/tableve.php @@ -100,7 +100,7 @@ class TableVE { { $field = query_fetch_field($hResult, $i); - if(ereg("^impl_(.+)$", $field->table, $arr)) + if(preg_match("/^impl_(.+)$/", $field->table, $arr)) { if($cur_impl != $arr[1]) echo "<tr><th class='box-label' colspan=2> ".ucfirst($arr[1])." Implementation </th></tr>\n"; @@ -154,7 +154,7 @@ class TableVE { $field = query_fetch_field($hResult, $i); $len = query_field_len($hResult, $i); - if(ereg("^impl_(.+)$", $field->table, $arr)) + if(preg_match("/^impl_(.+)$/", $field->table, $arr)) { if($cur_impl != $arr[1]) echo "<tr><th class='box-label' colspan=2> ".ucfirst($arr[1])." Implementation </th></tr>\n"; @@ -339,11 +339,8 @@ class TableVE { reset($this->table_ids); foreach ($this->table_ids as $table => $id) { - $r = "^$table$"; - //echo "Checking $r against $name <br>\n"; - if(ereg($r, $name)) + if(preg_match("/^$table$/", $name)) { - //echo "ID for $name -> $id <br>\n"; return $id; } } @@ -363,7 +360,7 @@ class TableVE { foreach ($vars as $varname => $arr) { - if(!ereg("^FIELD_([a-zA-Z_]+)___(.+)$", $varname, $regs)) + if(!preg_match("/^FIELD_([a-zA-Z_]+)___(.+)$/", $varname, $regs)) continue; $tables[$regs[1]][] = $regs[2]; @@ -424,7 +421,7 @@ class TableVE { addmsg("Database Operation Complete!","green"); } - if(ereg("^impl_.+$", $table)) + if(preg_match("/^impl_.+$/", $table)) { $value = $fieldnames["apiid"][$i]; query_parameters("UPDATE ? SET lastmodby = '?' WHERE apiid = '?'",

1 0

Jeremy Newman : fix outdatded ereg()
by Jeremy Newman Oct. 7, 2019

Oct. 7, 2019

Module: appdb Branch: master Commit: fa06b308139f1acc99b6bd293593b5647dc9785d URL: https://source.winehq.org/git/appdb.git/?a=commit;h=fa06b308139f1acc99b6bd2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 7 09:18:20 2019 -0500 fix outdatded ereg() --- preferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preferences.php b/preferences.php index 5481a09..b1f3236 100644 --- a/preferences.php +++ b/preferences.php @@ -46,7 +46,7 @@ if(isset($aClean['sSubmit']) && $aClean['sSubmit'] == "Update") { /* if a parameter lacks 'pref_' at its head it isn't a */ /* preference so skip over processing it */ - if(!ereg("^pref_(.+)$", $sKey, $arr)) + if(!preg_match("/^pref_(.+)$/", $sKey, $arr)) continue; $oUser->setPref($arr[1], $sValue); }

1 0

Alistair Leslie-Hughes : dmime/tests: Break out of loop if we fail to get segment pointer.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 7d954f23356f0aaf49b1ef0c4bed83041cb41c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d954f23356f0aaf49b1ef0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 4 21:30:48 2019 +0200 dmime/tests: Break out of loop if we fail to get segment pointer. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4433846f9b..073625f04b 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -454,6 +454,10 @@ static void test_notification_type(void) hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); ok(hr == S_OK, "Failed: %08x\n", hr); + if (FAILED(hr)) { + IDirectMusicSegmentState8_Release(segmentstate); + break; + } hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); ok(hr == S_OK, "Failed: %08x\n", hr);

1 0

Nikolay Sivov : mf: Send MF_TOPOSTATUS_STARTED_SOURCE status notification after all sources were started successfully.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 01bab1876dc3e9563712c791d214ebd2b3752cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bab1876dc3e9563712c791… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:47 2019 +0300 mf: Send MF_TOPOSTATUS_STARTED_SOURCE status notification after all sources were started successfully. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e23481d5c9..fa8d58ad9d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1127,18 +1127,19 @@ static HRESULT session_add_media_stream(struct media_source *source, IMFMediaStr return S_OK; } -static void session_set_source_state(struct media_session *session, IMFMediaSource *source, enum source_state state) +static BOOL session_set_source_state(struct media_session *session, IMFMediaSource *source, enum source_state state) { struct media_source *cur; + BOOL ret = TRUE; LIST_FOR_EACH_ENTRY(cur, &session->presentation.sources, struct media_source, entry) { if (source == cur->source) - { cur->state = state; - break; - } + ret &= cur->state == state; } + + return ret; } static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) @@ -1153,6 +1154,7 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM IMFMediaStream *stream; PROPVARIANT value; HRESULT hr; + BOOL ret; if (FAILED(hr = IMFAsyncResult_GetState(result, (IUnknown **)&event_source))) return hr; @@ -1189,7 +1191,12 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM source_state = SOURCE_STATE_STOPPED; EnterCriticalSection(&session->cs); - session_set_source_state(session, (IMFMediaSource *)event_source, source_state); + + ret = session_set_source_state(session, (IMFMediaSource *)event_source, source_state); + if (ret && event_type == MESourceStarted) + session_set_topo_status(session, &session->presentation.current_topology, S_OK, + MF_TOPOSTATUS_STARTED_SOURCE); + LeaveCriticalSection(&session->cs); break; case MENewStream:

1 0

Nikolay Sivov : mf: Unify trace formats for session methods.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 7c5fcfffe7b3a001c980f19cb6ed1cee049c26c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5fcfffe7b3a001c980f19c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:45 2019 +0300 mf: Unify trace formats for session methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5ac8bd97ae..9c0b80e340 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -550,7 +550,7 @@ static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID ri { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaSession) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -577,7 +577,7 @@ static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); ULONG refcount = InterlockedIncrement(&session->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -587,7 +587,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); ULONG refcount = InterlockedDecrement(&session->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { @@ -614,7 +614,7 @@ static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IM { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%#x, %p)\n", iface, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(session->event_queue, flags, event); } @@ -623,7 +623,7 @@ static HRESULT WINAPI mfsession_BeginGetEvent(IMFMediaSession *iface, IMFAsyncCa { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%p, %p)\n", iface, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(session->event_queue, callback, state); } @@ -632,7 +632,7 @@ static HRESULT WINAPI mfsession_EndGetEvent(IMFMediaSession *iface, IMFAsyncResu { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%p, %p)\n", iface, result, event); + TRACE("%p, %p, %p.\n", iface, result, event); return IMFMediaEventQueue_EndGetEvent(session->event_queue, result, event); } @@ -642,7 +642,7 @@ static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventTyp { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, ext_type, hr, value); } @@ -758,7 +758,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) struct session_op *op; HRESULT hr; - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); if (FAILED(hr = create_session_op(SESSION_CMD_CLOSE, &op))) return hr; @@ -774,7 +774,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); HRESULT hr = S_OK; - FIXME("(%p)\n", iface); + FIXME("%p.\n", iface); EnterCriticalSection(&session->cs); if (session->state == SESSION_STATE_SHUT_DOWN) @@ -803,14 +803,14 @@ static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **cloc static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) { - FIXME("(%p)->(%p)\n", iface, caps); + FIXME("%p, %p.\n", iface, caps); return E_NOTIMPL; } 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); + FIXME("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); return E_NOTIMPL; }

1 0

Nikolay Sivov : mf: Return earlier for clock state change calls when time source is not set.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 4e8d7ece69b6dfa43daaa419647e23fec58021af URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8d7ece69b6dfa43daaa419… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:49 2019 +0300 mf: Return earlier for clock state change calls when time source is not set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 3 +++ dlls/mf/tests/mf.c | 21 +++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index bf1e48aaf7..a3c0ee717f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1923,6 +1923,9 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c MFTIME system_time; HRESULT hr; + if (!clock->time_source) + return MF_E_CLOCK_NO_TIME_SOURCE; + if (command != CLOCK_CMD_SET_RATE && clock->state == states[command] && clock->state != MFCLOCK_STATE_RUNNING) return MF_E_CLOCK_STATE_ALREADY_SET; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b221398a71..e118c36ec7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1501,6 +1501,9 @@ static void test_presentation_clock(void) hr = MFCreatePresentationClock(&clock); ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); + ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); + hr = IMFPresentationClock_GetTimeSource(clock, &time_source); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); @@ -1521,7 +1524,7 @@ static void test_presentation_clock(void) value = 1; hr = IMFPresentationClock_GetContinuityKey(clock, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get continuity key, hr %#x.\n", hr); ok(value == 0, "Unexpected value %u.\n", value); hr = IMFPresentationClock_GetProperties(clock, &props); @@ -1559,6 +1562,19 @@ static void test_presentation_clock(void) hr = IMFPresentationClock_RemoveClockStateSink(clock, &test_sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* State change commands, time source is not set yet. */ + hr = IMFPresentationClock_Start(clock, 0); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_Pause(clock); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_Stop(clock); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFRateControl_SetRate(rate_control, FALSE, 0.0f); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + /* Set default time source. */ hr = MFCreateSystemTimeSource(&time_source); ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); @@ -1631,9 +1647,6 @@ static void test_presentation_clock(void) IMFPresentationTimeSource_Release(time_source); - hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); - ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - hr = IMFRateControl_GetRate(rate_control, NULL, &rate); ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr);

1 0

Jacek Caban : msvcr: Use -norelay for _vsnprintf.
by Alexandre Julliard Oct. 4, 2019

Oct. 4, 2019

Module: wine Branch: master Commit: 5dd76803ba25f27b2e2040bb952cf9a4c20fad91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dd76803ba25f27b2e2040bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 17:48:32 2019 +0200 msvcr: Use -norelay for _vsnprintf. Fixes debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 895298478d..a2505ede12 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1453,7 +1453,7 @@ @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 66c6f65a9b..4f48997183 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1810,7 +1810,7 @@ @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8c9d93fd81..19d5bce0d3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1828,7 +1828,7 @@ @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index ba1b351e89..538bbfdfa8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1522,7 +1522,7 @@ @ cdecl _vscwprintf_l(wstr ptr ptr) msvcr120._vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) msvcr120._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcr120._vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) msvcr120._vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) msvcr120._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcr120._vsnprintf_c @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcr120._vsnprintf_c_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) msvcr120._vsnprintf_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 1fefdaa59b..a014cf5036 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -586,7 +586,7 @@ @ cdecl _utime64(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf @ cdecl _waccess(wstr long) MSVCRT__waccess @ cdecl _wasctime(ptr) MSVCRT__wasctime diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7f4f35acb0..21b73d3a75 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -582,7 +582,7 @@ @ cdecl _utime64(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf @ cdecl _waccess(wstr long) MSVCRT__waccess @ cdecl _wasctime(ptr) MSVCRT__wasctime diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f8d0920c3c..8c68ca437f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1132,7 +1132,7 @@ @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d2f469a77d..2beb0e981a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1108,7 +1108,7 @@ @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l

1 0