September 2013 - Wine-commits

Alexandre Julliard : makefiles: Add support for specifying a prefix for installed library file names.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: a83c598c7987316582d254280ab57fcbe45acc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83c598c7987316582d254280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 14:31:57 2013 +0200 makefiles: Add support for specifying a prefix for installed library file names. --- Make.vars.in | 1 + aclocal.m4 | 8 ++++---- configure | 11 +++++++---- configure.ac | 1 + dlls/Makedll.rules.in | 4 ++-- libs/wine/Makefile.in | 1 + libs/wine/config.c | 3 ++- libs/wine/loader.c | 14 ++++++++------ programs/Makeprog.rules.in | 4 ++-- 9 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 76436fa..133da5f 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -31,6 +31,7 @@ FLEX = @FLEX@ EXEEXT = @EXEEXT@ OBJEXT = @OBJEXT@ DLLEXT = @DLLEXT@ +DLLPREFIX = @DLLPREFIX@ FAKEEXT = $(DLLEXT:.so=.fake) TOOLSEXT = @TOOLSEXT@ IMPLIBEXT = @IMPLIBEXT@ diff --git a/aclocal.m4 b/aclocal.m4 index a3de5ee..ee67b83 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -381,10 +381,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" else wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) @@ -501,10 +501,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags then diff --git a/configure b/configure index 58f2579..cf4bbd5 100755 --- a/configure +++ b/configure @@ -713,6 +713,7 @@ LDRPATH_LOCAL LDRPATH_INSTALL IMPLIBEXT DLLFLAGS +DLLPREFIX DLLEXT CPP OPENGL_LIBS @@ -6409,6 +6410,8 @@ done DLLEXT="" +DLLPREFIX="" + DLLFLAGS="-D_REENTRANT" IMPLIBEXT="def" @@ -15634,10 +15637,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" else wine_fn_append_rule \ "$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) @@ -15758,10 +15761,10 @@ __uninstall__: $ac_dir/__uninstall__" then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags then diff --git a/configure.ac b/configure.ac index 1055b0a..337235c 100644 --- a/configure.ac +++ b/configure.ac @@ -677,6 +677,7 @@ AC_CHECK_HEADERS([libprocstat.h],,, dnl **** Check for working dll **** AC_SUBST(DLLEXT,"") +AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(IMPLIBEXT,"def") AC_SUBST(LDRPATH_INSTALL,"") diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 56414a0..b34a35a 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -72,7 +72,7 @@ install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) @@ -80,7 +80,7 @@ install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) uninstall:: - $(RM) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) + $(RM) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) # Misc. rules diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 04838c9..7123e9b 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -107,6 +107,7 @@ EXTRA_OBJS = version.o CONFIGDIRS = \ -DBINDIR='"$(bindir)"' \ -DDLLDIR='"$(dlldir)"' \ + -DDLLPREFIX='"$(DLLPREFIX)"' \ -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \ diff --git a/libs/wine/config.c b/libs/wine/config.c index 3b5dd68..a273502 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -249,9 +249,10 @@ static void init_server_dir( dev_t dev, ino_t ino ) } /* retrieve the default dll dir */ -const char *get_dlldir( const char **default_dlldir ) +const char *get_dlldir( const char **default_dlldir, const char **dll_prefix ) { *default_dlldir = DLLDIR; + *dll_prefix = "/" DLLPREFIX; return dlldir; } diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4e78116..01cc57a 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -90,19 +90,20 @@ static load_dll_callback_t load_dll_callback; static const char *build_dir; static const char *default_dlldir; +static const char *dll_prefix; static const char **dll_paths; static unsigned int nb_dll_paths; static int dll_path_maxlen; extern void mmap_init(void); -extern const char *get_dlldir( const char **default_dlldir ); +extern const char *get_dlldir( const char **default_dlldir, const char **dll_prefix ); /* build the dll load path from the WINEDLLPATH variable */ static void build_dll_path(void) { int len, count = 0; char *p, *path = getenv( "WINEDLLPATH" ); - const char *dlldir = get_dlldir( &default_dlldir ); + const char *dlldir = get_dlldir( &default_dlldir, &dll_prefix ); if (path) { @@ -152,6 +153,7 @@ static void build_dll_path(void) if (len > dll_path_maxlen) dll_path_maxlen = len; dll_paths[nb_dll_paths++] = default_dlldir; } + dll_path_maxlen += strlen( dll_prefix ) - 1; } /* check if the library is the correct architecture */ @@ -237,11 +239,11 @@ static char *next_dll_path( struct dll_path_context *context ) /* fall through */ default: index -= 2; - if (index < nb_dll_paths) - return prepend( context->name, dll_paths[index], strlen( dll_paths[index] )); - break; + if (index >= nb_dll_paths) return NULL; + path = prepend( path + 1, dll_prefix, strlen( dll_prefix )); + path = prepend( path, dll_paths[index], strlen( dll_paths[index] )); + return path; } - return NULL; } diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index a3da072..9c2cb4b 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -26,7 +26,7 @@ $(MODULE) $(MODULE).so $(MODULE).fake: $(OBJS) Makefile.in .PHONY: install_prog install_prog.so install_prog.fake install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE).so install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) @@ -37,7 +37,7 @@ install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT) uninstall:: - $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) + $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(DLLPREFIX)$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) clean:: $(RM) $(MODULE)

