wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Zebediah Figura : wineqtdecoder: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 724b7f085375a85291703fe6de86b0de9c5f85ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=724b7f085375a85291703fe6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:34 2019 -0600 wineqtdecoder: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 45 ++++++++++++----------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 1db6dfd6ad..2ce06a7f59 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1140,15 +1140,7 @@ static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_NewSegment }; -/* - * Output Pin - */ -static inline QTOutPin *impl_QTOutPin_from_IPin( IPin *iface ) -{ - return CONTAINING_RECORD(iface, QTOutPin, pin.pin.IPin_iface); -} - -static inline QTOutPin *impl_sink_from_strmbase_pin(struct strmbase_pin *iface) +static inline QTOutPin *impl_source_from_strmbase_pin(struct strmbase_pin *iface) { return CONTAINING_RECORD(iface, QTOutPin, pin.pin); } @@ -1158,30 +1150,19 @@ static inline QTOutPin *impl_QTOutPin_from_BaseOutputPin(struct strmbase_source return CONTAINING_RECORD(iface, QTOutPin, pin); } -static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - QTOutPin *This = impl_QTOutPin_from_IPin(iface); - - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - - *ppv = NULL; + QTOutPin *pin = impl_source_from_strmbase_pin(&iface->IPin_iface); - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->seeking.IMediaSeeking_iface; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->seeking.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - FIXME("No interface for %s!\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) @@ -1192,7 +1173,7 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { - QTOutPin *This = impl_sink_from_strmbase_pin(iface); + QTOutPin *This = impl_source_from_strmbase_pin(iface); if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; @@ -1231,7 +1212,7 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(struct strmbase_source *iface, } static const IPinVtbl QT_OutputPin_Vtbl = { - QTOutPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect,

1 0

Zebediah Figura : winegstreamer: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 5c83561b3324e82c0e67a2cd8c463c3d8ad16f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c83561b3324e82c0e67a2cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:33 2019 -0600 winegstreamer: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 63 +++++++++---------------------------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 78c8e38701..04fb54915c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1735,29 +1735,19 @@ static inline struct gstdemux_source *impl_source_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct gstdemux_source, pin.pin.IPin_iface); } -static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - struct gstdemux_source *This = impl_source_from_IPin(iface); + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->seek; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->seek.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - FIXME("No interface for %s!\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) @@ -1847,7 +1837,7 @@ static void free_source_pin(struct gstdemux_source *pin) } static const IPinVtbl GST_OutputPin_Vtbl = { - GSTOutPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect, @@ -1869,6 +1859,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = source_query_interface, .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, @@ -2071,36 +2062,8 @@ static HRESULT WINAPI GSTInPin_NewSegment(IPin *iface, REFERENCE_TIME start, return S_OK; } -static HRESULT WINAPI GSTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) -{ - struct gstdemux *filter = impl_from_sink_IPin(iface); - - TRACE("filter %p, riid %s, ppv %p.\n", filter, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { - return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, &IID_IMediaSeeking, ppv); - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IPinVtbl GST_InputPin_Vtbl = { - GSTInPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect,

1 0

Zebediah Figura : wineqtdecoder: Move the SourceSeeking structure to the source pin.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 54ccf805e7933ec8e7cad57daa5ac4037ac94ed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ccf805e7933ec8e7cad57d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:32 2019 -0600 wineqtdecoder: Move the SourceSeeking structure to the source pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 53 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 0dbc3d8bf1..1db6dfd6ad 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -131,6 +131,7 @@ extern CLSID CLSID_QTSplitter; typedef struct QTOutPin { struct strmbase_source pin; IQualityControl IQualityControl_iface; + SourceSeeking seeking; AM_MEDIA_TYPE * pmt; OutputQueue * queue; @@ -162,7 +163,6 @@ typedef struct QTSplitter { DWORD outputSize; CRITICAL_SECTION csReceive; - SourceSeeking sourceSeeking; TimeValue movie_time; TimeValue movie_start; TimeScale movie_scale; @@ -183,9 +183,9 @@ static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface); static HRESULT WINAPI QTSplitter_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface); -static inline QTSplitter *impl_from_IMediaSeeking( IMediaSeeking *iface ) +static inline QTOutPin *impl_from_IMediaSeeking(IMediaSeeking *iface) { - return CONTAINING_RECORD(iface, QTSplitter, sourceSeeking.IMediaSeeking_iface); + return CONTAINING_RECORD(iface, QTOutPin, seeking.IMediaSeeking_iface); } static inline QTSplitter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -374,9 +374,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->pInputPin.pin.peer = NULL; This->pInputPin.pin.pFuncsTable = &sink_ops; - strmbase_seeking_init(&This->sourceSeeking, &QT_Seeking_Vtbl, - QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate); - *phr = S_OK; return &This->filter.IUnknown_inner; } @@ -731,6 +728,7 @@ static void free_source_pin(QTOutPin *pin) } DeleteMediaType(pin->pmt); + strmbase_seeking_cleanup(&pin->seeking); strmbase_source_cleanup(&pin->pin); heap_free(pin); } @@ -914,7 +912,7 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) Track trk; short id = 0; DWORD tid; - LONGLONG time; + LONGLONG time, duration; TRACE("Trying movie connect\n"); @@ -955,10 +953,12 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) time = GetMovieDuration(filter->pQTMovie); filter->movie_scale = GetMovieTimeScale(filter->pQTMovie); - filter->sourceSeeking.llDuration = ((double)time / filter->movie_scale) * 10000000; - filter->sourceSeeking.llStop = filter->sourceSeeking.llDuration; - - TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); + duration = ((double)time / filter->movie_scale) * 10000000; + TRACE("Movie duration is %s.\n", wine_dbgstr_longlong(duration)); + if (filter->pVideo_Pin) + filter->pVideo_Pin->seeking.llStop = filter->pVideo_Pin->seeking.llDuration = duration; + if (filter->pAudio_Pin) + filter->pAudio_Pin->seeking.llStop = filter->pAudio_Pin->seeking.llDuration = duration; filter->loaderThread = CreateThread(NULL, 0, QTSplitter_loading_thread, filter, 0, &tid); if (filter->loaderThread) @@ -1171,7 +1171,7 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->sourceSeeking.IMediaSeeking_iface; + *ppv = &This->seeking.IMediaSeeking_iface; else if (IsEqualIID(riid, &IID_IQualityControl)) *ppv = &This->IQualityControl_iface; @@ -1328,6 +1328,8 @@ static HRESULT QT_AddPin(QTSplitter *filter, const WCHAR *name, pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, mt); pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; + strmbase_seeking_init(&pin->seeking, &QT_Seeking_Vtbl, + QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); return OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, @@ -1336,12 +1338,12 @@ static HRESULT QT_AddPin(QTSplitter *filter, const WCHAR *name, static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) { - QTSplitter *This = impl_from_IMediaSeeking(iface); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + QTSplitter *filter = impl_from_strmbase_filter(pin->pin.pin.filter); TRACE("(%p)\n", iface); - EnterCriticalSection(&This->csReceive); - This->movie_time = (This->sourceSeeking.llCurrent * This->movie_scale)/10000000; - This->movie_start = This->movie_time; - LeaveCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); + filter->movie_start = filter->movie_time = (pin->seeking.llCurrent * filter->movie_scale)/10000000; + LeaveCriticalSection(&filter->csReceive); return S_OK; } @@ -1357,25 +1359,22 @@ static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface) return S_OK; } -static HRESULT WINAPI QT_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI QT_Seeking_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) { - QTSplitter *This = impl_from_IMediaSeeking(iface); - - return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + return IPin_QueryInterface(&pin->pin.pin.IPin_iface, iid, out); } static ULONG WINAPI QT_Seeking_AddRef(IMediaSeeking * iface) { - QTSplitter *This = impl_from_IMediaSeeking(iface); - - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + return IPin_AddRef(&pin->pin.pin.IPin_iface); } static ULONG WINAPI QT_Seeking_Release(IMediaSeeking * iface) { - QTSplitter *This = impl_from_IMediaSeeking(iface); - - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + return IPin_Release(&pin->pin.pin.IPin_iface); } static const IMediaSeekingVtbl QT_Seeking_Vtbl =

