May 2019 - Wine-commits - list.winehq.org

Tim Schumacher : dinput: Check for wheel axes/ buttons when finding joysticks.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 66462cb7dcff05df68edf398e42641b24c940d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66462cb7dcff05df68edf398… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Fri May 31 16:42:00 2019 +0200 dinput: Check for wheel axes/buttons when finding joysticks. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e4f5db8..8d80b34 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -234,10 +234,16 @@ static void find_joydevs(void) /* A true joystick has at least axis X and Y, and at least 1 * button. copied from linux/drivers/input/joydev.c */ - if (!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y) || + if (((!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y)) && + !test_bit(joydev.absbits, ABS_WHEEL) && + !test_bit(joydev.absbits, ABS_GAS) && + !test_bit(joydev.absbits, ABS_BRAKE)) || !(test_bit(joydev.keybits, BTN_TRIGGER) || test_bit(joydev.keybits, BTN_A) || - test_bit(joydev.keybits, BTN_1))) + test_bit(joydev.keybits, BTN_1) || + test_bit(joydev.keybits, BTN_BASE) || + test_bit(joydev.keybits, BTN_GEAR_UP) || + test_bit(joydev.keybits, BTN_GEAR_DOWN))) { close(fd); continue; @@ -259,6 +265,8 @@ static void find_joydevs(void) test_bit(joydev.keybits, BTN_BASE4) || test_bit(joydev.keybits, BTN_BASE5) || test_bit(joydev.keybits, BTN_BASE6) || + test_bit(joydev.keybits, BTN_GEAR_UP) || + test_bit(joydev.keybits, BTN_GEAR_DOWN) || test_bit(joydev.keybits, BTN_DEAD); if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1)))

1 0

Dmitry Timoshkov : include/mshtml.idl: Add more interface declarations.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: aee24566816120b13d3b5087a5fed236cf39a930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aee24566816120b13d3b5087… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 31 17:50:28 2019 +0200 include/mshtml.idl: Add more interface declarations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 32 ++++- include/mshtml.idl | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 356 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aee24566816120b13d3b…

1 0

Dmitry Timoshkov : mshtml: Add IMarkupServices interface stub.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: c9edd1ca73072c50eb1aa760f55313eb4bd6520d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9edd1ca73072c50eb1aa760… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 31 17:50:51 2019 +0200 mshtml: Add IMarkupServices interface stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 215 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 218 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9edd1ca73072c50eb1a…

1 0

