wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Zebediah Figura : makedep: Check for external libraries instead of include paths when determining whether to allow external includes.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: e454c62f36c7330fbdb59815771966a8d4b90c4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e454c62f36c7330fbdb59815… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 16:43:06 2021 -0600 makedep: Check for external libraries instead of include paths when determining whether to allow external includes. The include path may be empty, e.g. if the relevant headers are to be found directly in the MinGW sysroot. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index ac3e6d969e2..2301ecf191e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1286,6 +1286,22 @@ static struct makefile *find_importlib_module( const char *name ) } +/******************************************************************* + * has_external_import + */ +static int has_external_import( const struct makefile *make ) +{ + unsigned int i; + + for (i = 0; i < make->imports.count; i++) + { + if (!strncmp( make->imports.str[i], "-l", 2 )) + return 1; + } + return 0; +} + + /******************************************************************* * open_include_file */ @@ -1404,7 +1420,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; - if (make->include_paths.count) return NULL; + if (has_external_import( make )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1);

1 0

Zebediah Figura : configure: Fix the makefile path for libxml2 and libxslt.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: eeae3554fd45754dc40e887d3336290a0c6c7ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeae3554fd45754dc40e887d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 16:43:05 2021 -0600 configure: Fix the makefile path for libxml2 and libxslt. They were not correctly being disabled if an external library was specified, which was causing msxml3 to link to the bundled version. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 ++++++++++++-------------- configure.ac | 4 ++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/configure b/configure index a0df1a68c3d..3378aef22f0 100755 --- a/configure +++ b/configure @@ -2764,15 +2764,13 @@ Some influential environment variables: TIFF_PE_LIBS Linker flags for the PE tiff, overriding the bundled version XML2_PE_CFLAGS - C compiler flags for the PE libxml2, overriding the bundled - version + C compiler flags for the PE xml2, overriding the bundled version XML2_PE_LIBS - Linker flags for the PE libxml2, overriding the bundled version + Linker flags for the PE xml2, overriding the bundled version XSLT_PE_CFLAGS - C compiler flags for the PE libxslt, overriding the bundled - version + C compiler flags for the PE xslt, overriding the bundled version XSLT_PE_LIBS - Linker flags for the PE libxslt, overriding the bundled version + Linker flags for the PE xslt, overriding the bundled version ZLIB_PE_CFLAGS C compiler flags for the PE zlib, overriding the bundled version ZLIB_PE_LIBS @@ -12422,31 +12420,31 @@ if ${XML2_PE_CFLAGS:+false} : then : XML2_PE_CFLAGS="-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC" else $as_nop - enable_libxml2=no + enable_xml2=no fi if ${XML2_PE_LIBS:+false} : then : XML2_PE_LIBS=xml2 else $as_nop - enable_libxml2=no + enable_xml2=no fi -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxml2 cflags: $XML2_PE_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxml2 libs: $XML2_PE_LIBS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 cflags: $XML2_PE_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 libs: $XML2_PE_LIBS" >&5 if ${XSLT_PE_CFLAGS:+false} : then : XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else $as_nop - enable_libxslt=no + enable_xslt=no fi if ${XSLT_PE_LIBS:+false} : then : XSLT_PE_LIBS=xslt else $as_nop - enable_libxslt=no + enable_xslt=no fi -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxslt cflags: $XSLT_PE_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxslt libs: $XSLT_PE_LIBS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt cflags: $XSLT_PE_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt libs: $XSLT_PE_LIBS" >&5 if ${ZLIB_PE_CFLAGS:+false} : then : diff --git a/configure.ac b/configure.ac index 1e779508828..aa5396e8d06 100644 --- a/configure.ac +++ b/configure.ac @@ -1041,8 +1041,8 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") -WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") +WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") +WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread ****

1 0

Zebediah Figura : include: Do not include wine/list.h in wine/strmbase.h.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 507853c7b83656c5c52479d4a779f22fbfce86ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=507853c7b83656c5c52479d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:30:36 2021 -0600 include: Do not include wine/list.h in wine/strmbase.h. Nothing in strmbase.h uses list.h anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 1 + dlls/amstream/ddrawstream.c | 1 + include/wine/strmbase.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 91ca0630199..bb86cfdaf69 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5e88e096991..b1b79756ff9 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a9233ef7820..1c8696ed620 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -20,7 +20,6 @@ */ #include "dshow.h" -#include "wine/list.h" HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType);

1 0

Zebediah Figura : strmbase: Remove the no longer used output queue helper.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 883325ccf75098dc499ff4f5274127fb35ad2be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=883325ccf75098dc499ff4f5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:30:35 2021 -0600 strmbase: Remove the no longer used output queue helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 36 ------ libs/strmbase/Makefile.in | 1 - libs/strmbase/outputqueue.c | 275 -------------------------------------------- 3 files changed, 312 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=883325ccf75098dc499f…

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

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

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 : 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 : 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

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

← Newer
1
2
3
4
5
6
7
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021