1 0

Alistair Leslie-Hughes : wineqtdecoder: Fix some copy-paste errors.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 9582f6a41d70b2291e4676bd1cb87fb553c4f694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9582f6a41d70b2291e4676bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Dec 7 22:20:31 2019 -0600 wineqtdecoder: Fix some copy-paste errors. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 5b1e82ebc9..0dbc3d8bf1 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE QTSplitter *filter = impl_from_strmbase_filter(iface); HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); if (filter->pVideo_Pin) pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin); @@ -297,7 +297,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE hr = pin_hr; SetEvent(filter->runEvent); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return hr; } @@ -306,10 +306,10 @@ static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) { QTSplitter *filter = impl_from_strmbase_filter(iface); - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); IAsyncReader_BeginFlush(filter->pInputPin.pReader); IAsyncReader_EndFlush(filter->pInputPin.pReader); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return S_OK; }

1 0

Alexandre Julliard : kernel32: Move Get/SetLocaleInfoW() to kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 6bcda47419b527046711140d16a5be65af056bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcda47419b527046711140d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:47:43 2019 +0100 kernel32: Move Get/SetLocaleInfoW() to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/locale.c | 501 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 289 +++++++++++++++++++++++ 4 files changed, 293 insertions(+), 505 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bcda47419b527046711…

