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

Zebediah Figura : quartz: Return void from video_window_init().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 53e842c946ba2461b58cb0db8f3b7ade114f173c URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e842c946ba2461b58cb0db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:49:42 2020 -0500 quartz: Return void from video_window_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 2 +- dlls/quartz/videorenderer.c | 17 +++++++---------- dlls/quartz/vmr9.c | 20 +++++++++----------- dlls/quartz/window.c | 3 +-- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 3274714eea..b0fb91c665 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -111,7 +111,7 @@ struct video_window_ops void video_window_cleanup(struct video_window *window) DECLSPEC_HIDDEN; HRESULT video_window_create_window(struct video_window *window) DECLSPEC_HIDDEN; -HRESULT video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl, +void video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl, struct strmbase_filter *filter, struct strmbase_pin *pin, const struct video_window_ops *ops) DECLSPEC_HIDDEN; void video_window_unregister_class(void) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3888d010e6..54a646fbc0 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -714,27 +714,24 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) strmbase_renderer_init(&object->renderer, outer, &CLSID_VideoRenderer, L"In", &renderer_ops); object->IOverlay_iface.lpVtbl = &overlay_vtbl; - hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, &object->renderer.filter, &object->renderer.sink.pin, &window_ops); - if (FAILED(hr)) - goto fail; - basic_video_init(&object->baseControlVideo, &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr = video_window_create_window(&object->baseControlWindow))) - goto fail; + { + video_window_cleanup(&object->baseControlWindow); + strmbase_renderer_cleanup(&object->renderer); + free(object); + return hr; + } object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Created video renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; - -fail: - strmbase_renderer_cleanup(&object->renderer); - free(object); - return hr; } HRESULT video_renderer_default_create(IUnknown *outer, IUnknown **out) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 82727adb87..389166db3e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2318,13 +2318,17 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; object->IOverlay_iface.lpVtbl = &overlay_vtbl; - hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, &object->renderer.filter, &object->renderer.sink.pin, &window_ops); - if (FAILED(hr)) - goto fail; if (FAILED(hr = video_window_create_window(&object->baseControlWindow))) - goto fail; + { + video_window_cleanup(&object->baseControlWindow); + strmbase_renderer_cleanup(&object->renderer); + FreeLibrary(object->hD3d9); + free(object); + return hr; + } basic_video_init(&object->baseControlVideo, &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); @@ -2333,13 +2337,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; - return hr; - -fail: - strmbase_renderer_cleanup(&object->renderer); - FreeLibrary(object->hD3d9); - free(object); - return hr; + return S_OK; } HRESULT vmr7_create(IUnknown *outer, IUnknown **out) diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 7e8aba8a26..61673cab04 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -662,7 +662,7 @@ void video_window_unregister_class(void) ERR("Failed to unregister class, error %u.\n", GetLastError()); } -HRESULT video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl, +void video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl, struct strmbase_filter *owner, struct strmbase_pin *pin, const struct video_window_ops *ops) { memset(window, 0, sizeof(*window)); @@ -671,7 +671,6 @@ HRESULT video_window_init(struct video_window *window, const IVideoWindowVtbl *v window->AutoShow = OATRUE; window->pFilter = owner; window->pPin = pin; - return S_OK; } void video_window_cleanup(struct video_window *window)

1 0

Zebediah Figura : quartz: Get rid of the "width" and "height" fields of video_window.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 4d7ac46b2724366d8f97d33d9d2ca7016bacb5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d7ac46b2724366d8f97d33d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:49:43 2020 -0500 quartz: Get rid of the "width" and "height" fields of video_window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 - dlls/quartz/window.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index b0fb91c665..9c39b642c4 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -92,7 +92,6 @@ struct video_window IVideoWindow IVideoWindow_iface; HWND hwnd; - LONG width, height; BOOL AutoShow; HWND hwndDrain; HWND hwndOwner; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 61673cab04..b8fbd2694c 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -70,9 +70,6 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM case WM_SIZE: if (window->ops->resize) return window->ops->resize(window, LOWORD(lparam), HIWORD(lparam)); - - window->width = LOWORD(lparam); - window->height = HIWORD(lparam); } return DefWindowProcW(hwnd, message, wparam, lparam); @@ -370,24 +367,27 @@ HRESULT WINAPI BaseControlWindowImpl_get_Left(IVideoWindow *iface, LONG *left) HRESULT WINAPI BaseControlWindowImpl_put_Width(IVideoWindow *iface, LONG width) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, width %d.\n", window, width); - if (!SetWindowPos(window->hwnd, NULL, 0, 0, width, window->height, + GetWindowRect(window->hwnd, &rect); + if (!SetWindowPos(window->hwnd, NULL, 0, 0, width, rect.bottom - rect.top, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; - window->width = width; return S_OK; } HRESULT WINAPI BaseControlWindowImpl_get_Width(IVideoWindow *iface, LONG *width) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, width %p.\n", window, width); - *width = window->width; + GetWindowRect(window->hwnd, &rect); + *width = rect.right - rect.left; return S_OK; } @@ -421,24 +421,27 @@ HRESULT WINAPI BaseControlWindowImpl_get_Top(IVideoWindow *iface, LONG *top) HRESULT WINAPI BaseControlWindowImpl_put_Height(IVideoWindow *iface, LONG height) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, height %d.\n", window, height); - if (!SetWindowPos(window->hwnd, NULL, 0, 0, window->width, + GetWindowRect(window->hwnd, &rect); + if (!SetWindowPos(window->hwnd, NULL, 0, 0, rect.right - rect.left, height, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; - window->height = height; return S_OK; } HRESULT WINAPI BaseControlWindowImpl_get_Height(IVideoWindow *iface, LONG *height) { struct video_window *window = impl_from_IVideoWindow(iface); + RECT rect; TRACE("window %p, height %p.\n", window, height); - *height = window->height; + GetWindowRect(window->hwnd, &rect); + *height = rect.bottom - rect.top; return S_OK; } @@ -555,9 +558,6 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface, if (!SetWindowPos(window->hwnd, NULL, left, top, width, height, SWP_NOACTIVATE | SWP_NOZORDER)) return E_FAIL; - - window->width = width; - window->height = height; return S_OK; } @@ -572,8 +572,8 @@ HRESULT WINAPI BaseControlWindowImpl_GetWindowPosition(IVideoWindow *iface, GetWindowRect(window->hwnd, &rect); *left = rect.left; *top = rect.top; - *width = window->width; - *height = window->height; + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; return S_OK; }

