June 2017 - Wine-commits - list.winehq.org

Zebediah Figura : msi/tests: Add another test for MsiProcessMessage.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 20b33b8009f9130e7cb3ab850ab7279ea0512a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b33b8009f9130e7cb3ab850… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 25 21:13:53 2017 -0500 msi/tests: Add another test for MsiProcessMessage. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/format.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 8ed4bbb..da586b2 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2777,6 +2777,10 @@ static void test_processmessage(void) r = MsiProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, hrec); ok( r == IDOK, "expected IDOK, got %i\n", r); + r = MsiProcessMessage(package, INSTALLMESSAGE_PROGRESS, hrec); + todo_wine + ok( r == IDOK, "expected IDOK, got %i\n", r); + MsiCloseHandle(hrec); MsiCloseHandle(package);

1 0

Zebediah Figura : comctl32: Don't FIXME on handled cases.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 11c557b66cf0f65e8207e2957f5d7a1981c41535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c557b66cf0f65e8207e2957… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 13 16:04:44 2017 -0500 comctl32: Don't FIXME on handled cases. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 459bb38..8506566 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10756,11 +10756,12 @@ static inline LRESULT LISTVIEW_WMPaint(LISTVIEW_INFO *infoPtr, HDC hdc) */ static LRESULT LISTVIEW_PrintClient(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); - if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) return 0; + if (options & ~(PRF_ERASEBKGND|PRF_CLIENT)) + FIXME("(hdc=%p options=0x%08x) partial stub\n", hdc, options); + if (options & PRF_ERASEBKGND) LISTVIEW_EraseBkgnd(infoPtr, hdc);

1 0