Dmitry Timoshkov : mshtml: Add IMarkupContainer interface stub.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: c4934ac98d08e31767dd3679959af4de516af247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4934ac98d08e31767dd3679… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 31 17:51:03 2019 +0200 mshtml: Add IMarkupContainer interface stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 46 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bb93db9..9dec890 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4974,6 +4974,46 @@ static const IMarkupServicesVtbl MarkupServicesVtbl = { MarkupServices_EndUndoUnit }; +/********************************************************** + * IMarkupContainer implementation + */ +static inline HTMLDocument *impl_from_IMarkupContainer(IMarkupContainer *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IMarkupContainer_iface); +} + +static HRESULT WINAPI MarkupContainer_QueryInterface(IMarkupContainer *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + return htmldoc_query_interface(This, riid, ppvObject); +} + +static ULONG WINAPI MarkupContainer_AddRef(IMarkupContainer *iface) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI MarkupContainer_Release(IMarkupContainer *iface) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI MarkupContainer_OwningDoc(IMarkupContainer *iface, IHTMLDocument2 **ppDoc) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + FIXME("(%p)->(%p)\n", This, ppDoc); + return E_NOTIMPL; +} + +static const IMarkupContainerVtbl MarkupContainerVtbl = { + MarkupContainer_QueryInterface, + MarkupContainer_AddRef, + MarkupContainer_Release, + MarkupContainer_OwningDoc +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5054,6 +5094,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; else if(IsEqualGUID(&IID_IMarkupServices, riid)) *ppv = &This->IMarkupServices_iface; + else if(IsEqualGUID(&IID_IMarkupContainer, riid)) + *ppv = &This->IMarkupContainer_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5102,6 +5144,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; + doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9ed2e5f..7dc9367 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -624,6 +624,7 @@ struct HTMLDocument { IObjectSafety IObjectSafety_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; IMarkupServices IMarkupServices_iface; + IMarkupContainer IMarkupContainer_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d4ef42e..8a08282 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -175,6 +175,7 @@ static const IID * const doc_node_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, + &IID_IMarkupContainer, &IID_IMarkupServices, &IID_IOleContainer, &IID_IObjectSafety, @@ -192,6 +193,7 @@ static const IID * const doc_obj_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_ICustomDoc, + &IID_IMarkupContainer, &IID_IMarkupServices, &IID_IOleContainer, &IID_IObjectSafety,

1 0

Sven Baars : ntdll/tests: Fix a string leak (Valgrind).
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 539ebebc943c2c305d45b1aaa83186b73adb7eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=539ebebc943c2c305d45b1aa… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 19:44:36 2019 +0200 ntdll/tests: Fix a string leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 84f97d4..931628b 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1335,6 +1335,8 @@ static void _test_object_type(unsigned line, HANDLE handle, const char *expected ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); ok_(__FILE__,line)( str->Length == expect.Length && !memcmp( str->Buffer, expect.Buffer, expect.Length ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + + pRtlFreeUnicodeString( &expect ); } static void test_query_object(void)

1 0

Alexandre Julliard : dciman32: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 03c07b5a99455073a3aa56f4d23fc276b4127101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c07b5a99455073a3aa56f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:47:48 2019 +0200 dciman32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dciman32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in index 6795714..2ed2f17 100644 --- a/dlls/dciman32/Makefile.in +++ b/dlls/dciman32/Makefile.in @@ -1,4 +1,6 @@ MODULE = dciman32.dll IMPORTLIB = dciman32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = dciman_main.c

1 0

Alexandre Julliard : ddeml: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 0ac96ea3d573b2ba22c2840bbcc74240cb061f8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac96ea3d573b2ba22c2840b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:48:05 2019 +0200 ddeml: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddeml.dll16/Makefile.in | 2 +- dlls/ddeml.dll16/ddeml.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ddeml.dll16/Makefile.in b/dlls/ddeml.dll16/Makefile.in index 82a0817..77208b0 100644 --- a/dlls/ddeml.dll16/Makefile.in +++ b/dlls/ddeml.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = ddeml.dll16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = ddeml.c diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 5ecb35e..c1ca8f7 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <string.h>

1 0

Alexandre Julliard : ddrawex: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: e432e4c296c5b12583996485f18c5a4f8e21748f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e432e4c296c5b12583996485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:48:22 2019 +0200 ddrawex: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in index ad16636..fc4a50b 100644 --- a/dlls/ddrawex/Makefile.in +++ b/dlls/ddrawex/Makefile.in @@ -1,6 +1,8 @@ MODULE = ddrawex.dll IMPORTS = dxguid uuid ddraw ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ ddraw.c \ main.c \

1 0

Alexandre Julliard : devenum: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 70d6d09f5d9d912ed1a62e1e173075b4e58608fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d6d09f5d9d912ed1a62e1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:49:22 2019 +0200 devenum: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/Makefile.in | 2 ++ dlls/devenum/createdevenum.c | 27 ++++++++-------- dlls/devenum/devenum_private.h | 4 --- dlls/devenum/mediacatenum.c | 68 ++++++++++++++++++++--------------------- dlls/devenum/parsedisplayname.c | 14 ++++----- 5 files changed, 56 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70d6d09f5d9d912ed1a6…

1 0

Alexandre Julliard : dhcpcsvc: Build with msvcrt.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: ea19a79f375efe4ad339199818fe6c1facd3f8d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea19a79f375efe4ad3391998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 08:49:38 2019 +0200 dhcpcsvc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in index 112f1a8..435cbfa 100644 --- a/dlls/dhcpcsvc/Makefile.in +++ b/dlls/dhcpcsvc/Makefile.in @@ -1,3 +1,5 @@ MODULE = dhcpcsvc.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = dhcpcsvc.c

1 0