1 0

Zebediah Figura : quartz/filesource: Remove unused callbacks.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: bd80194abde8136d8a4fd39ba6977b22d526d7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd80194abde8136d8a4fd39b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:49:44 2020 -0500 quartz/filesource: Remove unused callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a464352922..3b19d6e7df 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -63,7 +63,6 @@ struct async_reader LPOLESTR pszFileName; AM_MEDIA_TYPE mt; - ALLOCATOR_PROPERTIES allocProps; HANDLE file, port, io_thread; CRITICAL_SECTION sample_cs; BOOL flushing; @@ -550,11 +549,6 @@ static inline struct async_reader *impl_from_strmbase_pin(struct strmbase_pin *i return CONTAINING_RECORD(iface, struct async_reader, source.pin); } -static inline struct async_reader *impl_from_strmbase_source(struct strmbase_source *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, source); -} - static inline struct async_reader *impl_from_IAsyncReader(IAsyncReader *iface) { return CONTAINING_RECORD(iface, struct async_reader, IAsyncReader_iface); @@ -630,32 +624,12 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc return hr; } -static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(struct strmbase_source *iface, - IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) -{ - struct async_reader *This = impl_from_strmbase_source(iface); - ALLOCATOR_PROPERTIES actual; - - if (ppropInputRequest->cbAlign && ppropInputRequest->cbAlign != This->allocProps.cbAlign) - FIXME("Requested Buffer cbAlign mismatch %i,%i\n",This->allocProps.cbAlign, ppropInputRequest->cbAlign); - if (ppropInputRequest->cbPrefix) - FIXME("Requested Buffer cbPrefix mismatch %i,%i\n",This->allocProps.cbPrefix, ppropInputRequest->cbPrefix); - if (ppropInputRequest->cbBuffer) - FIXME("Requested Buffer cbBuffer mismatch %i,%i\n",This->allocProps.cbBuffer, ppropInputRequest->cbBuffer); - if (ppropInputRequest->cBuffers) - FIXME("Requested Buffer cBuffers mismatch %i,%i\n",This->allocProps.cBuffers, ppropInputRequest->cBuffers); - - return IMemAllocator_SetProperties(pAlloc, &This->allocProps, &actual); -} - static const struct strmbase_source_ops source_ops = { .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .base.pin_query_interface = source_query_interface, .pfnAttemptConnection = FileAsyncReaderPin_AttemptConnection, - .pfnDecideBufferSize = FileAsyncReaderPin_DecideBufferSize, - .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; static HRESULT WINAPI FileAsyncReader_QueryInterface(IAsyncReader *iface, REFIID iid, void **out) @@ -720,7 +694,6 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader *iface, for (i = 0; i < filter->max_requests; ++i) filter->requests[i].ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - filter->allocProps = *props; *ret_allocator = allocator; return S_OK;

1 0

Zebediah Figura : strmbase: Check the peer direction in source_Connect().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 0c1d9312434bb47a4e8135926a79cf3a0b2f44f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c1d9312434bb47a4e813592… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:49:45 2020 -0500 strmbase: Check the peer direction in source_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 2 +- dlls/strmbase/pin.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 45fd98b7f9..56eaf77513 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1433,7 +1433,7 @@ static void test_AviMux(char *arg) pin, &source_filter.IPin_iface); hr = IPin_Connect(avimux_out, &source_filter.IPin_iface, NULL); - todo_wine ok(hr == VFW_E_INVALID_DIRECTION, "Connect returned %x\n", hr); + ok(hr == VFW_E_INVALID_DIRECTION, "Connect returned %x\n", hr); hr = IBaseFilter_JoinFilterGraph(avimux, (IFilterGraph*)&GraphBuilder, NULL); ok(hr == S_OK, "JoinFilterGraph returned %x\n", hr); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index b2a0c39110..4676c9d82b 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -447,6 +447,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP struct strmbase_source *pin = impl_source_from_IPin(iface); AM_MEDIA_TYPE candidate, *candidate_ptr; IEnumMediaTypes *enummt; + PIN_DIRECTION dir; unsigned int i; ULONG count; HRESULT hr; @@ -458,10 +459,12 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP if (!peer) return E_POINTER; - /* If we try to connect to ourselves, we will definitely deadlock. - * There are other cases where we could deadlock too, but this - * catches the obvious case */ - assert(peer != iface); + IPin_QueryDirection(peer, &dir); + if (dir != PINDIR_INPUT) + { + WARN("Attempt to connect to another source pin, returning VFW_E_INVALID_DIRECTION.\n"); + return VFW_E_INVALID_DIRECTION; + } EnterCriticalSection(&pin->pin.filter->csFilter);

