November 2013 - Wine-Commits

Alexandre Julliard : makefiles: Only output tools directory dependencies when tools are enabled.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 210af2e399ea4f44ceb3419f6f82f110962d9bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=210af2e399ea4f44ceb3419f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 15:06:05 2013 +0100 makefiles: Only output tools directory dependencies when tools are enabled. --- aclocal.m4 | 7 +++++-- configure | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index b1315b7..d6f5790 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -343,7 +343,9 @@ wine_fn_config_lib () ac_name=$[1] ac_flags=$[2] ac_dir=dlls/$ac_name + ac_deps="include" + AS_VAR_IF([enable_tools],[no],,[ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"]) wine_fn_all_rules Make.rules.in wine_fn_clean_rules @@ -356,7 +358,7 @@ $ac_dir/uninstall:: install install-dev:: $ac_dir/install __uninstall__: $ac_dir/uninstall __builddeps__: $ac_dir -$ac_dir: tools/widl tools/winebuild tools/winegcc include" +$ac_dir: $ac_deps" } wine_fn_config_dll () @@ -368,9 +370,10 @@ wine_fn_config_dll () ac_implib=${4:-$ac_name} ac_file=$ac_dir/lib$ac_implib ac_dll=$ac_name - ac_deps="tools/widl tools/winebuild tools/winegcc include" + ac_deps="include" ac_implibflags="" + AS_VAR_IF([enable_tools],[no],,[ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"]) case $ac_name in *16) ac_implibflags=" -m16" ;; *.*) ;; diff --git a/configure b/configure index 8556682..680c049 100755 --- a/configure +++ b/configure @@ -16338,7 +16338,13 @@ wine_fn_config_lib () ac_name=$1 ac_flags=$2 ac_dir=dlls/$ac_name + ac_deps="include" + if test "x$enable_tools" = xno; then : + +else + ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" +fi wine_fn_all_rules Make.rules.in wine_fn_clean_rules @@ -16351,7 +16357,7 @@ $ac_dir/uninstall:: install install-dev:: $ac_dir/install __uninstall__: $ac_dir/uninstall __builddeps__: $ac_dir -$ac_dir: tools/widl tools/winebuild tools/winegcc include" +$ac_dir: $ac_deps" } wine_fn_config_dll () @@ -16363,9 +16369,14 @@ wine_fn_config_dll () ac_implib=${4:-$ac_name} ac_file=$ac_dir/lib$ac_implib ac_dll=$ac_name - ac_deps="tools/widl tools/winebuild tools/winegcc include" + ac_deps="include" ac_implibflags="" + if test "x$enable_tools" = xno; then : + +else + ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" +fi case $ac_name in *16) ac_implibflags=" -m16" ;; *.*) ;;

1 0

