November 2021 - Wine-commits

Andrew Eikum : quartz: Allow time format change while running.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 0dea2b615e82b51ba3231c493b3c11ee6997446e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dea2b615e82b51ba3231c49… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 29 09:05:10 2021 -0600 quartz: Allow time format change while running. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 3 --- dlls/quartz/tests/filtergraph.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 47b9da9510b..4351eaaffef 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2213,9 +2213,6 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUI TRACE("(%p/%p)->(%s)\n", This, iface, debugstr_guid(pFormat)); - if (This->state != State_Stopped) - return VFW_E_WRONG_STATE; - if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) { FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fef7b972fac..a83bfde0806 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4930,6 +4930,12 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 6000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time)); + hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_NONE); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Jinoh Kang : ntdll/tests: Add tests for NtCompareObjects.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 47c365606fe67b505fa94ad177d353cd1d10e1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c365606fe67b505fa94ad1… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:40:29 2021 +0900 ntdll/tests: Add tests for NtCompareObjects. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 250984ebdda..c32136763a1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -71,6 +71,7 @@ static NTSTATUS (WINAPI *pNtOpenProcessToken)(HANDLE,DWORD,HANDLE*); static NTSTATUS (WINAPI *pNtOpenThreadToken)(HANDLE,DWORD,BOOLEAN,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateToken)(HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,HANDLE*); static NTSTATUS (WINAPI *pNtDuplicateObject)(HANDLE,HANDLE,HANDLE,HANDLE*,ACCESS_MASK,ULONG,ULONG); +static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2446,6 +2447,59 @@ static void test_globalroot(void) pNtClose(h); } +static void test_object_identity(void) +{ + NTSTATUS status; + HANDLE h1, h2; + + if (!pNtCompareObjects) + { + skip("NtCompareObjects is not available.\n"); + return; + } + + status = pNtCompareObjects( GetCurrentProcess(), GetCurrentProcess() ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() to self failed with %08x\n", status ); + + status = pNtCompareObjects( GetCurrentThread(), GetCurrentThread() ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentThread() to self failed with %08x\n", status ); + + status = pNtCompareObjects( GetCurrentProcess(), GetCurrentThread() ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %08x\n", status ); + + h1 = NULL; + status = pNtDuplicateObject( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &h1, 0, 0, DUPLICATE_SAME_ACCESS ); + ok( status == STATUS_SUCCESS, "failed to duplicate current process handle: %08x\n", status); + + status = pNtCompareObjects( GetCurrentProcess(), h1 ); + ok( status == STATUS_SUCCESS, "comparing GetCurrentProcess() with %p failed with %08x\n", h1, status ); + + pNtClose( h1 ); + + h1 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + h2 = NULL; + status = pNtDuplicateObject( GetCurrentProcess(), h1, GetCurrentProcess(), + &h2, 0, 0, DUPLICATE_SAME_ACCESS ); + ok( status == STATUS_SUCCESS, "failed to duplicate handle %p: %08x\n", h1, status); + + status = pNtCompareObjects( h1, h2 ); + ok( status == STATUS_SUCCESS, "comparing %p with %p failed with %08x\n", h1, h2, status ); + + pNtClose( h2 ); + + h2 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + status = pNtCompareObjects( h1, h2 ); + ok( status == STATUS_NOT_SAME_OBJECT, "comparing %p with %p returned %08x\n", h1, h2, status ); + + pNtClose( h2 ); + pNtClose( h1 ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2489,6 +2543,7 @@ START_TEST(om) pNtOpenThreadToken = (void *)GetProcAddress(hntdll, "NtOpenThreadToken"); pNtDuplicateToken = (void *)GetProcAddress(hntdll, "NtDuplicateToken"); pNtDuplicateObject = (void *)GetProcAddress(hntdll, "NtDuplicateObject"); + pNtCompareObjects = (void *)GetProcAddress(hntdll, "NtCompareObjects"); test_case_sensitive(); test_namespace_pipe(); @@ -2505,4 +2560,5 @@ START_TEST(om) test_object_types(); test_get_next_thread(); test_globalroot(); + test_object_identity(); }

1 0

Jinoh Kang : ntdll: Implement NtCompareObjects.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: a4ffa1e7e2fbabc7dc2067c1652bce4ae5276242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ffa1e7e2fbabc7dc2067c1… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:41:25 2021 +0900 ntdll: Implement NtCompareObjects. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/server.c | 19 +++++++++++++++++++ dlls/wow64/sync.c | 12 ++++++++++++ dlls/wow64/syscall.h | 1 + include/wine/server_protocol.h | 19 ++++++++++++++++++- include/winternl.h | 1 + server/handle.c | 17 +++++++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 10 ++++++++++ 11 files changed, 93 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ffa1e7e2fbabc7dc20…

1 0

Jinoh Kang : kernelbase/tests: Add tests for CompareObjectHandles.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: fef007182a3ea5fc3c5f477903cefcf5ee1c9ca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef007182a3ea5fc3c5f4779… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:41:30 2021 +0900 kernelbase/tests: Add tests for CompareObjectHandles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/Makefile.in | 1 + dlls/kernelbase/tests/process.c | 102 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in index fe7ab212e6e..675054c753d 100644 --- a/dlls/kernelbase/tests/Makefile.in +++ b/dlls/kernelbase/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = kernelbase.dll C_SRCS = \ path.c \ + process.c \ sync.c RC_SRCS = \ diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c new file mode 100644 index 00000000000..7aa07df6e4e --- /dev/null +++ b/dlls/kernelbase/tests/process.c @@ -0,0 +1,102 @@ +/* + * Process tests + * + * Copyright 2021 Jinoh Kang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdlib.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winerror.h> +#include <winternl.h> + +#include "wine/test.h" + +static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); + +static void test_CompareObjectHandles(void) +{ + HANDLE h1, h2; + + if (!pCompareObjectHandles) + { + skip("CompareObjectHandles is not available.\n"); + return; + } + + ok( pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() ), + "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() ); + + ok( pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() ), + "comparing GetCurrentThread() to self failed with %u\n", GetLastError() ); + + SetLastError(0); + ok( !pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() ) && + GetLastError() == ERROR_NOT_SAME_OBJECT, + "comparing GetCurrentProcess() to GetCurrentThread() returned %u\n", GetLastError() ); + + h1 = NULL; + ok( DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &h1, 0, FALSE, DUPLICATE_SAME_ACCESS ), + "failed to duplicate current process handle: %u\n", GetLastError() ); + + ok( pCompareObjectHandles( GetCurrentProcess(), h1 ), + "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() ); + + CloseHandle( h1 ); + + h1 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + h2 = NULL; + ok( DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(), + &h2, 0, FALSE, DUPLICATE_SAME_ACCESS ), + "failed to duplicate handle %p: %u\n", h1, GetLastError() ); + + ok( pCompareObjectHandles( h1, h2 ), + "comparing %p with %p failed with %u\n", h1, h2, GetLastError() ); + + CloseHandle( h2 ); + + h2 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + SetLastError(0); + ok( !pCompareObjectHandles( h1, h2 ) && GetLastError() == ERROR_NOT_SAME_OBJECT, + "comparing %p with %p returned %u\n", h1, h2, GetLastError() ); + + CloseHandle( h2 ); + CloseHandle( h1 ); +} + +START_TEST(process) +{ + HMODULE hmod; + + hmod = GetModuleHandleA("kernel32.dll"); + pCompareObjectHandles = (void *)GetProcAddress(hmod, "CompareObjectHandles"); + ok(!pCompareObjectHandles, "expected CompareObjectHandles only in kernelbase.dll\n"); + + hmod = GetModuleHandleA("kernelbase.dll"); + pCompareObjectHandles = (void *)GetProcAddress(hmod, "CompareObjectHandles"); + + test_CompareObjectHandles(); +}

1 0

Jinoh Kang : kernelbase: Implement CompareObjectHandles.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: b89c47826d3ce515013346c9a7ccd2535b881587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89c47826d3ce515013346c9… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:41:36 2021 +0900 kernelbase: Implement CompareObjectHandles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index be40e425783..7bc0c262fdd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -153,7 +153,7 @@ @ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork # @ stub CommitStateAtom @ stdcall CompareFileTime(ptr ptr) -# @ stub CompareObjectHandles +@ stdcall CompareObjectHandles(ptr ptr) @ stdcall CompareStringA(long long str long str long) @ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) @ stdcall CompareStringOrdinal(wstr long wstr long long) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 5973eb7d933..0e4a3eb9b6b 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1771,3 +1771,12 @@ void WINAPI DECLSPEC_HOTPATCH DeleteProcThreadAttributeList( struct _PROC_THREAD { return; } + + +/*********************************************************************** + * CompareObjectHandles (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CompareObjectHandles( HANDLE first, HANDLE second ) +{ + return set_ntstatus( NtCompareObjects( first, second )); +}

1 0

Gabriel Ivăncescu : mshtml: Stringify attribute values in setAttribute using string hints in IE10+.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: f374e9ccc8c9b9933520d006b879495bde4e7bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f374e9ccc8c9b9933520d006… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 29 18:31:20 2021 +0200 mshtml: Stringify attribute values in setAttribute using string hints in IE10+. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlelem.c | 36 +++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 - 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4605fdac0f0..9f56a561e0d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1043,7 +1043,7 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } -static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) +HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) { V_VT(dst) = VT_EMPTY; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d54f729b2e5..3f7c60b0172 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6585,8 +6585,42 @@ static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEve return default_set_current_event(This->node.doc->window, event); } +static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + HRESULT hres; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + if(!(flags & DISPATCH_METHOD) || dp->cArgs < 2 || dp->cNamedArgs) + return S_FALSE; + + switch(V_VT(&dp->rgvarg[dp->cArgs - 2])) { + case VT_EMPTY: + case VT_BSTR: + case VT_NULL: + return S_FALSE; + default: + break; + } + + hres = change_type(&args[0], &dp->rgvarg[dp->cArgs - 2], VT_BSTR, caller); + if(FAILED(hres)) + return hres; + args[1] = dp->rgvarg[dp->cArgs - 1]; + + hres = IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, + lcid, flags, &new_dp, res, ei, caller); + VariantClear(&args[0]); + return hres; +} + void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { + static const dispex_hook_t elem6_ie10_hooks[] = { + {DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, IHTMLElement6_setAttribute_hook}, + {DISPID_UNKNOWN} + }; static const dispex_hook_t elem2_ie11_hooks[] = { {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, @@ -6601,7 +6635,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IElementSelector_tid, NULL); if(mode >= COMPAT_MODE_IE9) { - dispex_info_add_interface(info, IHTMLElement6_tid, NULL); + dispex_info_add_interface(info, IHTMLElement6_tid, mode >= COMPAT_MODE_IE10 ? elem6_ie10_hooks : NULL); dispex_info_add_interface(info, IElementTraversal_tid, NULL); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5cf53bb48c9..6978ed77c85 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -384,6 +384,7 @@ extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTr void init_dispatch(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT change_type(VARIANT*,VARIANT*,VARTYPE,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_attribute(DispatchEx*,DISPID,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 08fcde4ff75..c2fd8bd2774 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1136,7 +1136,6 @@ sync_test("elem_attr", function() { ok(r === (v < 8 ? arr : (v < 9 ? "arrval" : null)), "testattr with custom valueOf = " + r); elem.setAttribute("testattr", arr); r = elem.getAttribute("testattr"); - todo_wine_if(v >= 10). ok(r === (v < 8 ? arr : (v < 10 ? "arrval" : "42")), "testattr after setAttribute with custom valueOf = " + r); ok(elem.testattr === arr, "elem.testattr after setAttribute with custom valueOf = " + elem.testattr); r = elem.removeAttribute("testattr");

1 0

Gerald Pfeifer : configure: Diagnose if NetAPI is not present.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 07c9dd9bdf560f86598aa496a0ffaec6bb8479fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c9dd9bdf560f86598aa496… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 23 21:07:18 2021 +0100 configure: Diagnose if NetAPI is not present. For most other configure options we are warning when some dependency is not present, in particular when it's been explicitly requested. Also do this for Samba NetAPI now. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 +++++++++++ configure.ac | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/configure b/configure index 67bcd371525..a38178fb466 100755 --- a/configure +++ b/configure @@ -17417,6 +17417,17 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi +if test "x$ac_cv_lib_soname_netapi" != xyes +then : + case "x$with_netapi" in + x) as_fn_append wine_notices "|libnetapi not found, Samba NetAPI won't be supported." ;; + xno) ;; + *) as_fn_error $? "libnetapi not found, Samba NetAPI won't be supported. +This is an error since --with-netapi was requested." "$LINENO" 5 ;; +esac +enable_netapi=${enable_netapi:-no} +fi + if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \ "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono diff --git a/configure.ac b/configure.ac index b69f738ebca..60d92ec7f03 100644 --- a/configure.ac +++ b/configure.ac @@ -1711,6 +1711,10 @@ then WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,, [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])]) fi +WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" != xyes], + [libnetapi not found, Samba NetAPI won't be supported.], + [enable_netapi]) + dnl **** Check for any sound system **** if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \

1 0

Alexandre Julliard : mountmgr: Move the macOS credentials support to the Unix library.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: e54f6d8f8f1e6a51037c2285cd519b8c92e324a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e54f6d8f8f1e6a51037c2285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 14:50:05 2021 +0100 mountmgr: Move the macOS credentials support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/cred.c | 228 ++++++++++++++++++++++++------------------- dlls/mountmgr.sys/device.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 74 +++++++------- dlls/mountmgr.sys/mountmgr.h | 2 - dlls/mountmgr.sys/unixlib.c | 5 + dlls/mountmgr.sys/unixlib.h | 23 ++++- 6 files changed, 188 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e54f6d8f8f1e6a51037c…

1 0

Alexandre Julliard : mountmgr: Move the macOS device access check to the Unix library.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: fd5acd68b07d749d9e98633d2b1b46e734454135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5acd68b07d749d9e98633d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:10:44 2021 +0100 mountmgr: Move the macOS device access check to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 8 +------- dlls/mountmgr.sys/unixlib.c | 10 ++++++++++ dlls/mountmgr.sys/unixlib.h | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index a657cf19d29..724c618be20 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -915,13 +915,7 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!unix_device) return FALSE; -#ifdef __APPLE__ - if (access( unix_device, R_OK )) - { - WARN("Unable to open %s, not accessible\n", debugstr_a(unix_device)); - return FALSE; - } -#endif + if (MOUNTMGR_CALL( check_device_access, volume->device->unix_device )) return FALSE; if (!(name = wine_get_dos_file_name( unix_device ))) { diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index e45b6696ae6..52a3fce66d6 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -319,6 +319,15 @@ static NTSTATUS match_unixdev( void *args ) return !stat( params->device, &st ) && st.st_rdev == params->unix_dev; } +static NTSTATUS check_device_access( void *args ) +{ +#ifdef __APPLE__ + const char *unix_device = args; + if (access( unix_device, R_OK )) return STATUS_ACCESS_DENIED; +#endif + return STATUS_SUCCESS; +} + static NTSTATUS detect_serial_ports( void *args ) { const struct detect_ports_params *params = args; @@ -434,6 +443,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_volume_dos_devices, read_volume_file, match_unixdev, + check_device_access, detect_serial_ports, detect_parallel_ports, set_shell_folder, diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index 08f7e313236..e7846a764da 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -145,6 +145,7 @@ enum mountmgr_funcs unix_get_volume_dos_devices, unix_read_volume_file, unix_match_unixdev, + unix_check_device_access, unix_detect_serial_ports, unix_detect_parallel_ports, unix_set_shell_folder,

1 0

Alexandre Julliard : mountmgr: Build with msvcrt.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 406309e133ece4ae0d1b64e6808a7e16e6e2a052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=406309e133ece4ae0d1b64e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:12:47 2021 +0100 mountmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/device.c | 68 ++++++++++++++++++++----------------------- dlls/mountmgr.sys/mountmgr.c | 20 +++++-------- 3 files changed, 40 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=406309e133ece4ae0d1b…

1 0