1 0

Alexandre Julliard : kernel32: Use MultiByteToWideChar() and WideCharToMultiByte() from kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 830de63139725a0e4574d8674c1b09b5b908db4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=830de63139725a0e4574d867… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:47:34 2019 +0100 kernel32: Use MultiByteToWideChar() and WideCharToMultiByte() from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/kernel_private.h | 3 - dlls/kernel32/locale.c | 589 ----------------------------------------- dlls/kernel32/process.c | 2 - dlls/kernelbase/locale.c | 5 +- 5 files changed, 6 insertions(+), 597 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=830de63139725a0e4574…

1 0

Alexandre Julliard : kernel32: Remove initialization of the global argv.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: a2c107fca35c14455493f895a8b1ff486e68c8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c107fca35c14455493f895… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:45:50 2019 +0100 kernel32: Remove initialization of the global argv. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 1d61853d86..9247e3c117 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -77,36 +77,6 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) } -/*********************************************************************** - * set_library_argv - * - * Set the Wine library argv global variable. - */ -static void set_library_argv( WCHAR **wargv ) -{ - int argc; - char *p, **argv; - DWORD total = 0; - - /* convert argv back from Unicode since it has to be in the Ansi codepage not the Unix one */ - - for (argc = 0; wargv[argc]; argc++) - total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); - - argv = RtlAllocateHeap( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); - p = (char *)(argv + argc + 1); - for (argc = 0; wargv[argc]; argc++) - { - DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); - argv[argc] = p; - p += reslen; - total -= reslen; - } - argv[argc] = NULL; - __wine_main_argv = argv; -} - - /*********************************************************************** * KERNEL process initialisation routine */ @@ -114,7 +84,6 @@ static BOOL process_attach( HMODULE module ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; - set_library_argv( __wine_main_wargv ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); /* Setup registry timezone information */

1 0

Alexandre Julliard : msvcrt: Create the Ansi argv from the Unicode one.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 94a3d4adad43dad1086f8293d6ea293cc601c13b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a3d4adad43dad1086f8293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:45:43 2019 +0100 msvcrt: Create the Ansi argv from the Unicode one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 187 ++++++++++++++++++++--------------------------------- 1 file changed, 71 insertions(+), 116 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c3a1255a60..af7a13528f 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); int MSVCRT___argc = 0; -static int argc_expand; static int wargc_expand; unsigned int MSVCRT__commode = 0; int MSVCRT__fmode = 0; @@ -50,7 +49,6 @@ unsigned int MSVCRT___setlc_active = 0; unsigned int MSVCRT___unguarded_readlc_active = 0; double MSVCRT__HUGE = 0; char **MSVCRT___argv = NULL; -static char **argv_expand; MSVCRT_wchar_t **MSVCRT___wargv = NULL; static MSVCRT_wchar_t **wargv_expand; char *MSVCRT__acmdln = NULL; @@ -139,6 +137,28 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) return wblk; } +static char **build_argv( WCHAR **wargv ) +{ + int argc; + char *p, **argv; + DWORD total = 0; + + for (argc = 0; wargv[argc]; argc++) + total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); + + argv = HeapAlloc( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); + p = (char *)(argv + argc + 1); + for (argc = 0; wargv[argc]; argc++) + { + DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); + argv[argc] = p; + p += reslen; + total -= reslen; + } + argv[argc] = NULL; + return argv; +} + typedef void (CDECL *_INITTERMFUN)(void); typedef int (CDECL *_INITTERM_E_FN)(void); @@ -327,10 +347,10 @@ void msvcrt_init_args(void) OSVERSIONINFOW osvi; MSVCRT__acmdln = MSVCRT__strdup( GetCommandLineA() ); - MSVCRT__wcmdln = msvcrt_wstrdupa(MSVCRT__acmdln); + MSVCRT__wcmdln = MSVCRT__wcsdup( GetCommandLineW() ); MSVCRT___argc = __wine_main_argc; - MSVCRT___argv = __wine_main_argv; MSVCRT___wargv = __wine_main_wargv; + MSVCRT___argv = build_argv( MSVCRT___wargv ); TRACE("got %s, wide = %s argc=%d\n", debugstr_a(MSVCRT__acmdln), debugstr_w(MSVCRT__wcmdln),MSVCRT___argc); @@ -382,125 +402,16 @@ void msvcrt_init_args(void) void msvcrt_free_args(void) { /* FIXME: more things to free */ + HeapFree(GetProcessHeap(), 0, MSVCRT___argv); HeapFree(GetProcessHeap(), 0, MSVCRT___initenv); HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv); HeapFree(GetProcessHeap(), 0, MSVCRT__environ); HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); - HeapFree(GetProcessHeap(), 0, argv_expand); HeapFree(GetProcessHeap(), 0, wargv_expand); } -static int build_expanded_argv(int *argc, char **argv) -{ - int i, size=0, args_no=0, path_len; - BOOL is_expandable; - HANDLE h; - - args_no = 0; - for(i=0; i<__wine_main_argc; i++) { - WIN32_FIND_DATAA data; - int len = 0; - - is_expandable = FALSE; - for(path_len = strlen(__wine_main_argv[i])-1; path_len>=0; path_len--) { - if(__wine_main_argv[i][path_len]=='*' || __wine_main_argv[i][path_len]=='?') - is_expandable = TRUE; - else if(__wine_main_argv[i][path_len]=='\\' || __wine_main_argv[i][path_len]=='/') - break; - } - path_len++; - - if(is_expandable) - h = FindFirstFileA(__wine_main_argv[i], &data); - else - h = INVALID_HANDLE_VALUE; - - if(h != INVALID_HANDLE_VALUE) { - do { - if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || - (data.cFileName[1]=='.' && data.cFileName[2]=='\0'))) - continue; - - len = strlen(data.cFileName)+1; - if(argv) { - argv[args_no] = (char*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_argv[i], path_len*sizeof(char)); - memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(char)); - } - args_no++; - size += len+path_len; - }while(FindNextFileA(h, &data)); - FindClose(h); - } - - if(!len) { - len = strlen(__wine_main_argv[i])+1; - if(argv) { - argv[args_no] = (char*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_argv[i], len*sizeof(char)); - } - args_no++; - size += len; - } - } - - if(argv) - argv[args_no] = NULL; - size += (args_no+1)*sizeof(char*); - *argc = args_no; - return size; -} - -/********************************************************************* - * __getmainargs (MSVCRT.@) - */ -int CDECL __getmainargs(int *argc, char** *argv, char** *envp, - int expand_wildcards, int *new_mode) -{ - TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); - - if (expand_wildcards) { - HeapFree(GetProcessHeap(), 0, argv_expand); - argv_expand = NULL; - - argv_expand = HeapAlloc(GetProcessHeap(), 0, - build_expanded_argv(&argc_expand, NULL)); - if (argv_expand) { - build_expanded_argv(&argc_expand, argv_expand); - - MSVCRT___argc = argc_expand; - MSVCRT___argv = argv_expand; - }else { - expand_wildcards = 0; - } - } - if (!expand_wildcards) { - MSVCRT___argc = __wine_main_argc; - MSVCRT___argv = __wine_main_argv; - } - - *argc = MSVCRT___argc; - *argv = MSVCRT___argv; - *envp = MSVCRT___initenv; - - if (new_mode) - MSVCRT__set_new_mode( *new_mode ); - return 0; -} - -#ifdef _CRTDLL -/********************************************************************* - * __GetMainArgs (CRTDLL.@) - */ -void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) -{ - int new_mode = 0; - __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); -} -#endif - static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) { int i, size=0, args_no=0, path_len; @@ -573,8 +484,6 @@ int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *w if (expand_wildcards) { HeapFree(GetProcessHeap(), 0, wargv_expand); - wargv_expand = NULL; - wargv_expand = HeapAlloc(GetProcessHeap(), 0, build_expanded_wargv(&wargc_expand, NULL)); if (wargv_expand) { @@ -602,6 +511,52 @@ int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *w return 0; } +/********************************************************************* + * __getmainargs (MSVCRT.@) + */ +int CDECL __getmainargs(int *argc, char** *argv, char** *envp, + int expand_wildcards, int *new_mode) +{ + TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); + + if (expand_wildcards) { + HeapFree(GetProcessHeap(), 0, wargv_expand); + wargv_expand = HeapAlloc(GetProcessHeap(), 0, + build_expanded_wargv(&wargc_expand, NULL)); + if (wargv_expand) { + build_expanded_wargv(&wargc_expand, wargv_expand); + + MSVCRT___argc = wargc_expand; + MSVCRT___argv = build_argv( wargv_expand ); + }else { + expand_wildcards = 0; + } + } + if (!expand_wildcards) { + MSVCRT___argc = __wine_main_argc; + MSVCRT___argv = build_argv( __wine_main_wargv ); + } + + *argc = MSVCRT___argc; + *argv = MSVCRT___argv; + *envp = MSVCRT___initenv; + + if (new_mode) + MSVCRT__set_new_mode( *new_mode ); + return 0; +} + +#ifdef _CRTDLL +/********************************************************************* + * __GetMainArgs (CRTDLL.@) + */ +void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) +{ + int new_mode = 0; + __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); +} +#endif + /********************************************************************* * _initterm (MSVCRT.@) */

