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

Alexandre Julliard : wineandroid: Work around the Android N restriction on loading libhardware.
by Alexandre Julliard June 26, 2017

June 26, 2017

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

Nikolay Sivov : d3drm/tests: Some tests for animation object QI behavior.
by Alexandre Julliard June 26, 2017

June 26, 2017

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

Nikolay Sivov : d3drm: Added IDirect3DRMWrap stub.
by Alexandre Julliard June 26, 2017

June 26, 2017

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

Alexandre Julliard : libwine: Fall back to the WINELOADER path for the bin directory.
by Alexandre Julliard June 26, 2017

June 26, 2017

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

Alexandre Julliard : libwine: Add a helper function to set the dll directory.
by Alexandre Julliard June 26, 2017

June 26, 2017

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

Zebediah Figura : msi/tests: Add another test for MsiProcessMessage.
by Alexandre Julliard June 26, 2017

June 26, 2017

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

Hugh McMaster : reg/tests: Separate Unicode import tests from the combined import tests.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: 22f57c788837df566d7563e915208c712ac43f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f57c788837df566d7563e91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:42 2017 +0000 reg/tests: Separate Unicode import tests from the combined import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ba36d54..e23586c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1836,8 +1836,16 @@ static void test_import(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); +} + +static void test_unicode_import(void) +{ + DWORD r, dword = 0x123, type, size; + HKEY hkey, subkey; + LONG err; + char buffer[8]; + BYTE hex[8]; - /* Test file contents - Unicode */ test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -2984,6 +2992,13 @@ static void test_import_with_whitespace(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); +} + +static void test_unicode_import_with_whitespace(void) +{ + HKEY hkey; + DWORD r, dword; + LONG err; test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -3139,5 +3154,7 @@ START_TEST(reg) test_query(); test_v_flags(); test_import(); + test_unicode_import(); test_import_with_whitespace(); + test_unicode_import_with_whitespace(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetRetransmitParams.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: 098ffa244d93002a909723662e12fa83d99e4d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098ffa244d93002a909723662… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:26:18 2017 +0100 wsdapi/tests: Add tests for Get/SetRetransmitParams. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/msgparams.c | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index ba0590f..246cfd6 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -182,6 +182,79 @@ static void RemoteAddress_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void RetransmitParams_tests(void) +{ + WSDUdpRetransmitParams origParams, returnedParams; + IWSDUdpMessageParameters *udpMessageParams = NULL; + HRESULT rc; + int ret; + + ZeroMemory(&origParams, sizeof(WSDUdpRetransmitParams)); + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, NULL); + todo_wine ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); + + /* Check if the default values are returned */ + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Now try setting some custom parameters */ + origParams.ulSendDelay = 100; + origParams.ulRepeat = 7; + origParams.ulRepeatMinDelay = 125; + origParams.ulRepeatMaxDelay = 175; + origParams.ulRepeatUpperDelay = 500; + + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); + todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + /* Now attempt to set some invalid parameters - these appear to be accepted */ + origParams.ulSendDelay = INFINITE; + origParams.ulRepeat = 500; + origParams.ulRepeatMinDelay = 250; + origParams.ulRepeatMaxDelay = 125; + origParams.ulRepeatUpperDelay = 100; + + rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); + todo_wine ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + + ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); + + rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); + todo_wine ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + + todo_wine ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); + todo_wine ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); + todo_wine ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); + todo_wine ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); + todo_wine ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + + ret = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); +} + START_TEST(msgparams) { CoInitialize(NULL); @@ -189,6 +262,7 @@ START_TEST(msgparams) CreateUdpMessageParameters_tests(); LocalAddress_tests(); RemoteAddress_tests(); + RetransmitParams_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetLocalAddress.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: f21d3836a297cafc2f70123b3193d7bb3112a884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21d3836a297cafc2f70123b3… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 20 22:26:05 2017 +0100 wsdapi/tests: Add tests for Get/SetLocalAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/msgparams.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 0de1860..d4a300a 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -66,11 +66,70 @@ static void CreateUdpMessageParameters_tests(void) ok(ref == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ref); } +static void LocalAddress_tests(void) +{ + IWSDUdpAddress *origUdpAddress = NULL; + IWSDAddress *returnedAddress = NULL; + IWSDUdpMessageParameters *udpMessageParams = NULL; + WCHAR address[] = {'1','.','2','.','3','.','4',0}; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpMessageParameters(&udpMessageParams); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); + + rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, NULL); + todo_wine ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); + + rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); + ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); + + rc = WSDCreateUdpAddress(&origUdpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); + + rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, address); + todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); + todo_wine ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); + + rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); + todo_wine ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); + + /* Check if GetLocalAddress returns the same object */ + todo_wine ok(returnedAddress == (IWSDAddress *)origUdpAddress, "returnedAddress != origUdpAddress\n"); + + ret = IWSDUdpMessageParameters_Release(udpMessageParams); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + if (returnedAddress != NULL) + { + ret = IWSDAddress_Release(returnedAddress); + ok(ret == 1, "IWSDAddress_Release() has %d references, should have 1\n", ret); + } + + ret = IWSDUdpAddress_Release(origUdpAddress); + ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(msgparams) { CoInitialize(NULL); CreateUdpMessageParameters_tests(); + LocalAddress_tests(); CoUninitialize(); }

1 0

Clemens Tamme : gdiplus: Write API for GdipClonePath.
by Alexandre Julliard June 26, 2017

June 26, 2017

Module: wine Branch: master Commit: f1123f35788effc9ceea462210189600191d9966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1123f35788effc9ceea46221… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Wed Jun 21 21:40:35 2017 +0200 gdiplus: Write API for GdipClonePath. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 90d15bb..815ce34 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1087,6 +1087,20 @@ GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, IN return InvalidParameter; } +/************************************************************************* + * GdipClonePath [GDIPLUS.53] + * + * Duplicate the given path in memory. + * + * PARAMS + * path [I] The path to be duplicated + * clone [O] Pointer to the new path + * + * RETURNS + * InvalidParameter If the input path is invalid + * OutOfMemory If allocation of needed memory fails + * Ok If everything works out as expected + */ GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { TRACE("(%p, %p)\n", path, clone);

1 0