Alexandre Julliard : configure: Add a rule to prevent rebuilding makedep when tools are disabled.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 6ff553d36f29cd2615164f396e31359b90c3eaee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff553d36f29cd2615164f396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 23 15:41:15 2013 +0100 configure: Add a rule to prevent rebuilding makedep when tools are disabled. --- configure | 3 +++ configure.ac | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 17e8af6..8556682 100755 --- a/configure +++ b/configure @@ -17524,6 +17524,9 @@ then \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext" +else + wine_fn_append_rule "\$(MAKEDEP): + @echo \"You need to run make in $TOOLSDIR first\" && false" fi if test -n "$with_wine64" diff --git a/configure.ac b/configure.ac index 98a73f2..faadbef 100644 --- a/configure.ac +++ b/configure.ac @@ -3525,6 +3525,10 @@ then \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext]) +else + WINE_APPEND_RULE( +[\$(MAKEDEP): + @echo \"You need to run make in $TOOLSDIR first\" && false]) fi if test -n "$with_wine64"

1 0

Frédéric Delanoy : comctl32: Clarify DATETIME_GetPrevDateField documentation.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: ef2a8be6483bb5c0e2857cde4cd10a9bef72252e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2a8be6483bb5c0e2857cde4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 22 18:04:02 2013 +0100 comctl32: Clarify DATETIME_GetPrevDateField documentation. --- dlls/comctl32/datetime.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9684a92..d13b50c 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -831,8 +831,8 @@ DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt) return DTHT_NONE; } -/* Returns index of a closest date field from given counting to left - or -1 if there's no such field at left */ +/* Returns index of the nearest preceding date field from given, + or -1 if none was found */ static int DATETIME_GetPrevDateField(const DATETIME_INFO *infoPtr, int i) { for(--i; i >= 0; i--)

1 0

Nikolay Sivov : kernel32: Add more LoadLibraryEx() flags defines and mark them as unsupported.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: a2bcfa28d46563ab3d48eb3ba353583f6888e295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2bcfa28d46563ab3d48eb3ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 22 20:45:03 2013 +0400 kernel32: Add more LoadLibraryEx() flags defines and mark them as unsupported. --- dlls/kernel32/module.c | 7 ++++++- include/winbase.h | 5 +++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 63cf012..d1555f1 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -897,7 +897,12 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | - LOAD_LIBRARY_REQUIRE_SIGNED_TARGET; + LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | + LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | + LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS; if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); diff --git a/include/winbase.h b/include/winbase.h index 8e51c0b..3c620e4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -884,6 +884,11 @@ DECL_WINELIB_TYPE_AW(ENUMRESLANGPROC) #define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x00000020 #define LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE 0x00000040 #define LOAD_LIBRARY_REQUIRE_SIGNED_TARGET 0x00000080 +#define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x00000100 +#define LOAD_LIBRARY_SEARCH_APPLICATION_DIR 0x00000200 +#define LOAD_LIBRARY_SEARCH_USER_DIRS 0x00000400 +#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 +#define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 0x00001000 #define GET_MODULE_HANDLE_EX_FLAG_PIN 1 #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2

1 0

Jacek Caban : vbscript: Don't allow OP_dim on already initialized arrays.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 1c1a261122e9a2de546bc818d9739e38acec8e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1a261122e9a2de546bc818d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 22 16:48:33 2013 +0100 vbscript: Don't allow OP_dim on already initialized arrays. --- dlls/vbscript/interp.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4a137cd..6365461 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -984,6 +984,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg1.bstr; const unsigned array_id = ctx->instr->arg2.uint; + const array_desc_t *array_desc; ref_t ref; HRESULT hres; @@ -1007,15 +1008,16 @@ static HRESULT interp_dim(exec_ctx_t *ctx) return E_FAIL; } - if(!ctx->arrays[array_id]) { - const array_desc_t *array_desc; + if(ctx->arrays[array_id]) { + FIXME("Array already initialized\n"); + return E_FAIL; + } - array_desc = ctx->func->array_descs + array_id; - if(array_desc->dim_cnt) { - ctx->arrays[array_id] = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); - if(!ctx->arrays[array_id]) - return E_OUTOFMEMORY; - } + array_desc = ctx->func->array_descs + array_id; + if(array_desc->dim_cnt) { + ctx->arrays[array_id] = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); + if(!ctx->arrays[array_id]) + return E_OUTOFMEMORY; } V_VT(ref.u.v) = VT_ARRAY|VT_BYREF|VT_VARIANT;

1 0

