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

Huw Davies : regedit: Use the system metrics to retrieve the treeview icon sizes.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 6bc8ecafe87ad4117dc0aec295e881a5793f78ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc8ecafe87ad4117dc0aec29… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 27 14:27:21 2017 +0100 regedit: Use the system metrics to retrieve the treeview icon sizes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 4b5e1ca..d11793c 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -43,8 +43,6 @@ int Image_Open; int Image_Closed; int Image_Root; -#define CX_ICON 16 -#define CY_ICON 16 #define NUM_ICONS 3 static BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state); @@ -599,10 +597,11 @@ static BOOL InitTreeViewImageLists(HWND hwndTV) { HIMAGELIST himl; /* handle to image list */ HICON hico; /* handle to icon */ + INT cx = GetSystemMetrics(SM_CXSMICON); + INT cy = GetSystemMetrics(SM_CYSMICON); /* Create the image list. */ - if ((himl = ImageList_Create(CX_ICON, CY_ICON, - ILC_MASK, 0, NUM_ICONS)) == NULL) + if ((himl = ImageList_Create(cx, cy, ILC_MASK, 0, NUM_ICONS)) == NULL) return FALSE; /* Add the open file, closed file, and document bitmaps. */

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 43c93b22ccee6492feec5f0349a5e572fbf3622d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c93b22ccee6492feec5f034… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 27 17:04:39 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index fb7db81..dc00b52 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3695,7 +3695,7 @@ msgstr "Odotettiin taulukkoa" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Winen ydin-DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -12078,10 +12078,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Rekisteriluokkaa '%1' ei voida poistaa.\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Riviä '%1' ei tunnisteta.\n" +msgstr "regedit: Rivin syntaksi on virheellinen.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Alexandre Julliard : configure: Re-enable the preloader on Android.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: fec21ed61947e1a301e03be116d39ae4ba04645e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec21ed61947e1a301e03be11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 27 15:41:44 2017 +0200 configure: Re-enable the preloader on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 30 ++---------------------------- configure.ac | 7 ++----- loader/main.c | 4 ++++ 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/configure b/configure index dee9369..229dba9 100755 --- a/configure +++ b/configure @@ -8353,6 +8353,7 @@ fi linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" + LDEXECFLAGS="-Wl,-pie" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : @@ -8376,7 +8377,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fPIC__Wl___export_dynamic" >&5 $as_echo "$ac_cv_cflags__fPIC__Wl___export_dynamic" >&6; } if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : - LDEXECFLAGS="-Wl,--export-dynamic" + LDEXECFLAGS="$LDEXECFLAGS -Wl,--export-dynamic" fi as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 @@ -8435,7 +8436,6 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--enable-new-dtags" >&5 $as_echo_n "checking whether the compiler supports -Wl,--enable-new-dtags... " >&6; } if ${ac_cv_cflags__Wl___enable_new_dtags+:} false; then : @@ -8461,31 +8461,6 @@ $as_echo "$ac_cv_cflags__Wl___enable_new_dtags" >&6; } if test "x$ac_cv_cflags__Wl___enable_new_dtags" = xyes; then : LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 -$as_echo_n "checking whether the compiler supports -Wl,-pie... " >&6; } -if ${ac_cv_cflags__Wl__pie+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-pie" -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__Wl__pie=yes -else - ac_cv_cflags__Wl__pie=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__Wl__pie" >&5 -$as_echo "$ac_cv_cflags__Wl__pie" >&6; } -if test "x$ac_cv_cflags__Wl__pie" = xyes; then : - LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie" -fi LIBWINE_SHAREDLIB="libwine.so" @@ -15258,7 +15233,6 @@ case $build_os in esac case $host_os in - linux-android*) ;; linux*) case $host_cpu in *i[3456789]86*|x86_64*) diff --git a/configure.ac b/configure.ac index 0a3b3b1..057bcc8 100644 --- a/configure.ac +++ b/configure.ac @@ -847,19 +847,17 @@ case $host_os in linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" + LDEXECFLAGS="-Wl,-pie" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], - [LDEXECFLAGS="-Wl,--export-dynamic"]) + [LDEXECFLAGS="$LDEXECFLAGS -Wl,--export-dynamic"]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])]) - WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) - WINE_TRY_CFLAGS([-Wl,-pie], - [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie"]) AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") @@ -1967,7 +1965,6 @@ case $build_os in esac case $host_os in - linux-android*) ;; linux*) case $host_cpu in *i[[3456789]]86*|x86_64*) diff --git a/loader/main.c b/loader/main.c index 05e0c06..a560ec3 100644 --- a/loader/main.c +++ b/loader/main.c @@ -113,7 +113,11 @@ static void check_command_line( int argc, char *argv[] ) static int pre_exec(void) { +#if defined(__i386__) || defined(__x86_64__) + return 1; /* we have a preloader */ +#else return 0; /* no exec needed */ +#endif } #elif defined(__linux__) && (defined(__i386__) || defined(__arm__))

