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

Dmitry Timoshkov : windowscodecs: Add initial implementation of the GIF encoder.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 7eb1f5d6ad4205c22d933d0bb417fb4ef6a035ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb1f5d6ad4205c22d933d0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 27 10:32:36 2020 +0800 windowscodecs: Add initial implementation of the GIF encoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 14 +- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/gifformat.c | 1012 ++++++++++++++++++++++++- dlls/windowscodecs/regsvr.c | 10 + dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 6 files changed, 1003 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7eb1f5d6ad4205c22d93…

1 0

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapDecoder::CopyPalette for a not initialized case in the GIF decoder.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 18a915ef3ca9cd9ad76b97f2646bf32651e045d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18a915ef3ca9cd9ad76b97f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 27 10:32:38 2020 +0800 windowscodecs: Fix IWICBitmapDecoder::CopyPalette for a not initialized case in the GIF decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index fc8f4b1c3e..5d5a3a07a2 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1187,6 +1187,9 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet TRACE("(%p,%p)\n", iface, palette); + if (!This->gif) + return WINCODEC_ERR_WRONGSTATE; + cm = This->gif->SColorMap; if (cm) {

1 0

Dmitry Timoshkov : windowscodecs/tests: Add the tests for GIF encoder and decoder.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: c1d02a5fdf8995dba607530df0f79ef502d24185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1d02a5fdf8995dba607530d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 27 10:32:40 2020 +0800 windowscodecs/tests: Add the tests for GIF encoder and decoder. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 61 +++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 0a7e7238aa..7936c5e653 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1132,6 +1132,40 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } +static void check_gif_format(IStream *stream, const WICPixelFormatGUID *format) +{ +#include "pshpack1.h" + struct logical_screen_descriptor + { + char signature[6]; + USHORT width; + USHORT height; + BYTE packed; + /* global_color_table_flag : 1; + * color_resolution : 3; + * sort_flag : 1; + * global_color_table_size : 3; + */ + BYTE background_color_index; + BYTE pixel_aspect_ratio; + } lsd; +#include "poppack.h" + UINT color_resolution; + HRESULT hr; + + memset(&lsd, 0, sizeof(lsd)); + hr = IStream_Read(stream, &lsd, sizeof(lsd), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(!memcmp(lsd.signature, "GIF89a", 6), "wrong GIF signature %.6s\n", lsd.signature); + + ok(lsd.width == 32, "wrong width %u\n", lsd.width); + ok(lsd.height == 2, "wrong height %u\n", lsd.height); + color_resolution = 1 << (((lsd.packed >> 4) & 0x07) + 1); + ok(color_resolution == 256, "wrong color resolution %u\n", color_resolution); + ok(lsd.pixel_aspect_ratio == 0, "wrong pixel_aspect_ratio %u\n", lsd.pixel_aspect_ratio); +} + static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; @@ -1147,6 +1181,8 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WIC check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) check_tiff_format(stream, format); + else if (IsEqualGUID(encoder, &CLSID_WICGifEncoder)) + check_gif_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -1241,6 +1277,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls container_format = &GUID_ContainerFormatTiff; else if (IsEqualGUID(clsid_encoder, &CLSID_WICJpegEncoder)) container_format = &GUID_ContainerFormatJpeg; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + container_format = &GUID_ContainerFormatGif; else ok(0, "Unknown encoder %s.\n", wine_dbgstr_guid(clsid_encoder)); @@ -1265,7 +1303,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + ok(SUCCEEDED(hr), "CoCreateInstance(%s) failed, hr=%x\n", wine_dbgstr_guid(clsid_encoder), hr); if (SUCCEEDED(hr)) { hglobal = GlobalAlloc(GMEM_MOVEABLE, 0); @@ -1290,7 +1328,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (palette) { hr = IWICBitmapEncoder_SetPalette(encoder, palette); - ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + ok(hr == S_OK, "SetPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); hr = S_OK; } @@ -1429,13 +1470,19 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == WINCODEC_ERR_WRONGSTATE, "wrong error %#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING) /* XP */, "CopyPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = S_OK; i=0; @@ -1495,7 +1542,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || - IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder)) + IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder) || + IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) { if (IsEqualGUID(&pixelformat, &GUID_WICPixelFormatBlackWhite) || IsEqualGUID(&pixelformat, &GUID_WICPixelFormat8bppIndexed)) @@ -1845,6 +1893,9 @@ START_TEST(converter) test_default_converter(); test_converter_8bppIndexed(); + test_encoder(&testdata_8bppIndexed, &CLSID_WICGifEncoder, + &testdata_8bppIndexed, &CLSID_WICGifDecoder, "GIF encoder 8bppIndexed"); + test_encoder(&testdata_BlackWhite, &CLSID_WICPngEncoder, &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder,

1 0

Gabriel Ivăncescu : qedit: Retrieve the pin media type using a helper function.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: ef00425a9c73e92da7bd1129d0c188243eba3c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef00425a9c73e92da7bd1129… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 14:14:03 2020 -0500 qedit: Retrieve the pin media type using a helper function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 392320560b..3c00a85b9e 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -103,6 +103,24 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) return hr; } +static HRESULT get_pin_media_type(IPin *pin, AM_MEDIA_TYPE *out) +{ + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + if (FAILED(hr = IPin_EnumMediaTypes(pin, &enummt))) + return hr; + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + IEnumMediaTypes_Release(enummt); + if (hr != S_OK) + return E_NOINTERFACE; + + *out = *pmt; + CoTaskMemFree(pmt); + return S_OK; +} + static HRESULT find_splitter(MediaDetImpl *detector) { IPin *source_pin, *splitter_pin; @@ -611,9 +629,6 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, AM_MEDIA_TYPE *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - IEnumMediaTypes *types; - AM_MEDIA_TYPE *pmt; - HRESULT hr; TRACE("(%p)\n", This); @@ -623,22 +638,7 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, if (!This->cur_pin) return E_INVALIDARG; - hr = IPin_EnumMediaTypes(This->cur_pin, &types); - if (SUCCEEDED(hr)) - { - hr = (IEnumMediaTypes_Next(types, 1, &pmt, NULL) == S_OK - ? S_OK - : E_NOINTERFACE); - IEnumMediaTypes_Release(types); - } - - if (SUCCEEDED(hr)) - { - *pVal = *pmt; - CoTaskMemFree(pmt); - } - - return hr; + return get_pin_media_type(This->cur_pin, pVal); } static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface,