Jacek Caban : vbscript: Added support for VT_BYREF|VT_VARIANT to to_int.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: d22252198949d3bf5fd3df77fa686adb8202a390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22252198949d3bf5fd3df77f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 22 16:48:23 2013 +0100 vbscript: Added support for VT_BYREF|VT_VARIANT to to_int. --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/lang.vbs | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5088e59..9d8f021 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -152,6 +152,9 @@ static inline HRESULT return_date(VARIANT *res, double date) HRESULT to_int(VARIANT *v, int *ret) { + if(V_VT(v) == (VT_BYREF|VT_VARIANT)) + v = V_VARIANTREF(v); + switch(V_VT(v)) { case VT_I2: *ret = V_I2(v); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f4b0255..06d0284 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -964,7 +964,6 @@ Class Property2 Function Property() End Function - Sub Test(property) End Sub @@ -1042,4 +1041,7 @@ for x=1 to 1 forarr(1) = x+1 next +x=1 +Call ok(forarr(x) = 2, "forarr(x) = " & forarr(x)) + reportSuccess()

1 0

Alexandre Julliard : makefiles: Don't make binaries depend on Makefile.in.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: ddcd19cf63bea5300cee48127c765fab6341ff81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcd19cf63bea5300cee48127… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:41:39 2013 +0100 makefiles: Don't make binaries depend on Makefile.in. --- Make.rules.in | 12 ++++++------ configure | 22 +++++++++++----------- configure.ac | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7409e06..0617611 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -44,19 +44,19 @@ ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Rules for main module -$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) Makefile.in +$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) $(WINEGCC) $(APPMODE) $(MODULEFLAGS) $(OBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) -lwine $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) # Rules for static libraries all: $(STATICLIB) -$(STATICLIB): $(OBJS) Makefile.in +$(STATICLIB): $(OBJS) $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ -$(STATICLIB:.a=.cross.a): $(CROSSOBJS) Makefile.in +$(STATICLIB:.a=.cross.a): $(CROSSOBJS) $(RM) $@ $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSRANLIB) $@ @@ -87,13 +87,13 @@ depend: dummy # Rules for tests -$(TESTMODULE) $(TESTMODULE:%=%.so): $(OBJS) Makefile.in +$(TESTMODULE) $(TESTMODULE:%=%.so): $(OBJS) $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) -$(TESTMODULE_STRIPPED): $(OBJS) Makefile.in +$(TESTMODULE_STRIPPED): $(OBJS) $(WINEGCC) -s -Wb,-F,$(TESTMODULE) $(APPMODE) $(OBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) -$(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in +$(CROSSTESTMODULE): $(CROSSOBJS) $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS) $(WINETEST_RES): $(TESTMODULE_STRIPPED) diff --git a/configure b/configure index 680c049..84a04b4 100755 --- a/configure +++ b/configure @@ -7270,7 +7270,7 @@ all: libwine.dll libwine.a libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def Makefile.in +libwine.dll: \$(OBJS) wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -7462,7 +7462,7 @@ fi LIBWINE_RULES=" all: libwine.dylib -libwine.\$(VERSION).dylib: \$(OBJS) Makefile.in +libwine.\$(VERSION).dylib: \$(OBJS) \$(CC) -dynamiclib -install_name @rpath/libwine.\$(SOVERSION).dylib -Wl,-rpath,@loader_path/ -compatibility_version \$(SOVERSION) -current_version \$(VERSION) \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.\$(SOVERSION).dylib: libwine.\$(VERSION).dylib @@ -7487,10 +7487,10 @@ clean:: as_fn_append LOADER_RULES " -$wine_binary: main.o Makefile.in wine_info.plist +$wine_binary: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in wine_info.plist +wine-installed: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h @@ -7645,7 +7645,7 @@ fi LIBWINE_RULES=" all: libwine.so -libwine.so: \$(OBJS) Makefile.in +libwine.so: \$(OBJS) \$(CC) -shared \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ install install-lib:: libwine.so \$(DESTDIR)\$(libdir) dummy @@ -7660,10 +7660,10 @@ clean:: as_fn_append LOADER_RULES " -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) " ;; @@ -7996,7 +7996,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } LIBWINE_RULES=" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map Makefile.in +libwine.so.\$(VERSION): \$(OBJS) wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -8021,10 +8021,10 @@ clean:: as_fn_append LOADER_RULES " -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) " ;; @@ -14019,7 +14019,7 @@ case $host_os in as_fn_append LOADER_RULES " all: $wine_binary-preloader -$wine_binary-preloader: preloader.o Makefile.in +$wine_binary-preloader: preloader.o \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) install install-lib:: $wine_binary-preloader \$(DESTDIR)\$(bindir) diff --git a/configure.ac b/configure.ac index faadbef..2c15f52 100644 --- a/configure.ac +++ b/configure.ac @@ -725,7 +725,7 @@ all: libwine.dll libwine.a libwine.a: wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def Makefile.in +libwine.dll: \$(OBJS) wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -849,7 +849,7 @@ clean:: AC_SUBST(LIBWINE_RULES,[" all: libwine.dylib -libwine.\$(VERSION).dylib: \$(OBJS) Makefile.in +libwine.\$(VERSION).dylib: \$(OBJS) \$(CC) -dynamiclib -install_name @rpath/libwine.\$(SOVERSION).dylib -Wl,-rpath,@loader_path/ -compatibility_version \$(SOVERSION) -current_version \$(VERSION) \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.\$(SOVERSION).dylib: libwine.\$(VERSION).dylib @@ -873,10 +873,10 @@ clean:: "]) AS_VAR_APPEND([LOADER_RULES],[" -$wine_binary: main.o Makefile.in wine_info.plist +$wine_binary: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in wine_info.plist +wine-installed: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h @@ -911,7 +911,7 @@ wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h AC_SUBST(LIBWINE_RULES,[" all: libwine.so -libwine.so: \$(OBJS) Makefile.in +libwine.so: \$(OBJS) \$(CC) -shared \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ install install-lib:: libwine.so \$(DESTDIR)\$(libdir) dummy @@ -925,10 +925,10 @@ clean:: "]) AS_VAR_APPEND([LOADER_RULES],[" -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) "]) ;; @@ -993,7 +993,7 @@ wine-installed: main.o Makefile.in AC_SUBST(LIBWINE_RULES,[" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map Makefile.in +libwine.so.\$(VERSION): \$(OBJS) wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -1017,10 +1017,10 @@ clean:: "]) AS_VAR_APPEND([LOADER_RULES],[" -$wine_binary: main.o Makefile.in +$wine_binary: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_LOCAL) -wine-installed: main.o Makefile.in +wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) "]) ;; @@ -2013,7 +2013,7 @@ case $host_os in AS_VAR_APPEND([LOADER_RULES],[" all: $wine_binary-preloader -$wine_binary-preloader: preloader.o Makefile.in +$wine_binary-preloader: preloader.o \$(CC) -o \$@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000 preloader.o \$(LIBPORT) \$(LDFLAGS) install install-lib:: $wine_binary-preloader \$(DESTDIR)\$(bindir)