1 0

Alexandre Julliard : configure: Set the library prefix to "lib" on Android.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 90520f7fc4a7875c93a73519efbe6dea2914721f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90520f7fc4a7875c93a73519e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 14:36:02 2013 +0200 configure: Set the library prefix to "lib" on Android. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure index cf4bbd5..317bade 100755 --- a/configure +++ b/configure @@ -6903,6 +6903,7 @@ clean:: linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" + DLLPREFIX="lib" { $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 : diff --git a/configure.ac b/configure.ac index 337235c..8ac0216 100644 --- a/configure.ac +++ b/configure.ac @@ -872,6 +872,7 @@ clean:: linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" + DLLPREFIX="lib" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],

1 0

Alexandre Julliard : configure: Store all libraries in libdir on Android.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 770d902d10ab7d3ca096a4cd099fa52ca1abe711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770d902d10ab7d3ca096a4cd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 17:58:38 2013 +0200 configure: Store all libraries in libdir on Android. --- Make.vars.in | 2 +- configure | 4 ++++ configure.ac | 2 ++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 133da5f..ea3869d 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -10,7 +10,7 @@ infodir = @infodir@ mandir = @mandir@ fontdir = $(datadir)/wine/fonts includedir = @includedir@/wine -dlldir = @libdir@/wine +dlldir = @dlldir@ fakedlldir = $(dlldir)/fakedlls top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ diff --git a/configure b/configure index 317bade..a296e67 100755 --- a/configure +++ b/configure @@ -715,6 +715,7 @@ IMPLIBEXT DLLFLAGS DLLPREFIX DLLEXT +dlldir CPP OPENGL_LIBS XLIB @@ -6408,6 +6409,8 @@ done +dlldir="\${libdir}/wine" + DLLEXT="" DLLPREFIX="" @@ -6904,6 +6907,7 @@ clean:: DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" DLLPREFIX="lib" + dlldir="\${libdir}" { $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 : diff --git a/configure.ac b/configure.ac index 8ac0216..dacee3a 100644 --- a/configure.ac +++ b/configure.ac @@ -676,6 +676,7 @@ AC_CHECK_HEADERS([libprocstat.h],,, dnl **** Check for working dll **** +AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLEXT,"") AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLFLAGS,"-D_REENTRANT") @@ -873,6 +874,7 @@ clean:: DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" DLLPREFIX="lib" + dlldir="\${libdir}" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],

1 0

Alexandre Julliard : libwine: Look for all libraries in the dll search path on Android.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 626be2eab12e75bbfe198621875218feb93c19ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=626be2eab12e75bbfe1986218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 18:15:08 2013 +0200 libwine: Look for all libraries in the dll search path on Android. --- libs/wine/loader.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 01cc57a..5891a20 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -902,6 +902,23 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ret = dlopen( path, flag | RTLD_FIRST ); } else +#elif defined(__ANDROID__) + if (!strchr( filename, '/' ) && nb_dll_paths) + { + unsigned int i; + char *buffer = malloc( dll_path_maxlen + strlen(filename) + 2 ); + + buffer[dll_path_maxlen] = '/'; + strcpy( buffer + dll_path_maxlen + 1, filename ); + for (i = 0; i < nb_dll_paths; i++) + { + char *path = prepend( buffer + dll_path_maxlen, dll_paths[i], strlen(dll_paths[i]) ); + ret = dlopen( path, flag | RTLD_FIRST ); + if (ret) break; + } + free( buffer ); + if (ret) return ret; + } #endif ret = dlopen( filename, flag | RTLD_FIRST ); s = dlerror();