1 0

Gabriel Ivăncescu : qedit: Use the pin's media type instead of querying for IFileSourceFilter.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 11fd2092054a7af57382dc465ac416b3db779516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fd2092054a7af57382dc46… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 14:14:04 2020 -0500 qedit: Use the pin's media type instead of querying for IFileSourceFilter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3c00a85b9e..5a19268985 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -124,12 +124,10 @@ static HRESULT get_pin_media_type(IPin *pin, AM_MEDIA_TYPE *out) static HRESULT find_splitter(MediaDetImpl *detector) { IPin *source_pin, *splitter_pin; - IFileSourceFilter *file_source; IEnumMoniker *enum_moniker; IFilterMapper2 *mapper; IBaseFilter *splitter; IEnumPins *enum_pins; - LPOLESTR filename; AM_MEDIA_TYPE mt; IMoniker *mon; GUID type[2]; @@ -137,25 +135,6 @@ static HRESULT find_splitter(MediaDetImpl *detector) HRESULT hr; GUID clsid; - if (FAILED(hr = IBaseFilter_QueryInterface(detector->source, - &IID_IFileSourceFilter, (void **)&file_source))) - { - ERR("Failed to get file source interface.\n"); - return hr; - } - - hr = IFileSourceFilter_GetCurFile(file_source, &filename, &mt); - IFileSourceFilter_Release(file_source); - CoTaskMemFree(filename); - if (FAILED(hr)) - { - ERR("Failed to get current file, hr %#x.\n", hr); - return hr; - } - type[0] = mt.majortype; - type[1] = mt.subtype; - FreeMediaType(&mt); - if (FAILED(hr = IBaseFilter_EnumPins(detector->source, &enum_pins))) { ERR("Failed to enumerate source pins, hr %#x.\n", hr); @@ -169,6 +148,17 @@ static HRESULT find_splitter(MediaDetImpl *detector) return hr; } + if (FAILED(hr = get_pin_media_type(source_pin, &mt))) + { + ERR("Failed to get media type, hr %#x.\n", hr); + IPin_Release(source_pin); + return hr; + } + + type[0] = mt.majortype; + type[1] = mt.subtype; + FreeMediaType(&mt); + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&mapper))) {

1 0

Gabriel Ivăncescu : qedit: Implement IMediaDet::get_StreamLength().
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 28ec2795186c7db83637b3b17e4fa95095ebb77d URL: https://source.winehq.org/git/wine.git/?a=commit;h=28ec2795186c7db83637b3b1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 27 14:14:05 2020 -0500 qedit: Implement IMediaDet::get_StreamLength(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 32 +++++++- dlls/qedit/tests/mediadet.c | 185 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 5a19268985..d32679b6bb 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -524,11 +524,35 @@ static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet *iface, BSTR *bstr) return hr; } -static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) +static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet *iface, double *length) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p): stub!\n", This); - return VFW_E_INVALIDMEDIATYPE; + MediaDetImpl *detector = impl_from_IMediaDet(iface); + IMediaSeeking *seeking; + HRESULT hr; + + TRACE("detector %p, length %p.\n", detector, length); + + if (!length) + return E_POINTER; + + if (!detector->cur_pin) + return E_INVALIDARG; + + if (SUCCEEDED(hr = IPin_QueryInterface(detector->cur_pin, + &IID_IMediaSeeking, (void **)&seeking))) + { + LONGLONG duration; + + if (SUCCEEDED(hr = IMediaSeeking_GetDuration(seeking, &duration))) + { + /* Windows assumes the time format is TIME_FORMAT_MEDIA_TIME + and does not check it nor convert it, as tests show. */ + *length = (REFTIME)duration / 10000000; + } + IMediaSeeking_Release(seeking); + } + + return hr; } static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 32861476dd..9bf6c43a2a 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -135,6 +135,7 @@ struct testfilter { struct strmbase_filter filter; struct strmbase_source source; + IMediaSeeking IMediaSeeking_iface; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -163,6 +164,11 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; +static inline struct testfilter *impl_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, source.pin); +} + static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { static const VIDEOINFOHEADER source_format = @@ -192,6 +198,19 @@ static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned in return S_OK; } +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->IMediaSeeking_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -201,10 +220,164 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { .base.pin_get_media_type = testsource_get_media_type, + .base.pin_query_interface = testsource_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; +static inline struct testfilter *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IMediaSeeking_iface); +} + +static HRESULT WINAPI testseek_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI testseek_AddRef(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI testseek_Release(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +static HRESULT WINAPI testseek_GetCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_CheckCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsFormatSupported(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetTimeFormat(IMediaSeeking *iface, GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsUsingTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *duration) +{ + if (winetest_debug > 1) trace("IMediaSeeking_GetDuration()\n"); + + *duration = 42000000; + return S_OK; +} + +static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target, + const GUID *target_format, LONGLONG source, const GUID *source_format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetPositions(IMediaSeeking *iface, LONGLONG *current, + DWORD current_flags, LONGLONG *stop, DWORD stop_flags) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPositions(IMediaSeeking *iface, LONGLONG *current, LONGLONG *stop) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetAvailable(IMediaSeeking *iface, LONGLONG *earliest, LONGLONG *latest) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetRate(IMediaSeeking *iface, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetRate(IMediaSeeking *iface, double *rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPreroll(IMediaSeeking *iface, LONGLONG *preroll) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMediaSeekingVtbl testseek_vtbl = +{ + testseek_QueryInterface, + testseek_AddRef, + testseek_Release, + testseek_GetCapabilities, + testseek_CheckCapabilities, + testseek_IsFormatSupported, + testseek_QueryPreferredFormat, + testseek_GetTimeFormat, + testseek_IsUsingTimeFormat, + testseek_SetTimeFormat, + testseek_GetDuration, + testseek_GetStopPosition, + testseek_GetCurrentPosition, + testseek_ConvertTimeFormat, + testseek_SetPositions, + testseek_GetPositions, + testseek_GetAvailable, + testseek_SetRate, + testseek_GetRate, + testseek_GetPreroll +}; + static void testfilter_init(struct testfilter *filter) { static const GUID clsid = {0xabacab}; @@ -212,6 +385,7 @@ static void testfilter_init(struct testfilter *filter) memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); + filter->IMediaSeeking_iface.lpVtbl = &testseek_vtbl; } static WCHAR test_avi_filename[MAX_PATH]; @@ -571,6 +745,7 @@ static void test_put_filter(void) IMediaDet *detector; LONG index, count; AM_MEDIA_TYPE mt; + double duration; IUnknown *unk; BSTR filename; HRESULT hr; @@ -586,6 +761,12 @@ static void test_put_filter(void) hr = IMediaDet_get_Filter(detector, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IMediaDet_get_StreamLength(detector, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IMediaDet_get_StreamLength(detector, &duration); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + testfilter_init(&testfilter); hr = IMediaDet_put_Filter(detector, &testfilter.filter.IUnknown_inner); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -639,6 +820,10 @@ static void test_put_filter(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!filename, "Got filename %s.\n", debugstr_w(filename)); + hr = IMediaDet_get_StreamLength(detector, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 4.2, "Got duration %.16e.\n", duration); + ref = IMediaDet_Release(detector); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(&testfilter2.filter.IBaseFilter_iface);

1 0

Alexandre Julliard : ntdll: Avoid using wine_get_user_name() from libwine.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 9122bc1096f3231c5f6b8ffc0d7ad3e700f18af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9122bc1096f3231c5f6b8ffc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:34:45 2020 +0200 ntdll: Avoid using wine_get_user_name() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index efb5270a2c..ff0c8fbe90 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -27,6 +27,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -386,15 +389,27 @@ static void set_wow64_environment( WCHAR **env ) UNICODE_STRING valW = { 0, sizeof(buf), buf }; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - const char *p, *name; + const char *p; + const char *home = getenv( "HOME" ); + const char *name = getenv( "USER" ); WCHAR *val; HANDLE hkey; DWORD i; + if (!home || !name) + { + struct passwd *pwd = getpwuid( getuid() ); + if (pwd) + { + if (!home) home = pwd->pw_dir; + if (!name) name = pwd->pw_name; + } + } + /* set the Wine paths */ set_wine_path_variable( env, winedatadirW, wine_get_data_dir() ); - set_wine_path_variable( env, winehomedirW, getenv("HOME") ); + set_wine_path_variable( env, winehomedirW, home ); set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); set_wine_path_variable( env, wineconfigdirW, config_dir ); for (i = 0; (p = wine_dll_enum_load_path( i )); i++) @@ -407,7 +422,7 @@ static void set_wow64_environment( WCHAR **env ) /* set user name */ - name = wine_get_user_name(); + if (!name) name = "wine"; if ((p = strrchr( name, '/' ))) name = p + 1; if ((p = strrchr( name, '\\' ))) name = p + 1; ntdll_umbstowcs( name, strlen(name) + 1, buf, ARRAY_SIZE(buf) );