1 0

Vincent Povirk : gdiplus: Write FillRects records to metafiles.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: c491d528212e87e46e2639891426808ca56eeee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c491d528212e87e46e2639891… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 20 16:50:51 2013 -0600 gdiplus: Write FillRects records to metafiles. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 7 +++ dlls/gdiplus/metafile.c | 94 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b2327f9..d95ea88 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -57,6 +57,8 @@ extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLS extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, + GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index de0fb30..122581d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3858,6 +3858,13 @@ GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDI if(!rects) return InvalidParameter; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + status = METAFILE_FillRectangles((GpMetafile*)graphics->image, brush, rects, count); + /* FIXME: Add gdi32 drawing. */ + return status; + } + status = GdipCreatePath(FillModeAlternate, &path); if (status != Ok) return status; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index bcb5be7..4949bd9 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -57,6 +57,21 @@ typedef struct EmfPlusHeader DWORD LogicalDpiY; } EmfPlusHeader; +typedef struct EmfPlusFillRects +{ + EmfPlusRecordHeader Header; + DWORD BrushID; + DWORD Count; +} EmfPlusFillRects; + +typedef struct EmfPlusRect +{ + SHORT X; + SHORT Y; + SHORT Width; + SHORT Height; +} EmfPlusRect; + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -316,6 +331,85 @@ GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) return Ok; } +static BOOL is_integer_rect(const GpRectF *rect) +{ + SHORT x, y, width, height; + x = rect->X; + y = rect->Y; + width = rect->Width; + height = rect->Height; + if (rect->X != (REAL)x || rect->Y != (REAL)y || + rect->Width != (REAL)width || rect->Height != (REAL)height) + return FALSE; + return TRUE; +} + +GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, + GDIPCONST GpRectF* rects, INT count) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusFillRects *record; + GpStatus stat; + BOOL integer_rects=1; + int i; + DWORD brushid; + int flags = 0; + + if (brush->bt == BrushTypeSolidColor) + { + flags |= 0x8000; + brushid = ((GpSolidFill*)brush)->color; + } + else + { + FIXME("brush serialization not implemented\n"); + return NotImplemented; + } + + for (i=0; i<count; i++) + { + if (!is_integer_rect(&rects[i])) + { + integer_rects = 0; + break; + } + } + + if (integer_rects) + flags |= 0x4000; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusFillRects) + count * (integer_rects ? sizeof(EmfPlusRect) : sizeof(GpRectF)), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeFillRects; + record->Header.Flags = flags; + record->BrushID = brushid; + record->Count = count; + + if (integer_rects) + { + EmfPlusRect *record_rects = (EmfPlusRect*)(record+1); + for (i=0; i<count; i++) + { + record_rects[i].X = (SHORT)rects[i].X; + record_rects[i].Y = (SHORT)rects[i].Y; + record_rects[i].Width = (SHORT)rects[i].Width; + record_rects[i].Height = (SHORT)rects[i].Height; + } + } + else + memcpy(record+1, rects, sizeof(GpRectF) * count); + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) { if (hdc != metafile->record_dc)

1 0

Vincent Povirk : gdiplus: Forward GdipFillRectangle to GdipFillRectangles.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 8babdc860a8ce357165bb218e898175d9cf40cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8babdc860a8ce357165bb218e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 20 16:14:10 2013 -0600 gdiplus: Forward GdipFillRectangle to GdipFillRectangles. --- dlls/gdiplus/graphics.c | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c2a5d42..de0fb30 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3820,38 +3820,31 @@ GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { - GpStatus stat; - GpPath *path; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height); - if(!graphics || !brush) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - stat = GdipCreatePath(FillModeAlternate, &path); - - if (stat == Ok) - { - stat = GdipAddPathRectangle(path, x, y, width, height); - - if (stat == Ok) - stat = GdipFillPath(graphics, brush, path); - - GdipDeletePath(path); - } + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; - return stat; + return GdipFillRectangles(graphics, brush, &rect, 1); } GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height) { + GpRectF rect; + TRACE("(%p, %p, %d, %d, %d, %d)\n", graphics, brush, x, y, width, height); - return GdipFillRectangle(graphics, brush, x, y, width, height); + rect.X = (REAL)x; + rect.Y = (REAL)y; + rect.Width = (REAL)width; + rect.Height = (REAL)height; + + return GdipFillRectangles(graphics, brush, &rect, 1); } GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects,