1 0

Alexandre Julliard : winecrt0: Create the Ansi argv from the Unicode one.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 5a9c88d62e018049cc29369b0c463b0664ef6ef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a9c88d62e018049cc29369b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:45:24 2019 +0100 winecrt0: Create the Ansi argv from the Unicode one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/dll_entry.c | 2 +- dlls/winecrt0/drv_entry.c | 2 +- dlls/winecrt0/exe_entry.c | 28 ++++++++++++++++++++++++++-- dlls/winecrt0/exe_wentry.c | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index a002d87875..92bd069529 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -38,7 +38,7 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, if (reason == DLL_PROCESS_ATTACH && __wine_spec_init_state != CONSTRUCTORS_DONE) { call_fini = TRUE; - _init( __wine_main_argc, __wine_main_argv, NULL ); + _init( 0, NULL, NULL ); } ret = DllMain( inst, reason, reserved ); diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index ee9f3b13a7..c7d39922e1 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -35,7 +35,7 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob { BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); - if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); + if (needs_init) _init( 0, NULL, NULL ); return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 13a1d893c9..9ae45f9f04 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -25,19 +25,43 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winternl.h" #include "wine/library.h" #include "crt0_private.h" extern int __cdecl main( int argc, char *argv[] ); +static char **build_argv( WCHAR **wargv ) +{ + int argc; + char *p, **argv; + DWORD total = 0; + + for (argc = 0; wargv[argc]; argc++) + total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); + + argv = HeapAlloc( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); + p = (char *)(argv + argc + 1); + for (argc = 0; wargv[argc]; argc++) + { + DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); + argv[argc] = p; + p += reslen; + total -= reslen; + } + argv[argc] = NULL; + return argv; +} + DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) { BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); + char **argv = build_argv( __wine_main_wargv ); DWORD ret; - if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); - ret = main( __wine_main_argc, __wine_main_argv ); + if (needs_init) _init( __wine_main_argc, argv, NULL ); + ret = main( __wine_main_argc, argv ); if (needs_init) _fini(); ExitProcess( ret ); } diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 9db135eed0..b889e5a102 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -36,7 +36,7 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); DWORD ret; - if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); + if (needs_init) _init( 0, NULL, NULL ); ret = wmain( __wine_main_argc, __wine_main_wargv ); if (needs_init) _fini(); ExitProcess( ret );