Alexandre Julliard : libwine: Add a helper function to set the bin directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 161f3fc417dd397072326c0720de065561531e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161f3fc417dd397072326c072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 13:32:38 2017 +0200 libwine: Add a helper function to set the bin directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 3b5dd68..129a565 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -374,22 +374,32 @@ static char *running_from_build_dir( const char *basedir ) return path; } +/* try to set the specified directory as bindir, or set build_dir if it's inside the build directory */ +static int set_bindir( char *dir ) +{ + if (!dir) return 0; + if (is_valid_bindir( dir )) + { + bindir = dir; + } + else + { + build_dir = running_from_build_dir( dir ); + free( dir ); + } + return bindir || build_dir; +} + /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { const char *basename; - char *libdir; + char *libdir = NULL; if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; - bindir = get_runtime_exedir(); - if (bindir && !is_valid_bindir( bindir )) - { - build_dir = running_from_build_dir( bindir ); - free( bindir ); - bindir = NULL; - } + if (set_bindir( get_runtime_exedir() )) goto done; libdir = get_runtime_libdir(); if (libdir && !bindir && !build_dir) @@ -399,16 +409,9 @@ void wine_init_argv0_path( const char *argv0 ) } if (!libdir && !bindir && !build_dir) - { - bindir = get_runtime_argvdir( argv0 ); - if (bindir && !is_valid_bindir( bindir )) - { - build_dir = running_from_build_dir( bindir ); - free( bindir ); - bindir = NULL; - } - } + set_bindir( get_runtime_argvdir( argv0 )); +done: if (build_dir) { argv0_name = build_path( "loader/", basename );

1 0

Alexandre Julliard : libwine: Add a helper function to set the dll directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 56b14d637fdd213e0377526c2b98d2f36384332e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b14d637fdd213e0377526c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 13:37:25 2017 +0200 libwine: Add a helper function to set the dll directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 50 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 129a565..f85910b 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -330,6 +330,16 @@ static int is_valid_bindir( const char *bindir ) return ret; } +/* check if dlldir is valid by checking for ntdll */ +static int is_valid_dlldir( const char *dlldir ) +{ + struct stat st; + char *path = build_path( dlldir, "ntdll.dll.so" ); + int ret = (stat( path, &st ) != -1); + free( path ); + return ret; +} + /* check if basedir is a valid build dir by checking for wineserver and ntdll */ /* helper for running_from_build_dir */ static inline int is_valid_build_dir( char *basedir, int baselen ) @@ -381,6 +391,7 @@ static int set_bindir( char *dir ) if (is_valid_bindir( dir )) { bindir = dir; + dlldir = build_path( bindir, BIN_TO_DLLDIR ); } else { @@ -390,26 +401,39 @@ static int set_bindir( char *dir ) return bindir || build_dir; } +/* try to set the specified directory as dlldir, or set build_dir if it's inside the build directory */ +static int set_dlldir( char *libdir ) +{ + char *path; + + if (!libdir) return 0; + + path = build_path( libdir, LIB_TO_DLLDIR ); + if (is_valid_dlldir( path )) + { + dlldir = path; + bindir = build_path( libdir, LIB_TO_BINDIR ); + } + else + { + build_dir = running_from_build_dir( libdir ); + free( path ); + } + free( libdir ); + return dlldir || build_dir; +} + /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { const char *basename; - char *libdir = NULL; if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; if (set_bindir( get_runtime_exedir() )) goto done; - - libdir = get_runtime_libdir(); - if (libdir && !bindir && !build_dir) - { - build_dir = running_from_build_dir( libdir ); - if (!build_dir) bindir = build_path( libdir, LIB_TO_BINDIR ); - } - - if (!libdir && !bindir && !build_dir) - set_bindir( get_runtime_argvdir( argv0 )); + if (set_dlldir( get_runtime_libdir() )) goto done; + set_bindir( get_runtime_argvdir( argv0 )); done: if (build_dir) @@ -418,13 +442,9 @@ done: } else { - if (libdir) dlldir = build_path( libdir, LIB_TO_DLLDIR ); - else if (bindir) dlldir = build_path( bindir, BIN_TO_DLLDIR ); - if (bindir) datadir = build_path( bindir, BIN_TO_DATADIR ); argv0_name = xstrdup( basename ); } - free( libdir ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */

1 0

Alexandre Julliard : libwine: Fall back to the WINELOADER path for the bin directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 4ee9bbc8891bbc866e0d6e012e09514433393df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee9bbc8891bbc866e0d6e012… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 13:38:00 2017 +0200 libwine: Fall back to the WINELOADER path for the bin directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index f85910b..13f016a 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -426,14 +426,15 @@ static int set_dlldir( char *libdir ) /* initialize the argv0 path */ void wine_init_argv0_path( const char *argv0 ) { - const char *basename; + const char *basename, *wineloader; if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; if (set_bindir( get_runtime_exedir() )) goto done; if (set_dlldir( get_runtime_libdir() )) goto done; - set_bindir( get_runtime_argvdir( argv0 )); + if (set_bindir( get_runtime_argvdir( argv0 ))) goto done; + if ((wineloader = getenv( "WINELOADER" ))) set_bindir( get_runtime_argvdir( wineloader )); done: if (build_dir)

1 0

Nikolay Sivov : d3drm: Added IDirect3DRMWrap stub.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 56978219170bfaf037acffc93dfe6839365b2ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56978219170bfaf037acffc93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 26 02:16:12 2017 +0300 d3drm: Added IDirect3DRMWrap stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 54 +++++++++++-- dlls/d3drm/d3drm_private.h | 7 ++ dlls/d3drm/meshbuilder.c | 189 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/tests/d3drm.c | 115 ++++++++++++++++++++++++++- 4 files changed, 355 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56978219170bfaf037acf…

1 0

Nikolay Sivov : d3drm/tests: Some tests for animation object QI behavior.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ae5ec5c597e1434233cd06ae12b3e995fda30a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5ec5c597e1434233cd06ae1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 26 02:16:13 2017 +0300 d3drm/tests: Some tests for animation object QI behavior. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7020b5e..ff1aadd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6744,6 +6744,111 @@ static void test_animation(void) IDirect3DRM_Release(d3drm1); } +static void test_animation_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRMAnimation2, &IID_IUnknown, &IID_IDirect3DRMAnimation2, S_OK }, + { &IID_IDirect3DRMAnimation, &IID_IUnknown, &IID_IDirect3DRMAnimation, S_OK }, + { &IID_IDirect3DRM, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObject, &IID_IUnknown, &IID_IDirect3DRMAnimation, S_OK }, + { &IID_IDirect3DRMDevice2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewport, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewport2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisual, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMesh, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLight, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObjectArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDeviceArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewportArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrameArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisualArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLightArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPickedArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFaceArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationArray, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMUserVisual, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMInterpolator, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMProgressiveMesh, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPicked2Array, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMClippedVisual, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawClipper, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface4, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw7, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw4, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw3, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw2, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DLight, NULL, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IUnknown, &IID_IUnknown, NULL, S_OK }, + }; + IDirect3DRMAnimation2 *animation2; + IDirect3DRMAnimation *animation; + IDirect3DRM3 *d3drm3; + IDirect3DRM *d3drm1; + IUnknown *unknown; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Failed to create d3drm instance, hr %#x.\n", hr); + + hr = IDirect3DRM_CreateAnimation(d3drm1, &animation); + ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_QueryInterface(animation, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr); + IDirect3DRMAnimation_Release(animation); + + test_qi("animation_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3, hr %#x.\n", hr); + + hr = IDirect3DRM3_CreateAnimation(d3drm3, &animation2); + ok(SUCCEEDED(hr), "Failed to create animation hr %#x.\n", hr); + + hr = IDirect3DRMAnimation2_QueryInterface(animation2, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr); + IDirect3DRMAnimation2_Release(animation2); + + test_qi("animation2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm1); +} + static void test_wrap(void) { IDirect3DRMWrap *wrap; @@ -6885,6 +6990,7 @@ START_TEST(d3drm) test_viewport_clear2(); test_create_texture_from_surface(); test_animation(); + test_animation_qi(); test_wrap(); test_wrap_qi(); }