1 0

Zebediah Figura : winegstreamer: Check the format GUID, size, and pointer in amt_to_gst_caps().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: ac531be92eecfde35fc48fb50e9070d21d6578c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac531be92eecfde35fc48fb5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:43:35 2020 -0500 winegstreamer: Check the format GUID, size, and pointer in amt_to_gst_caps(). Some application filters enumerate types without a format block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2d9efe8ead..2186192b59 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -387,6 +387,10 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) unsigned int i; GstCaps *caps; + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + || mt->cbFormat < sizeof(VIDEOINFOHEADER) || !mt->pbFormat) + return NULL; + for (i = 0; i < ARRAY_SIZE(format_map); ++i) { if (IsEqualGUID(&mt->subtype, format_map[i].subtype)) @@ -425,6 +429,10 @@ static GstCaps *amt_to_gst_caps_audio(const AM_MEDIA_TYPE *mt) GstAudioFormat format = GST_AUDIO_FORMAT_UNKNOWN; GstAudioInfo info; + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) + || mt->cbFormat < sizeof(WAVEFORMATEX) || !mt->pbFormat) + return NULL; + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_PCM)) format = gst_audio_format_build_integer(wfx->wBitsPerSample != 8, G_LITTLE_ENDIAN, wfx->wBitsPerSample, wfx->wBitsPerSample);