1 0

Alexandre Julliard : preloader: Fix symbol lookup for dynamic libraries.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 60fb3d4b64c3d53101243e81b26ca98bf4d469d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fb3d4b64c3d53101243e81b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 27 15:04:34 2017 +0200 preloader: Fix symbol lookup for dynamic libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 903061e..a21efc9 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -945,7 +945,7 @@ static unsigned int gnu_hash( const char *name ) /* * Find a symbol in the symbol table of the executable loaded */ -static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int type ) +static void *find_symbol( const struct wld_link_map *map, const char *var, int type ) { const ElfW(Dyn) *dyn = NULL; const ElfW(Phdr) *ph; @@ -957,21 +957,14 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int /* check the values */ #ifdef DUMP_SYMS - wld_printf("%p %x\n", phdr, num ); + wld_printf("%p %x\n", map->l_phdr, map->l_phnum ); #endif - if( ( phdr == NULL ) || ( num == 0 ) ) - { - wld_printf("could not find PT_DYNAMIC header entry\n"); - return NULL; - } - /* parse the (already loaded) ELF executable's header */ - for (ph = phdr; ph < &phdr[num]; ++ph) + for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph) { if( PT_DYNAMIC == ph->p_type ) { - dyn = (void *) ph->p_vaddr; - num = ph->p_memsz / sizeof (*dyn); + dyn = (void *)(ph->p_vaddr + map->l_addr); break; } } @@ -980,13 +973,13 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int while( dyn->d_tag ) { if( dyn->d_tag == DT_STRTAB ) - strings = (const char*) dyn->d_un.d_ptr; + strings = (const char*)(dyn->d_un.d_ptr + map->l_addr); if( dyn->d_tag == DT_SYMTAB ) - symtab = (const ElfW(Sym) *)dyn->d_un.d_ptr; + symtab = (const ElfW(Sym) *)(dyn->d_un.d_ptr + map->l_addr); if( dyn->d_tag == DT_HASH ) - hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; + hashtab = (const Elf32_Word *)(dyn->d_un.d_ptr + map->l_addr); if( dyn->d_tag == DT_GNU_HASH ) - gnu_hashtab = (const Elf32_Word *)dyn->d_un.d_ptr; + gnu_hashtab = (const Elf32_Word *)(dyn->d_un.d_ptr + map->l_addr); #ifdef DUMP_SYMS wld_printf("%lx %p\n", (unsigned long)dyn->d_tag, (void *)dyn->d_un.d_ptr ); #endif @@ -1036,7 +1029,7 @@ found: #ifdef DUMP_SYMS wld_printf("Found %s -> %p\n", strings + symtab[idx].st_name, (void *)symtab[idx].st_value ); #endif - return (void *)symtab[idx].st_value; + return (void *)(symtab[idx].st_value + map->l_addr); } /* @@ -1240,8 +1233,7 @@ void* wld_start( void **stack ) map_so_lib( interp, &ld_so_map ); /* store pointer to the preload info into the appropriate main binary variable */ - wine_main_preload_info = find_symbol( main_binary_map.l_phdr, main_binary_map.l_phnum, - "wine_main_preload_info", STT_OBJECT ); + wine_main_preload_info = find_symbol( &main_binary_map, "wine_main_preload_info", STT_OBJECT ); if (wine_main_preload_info) *wine_main_preload_info = preload_info; else wld_printf( "wine_main_preload_info not found\n" );

1 0

Alexandre Julliard : preloader: Add a debug option to dump memory maps.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 1172754fcbbcf5769edbba8a3e76a604c487af6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1172754fcbbcf5769edbba8a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 27 15:03:46 2017 +0200 preloader: Add a debug option to dump memory maps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index 7cf2946..91ad1da 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -127,6 +127,7 @@ static struct wine_preload_info preload_info[] = #undef DUMP_SEGMENTS #undef DUMP_AUX_INFO #undef DUMP_SYMS +#undef DUMP_MAPS /* older systems may not define these */ #ifndef PT_TLS @@ -1272,6 +1273,17 @@ void* wld_start( void **stack ) wld_printf("new stack = %p\n", *stack); wld_printf("jumping to %p\n", (void *)ld_so_map.l_entry); #endif +#ifdef DUMP_MAPS + { + char buffer[1024]; + int len, fd = wld_open( "/proc/self/maps", O_RDONLY ); + if (fd != -1) + { + while ((len = wld_read( fd, buffer, sizeof(buffer) )) > 0) wld_write( 2, buffer, len ); + wld_close( fd ); + } + } +#endif return (void *)ld_so_map.l_entry; }

1 0

Józef Kucia : d3d11: Delay destroying unordered access view until it is no longer referenced.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 5b305503112613c952b39e00003da1a1bfd30d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b305503112613c952b39e000… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:50 2017 +0200 d3d11: Delay destroying unordered access view until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 2 +- dlls/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a8987cb..cbc8d7c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -54,8 +54,6 @@ struct d3d_device; -extern const struct wined3d_parent_ops d3d_null_wined3d_parent_ops DECLSPEC_HIDDEN; - /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) DECLSPEC_HIDDEN; const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c5ead36..259f189 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {} -const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = { d3d_null_wined3d_object_destroyed, }; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index f1478ba..f747c4b 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2377,6 +2377,14 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_unordered_access_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -2389,12 +2397,13 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -2477,6 +2486,19 @@ static const struct ID3D11UnorderedAccessViewVtbl d3d11_unordered_access_view_vt d3d11_unordered_access_view_GetDesc, }; +static void STDMETHODCALLTYPE d3d11_unordered_access_view_wined3d_object_destroyed(void *parent) +{ + struct d3d11_unordered_access_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d11_unordered_access_view_wined3d_parent_ops = +{ + d3d11_unordered_access_view_wined3d_object_destroyed, +}; + static unsigned int wined3d_view_flags_from_d3d11_buffer_uav_flags(unsigned int d3d11_flags) { unsigned int wined3d_flags = d3d11_flags & (WINED3D_VIEW_BUFFER_RAW @@ -2577,7 +2599,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi } if (FAILED(hr = wined3d_unordered_access_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d11_unordered_access_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create wined3d unordered access view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Delay destroying depth stencil view until it is no longer referenced.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 02a767cde201a437c9edec20054f46eada05624b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a767cde201a437c9edec200… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:47 2017 +0200 d3d11: Delay destroying depth stencil view until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index ac5395d..85c16d8 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -999,6 +999,14 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_rendertarget_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1011,12 +1019,13 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -1225,6 +1234,19 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; +static void STDMETHODCALLTYPE d3d_depth_stencil_view_wined3d_object_destroyed(void *parent) +{ + struct d3d_depthstencil_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_depth_stencil_view_wined3d_parent_ops = +{ + d3d_depth_stencil_view_wined3d_object_destroyed, +}; + static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc *wined3d_desc, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc) { @@ -1318,7 +1340,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_depth_stencil_view_desc_from_d3d11(&wined3d_desc, &view->desc); if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_depth_stencil_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr);

1 0

Piotr Caban : dwrite: Don' t crash on uninitialized cached and factory fields in dwritefontface_Release.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: e98cdc3215ccc826242573675ff37486c6707660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98cdc3215ccc826242573675… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 16:27:33 2017 +0200 dwrite: Don't crash on uninitialized cached and factory fields in dwritefontface_Release. The function may be called with the fields uninitialized from create_fontface when init_font_data fails. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ca2d69a..328e5e4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -501,8 +501,10 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace4 *iface) heap_free(This->glyphs[i]); freetype_notify_cacheremove(iface); - factory_release_cached_fontface(This->cached); - IDWriteFactory4_Release(This->factory); + if (This->cached) + factory_release_cached_fontface(This->cached); + if (This->factory) + IDWriteFactory4_Release(This->factory); heap_free(This); } @@ -4283,7 +4285,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li *ret = NULL; - fontface = heap_alloc(sizeof(struct dwrite_fontface)); + fontface = heap_alloc_zero(sizeof(struct dwrite_fontface)); if (!fontface) return E_OUTOFMEMORY; @@ -4301,11 +4303,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->ref = 1; fontface->type = desc->face_type; fontface->file_count = desc->files_number; - memset(&fontface->cmap, 0, sizeof(fontface->cmap)); - memset(&fontface->vdmx, 0, sizeof(fontface->vdmx)); - memset(&fontface->gasp, 0, sizeof(fontface->gasp)); - memset(&fontface->cpal, 0, sizeof(fontface->cpal)); - memset(&fontface->colr, 0, sizeof(fontface->colr)); fontface->cmap.exists = TRUE; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; @@ -4313,7 +4310,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->colr.exists = TRUE; fontface->index = desc->index; fontface->simulations = desc->simulations; - memset(fontface->glyphs, 0, sizeof(fontface->glyphs)); for (i = 0; i < fontface->file_count; i++) { hr = get_stream_from_file(desc->files[i], &fontface->streams[i]); @@ -4338,7 +4334,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li } } - fontface->flags = 0; fontface->charmap = freetype_get_charmap_index(&fontface->IDWriteFontFace4_iface, &is_symbol); if (is_symbol) fontface->flags |= FONTFACE_IS_SYMBOL;

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 8cb12084db9bd4d807162a950dc56380f03d823e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb12084db9bd4d807162a950… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Apr 27 18:54:44 2017 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4c7b8a9..6b2076b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 16:04+0200\n" +"PO-Revision-Date: 2017-04-27 18:47+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -3711,7 +3711,7 @@ msgstr "Очікується об'єкт Array" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Бібліотека ядра Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -9436,10 +9436,8 @@ msgid "Confidentiality Required" msgstr "Потрібна конфіденційність" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Проводиться вимкнення системи.\n" +msgstr "Проводиться прив'язка за допомогою SASL" #: wldap32.rc:48 msgid "No Such Attribute" @@ -9463,7 +9461,7 @@ msgstr "Властивість або значення існує" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Неправильний синтакс" +msgstr "Невірний синтаксис" #: wldap32.rc:64 msgid "No Such Object" @@ -12037,17 +12035,11 @@ msgstr "Неможливо перейменувати вибране значе #: regedit.rc:222 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Ключі та значення з '%1' були успішно додані до реєстру." #: regedit.rc:223 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "" -"Неможливо перейменувати ключ '%1'.\n" -"Вказаний ключ вже існує." +msgstr "Неможливо імпортувати '%1'. Вказаний файл не є файлом реєстру." #: regedit.rc:375 msgid "" @@ -12198,10 +12190,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Неможливо видалити клас реєстру '%1'.\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Рядок '%1' не був розпізнаний.\n" +msgstr "regedit: Рядок має невірний синтаксис.\n" #: regedit.rc:163 msgid "Quits the registry editor" @@ -12328,17 +12318,14 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Експортує вибрану гілку реєстру до текстового файлу" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Підтвердження видалення значення" +msgstr "Підтвердження видалення ключа" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Ви впевнені, що хочете видалити ключ реєстру '%1'?" +msgstr "" +"Ви впевнені, що хочете видалити ключ реєстру '%1' та всі його підрозділи?" #: regsvr32.rc:32 msgid ""

1 0

Piotr Caban : dwrite: Fix EUDC font collection use after free issue.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 4d02f2fed6e5dde284ec7e1b170ff9704a0bf3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d02f2fed6e5dde284ec7e1b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 27 17:20:03 2017 +0200 dwrite: Fix EUDC font collection use after free issue. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 6 ++++-- dlls/dwrite/main.c | 15 ++++++++------- dlls/dwrite/tests/font.c | 3 +++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7dca5fb..0676b95 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -168,7 +168,7 @@ extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const W extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory4*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; -extern HRESULT get_eudc_fontcollection(IDWriteFactory4*,IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT get_eudc_fontcollection(IDWriteFactory4*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 328e5e4..d5bed85 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4052,7 +4052,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory4 *factory, struct dwrit return hr; } -HRESULT get_eudc_fontcollection(IDWriteFactory4 *factory, IDWriteFontCollection **ret) +HRESULT get_eudc_fontcollection(IDWriteFactory4 *factory, IDWriteFontCollection1 **ret) { static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0}; struct dwrite_fontcollection *collection; @@ -4078,7 +4078,9 @@ HRESULT get_eudc_fontcollection(IDWriteFactory4 *factory, IDWriteFontCollection return hr; } - *ret = (IDWriteFontCollection*)&collection->IDWriteFontCollection1_iface; + *ret = &collection->IDWriteFontCollection1_iface; + collection->factory = factory; + IDWriteFactory4_AddRef(factory); /* return empty collection if EUDC fonts are not configured */ sprintfW(eudckeypathW, eudckeyfmtW, GetACP()); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 73fcb51..a99bd95 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -537,7 +537,7 @@ struct dwritefactory { LONG ref; IDWriteFontCollection1 *system_collection; - IDWriteFontCollection *eudc_collection; + IDWriteFontCollection1 *eudc_collection; IDWriteGdiInterop1 *gdiinterop; IDWriteFontFallback *fallback; @@ -592,7 +592,7 @@ static void release_dwritefactory(struct dwritefactory *factory) if (factory->system_collection) IDWriteFontCollection1_Release(factory->system_collection); if (factory->eudc_collection) - IDWriteFontCollection_Release(factory->eudc_collection); + IDWriteFontCollection1_Release(factory->eudc_collection); if (factory->fallback) release_system_fontfallback(factory->fallback); heap_free(factory); @@ -1201,13 +1201,12 @@ static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory4 *ifac if (check_for_updates) FIXME("checking for eudc updates not implemented\n"); - if (!This->eudc_collection) + if (This->eudc_collection) + IDWriteFontCollection1_AddRef(This->eudc_collection); + else hr = get_eudc_fontcollection(iface, &This->eudc_collection); - if (SUCCEEDED(hr)) - IDWriteFontCollection_AddRef(This->eudc_collection); - - *collection = This->eudc_collection; + *collection = (IDWriteFontCollection*)This->eudc_collection; return hr; } @@ -1665,6 +1664,8 @@ void factory_detach_fontcollection(IDWriteFactory4 *iface, IDWriteFontCollection struct dwritefactory *factory = impl_from_IDWriteFactory4(iface); if (factory->system_collection == collection) factory->system_collection = NULL; + if (factory->eudc_collection == collection) + factory->eudc_collection = NULL; IDWriteFactory4_Release(iface); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 980278e..2d1b550 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4366,10 +4366,13 @@ static void test_GetEudcFontCollection(void) return; } + EXPECT_REF(factory1, 1); hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(factory1, 2); hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(factory1, 2); ok(coll == coll2, "got %p, %p\n", coll, coll2); IDWriteFontCollection_Release(coll); IDWriteFontCollection_Release(coll2);

1 0