1 0

Huw Davies : server: Android declares syscall() in sys/syscall.h .
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: b47a391e9326bd4ff26e64cbae8b74d9e40907be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47a391e9326bd4ff26e64cba… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 26 11:15:15 2013 +0100 server: Android declares syscall() in sys/syscall.h . --- server/fd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/fd.c b/server/fd.c index 16e4196..32b2a29 100644 --- a/server/fd.c +++ b/server/fd.c @@ -88,6 +88,9 @@ #include <sys/time.h> #include <sys/types.h> #include <unistd.h> +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Michael Stefaniuc : include: Avoid using CONST in d3dx9math.inl.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 2693d5af710fc14d7568c096659dc0da3c7b164c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2693d5af710fc14d7568c0966… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 26 12:16:24 2013 +0200 include: Avoid using CONST in d3dx9math.inl. --- include/d3dx9math.inl | 244 ++++++++++++++++++++++++------------------------ 1 files changed, 122 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2693d5af710fc14d7568c…

1 0

Akihiro Sagawa : gdi32: Return GDI_ERROR when requested empty glyph bitmaps .
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: e2bce62a6daf5e79e5add26920552f3ef5df8170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bce62a6daf5e79e5add2692… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Sep 26 00:47:59 2013 +0900 gdi32: Return GDI_ERROR when requested empty glyph bitmaps. --- dlls/gdi32/freetype.c | 23 ++++++++++++++--------- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2a2619ee..bd4c895 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6518,12 +6518,14 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } } - lpgm->gmBlackBoxX = (right - left) >> 6; - lpgm->gmBlackBoxY = (top - bottom) >> 6; + width = (right - left) >> 6; + height = (top - bottom) >> 6; + lpgm->gmBlackBoxX = width; + lpgm->gmBlackBoxY = height; lpgm->gmptGlyphOrigin.x = origin_x >> 6; lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; - abc->abcB = (right - left) >> 6; + abc->abcB = width; abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, @@ -6552,12 +6554,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, switch(format) { case GGO_BITMAP: - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; pitch = ((width + 31) >> 5) << 2; needed = pitch * height; if(!buf || !buflen) break; + if (!needed) return GDI_ERROR; /* empty glyph */ switch(ft_face->glyph->format) { case ft_glyph_format_bitmap: @@ -6604,12 +6605,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, unsigned int max_level, row, col; BYTE *start, *ptr; - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; pitch = (width + 3) / 4 * 4; needed = pitch * height; if(!buf || !buflen) break; + if (!needed) return GDI_ERROR; /* empty glyph */ max_level = get_max_level( format ); @@ -6677,12 +6677,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BYTE *src, *dst; INT src_pitch, x; - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; pitch = width * 4; needed = pitch * height; if (!buf || !buflen) break; + if (!needed) return GDI_ERROR; /* empty glyph */ memset(buf, 0, buflen); dst = buf; @@ -6716,6 +6715,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_HBGR_BITMAP)? FT_RENDER_MODE_LCD: FT_RENDER_MODE_LCD_V; + if (!width || !height) + { + if (!buf || !buflen) return 0; + return GDI_ERROR; + } + if ( lcdfilter == FT_LCD_FILTER_DEFAULT || lcdfilter == FT_LCD_FILTER_LIGHT ) { if ( render_mode == FT_RENDER_MODE_LCD) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f68021e..eed9cec 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4169,7 +4169,7 @@ static void test_GetGlyphOutline(void) } } else - todo_wine ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret); + ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret); } }

1 0

