May 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : configure: Check the positive form of the warning options.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: d2ede450905b41b22d4282c90c25013416c230ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ede450905b41b22d4282c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 13:37:15 2018 +0100 configure: Check the positive form of the warning options. Checking the -Wno- form doesn't fail and causes warnings on gcc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8cf375de353dc16d834f6447b2765b2d9c2d9ddb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 36 ++++++++++++++++++------------------ configure.ac | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure b/configure index d80dc55..3cc342b 100755 --- a/configure +++ b/configure @@ -14869,54 +14869,54 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-packed-not-aligned" >&5 -$as_echo_n "checking whether the compiler supports -Wno-packed-not-aligned... " >&6; } -if ${ac_cv_cflags__Wno_packed_not_aligned+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpacked-not-aligned" >&5 +$as_echo_n "checking whether the compiler supports -Wpacked-not-aligned... " >&6; } +if ${ac_cv_cflags__Wpacked_not_aligned+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-packed-not-aligned" +CFLAGS="$CFLAGS -Wpacked-not-aligned" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_packed_not_aligned=yes + ac_cv_cflags__Wpacked_not_aligned=yes else - ac_cv_cflags__Wno_packed_not_aligned=no + ac_cv_cflags__Wpacked_not_aligned=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_packed_not_aligned" >&5 -$as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } -if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpacked_not_aligned" >&5 +$as_echo "$ac_cv_cflags__Wpacked_not_aligned" >&6; } +if test "x$ac_cv_cflags__Wpacked_not_aligned" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-pragma-pack" >&5 -$as_echo_n "checking whether the compiler supports -Wno-pragma-pack... " >&6; } -if ${ac_cv_cflags__Wno_pragma_pack+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpragma-pack" >&5 +$as_echo_n "checking whether the compiler supports -Wpragma-pack... " >&6; } +if ${ac_cv_cflags__Wpragma_pack+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-pragma-pack" +CFLAGS="$CFLAGS -Wpragma-pack" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_pragma_pack=yes + ac_cv_cflags__Wpragma_pack=yes else - ac_cv_cflags__Wno_pragma_pack=no + ac_cv_cflags__Wpragma_pack=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_pragma_pack" >&5 -$as_echo "$ac_cv_cflags__Wno_pragma_pack" >&6; } -if test "x$ac_cv_cflags__Wno_pragma_pack" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpragma_pack" >&5 +$as_echo "$ac_cv_cflags__Wpragma_pack" >&6; } +if test "x$ac_cv_cflags__Wpragma_pack" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 diff --git a/configure.ac b/configure.ac index 5b3a5c9..ec2e16f 100644 --- a/configure.ac +++ b/configure.ac @@ -1841,8 +1841,8 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) - WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) - WINE_TRY_CFLAGS([-Wno-pragma-pack]) + WINE_TRY_CFLAGS([-Wpacked-not-aligned],[EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned"]) + WINE_TRY_CFLAGS([-Wpragma-pack],[EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack"]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Zebediah Figura : ieframe: Clean up InternetExplorerManager server process.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 134993c0262712b64ac01febd00cdd36de70f217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=134993c0262712b64ac01feb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 14 12:10:07 2018 -0500 ieframe: Clean up InternetExplorerManager server process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b5b3146e4f701fe6273003fae609bec03d7d10e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/iexplore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 23d61f9..aac1436 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -887,7 +887,10 @@ static ULONG WINAPI InternetExplorerManager_Release(IInternetExplorerManager *if TRACE("(%p) decreasing refcount to %u\n", iface, ref); if (ref == 0) + { HeapFree(GetProcessHeap(), 0, This); + released_obj(); + } return ref; } @@ -923,6 +926,7 @@ HRESULT WINAPI InternetExplorerManager_Create(IClassFactory *iface, IUnknown *pO hr = IInternetExplorerManager_QueryInterface(&ret->IInternetExplorerManager_iface, riid, ppv); IInternetExplorerManager_Release(&ret->IInternetExplorerManager_iface); + InterlockedIncrement(&obj_cnt); return hr; }

1 0