1 0

Alexandre Julliard : wineandroid: Fix handling of Caps Lock with non-alphabetic keys.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ab006d00854f694e63778ac891f9e19d13450c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab006d00854f694e63778ac89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:12:10 2017 +0200 wineandroid: Fix handling of Caps Lock with non-alphabetic keys. Spotted by Dmitry Timoshkov. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index e6e1d02..3d459cd 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -757,7 +757,7 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR buf, int size, UINT flags, HKL hkl ) { WCHAR buffer[2]; - BOOL shift = (state[VK_SHIFT] & 0x80) || (state[VK_CAPITAL] & 0x01); + BOOL shift = state[VK_SHIFT] & 0x80; BOOL ctrl = state[VK_CONTROL] & 0x80; BOOL numlock = state[VK_NUMLOCK] & 0x01; @@ -798,7 +798,7 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, } if (virt >= 'A' && virt <= 'Z') { - buffer[0] = shift ? virt : virt + 'a' - 'A'; + buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; break; } if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift)

1 0

Alexandre Julliard : wineandroid: Work around the Android N restriction on loading libhardware.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 9065fd259776f07dc9a31de9dedd464c4f51de92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9065fd259776f07dc9a31de9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:12:44 2017 +0200 wineandroid: Work around the Android N restriction on loading libhardware. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 126 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 5626ad0..47ef4a2 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <string.h> +#include <link.h> #include "windef.h" #include "winbase.h" @@ -492,6 +493,115 @@ DECL_FUNCPTR( hw_get_module ); struct gralloc_module_t *gralloc_module = NULL; +#ifndef DT_GNU_HASH +#define DT_GNU_HASH 0x6ffffef5 +#endif + +static unsigned int gnu_hash( const char *name ) +{ + unsigned int h = 5381; + while (*name) h = h * 33 + (unsigned char)*name++; + return h; +} + +static unsigned int hash_symbol( const char *name ) +{ + unsigned int hi, hash = 0; + while (*name) + { + hash = (hash << 4) + (unsigned char)*name++; + hi = hash & 0xf0000000; + hash ^= hi; + hash ^= hi >> 24; + } + return hash; +} + +static void *find_symbol( const struct dl_phdr_info* info, const char *var, int type ) +{ + const ElfW(Dyn) *dyn = NULL; + const ElfW(Phdr) *ph; + const ElfW(Sym) *symtab = NULL; + const Elf32_Word *hashtab = NULL; + const Elf32_Word *gnu_hashtab = NULL; + const char *strings = NULL; + Elf32_Word idx; + + for (ph = info->dlpi_phdr; ph < &info->dlpi_phdr[info->dlpi_phnum]; ++ph) + { + if (PT_DYNAMIC == ph->p_type) + { + dyn = (const ElfW(Dyn) *)(info->dlpi_addr + ph->p_vaddr); + break; + } + } + if (!dyn) return NULL; + + while (dyn->d_tag) + { + if (dyn->d_tag == DT_STRTAB) + strings = (const char*)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_SYMTAB) + symtab = (const ElfW(Sym) *)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_HASH) + hashtab = (const Elf32_Word *)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_GNU_HASH) + gnu_hashtab = (const Elf32_Word *)(info->dlpi_addr + dyn->d_un.d_ptr); + dyn++; + } + + if (!symtab || !strings) return NULL; + + if (gnu_hashtab) /* new style hash table */ + { + const unsigned int hash = gnu_hash(var); + const Elf32_Word nbuckets = gnu_hashtab[0]; + const Elf32_Word symbias = gnu_hashtab[1]; + const Elf32_Word nwords = gnu_hashtab[2]; + const ElfW(Addr) *bitmask = (const ElfW(Addr) *)(gnu_hashtab + 4); + const Elf32_Word *buckets = (const Elf32_Word *)(bitmask + nwords); + const Elf32_Word *chains = buckets + nbuckets - symbias; + + if (!(idx = buckets[hash % nbuckets])) return NULL; + do + { + if ((chains[idx] & ~1u) == (hash & ~1u) && + ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && + !strcmp( strings + symtab[idx].st_name, var )) + return (void *)(info->dlpi_addr + symtab[idx].st_value); + } while (!(chains[idx++] & 1u)); + } + else if (hashtab) /* old style hash table */ + { + const unsigned int hash = hash_symbol( var ); + const Elf32_Word nbuckets = hashtab[0]; + const Elf32_Word *buckets = hashtab + 2; + const Elf32_Word *chains = buckets + nbuckets; + + for (idx = buckets[hash % nbuckets]; idx; idx = chains[idx]) + { + if (ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && + !strcmp( strings + symtab[idx].st_name, var )) + return (void *)(info->dlpi_addr + symtab[idx].st_value); + } + } + return NULL; +} + +static int enum_libs( struct dl_phdr_info* info, size_t size, void* data ) +{ + const char *p; + + if (!info->dlpi_name) return 0; + if (!(p = strrchr( info->dlpi_name, '/' ))) return 0; + if (strcmp( p, "/libhardware.so" )) return 0; + TRACE( "found libhardware at %p\n", info->dlpi_phdr ); + phw_get_module = find_symbol( info, "hw_get_module", STT_FUNC ); + return 1; +} + static void load_hardware_libs(void) { const struct hw_module_t *module; @@ -504,8 +614,20 @@ static void load_hardware_libs(void) } else { - ERR( "failed to load libhardware: %s\n", error ); - return; + /* Android >= N disallows loading libhardware, so we load libandroid (which imports + * libhardware), and then we can find libhardware in the list of loaded libraries. + */ + if (!wine_dlopen( "libandroid.so", RTLD_GLOBAL, error, sizeof(error) )) + { + ERR( "failed to load libandroid.so: %s\n", error ); + return; + } + dl_iterate_phdr( enum_libs, 0 ); + if (!phw_get_module) + { + ERR( "failed to find hw_get_module\n" ); + return; + } } if (phw_get_module( GRALLOC_HARDWARE_MODULE_ID, &module ) == 0)