1 0

Alexandre Julliard : ntdll: Avoid using wine_get_build/data_dir() from libwine.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 3e0c90e4c700d79124c6a7a14050799baa531879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0c90e4c700d79124c6a7a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:35:19 2020 +0200 ntdll: Avoid using wine_get_build/data_dir() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 7 +++++ dlls/ntdll/env.c | 4 +-- dlls/ntdll/loader.c | 2 +- dlls/ntdll/locale.c | 3 --- dlls/ntdll/ntdll_misc.h | 3 +++ dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/thread.c | 1 + 8 files changed, 83 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index a67809a6c2..7971ef98cf 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -56,3 +56,10 @@ C_SRCS = \ wcstring.c RC_SRCS = version.rc + +server_EXTRADEFS = \ + -DBINDIR=\"${bindir}\" \ + -DDLLDIR=\"${dlldir}\" \ + -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ + -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" \ + -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index ff0c8fbe90..eabebbcc28 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -408,9 +408,9 @@ static void set_wow64_environment( WCHAR **env ) /* set the Wine paths */ - set_wine_path_variable( env, winedatadirW, wine_get_data_dir() ); + set_wine_path_variable( env, winedatadirW, data_dir ); set_wine_path_variable( env, winehomedirW, home ); - set_wine_path_variable( env, winebuilddirW, wine_get_build_dir() ); + set_wine_path_variable( env, winebuilddirW, build_dir ); set_wine_path_variable( env, wineconfigdirW, config_dir ); for (i = 0; (p = wine_dll_enum_load_path( i )); i++) { diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 38c893e3eb..4d69e33b09 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2715,7 +2715,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, void **module, pe_image_info_t *image_info, struct stat *st, char **so_name ) { - const char *path, *build_dir = wine_get_build_dir(); + const char *path; unsigned int i, pos, len, namelen, maxlen = 0; char *ptr, *file; NTSTATUS status = STATUS_DLL_NOT_FOUND; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index a28f5d0f58..0d0c1194d2 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -39,7 +39,6 @@ #include "winbase.h" #include "winnls.h" #include "ntdll_misc.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nls); @@ -758,8 +757,6 @@ static const struct { const char *name; UINT cp; } charset_names[] = static void load_unix_cptable( unsigned int cp ) { - const char *build_dir = wine_get_build_dir(); - const char *data_dir = wine_get_data_dir(); const char *dir = build_dir ? build_dir : data_dir; struct stat st; char *name; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 11ff0d7bb3..fc12bf47ef 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -96,6 +96,7 @@ extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_unix_codepage(void) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; +extern void init_paths(void) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; @@ -104,6 +105,8 @@ extern char **__wine_main_argv; extern WCHAR **__wine_main_wargv; /* server support */ +extern const char *build_dir DECLSPEC_HIDDEN; +extern const char *data_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 28aa671f47..d2a3421ac5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1008,7 +1008,7 @@ static const char *get_alternate_loader( char **ret_env ) *ret_env = NULL; - if (wine_get_build_dir()) loader = is_win64 ? "loader/wine" : "loader/wine64"; + if (build_dir) loader = is_win64 ? "loader/wine" : "loader/wine64"; if (loader_env) { diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index d15ece3f4e..429a41c397 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -113,8 +113,11 @@ static const enum cpu_type client_cpu = CPU_ARM64; #error Unsupported CPU #endif +const char *build_dir = NULL; +const char *data_dir = NULL; const char *config_dir = NULL; static const char *server_dir; +static const char *bin_dir; unsigned int server_cpus = 0; BOOL is_wow64 = FALSE; @@ -177,6 +180,35 @@ static void fatal_perror( const char *err, ... ) exit(1); } +/* canonicalize path and return its directory name */ +static char *realpath_dirname( const char *name ) +{ + char *p, *fullpath = realpath( name, NULL ); + + if (fullpath) + { + p = strrchr( fullpath, '/' ); + if (p == fullpath) p++; + if (p) *p = 0; + } + return fullpath; +} + +/* if string ends with tail, remove it */ +static char *remove_tail( const char *str, const char *tail ) +{ + size_t len = strlen( str ); + size_t tail_len = strlen( tail ); + char *ret; + + if (len < tail_len) return NULL; + if (strcmp( str + len - tail_len, tail )) return NULL; + ret = malloc( len - tail_len + 1 ); + memcpy( ret, str, len - tail_len ); + ret[len - tail_len] = 0; + return ret; +} + /* build a path from the specified dir and name */ static char *build_path( const char *dir, const char *name ) { @@ -1279,6 +1311,42 @@ static const char *init_config_dir(void) } +/*********************************************************************** + * init_paths + */ +void init_paths(void) +{ + const char *dll_dir = NULL; + +#ifdef HAVE_DLADDR + Dl_info info; + + if (dladdr( init_paths, &info ) && info.dli_fname[0] == '/') + dll_dir = realpath_dirname( info.dli_fname ); +#endif + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + bin_dir = realpath_dirname( "/proc/self/exe" ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + bin_dir = realpath_dirname( "/proc/curproc/file" ); +#else + bin_dir = realpath_dirname( __wine_main_argv[0] ); +#endif + + if (dll_dir) build_dir = remove_tail( dll_dir, "/dlls/ntdll" ); + else if (bin_dir) build_dir = remove_tail( bin_dir, "/loader" ); + + if (!build_dir) + { + if (!bin_dir) bin_dir = dll_dir ? build_path( dll_dir, DLL_TO_BINDIR ) : BINDIR; + else if (!dll_dir) dll_dir = build_path( bin_dir, BIN_TO_DLLDIR ); + data_dir = build_path( bin_dir, BIN_TO_DATADIR ); + } + + config_dir = init_config_dir(); +} + + /*********************************************************************** * setup_config_dir * @@ -1524,8 +1592,6 @@ void server_init_process(void) obj_handle_t version; const char *env_socket = getenv( "WINESERVERSOCKET" ); - config_dir = init_config_dir(); - server_pid = -1; if (env_socket) { diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index e27b3a0c6d..73b5c9ebca 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -299,6 +299,7 @@ TEB *thread_init(void) signal_init_thread( teb ); virtual_init_threading(); debug_init(); + init_paths(); set_process_name( __wine_main_argc, __wine_main_argv ); /* initialize time values in user_shared_data */

1 0

Alexandre Julliard : ntdll: Avoid using wine_dll_enum_load_path() from libwine.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: ba1495f7c2c3cff3db9ce99600bfc8ddfa365387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1495f7c2c3cff3db9ce996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:35:39 2020 +0200 ntdll: Avoid using wine_dll_enum_load_path() from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 5 ++--- dlls/ntdll/loader.c | 8 +++----- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/server.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index eabebbcc28..71ae48681d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -38,7 +38,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" -#include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "winnt.h" @@ -412,10 +411,10 @@ static void set_wow64_environment( WCHAR **env ) set_wine_path_variable( env, winehomedirW, home ); set_wine_path_variable( env, winebuilddirW, build_dir ); set_wine_path_variable( env, wineconfigdirW, config_dir ); - for (i = 0; (p = wine_dll_enum_load_path( i )); i++) + for (i = 0; dll_paths[i]; i++) { NTDLL_swprintf( buf, winedlldirW, i ); - set_wine_path_variable( env, buf, p ); + set_wine_path_variable( env, buf, dll_paths[i] ); } NTDLL_swprintf( buf, winedlldirW, i ); set_wine_path_variable( env, buf, NULL ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4d69e33b09..5ae6b11e00 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2715,7 +2715,6 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, void **module, pe_image_info_t *image_info, struct stat *st, char **so_name ) { - const char *path; unsigned int i, pos, len, namelen, maxlen = 0; char *ptr, *file; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -2723,8 +2722,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, len = wcslen( name ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) maxlen = max( maxlen, strlen(path)+1 ); - maxlen += len + sizeof(".so"); + maxlen = max( maxlen, dll_path_maxlen ) + len + sizeof(".so"); if (!(file = RtlAllocateHeap( GetProcessHeap(), 0, maxlen ))) return STATUS_NO_MEMORY; @@ -2763,10 +2761,10 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, if (status != STATUS_DLL_NOT_FOUND) goto done; } - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + for (i = 0; dll_paths[i]; i++) { file[pos + len + 1] = 0; - ptr = prepend( file + pos, path, strlen(path) ); + ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); status = open_builtin_file( ptr, pwm, module, image_info, st, so_name ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index fc12bf47ef..2e26d189a1 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -108,6 +108,8 @@ extern WCHAR **__wine_main_wargv; extern const char *build_dir DECLSPEC_HIDDEN; extern const char *data_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; +extern const char **dll_paths DECLSPEC_HIDDEN; +extern size_t dll_path_maxlen DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 429a41c397..bc25e242a7 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -116,6 +116,8 @@ static const enum cpu_type client_cpu = CPU_ARM64; const char *build_dir = NULL; const char *data_dir = NULL; const char *config_dir = NULL; +const char **dll_paths = NULL; +size_t dll_path_maxlen = 0; static const char *server_dir; static const char *bin_dir; @@ -1311,6 +1313,36 @@ static const char *init_config_dir(void) } +/*********************************************************************** + * build_dll_path + */ +static void build_dll_path( const char *dll_dir ) +{ + const char *default_dlldir = DLLDIR; + char *p, *path = getenv( "WINEDLLPATH" ); + int i, count = 0; + + if (path) for (p = path, count = 1; *p; p++) if (*p == ':') count++; + + dll_paths = malloc( (count + 2) * sizeof(*dll_paths) ); + count = 0; + + if (!build_dir && dll_dir) dll_paths[count++] = dll_dir; + + if (path) + { + path = strdup(path); + for (p = strtok( path, ":" ); p; p = strtok( NULL, ":" )) dll_paths[count++] = strdup( p ); + free( path ); + } + + if (!build_dir && !dll_dir) dll_paths[count++] = default_dlldir; + + for (i = 0; i < count; i++) dll_path_maxlen = max( dll_path_maxlen, strlen(dll_paths[i]) ); + dll_paths[count] = NULL; +} + + /*********************************************************************** * init_paths */ @@ -1343,6 +1375,7 @@ void init_paths(void) data_dir = build_path( bin_dir, BIN_TO_DATADIR ); } + build_dll_path( dll_dir ); config_dir = init_config_dir(); }

1 0

Alexandre Julliard : libwine: Make the various directory functions obsolete.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 98682cfd01aca9be2755e4279db87d54e3642f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98682cfd01aca9be2755e427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 12:36:15 2020 +0200 libwine: Make the various directory functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/library.h | 6 -- libs/wine/config.c | 249 ++++++++++++++++++++++++++----------------------- libs/wine/loader.c | 11 ++- libs/wine/wine.map | 12 +-- 4 files changed, 142 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98682cfd01aca9be2755…

1 0