Ken Thomases : winemac: When programmatically focusing a window, don' t generate WINDOW_LOST_FOCUS event for previously focused window.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 4e0e9ca84a89d1ac2b548ee4a6224b764af2d23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0e9ca84a89d1ac2b548ee4a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 25 15:10:57 2013 -0500 winemac: When programmatically focusing a window, don't generate WINDOW_LOST_FOCUS event for previously focused window. That event can confuse things if the program switches focus from A to B and then back to A and then processes events. It will get an event saying that A lost focus in Cocoa, check that A does indeed have current focus in Wine, and so switch focus away from it (to the desktop window). (It then gets an event that B lost focus, but that does nothing at that point.) --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 14 ++++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 8672812..8893f85 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -58,7 +58,6 @@ NSSize savedContentMinSize; NSSize savedContentMaxSize; - BOOL causing_becomeKeyWindow; BOOL ignore_windowMiniaturize; BOOL ignore_windowDeminiaturize; } diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a602adb..43be5d5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -464,6 +464,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @implementation WineWindow + static WineWindow* causing_becomeKeyWindow; + @synthesize disabled, noActivate, floating, fullscreen, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; @synthesize shape, shapeChangedSinceLastDraw; @@ -1200,9 +1202,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { [self orderBelow:nil orAbove:nil activate:activate]; - causing_becomeKeyWindow = TRUE; + causing_becomeKeyWindow = self; [self makeKeyWindow]; - causing_becomeKeyWindow = FALSE; + causing_becomeKeyWindow = nil; } - (void) postKey:(uint16_t)keyCode @@ -1263,7 +1265,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) */ - (BOOL) canBecomeKeyWindow { - if (causing_becomeKeyWindow) return YES; + if (causing_becomeKeyWindow == self) return YES; if (self.disabled || self.noActivate) return NO; return [self isKeyWindow]; } @@ -1432,7 +1434,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (event) [self flagsChanged:event]; - if (causing_becomeKeyWindow) return; + if (causing_becomeKeyWindow == self) return; [controller windowGotFocus:self]; } @@ -1465,9 +1467,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (!self.disabled && !self.noActivate) { - causing_becomeKeyWindow = TRUE; + causing_becomeKeyWindow = self; [self makeKeyWindow]; - causing_becomeKeyWindow = FALSE; + causing_becomeKeyWindow = nil; [controller windowGotFocus:self]; }

1 0

Frédéric Delanoy : kernel32: Use BOOL type where appropriate.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 6918c86544779165c44b6707bd4d63d88ffeb4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6918c86544779165c44b6707b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 26 08:42:49 2013 +0200 kernel32: Use BOOL type where appropriate. --- dlls/kernel32/process.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6ce43d8..6b4d9b4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -738,19 +738,20 @@ static BOOL build_command_line( WCHAR **argv ) len = 0; for (arg = argv; *arg; arg++) { - int has_space,bcount; + BOOL has_space; + int bcount; WCHAR* a; - has_space=0; + has_space=FALSE; bcount=0; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space=TRUE; while (*a!='\0') { if (*a=='\\') { bcount++; } else { if (*a==' ' || *a=='\t') { - has_space=1; + has_space=TRUE; } else if (*a=='"') { /* doubling of '\' preceding a '"', * plus escaping of said '"' @@ -774,20 +775,20 @@ static BOOL build_command_line( WCHAR **argv ) rupp->CommandLine.MaximumLength = len * sizeof(WCHAR); for (arg = argv; *arg; arg++) { - int has_space,has_quote; + BOOL has_space,has_quote; WCHAR* a; /* Check for quotes and spaces in this argument */ - has_space=has_quote=0; + has_space=has_quote=FALSE; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space=TRUE; while (*a!='\0') { if (*a==' ' || *a=='\t') { - has_space=1; + has_space=TRUE; if (has_quote) break; } else if (*a=='"') { - has_quote=1; + has_quote=TRUE; if (has_space) break; }

1 0

Sebastian Lackner : winex11: Added missing release_win_data() to create_foreign_window().
by Alexandre Julliard 25 Sep '13

25 Sep '13

Module: wine Branch: master Commit: 5fb74c48d10e1f511adc43caf44d09e489c5c29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb74c48d10e1f511adc43caf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 24 05:50:33 2013 +0200 winex11: Added missing release_win_data() to create_foreign_window(). --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 429602b..1ff36eb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1897,11 +1897,12 @@ HWND create_foreign_window( Display *display, Window xwin ) SetPropA( hwnd, foreign_window_prop, (HANDLE)xwin ); XSaveContext( display, xwin, winContext, (char *)data->hwnd ); - ShowWindow( hwnd, SW_SHOW ); - TRACE( "win %lx parent %p style %08x %s -> hwnd %p\n", xwin, parent, style, wine_dbgstr_rect(&data->window_rect), hwnd ); + release_win_data( data ); + + ShowWindow( hwnd, SW_SHOW ); return hwnd; }

1 0