Michael Stefaniuc : include: Add generic HeapAlloc() wrappers.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 802ee0be22b8114e3ad5463170e25ca403b3d473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=802ee0be22b8114e3ad54631… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jan 26 20:56:14 2018 +0100 include: Add generic HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d5a897f46f6bb4acc23033571c5135f4d1835344) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/heap.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/include/wine/heap.h b/include/wine/heap.h new file mode 100644 index 0000000..014ef61 --- /dev/null +++ b/include/wine/heap.h @@ -0,0 +1,49 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013, 2018 Michael Stefaniuc + * + * 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 + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <windef.h> + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + if (!mem) + return HeapAlloc(GetProcessHeap(), 0, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* __WINE_WINE_HEAP_H */

1 0

Zebediah Figura : explorer: Pass the full path to ParseDisplayName().
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 460492f2b4ad17615cf16075b1a442677fa766af URL: https://source.winehq.org/git/wine.git/?a=commit;h=460492f2b4ad17615cf16075… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 10:58:24 2018 -0600 explorer: Pass the full path to ParseDisplayName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bd74183b1e9b443e52dedf1842c4721a54f9908e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index ac5bebb..c509336 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -24,6 +24,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "explorer_private.h" #include "resource.h" @@ -631,16 +632,26 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) { IShellFolder* desktop,*folder; LPITEMIDLIST root_pidl; + WCHAR *fullpath = NULL; HRESULT hres; + DWORD size; SHGetDesktopFolder(&desktop); if (!params->root[0]) { return desktop; } + + size = GetFullPathNameW(params->root, 0, fullpath, NULL); + if (!size) + return desktop; + fullpath = heap_alloc(size * sizeof(WCHAR)); + GetFullPathNameW(params->root, size, fullpath, NULL); + hres = IShellFolder_ParseDisplayName(desktop,NULL,NULL, - params->root,NULL, + fullpath,NULL, &root_pidl,NULL); + heap_free(fullpath); if(FAILED(hres)) {

1 0

Alistair Leslie-Hughes : msscript: Implement IScriptControl get/ set AllowUI.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 1e6d94b10d8da6aac6a76e2788ebcea0c162f808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e6d94b10d8da6aac6a76e27… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 12 22:08:09 2018 +0000 msscript: Implement IScriptControl get/set AllowUI. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c21c8525f9e69cfd48906ecc33b909490bd82783) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 17 +++++++++++++---- dlls/msscript.ocx/tests/msscript.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b0ea1e5..78b73c4 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -88,6 +88,7 @@ struct ScriptControl { IOleClientSite *site; SIZEL extent; LONG timeout; + VARIANT_BOOL allow_ui; /* connection points */ ConnectionPoint *cp_list; @@ -825,15 +826,22 @@ static HRESULT WINAPI ScriptControl_put_Timeout(IScriptControl *iface, LONG time static HRESULT WINAPI ScriptControl_get_AllowUI(IScriptControl *iface, VARIANT_BOOL *p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + *p = This->allow_ui; + return S_OK; } static HRESULT WINAPI ScriptControl_put_AllowUI(IScriptControl *iface, VARIANT_BOOL allow_ui) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%x)\n", This, allow_ui); - return E_NOTIMPL; + TRACE("(%p)->(%x)\n", This, allow_ui); + + This->allow_ui = allow_ui; + return S_OK; } static HRESULT WINAPI ScriptControl_get_UseSafeSubset(IScriptControl *iface, VARIANT_BOOL *p) @@ -1891,6 +1899,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->timeout = 10000; script_control->view_sink_flags = 0; script_control->view_sink = NULL; + script_control->allow_ui = VARIANT_TRUE; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 66e2611..576a6b1 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1227,6 +1227,33 @@ static void test_AddObject(void) SysFreeString(objname); } +static void test_AllowUI(void) +{ + IScriptControl *sc; + VARIANT_BOOL allow; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, &allow); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(allow == VARIANT_TRUE, "got %d\n", allow); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, &allow); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(allow == VARIANT_FALSE, "got %d\n", allow); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1253,6 +1280,7 @@ START_TEST(msscript) test_timeout(); test_Reset(); test_AddObject(); + test_AllowUI(); CoUninitialize(); }

1 0

Alexandre Julliard : ntdll: Avoid pushl %esp instruction in RtlUnwind prolog.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: bf25842dd2317c4b89f1585fcb298da6edf6fe5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf25842dd2317c4b89f1585f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 13:47:01 2018 -0600 ntdll: Avoid pushl %esp instruction in RtlUnwind prolog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 342e2cabd21c5a836683ac30e260ec4944eeac6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index dcca0f5..79d6e32 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2762,7 +2762,9 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16, "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "leal -(0x2cc+8)(%esp),%esp\n\t" /* sizeof(CONTEXT) + alignment */ - "pushl %esp\n\t" /* context */ + "pushl %eax\n\t" + "leal 4(%esp),%eax\n\t" /* context */ + "xchgl %eax,(%esp)\n\t" "call " __ASM_NAME("RtlCaptureContext") __ASM_STDCALL(4) "\n\t" "leal 24(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */

1 0

Andrew Wesie : ntdll: Implement NtCreateThreadEx.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 11dbee29209da0c1bedf6cac9a57c278bbbc6042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11dbee29209da0c1bedf6cac… Author: Andrew Wesie <awesie(a)gmail.com> Date: Tue Mar 6 03:10:30 2018 +0000 ntdll: Implement NtCreateThreadEx. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4fda0463237d395fbee5d955e72a7c13ed125416) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 17 +++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 27c10e1..584b5a4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -152,6 +152,7 @@ @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stub NtCreateThread +@ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 66beeb0..88008ad 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -522,6 +522,23 @@ static void start_thread( struct startup_info *info ) /*********************************************************************** + * NtCreateThreadEx (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, LPTHREAD_START_ROUTINE start, void *param, + ULONG flags, ULONG zero_bits, ULONG stack_commit, + ULONG stack_reserve, void *attribute_list ) +{ + FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, + process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + + return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, + NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, + param, handle_ptr, NULL ); +} + + +/*********************************************************************** * RtlCreateUserThread (NTDLL.@) */ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *descr, diff --git a/include/winternl.h b/include/winternl.h index 21353d8..24cf15c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2149,6 +2149,13 @@ typedef struct _SYSTEM_MODULE_INFORMATION SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +#define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 +#define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 +#define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004 +#define THREAD_CREATE_FLAGS_HAS_SECURITY_DESCRIPTOR 0x00000010 +#define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 +#define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 + /*********************************************************************** * Function declarations */

1 0

Zebediah Figura : d3dx9: Add stub for D3DXComputeNormalMap.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 1937cfedb23b9aacf6f77cbda0b809be98c2b3db URL: https://source.winehq.org/git/wine.git/?a=commit;h=1937cfedb23b9aacf6f77cbd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 13 19:17:38 2018 +0100 d3dx9: Add stub for D3DXComputeNormalMap. Based on a patch by Christian Costa. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dbcbed704ca3943109b0d417a97a9814dd5adfb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 9 +++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 29 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1937cfedb23b9aacf6f7…

1 0

Jacek Caban : mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: e93abfb47d39c1f94b4c3dcaaf15a161ac1f86a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93abfb47d39c1f94b4c3dca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 08:56:28 2018 -0600 mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 39766bcded650cec23c0c288dde12fe1e46e43cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index abc0a1c..78a89f7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1684,8 +1684,8 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS)) { - for(i = 0; !event->prevent_default && i < chain_cnt; i++) { - BOOL prevent_default = FALSE; + BOOL prevent_default = event->prevent_default; + for(i = 0; !prevent_default && i < chain_cnt; i++) { vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl || !vtbl->handle_event_default) continue; @@ -1694,7 +1694,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, if(FAILED(hres) || event->stop_propagation) break; if(prevent_default) - IDOMEvent_preventDefault(&event->IDOMEvent_iface); + nsIDOMEvent_PreventDefault(event->nsevent); } }

1 0

Michael Müller : sfc_os: Set an error code in SfcGetNextProtectedFile stub.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: b2e374137b376e90b527eaa465f6625c1b305e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e374137b376e90b527eaa4… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Mar 4 10:51:25 2018 -0600 sfc_os: Set an error code in SfcGetNextProtectedFile stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dd74d5b5084f352b46c0e52e421bf28f34cade1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sfc_os/sfc_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f4515f2..6193dda 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -55,6 +55,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) { FIXME("%p %p\n", handle, data); + + SetLastError(ERROR_NO_MORE_FILES); return FALSE; }

1 0