1 0

Alexandre Julliard : wineandroid: Allow putting libraries in the native library directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 0a2aac8dcaf9a53ef3abbede35e45d7d232fc77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2aac8dcaf9a53ef3abbede3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:13:35 2017 +0200 wineandroid: Allow putting libraries in the native library directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 +++++++++-- dlls/wineandroid.drv/build.gradle.in | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 295ecc4..6c6edd5 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -88,7 +88,7 @@ public class WineActivity extends Activity HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); env.put( "WINEPREFIX", prefix.toString() ); - env.put( "LD_LIBRARY_PATH", libdir.toString() ); + env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir ); env.put( "LC_ALL", locale ); env.put( "LANG", locale ); @@ -111,7 +111,14 @@ public class WineActivity extends Activity createProgressDialog( 0, "Setting up the Windows environment..." ); - System.load( libdir.toString() + "/libwine.so" ); + try + { + System.loadLibrary( "wine" ); + } + catch (java.lang.UnsatisfiedLinkError e) + { + System.load( libdir.toString() + "/libwine.so" ); + } prefix.mkdirs(); runWine( cmdline, env ); diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 8f02a12..53633b7 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -74,6 +74,7 @@ android { main.assets.srcDirs = [ "assets" ] main.java.srcDirs = [ "@srcdir@" ] + main.jniLibs.srcDirs = [ "lib" ] main.java.excludes = [ "build" ] main.res.srcDirs = [ "res" ] main.manifest.srcFile "@srcdir@/AndroidManifest.xml"

1 0