November 2017 - Wine-Commits

Alexandre Julliard : setupapi: Use correct architecture for fake dlls on ARM and ARM64.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 35719665d79bc1cc3be19628021a154f563daa51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35719665d79bc1cc3be196280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 10:41:51 2017 +0100 setupapi: Use correct architecture for fake dlls on ARM and ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index d521b0a..d310cc9 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -713,6 +713,10 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR static const char current_arch[] = "x86"; #elif defined __x86_64__ static const char current_arch[] = "amd64"; +#elif defined __arm__ + static const char current_arch[] = "arm"; +#elif defined __aarch64__ + static const char current_arch[] = "arm64"; #else static const char current_arch[] = "none"; #endif

1 0

Austin English : readme: Clarify the wording a bit.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 97dea5bd08af894463823fde64cbdf4619c5928c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dea5bd08af894463823fde6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 1 13:24:51 2017 -0500 readme: Clarify the wording a bit. Pointed out by Jens Reyer. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 4b76546..21dabed 100644 --- a/README +++ b/README @@ -19,11 +19,11 @@ run: ./configure make -Then either install wine: +Then either install Wine: make install -Or run it from the build directory: +Or run Wine directly from the build directory: ./wine notepad

1 0

Aric Stewart : usp10/tests: Add fingerprint to help ensure proper font for testing.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 265f5cad233963ed6cae188031e263ae3ff124d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=265f5cad233963ed6cae18803… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Nov 1 10:53:23 2017 -0500 usp10/tests: Add fingerprint to help ensure proper font for testing. Fixes problems where there is a linux font also named Estrangelo Edessa but does not have the font shaping properties we are testing. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 71 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=265f5cad233963ed6cae1…

1 0

Austin English : preloader: Fix a typo in error message.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 039d267b0925273197a9edcf7664c4a42dca932d URL: http://source.winehq.org/git/wine.git/?a=commit;h=039d267b0925273197a9edcf7… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 1 13:24:52 2017 -0500 preloader: Fix a typo in error message. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 6cb8e15..5a4bb16 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -831,7 +831,7 @@ static void map_so_lib( const char *name, struct wld_link_map *l) fatal_error("%s: not an x86-64 ELF binary... don't know how to load it\n", name ); #elif defined(__aarch64__) if( header->e_machine != EM_AARCH64 ) - fatal_error("%s: not an aarchs64 ELF binary... don't know how to load it\n", name ); + fatal_error("%s: not an aarch64 ELF binary... don't know how to load it\n", name ); #endif if (header->e_phnum > sizeof(loadcmds)/sizeof(loadcmds[0]))

1 0

Jacek Caban : mshtml: Added support for VT_UI2 in IDispatchEx.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: b77f7b54ce0e195702eb598b916c8ab48ce3a41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77f7b54ce0e195702eb598b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:43:42 2017 +0100 mshtml: Added support for VT_UI2 in IDispatchEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f434545..e42b068 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -206,6 +206,7 @@ HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) /* Not all argument types are supported yet */ #define BUILTIN_ARG_TYPES_SWITCH \ CASE_VT(VT_I2, INT16, V_I2); \ + CASE_VT(VT_UI2, UINT16, V_UI2); \ CASE_VT(VT_I4, INT32, V_I4); \ CASE_VT(VT_R4, float, V_R4); \ CASE_VT(VT_BSTR, BSTR, V_BSTR); \

1 0

Alex Henrie : mountmgr: Map ttyACM devices to COM ports on Linux.
by Alexandre Julliard Nov. 1, 2017

Nov. 1, 2017

Module: wine Branch: master Commit: 4177068d5a1f30f0ad14f6736815d41656ca141d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4177068d5a1f30f0ad14f6736… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 01:10:05 2017 +0100 mountmgr: Map ttyACM devices to COM ports on Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 20c96d0..1437bfc 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1085,6 +1085,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) #ifdef linux "/dev/ttyS%u", "/dev/ttyUSB%u", + "/dev/ttyACM%u", #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) "/dev/cuau%u", #elif defined(__DragonFly__)

1 0