1 0

Alexandre Julliard : configure: Add -ldl to default libs if necessary.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 149e03c72ae112a1091bca9012e2a59de156e949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=149e03c72ae112a1091bca90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:43:55 2020 +0200 configure: Add -ldl to default libs if necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 50 +++++++++++++++++++++++++++++--------------------- configure.ac | 6 +----- include/config.h.in | 3 --- include/wine/port.h | 5 +++++ libs/wine/Makefile.in | 2 +- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 018fb1bfd7..116825768c 100755 --- a/configure +++ b/configure @@ -629,7 +629,6 @@ LDAP_LIBS LDAP_CFLAGS RT_LIBS POLL_LIBS -DL_LIBS TOOLSEXT MSVCRTFLAGS EXCESS_PRECISION_CFLAGS @@ -17789,7 +17788,6 @@ for ac_func in \ __res_get_state \ __res_getservers \ _spawnvp \ - dlopen \ epoll_create \ ffs \ finitef \ @@ -17847,15 +17845,12 @@ done CFLAGS="$ac_save_CFLAGS" -if test "$ac_cv_func_dlopen" = no -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if ${ac_cv_search_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17874,24 +17869,38 @@ return dlopen (); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no +for ac_lib in '' dl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dlopen=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if ${ac_cv_search_dlopen+:} false; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h - DL_LIBS="-ldl" +done +if ${ac_cv_search_dlopen+:} false; then : +else + ac_cv_search_dlopen=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $DL_LIBS" for ac_func in dladdr @@ -20006,7 +20015,6 @@ NETAPI_LIBS = $NETAPI_LIBS VKD3D_CFLAGS = $VKD3D_CFLAGS VKD3D_LIBS = $VKD3D_LIBS EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS -DL_LIBS = $DL_LIBS POLL_LIBS = $POLL_LIBS RT_LIBS = $RT_LIBS LDAP_CFLAGS = $LDAP_CFLAGS diff --git a/configure.ac b/configure.ac index 9bae6a5dda..76d5d5ed72 100644 --- a/configure.ac +++ b/configure.ac @@ -2132,7 +2132,6 @@ AC_CHECK_FUNCS(\ __res_get_state \ __res_getservers \ _spawnvp \ - dlopen \ epoll_create \ ffs \ finitef \ @@ -2180,10 +2179,7 @@ AC_CHECK_FUNCS(\ CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl -if test "$ac_cv_func_dlopen" = no -then - AC_CHECK_LIB(dl,dlopen,[AC_DEFINE(HAVE_DLOPEN,1) AC_SUBST(DL_LIBS,"-ldl")]) -fi +AC_SEARCH_LIBS(dlopen, dl) WINE_CHECK_LIB_FUNCS(dladdr,[$DL_LIBS]) dnl Check for -lpoll for Mac OS X/Darwin diff --git a/include/config.h.in b/include/config.h.in index b6da8d8684..db9c7a1e7d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -110,9 +110,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `dlopen' function. */ -#undef HAVE_DLOPEN - /* Define to 1 if you have the <EGL/egl.h> header file. */ #undef HAVE_EGL_EGL_H diff --git a/include/wine/port.h b/include/wine/port.h index feb0558655..8514a4a43b 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -55,6 +55,11 @@ #define mkdir(path,mode) mkdir(path) +static inline void *dlopen(const char *name, int flags) { return NULL; } +static inline void *dlsym(void *handle, const char *name) { return NULL; } +static inline int dlclose(void *handle) { return 0; } +static inline const char *dlerror(void) { return "No dlopen support on Windows"; } + #ifdef _MSC_VER #define ftruncate chsize diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 66ecf13c67..fe2a2b45e5 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,4 @@ -EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) +EXTRALIBS = $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) C_SRCS = \ c_037.c \

1 0

Alexandre Julliard : bcrypt: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 3caa3331279be2c99747cde8e369011378b38e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3caa3331279be2c99747cde8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:44:27 2020 +0200 bcrypt: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 1 - dlls/bcrypt/gnutls.c | 31 +++++++++++++++---------------- dlls/bcrypt/macos.c | 1 - 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c2939ea815..5f0b9f1ca8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -37,7 +37,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 1d78b9f4d1..2b11566566 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -39,7 +39,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" #ifdef HAVE_GNUTLS_CIPHER_INIT @@ -180,14 +179,14 @@ BOOL gnutls_initialize(void) { int ret; - if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) + if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW ))) { ERR_(winediag)( "failed to load libgnutls, no support for encryption\n" ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ + if (!(p##f = dlsym( libgnutls_handle, #f ))) \ { \ ERR( "failed to load %s\n", #f ); \ goto fail; \ @@ -209,12 +208,12 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_pubkey_init); #undef LOAD_FUNCPTR - if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) + if (!(pgnutls_cipher_tag = dlsym( libgnutls_handle, "gnutls_cipher_tag" ))) { WARN("gnutls_cipher_tag not found\n"); pgnutls_cipher_tag = compat_gnutls_cipher_tag; } - if (!(pgnutls_cipher_add_auth = wine_dlsym( libgnutls_handle, "gnutls_cipher_add_auth", NULL, 0 ))) + if (!(pgnutls_cipher_add_auth = dlsym( libgnutls_handle, "gnutls_cipher_add_auth" ))) { WARN("gnutls_cipher_add_auth not found\n"); pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth; @@ -225,47 +224,47 @@ BOOL gnutls_initialize(void) pgnutls_perror( ret ); goto fail; } - if (!(pgnutls_pubkey_import_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw", NULL, 0 ))) + if (!(pgnutls_pubkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw" ))) { WARN("gnutls_pubkey_import_ecc_raw not found\n"); pgnutls_pubkey_import_ecc_raw = compat_gnutls_pubkey_import_ecc_raw; } - if (!(pgnutls_privkey_export_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_export_rsa_raw", NULL, 0 ))) + if (!(pgnutls_privkey_export_rsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_rsa_raw" ))) { WARN("gnutls_privkey_export_rsa_raw not found\n"); pgnutls_privkey_export_rsa_raw = compat_gnutls_privkey_export_rsa_raw; } - if (!(pgnutls_privkey_export_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_export_ecc_raw", NULL, 0 ))) + if (!(pgnutls_privkey_export_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_ecc_raw" ))) { WARN("gnutls_privkey_export_ecc_raw not found\n"); pgnutls_privkey_export_ecc_raw = compat_gnutls_privkey_export_ecc_raw; } - if (!(pgnutls_privkey_import_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_import_ecc_raw", NULL, 0 ))) + if (!(pgnutls_privkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_import_ecc_raw" ))) { WARN("gnutls_privkey_import_ecc_raw not found\n"); pgnutls_privkey_import_ecc_raw = compat_gnutls_privkey_import_ecc_raw; } - if (!(pgnutls_pk_to_sign = wine_dlsym( libgnutls_handle, "gnutls_pk_to_sign", NULL, 0 ))) + if (!(pgnutls_pk_to_sign = dlsym( libgnutls_handle, "gnutls_pk_to_sign" ))) { WARN("gnutls_pk_to_sign not found\n"); pgnutls_pk_to_sign = compat_gnutls_pk_to_sign; } - if (!(pgnutls_pubkey_verify_hash2 = wine_dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2", NULL, 0 ))) + if (!(pgnutls_pubkey_verify_hash2 = dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2" ))) { WARN("gnutls_pubkey_verify_hash2 not found\n"); pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; } - if (!(pgnutls_pubkey_import_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw", NULL, 0 ))) + if (!(pgnutls_pubkey_import_rsa_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw" ))) { WARN("gnutls_pubkey_import_rsa_raw not found\n"); pgnutls_pubkey_import_rsa_raw = compat_gnutls_pubkey_import_rsa_raw; } - if (!(pgnutls_privkey_generate = wine_dlsym( libgnutls_handle, "gnutls_privkey_generate", NULL, 0 ))) + if (!(pgnutls_privkey_generate = dlsym( libgnutls_handle, "gnutls_privkey_generate" ))) { 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 ))) + if (!(pgnutls_decode_rs_value = dlsym( libgnutls_handle, "gnutls_decode_rs_value" ))) { WARN("gnutls_decode_rs_value not found\n"); pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; @@ -280,7 +279,7 @@ BOOL gnutls_initialize(void) return TRUE; fail: - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; return FALSE; } @@ -288,7 +287,7 @@ fail: void gnutls_uninitialize(void) { pgnutls_global_deinit(); - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; } diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 9ff9772c15..f635ba4bc8 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -38,7 +38,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" #if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 && !defined(HAVE_GNUTLS_CIPHER_INIT)

1 0

Alexandre Julliard : capi2032: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: e39b3a2faff8fd9a3aa4807c7035be310e215a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39b3a2faff8fd9a3aa4807c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:44:41 2020 +0200 capi2032: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/capi2032/cap20wxx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c index a6f3e3fc95..6f22a020f3 100644 --- a/dlls/capi2032/cap20wxx.c +++ b/dlls/capi2032/cap20wxx.c @@ -37,7 +37,6 @@ #ifdef HAVE_CAPI20_H # include <capi20.h> #endif -#include "wine/library.h" #include "wine/debug.h" #include "cap20wxx.h" @@ -61,12 +60,12 @@ static void load_functions(void) { if (pcapi20_register) /* loaded already */ return; - capi_handle = wine_dlopen(SONAME_LIBCAPI20, RTLD_NOW, NULL, 0); + capi_handle = dlopen(SONAME_LIBCAPI20, RTLD_NOW); if(!capi_handle) { FIXME("Wine cannot find the library %s, capi2032.dll not working.\n", SONAME_LIBCAPI20); return; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(capi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return;} +#define LOAD_FUNCPTR(f) if((p##f = dlsym(capi_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return;} LOAD_FUNCPTR(capi20_register); LOAD_FUNCPTR(capi20_release); LOAD_FUNCPTR(capi20_put_message);

1 0

Alexandre Julliard : crypt32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 12157fac9f4e33a8cd14bf7c728635eba04ed042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12157fac9f4e33a8cd14bf7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:44:59 2020 +0200 crypt32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index a515585586..711cf76de2 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -31,7 +31,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -72,14 +71,14 @@ BOOL gnutls_initialize(void) { int ret; - if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) + if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW ))) { ERR_(winediag)( "failed to load libgnutls, no support for pfx import/export\n" ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ + if (!(p##f = dlsym( libgnutls_handle, #f ))) \ { \ ERR( "failed to load %s\n", #f ); \ goto fail; \ @@ -114,7 +113,7 @@ BOOL gnutls_initialize(void) return TRUE; fail: - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; return FALSE; } @@ -122,7 +121,7 @@ fail: void gnutls_uninitialize(void) { pgnutls_global_deinit(); - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; }

1 0

Alexandre Julliard : ctapi32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 3b9ddb66add8a361c9288817d508c29b5ccd1f10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9ddb66add8a361c9288817… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:45:10 2020 +0200 ctapi32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/ctapi32.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index a2dc5bca87..10adacb65d 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -21,7 +21,6 @@ #include "config.h" #include "wine/port.h" #include <string.h> -#include "wine/library.h" #include "wine/debug.h" #include "windef.h" #include "winreg.h" @@ -72,7 +71,7 @@ static BOOL load_functions(void) { } TRACE("Loading library '%s'\n", soname); - ctapi_handle = wine_dlopen(soname, RTLD_NOW, NULL, 0); + ctapi_handle = dlopen(soname, RTLD_NOW); if (ctapi_handle) { TRACE("Successfully loaded '%s'\n", soname); } @@ -83,7 +82,7 @@ static BOOL load_functions(void) { return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ctapi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;} +#define LOAD_FUNCPTR(f) if((p##f = dlsym(ctapi_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;} LOAD_FUNCPTR(CT_init); LOAD_FUNCPTR(CT_data); LOAD_FUNCPTR(CT_close); @@ -134,7 +133,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: if (lpvReserved) break; - if (ctapi_handle) wine_dlclose(ctapi_handle, NULL, 0); + if (ctapi_handle) dlclose(ctapi_handle); break; }

1 0