1 0

Derek Lesho : bcrypt: Add fallback when gnutls_decode_rs_value isn't present.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: ff91d9473a224be0a3272f2205db467c05fdaf65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff91d9473a224be0a3272f22… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Dec 6 20:11:03 2019 -0600 bcrypt: Add fallback when gnutls_decode_rs_value isn't present. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 1c31b5625f..868f898bbb 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -86,13 +86,15 @@ static int (*pgnutls_privkey_export_rsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_generate)(gnutls_privkey_t, gnutls_pk_algorithm_t, unsigned int, unsigned int); +/* Not present in gnutls version < 3.6.0 */ +static int (*pgnutls_decode_rs_value)(const gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); MAKE_FUNCPTR(gnutls_cipher_deinit); MAKE_FUNCPTR(gnutls_cipher_encrypt2); MAKE_FUNCPTR(gnutls_cipher_init); -MAKE_FUNCPTR(gnutls_decode_rs_value); MAKE_FUNCPTR(gnutls_global_deinit); MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); @@ -164,6 +166,11 @@ static int compat_gnutls_privkey_generate(gnutls_privkey_t key, gnutls_pk_algori return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_decode_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t * r, gnutls_datum_t * s) +{ + return GNUTLS_E_INTERNAL_ERROR; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -190,7 +197,6 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_cipher_deinit) LOAD_FUNCPTR(gnutls_cipher_encrypt2) LOAD_FUNCPTR(gnutls_cipher_init) - LOAD_FUNCPTR(gnutls_decode_rs_value) LOAD_FUNCPTR(gnutls_global_deinit) LOAD_FUNCPTR(gnutls_global_init) LOAD_FUNCPTR(gnutls_global_set_log_function) @@ -259,6 +265,11 @@ BOOL gnutls_initialize(void) WARN("gnutls_privkey_generate not found\n"); pgnutls_privkey_generate = compat_gnutls_privkey_generate; } + if (!(pgnutls_decode_rs_value = wine_dlsym( libgnutls_handle, "gnutls_decode_rs_value", NULL, 0 ))) + { + WARN("gnutls_decode_rs_value not found\n"); + pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; + } if (TRACE_ON( bcrypt )) {

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
64
Older →

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 December 2019