wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Nikolay Sivov : mf: Match session state names with events.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: be08f2c203467300baefba1b219881827455fc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be08f2c203467300baefba1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 12:25:01 2020 +0300 mf: Match session state names with events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 4639831578..29f366a34e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -75,7 +75,7 @@ enum session_state SESSION_STATE_STOPPED = 0, SESSION_STATE_STARTING_SOURCES, SESSION_STATE_STARTING_SINKS, - SESSION_STATE_RUNNING, + SESSION_STATE_STARTED, SESSION_STATE_PAUSING_SINKS, SESSION_STATE_PAUSING_SOURCES, SESSION_STATE_PAUSED, @@ -674,7 +674,7 @@ static void session_start(struct media_session *session, const GUID *time_format session->presentation.flags |= SESSION_FLAG_SOURCES_SUBSCRIBED; session->state = SESSION_STATE_STARTING_SOURCES; break; - case SESSION_STATE_RUNNING: + case SESSION_STATE_STARTED: FIXME("Seeking is not implemented.\n"); break; case SESSION_STATE_CLOSED: @@ -696,7 +696,7 @@ static void session_pause(struct media_session *session) switch (session->state) { - case SESSION_STATE_RUNNING: + case SESSION_STATE_STARTED: /* Transition in two steps - pause clock, wait for sinks and pause sources. */ if (SUCCEEDED(hr = IMFPresentationClock_Pause(session->clock))) @@ -724,7 +724,7 @@ static void session_stop(struct media_session *session) switch (session->state) { - case SESSION_STATE_RUNNING: + case SESSION_STATE_STARTED: case SESSION_STATE_PAUSED: /* Transition in two steps - pause clock, wait for sinks and pause sources. */ @@ -791,7 +791,7 @@ static void session_close(struct media_session *session) case SESSION_STATE_STOPPED: hr = session_finalize_sinks(session); break; - case SESSION_STATE_RUNNING: + case SESSION_STATE_STARTED: case SESSION_STATE_PAUSED: session->presentation.flags |= SESSION_FLAG_FINALIZE_SINKS; if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) @@ -1999,7 +1999,7 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre if (!session_is_output_nodes_state(session, OBJ_STATE_STARTED)) break; - session->state = SESSION_STATE_RUNNING; + session->state = SESSION_STATE_STARTED; caps = session->caps | MFSESSIONCAP_PAUSE;

1 0

Nikolay Sivov : mf: Implement transition to closed state together with sink finalization.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 186b6a6fa7f87f950ecb6d5e272caa339e97489e URL: https://source.winehq.org/git/wine.git/?a=commit;h=186b6a6fa7f87f950ecb6d5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 12:25:00 2020 +0300 mf: Implement transition to closed state together with sink finalization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 203 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=186b6a6fa7f87f950ecb…

1 0

Nikolay Sivov : mf: Correctly respond to start attempt from closed state.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 23012b1304374783bcb75a49b8b5123ab471a458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23012b1304374783bcb75a49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 12:24:59 2020 +0300 mf: Correctly respond to start attempt from closed state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c5235e42a8..779a10d08d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -646,6 +646,10 @@ static void session_start(struct media_session *session, const GUID *time_format case SESSION_STATE_RUNNING: FIXME("Seeking is not implemented.\n"); break; + case SESSION_STATE_CLOSED: + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStarted, &GUID_NULL, + MF_E_INVALIDREQUEST, NULL); + break; default: ; }

1 0

Nikolay Sivov : mf: Handle shutdown state in GetFullTopology().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 15a9ab9409f014ac5a91a34ae1ea94eb5ff2157e URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a9ab9409f014ac5a91a34a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 12:24:58 2020 +0300 mf: Handle shutdown state in GetFullTopology(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 33 ++++++++++++++++++--------------- dlls/mf/tests/mf.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a2a2ba6fe5..c5235e42a8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1401,8 +1401,8 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl { struct media_session *session = impl_from_IMFMediaSession(iface); struct queued_topology *queued; - HRESULT hr = S_OK; TOPOID topo_id; + HRESULT hr; TRACE("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); @@ -1410,27 +1410,30 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl EnterCriticalSection(&session->cs); - if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + if (SUCCEEDED(hr = session_is_shut_down(session))) { - if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) - *topology = session->presentation.current_topology; + if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + { + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + *topology = session->presentation.current_topology; + else + hr = MF_E_INVALIDREQUEST; + } 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) + LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) { - *topology = queued->topology; - break; + if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + { + *topology = queued->topology; + break; + } } } - } - if (*topology) - IMFTopology_AddRef(*topology); + if (*topology) + IMFTopology_AddRef(*topology); + } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5f3114da32..5a690880d1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1027,11 +1027,14 @@ static void test_media_session(void) IMFRateSupport *rate_support; IMFAttributes *attributes; IMFMediaSession *session; + IMFTopology *topology; + PROPVARIANT propvar; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; + DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1115,12 +1118,40 @@ todo_wine hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaSession_ClearTopologies(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Start(session, &GUID_NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Pause(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Stop(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + 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); + hr = IMFMediaSession_GetSessionCapabilities(session, &caps); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetSessionCapabilities(session, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetFullTopology(session, MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSession_Release(session); /* Custom topology loader, GUID is not registered. */

1 0

Alistair Leslie-Hughes : oledb32: Initialize data provider when switching tabs.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 67a791270f35abb6d2aa13ef93cf77303f0ac95c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a791270f35abb6d2aa13ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 00:01:21 2020 +0000 oledb32: Initialize data provider when switching tabs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 1 + dlls/oledb32/version.rc | 1 + po/ar.po | 64 ++++++++++++++------------ po/ast.po | 64 ++++++++++++++------------ po/bg.po | 64 ++++++++++++++------------ po/ca.po | 64 ++++++++++++++------------ po/cs.po | 64 ++++++++++++++------------ po/da.po | 64 ++++++++++++++------------ po/de.po | 64 ++++++++++++++------------ po/el.po | 64 ++++++++++++++------------ po/en.po | 66 +++++++++++++++------------ po/en_US.po | 66 +++++++++++++++------------ po/eo.po | 64 ++++++++++++++------------ po/es.po | 64 ++++++++++++++------------ po/fa.po | 64 ++++++++++++++------------ po/fi.po | 64 ++++++++++++++------------ po/fr.po | 64 ++++++++++++++------------ po/he.po | 64 ++++++++++++++------------ po/hi.po | 64 ++++++++++++++------------ po/hr.po | 64 ++++++++++++++------------ po/hu.po | 64 ++++++++++++++------------ po/it.po | 64 ++++++++++++++------------ po/ja.po | 64 ++++++++++++++------------ po/ko.po | 64 ++++++++++++++------------ po/lt.po | 64 ++++++++++++++------------ po/ml.po | 64 ++++++++++++++------------ po/nb_NO.po | 64 ++++++++++++++------------ po/nl.po | 64 ++++++++++++++------------ po/or.po | 64 ++++++++++++++------------ po/pa.po | 64 ++++++++++++++------------ po/pl.po | 64 ++++++++++++++------------ po/pt_BR.po | 64 ++++++++++++++------------ po/pt_PT.po | 64 ++++++++++++++------------ po/rm.po | 64 ++++++++++++++------------ po/ro.po | 64 ++++++++++++++------------ po/ru.po | 64 ++++++++++++++------------ po/si.po | 64 ++++++++++++++------------ po/sk.po | 64 ++++++++++++++------------ po/sl.po | 64 ++++++++++++++------------ po/sr_RS(a)cyrillic.po | 64 ++++++++++++++------------ po/sr_RS(a)latin.po | 64 ++++++++++++++------------ po/sv.po | 64 ++++++++++++++------------ po/ta.po | 64 ++++++++++++++------------ po/te.po | 64 ++++++++++++++------------ po/th.po | 64 ++++++++++++++------------ po/tr.po | 64 ++++++++++++++------------ po/uk.po | 64 ++++++++++++++------------ po/wa.po | 64 ++++++++++++++------------ po/wine.pot | 64 ++++++++++++++------------ po/zh_CN.po | 64 ++++++++++++++------------ po/zh_TW.po | 64 ++++++++++++++------------ 52 files changed, 1834 insertions(+), 1423 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67a791270f35abb6d2aa…

1 0

Vijay Kiran Kamuju : include: Fix QUOTA_LIMITS_EX in winnt.h.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 739b975b1eb9c3f2024b40efa88c50c172285515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=739b975b1eb9c3f2024b40ef… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 1 07:21:57 2020 +0100 include: Fix QUOTA_LIMITS_EX in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 771f769f2f..50a6213ef0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5342,6 +5342,15 @@ typedef struct _QUOTA_LIMITS { #define QUOTA_LIMITS_HARDWS_MIN_DISABLE 0x00000002 #define QUOTA_LIMITS_HARDWS_MAX_ENABLE 0x00000004 #define QUOTA_LIMITS_HARDWS_MAX_DISABLE 0x00000008 +#define QUOTA_LIMITS_USE_DEFAULT_LIMITS 0x00000010 + +typedef union _RATE_QUOTA_LIMIT { + DWORD RateData; + struct { + DWORD RatePercent:7; + DWORD Reserved0:25; + } DUMMYSTRUCTNAME; +} RATE_QUOTA_LIMIT, *PRATE_QUOTA_LIMIT; typedef struct _QUOTA_LIMITS_EX { SIZE_T PagedPoolLimit; @@ -5350,12 +5359,12 @@ typedef struct _QUOTA_LIMITS_EX { SIZE_T MaximumWorkingSetSize; SIZE_T PagefileLimit; LARGE_INTEGER TimeLimit; - SIZE_T Reserved1; + SIZE_T WorkingSetLimit; SIZE_T Reserved2; SIZE_T Reserved3; SIZE_T Reserved4; DWORD Flags; - DWORD Reserved5; + RATE_QUOTA_LIMIT CpuRateLimit; } QUOTA_LIMITS_EX, *PQUOTA_LIMITS_EX; #define SECTION_QUERY 0x0001

1 0

Vijay Kiran Kamuju : include: Add some missing defines in winnt.h.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: c921f9724a2c37e8d2e7a99bebfaffdff504a45e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c921f9724a2c37e8d2e7a99b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 1 07:16:16 2020 +0100 include: Add some missing defines in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index adb7ef5669..771f769f2f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4340,6 +4340,12 @@ typedef struct _ACL_SIZE_INFORMATION #define SE_MANAGE_VOLUME_NAME L"SeManageVolumePrivilege" #define SE_IMPERSONATE_NAME L"SeImpersonatePrivilege" #define SE_CREATE_GLOBAL_NAME L"SeCreateGlobalPrivilege" +#define SE_TRUSTED_CREDMAN_ACCESS_NAME L"SeTrustedCredManAccessPrivilege" +#define SE_RELABEL_NAME L"SeRelabelPrivilege" +#define SE_INC_WORKING_SET_NAME L"SeIncreaseWorkingSetPrivilege" +#define SE_TIME_ZONE_NAME L"SeTimeZonePrivilege" +#define SE_CREATE_SYMBOLIC_LINK_NAME L"SeCreateSymbolicLinkPrivilege" +#define SE_DELEGATE_SESSION_USER_IMPERSONATE_NAME L"SeDelegateSessionUserImpersonatePrivilege" #else /* _MSC_VER/__MINGW32__ */ static const WCHAR SE_CREATE_TOKEN_NAME[] = { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME[] = { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; @@ -4370,6 +4376,12 @@ static const WCHAR SE_ENABLE_DELEGATION_NAME[] = { 'S','e','E','n','a','b','l',' static const WCHAR SE_MANAGE_VOLUME_NAME[] = { 'S','e','M','a','n','a','g','e','V','o','l','u','m','e','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_IMPERSONATE_NAME[] = { 'S','e','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_CREATE_GLOBAL_NAME[] = { 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_TRUSTED_CREDMAN_ACCESS_NAME[] = { 'S','e','T','r','u','s','t','e','d','C','r','e','d','M','a','n','A','c','c','e','s','s','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_RELABEL_NAME[] = { 'S','e','R','e','l','a','b','e','l','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_INC_WORKING_SET_NAME[] = { 'S','e','I','n','c','r','e','a','s','e','W','o','r','k','i','n','g','S','e','t','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_TIME_ZONE_NAME[] = { 'S','e','T','i','m','e','Z','o','n','e','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_CREATE_SYMBOLIC_LINK_NAME[] = { 'S','e','C','r','e','a','t','e','S','y','m','b','o','l','i','c','L','i','n','k','P','r','i','v','i','l','e','g','e',0 }; +static const WCHAR SE_DELEGATE_SESSION_USER_IMPERSONATE_NAME[] = { 'S','e','D','e','l','e','g','a','t','e','S','e','s','s','i','o','n','U','s','e','r','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; #endif #else /* UNICODE */ #define SE_CREATE_TOKEN_NAME "SeCreateTokenPrivilege" @@ -4401,6 +4413,12 @@ static const WCHAR SE_CREATE_GLOBAL_NAME[] = { 'S','e','C','r','e','a','t','e',' #define SE_MANAGE_VOLUME_NAME "SeManageVolumePrivilege" #define SE_IMPERSONATE_NAME "SeImpersonatePrivilege" #define SE_CREATE_GLOBAL_NAME "SeCreateGlobalPrivilege" +#define SE_TRUSTED_CREDMAN_ACCESS_NAME "SeTrustedCredManAccessPrivilege" +#define SE_RELABEL_NAME "SeRelabelPrivilege" +#define SE_INC_WORKING_SET_NAME "SeIncreaseWorkingSetPrivilege" +#define SE_TIME_ZONE_NAME "SeTimeZonePrivilege" +#define SE_CREATE_SYMBOLIC_LINK_NAME "SeCreateSymbolicLinkPrivilege" +#define SE_DELEGATE_SESSION_USER_IMPERSONATE_NAME "SeDelegateSessionUserImpersonatePrivilege" #endif #define SE_GROUP_MANDATORY 0x00000001 @@ -5452,6 +5470,8 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 #define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 #define FILE_SUPPORTS_SPARSE_VDL 0x10000000 +#define FILE_DAX_VOLUME 0x20000000 +#define FILE_SUPPORTS_GHOSTING 0x40000000 /* File alignments (NT) */ #define FILE_BYTE_ALIGNMENT 0x00000000

1 0

Alexandre Julliard : kernel32: Move Idn functions to kernelbase.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 80e8c138f17663fe5d09cb26d90eb273443fde3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e8c138f17663fe5d09cb26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 18:35:03 2020 +0100 kernel32: Move Idn functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernel32/locale.c | 31 ------------------------------- dlls/kernelbase/kernelbase.spec | 6 +++--- dlls/kernelbase/locale.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 99297ea824..b8eaa6cdde 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -938,9 +938,9 @@ @ stub HeapUsage @ stdcall -import HeapValidate(long long ptr) @ stdcall -import HeapWalk(long ptr) -@ stdcall IdnToAscii(long wstr long ptr long) -@ stdcall IdnToNameprepUnicode(long wstr long ptr long) -@ stdcall IdnToUnicode(long wstr long ptr long) +@ stdcall -import IdnToAscii(long wstr long ptr long) +@ stdcall -import IdnToNameprepUnicode(long wstr long ptr long) +@ stdcall -import IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) @ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernelbase.InitOnceBeginInitialize @ stdcall InitOnceComplete(ptr long ptr) kernelbase.InitOnceComplete diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index cb77ec8c7d..ac04e85946 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -541,37 +541,6 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L } -/****************************************************************************** - * IdnToAscii (KERNEL32.@) - */ -INT WINAPI IdnToAscii( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen ) -{ - NTSTATUS status = RtlIdnToAscii( flags, src, srclen, dst, &dstlen ); - if (!set_ntstatus( status )) return 0; - return dstlen; -} - -/****************************************************************************** - * IdnToNameprepUnicode (KERNEL32.@) - */ -INT WINAPI IdnToNameprepUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen ) -{ - NTSTATUS status = RtlIdnToNameprepUnicode( flags, src, srclen, dst, &dstlen ); - if (!set_ntstatus( status )) return 0; - return dstlen; -} - -/****************************************************************************** - * IdnToUnicode (KERNEL32.@) - */ -INT WINAPI IdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHAR *dst, INT dstlen ) -{ - NTSTATUS status = RtlIdnToUnicode( flags, src, srclen, dst, &dstlen ); - if (!set_ntstatus( status )) return 0; - return dstlen; -} - - /****************************************************************************** * GetFileMUIPath (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 63719b514d..4f39f15f0b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -785,9 +785,9 @@ @ stdcall HeapUnlock(long) @ stdcall HeapValidate(long long ptr) @ stdcall HeapWalk(long ptr) -@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii -@ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode -@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IdnToAscii(long wstr long ptr long) +@ stdcall IdnToNameprepUnicode(long wstr long ptr long) +@ stdcall IdnToUnicode(long wstr long ptr long) @ stdcall ImpersonateAnonymousToken(long) @ stdcall ImpersonateLoggedOnUser(long) @ stdcall ImpersonateNamedPipeClient(long) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index aad2422db2..169da01608 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4459,6 +4459,42 @@ GEOID WINAPI DECLSPEC_HOTPATCH GetUserGeoID( GEOCLASS geoclass ) } +/****************************************************************************** + * IdnToAscii (kernelbase.@) + */ +INT WINAPI DECLSPEC_HOTPATCH IdnToAscii( DWORD flags, const WCHAR *src, INT srclen, + WCHAR *dst, INT dstlen ) +{ + NTSTATUS status = RtlIdnToAscii( flags, src, srclen, dst, &dstlen ); + if (!set_ntstatus( status )) return 0; + return dstlen; +} + + +/****************************************************************************** + * IdnToNameprepUnicode (kernelbase.@) + */ +INT WINAPI DECLSPEC_HOTPATCH IdnToNameprepUnicode( DWORD flags, const WCHAR *src, INT srclen, + WCHAR *dst, INT dstlen ) +{ + NTSTATUS status = RtlIdnToNameprepUnicode( flags, src, srclen, dst, &dstlen ); + if (!set_ntstatus( status )) return 0; + return dstlen; +} + + +/****************************************************************************** + * IdnToUnicode (kernelbase.@) + */ +INT WINAPI DECLSPEC_HOTPATCH IdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, + WCHAR *dst, INT dstlen ) +{ + NTSTATUS status = RtlIdnToUnicode( flags, src, srclen, dst, &dstlen ); + if (!set_ntstatus( status )) return 0; + return dstlen; +} + + /****************************************************************************** * IsCharAlphaA (kernelbase.@) */

1 0

Alexandre Julliard : kernel32: Remove the nameprep tables.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 5d2ec076fed7912f5e4cee6edf71953f3cfbc391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2ec076fed7912f5e4cee6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 18:29:47 2020 +0100 kernel32: Remove the nameprep tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/locale.c | 3 - dlls/kernel32/nameprep.c | 1299 --------------------------------------------- tools/make_unicode | 218 -------- 4 files changed, 1521 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d2ec076fed7912f5e4c…

1 0

Alexandre Julliard : ntdll: Reimplement IdnToUnicode() using the normalization table and the ntdll helpers.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: ab9fe967f14cd2838ea7e4a43031665c6781b9ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9fe967f14cd2838ea7e4a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 16:28:48 2020 +0100 ntdll: Reimplement IdnToUnicode() using the normalization table and the ntdll helpers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 173 +------------------------------------------ dlls/kernel32/tests/locale.c | 19 +++-- dlls/ntdll/locale.c | 129 ++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 5 files changed, 148 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab9fe967f14cd2838ea7…

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