1 0

Lucas Zawacki : Portuguese translation for release 1.7.7 (try 2)
by Jeremy Newman Nov. 25, 2013

Nov. 25, 2013

Module: website Branch: master Commit: c072fa69409a2f872607b6ba8dd11a70e586c340 URL: http://source.winehq.org/git/website.git/?a=commit;h=c072fa69409a2f872607b6… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Nov 25 14:30:29 2013 -0200 Portuguese translation for release 1.7.7 (try 2) Small corrections --- news/pt/2013112201.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2013112201.xml b/news/pt/2013112201.xml new file mode 100644 index 0000000..9a36d17 --- /dev/null +++ b/news/pt/2013112201.xml @@ -0,0 +1,15 @@ +<news> +<date>22 de Novembro de 2013</date> +<title>Wine 1.7.7 lançado</title> +<body> + A versão de desenvolvimento 1.7.7 já está disponível agora. + <a href="{$root}/announce/1.7.7">Novidades</a> desta versão: +<ul> + <li>Suporte a configuração de compartilhamento remoto usando a biblioteca NetAPI do Samba.</li> + <li>Suporte a múltiplos layouts de teclado no driver de Mac.</li> + <li>Melhor suporte a uso embutido com XEMBED.</li> + <li>Suporte a arrays em VBScript.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.7.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0