October 2013 - Wine-commits

Henri Verbeet : wined3d: Don' t update lowest_disabled_stage in wined3d_stateblock_apply().
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 242a79a9d7377e8534b7db6b9dbf373b8f5a5961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242a79a9d7377e8534b7db6b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:05 2013 +0200 wined3d: Don't update lowest_disabled_stage in wined3d_stateblock_apply(). --- dlls/wined3d/stateblock.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 24c4362..2a1cb12 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1133,16 +1133,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_clip_plane(device, i, &stateblock->state.clip_planes[i]); } - stateblock->device->state.lowest_disabled_stage = MAX_TEXTURES - 1; - for (i = 0; i < MAX_TEXTURES - 1; ++i) - { - if (stateblock->device->state.texture_states[i][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_DISABLE) - { - stateblock->device->state.lowest_disabled_stage = i; - break; - } - } - TRACE("Applied stateblock %p.\n", stateblock); }

1 0

Henri Verbeet : wined3d: Move lowest_disabled_stage to the context.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 8644b6272677e06865b3875d5194d5efe1c2f5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8644b6272677e06865b3875d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:06 2013 +0200 wined3d: Move lowest_disabled_stage to the context. --- dlls/wined3d/arb_program_shader.c | 8 ++--- dlls/wined3d/context.c | 21 +++++++++++++- dlls/wined3d/device.c | 50 ---------------------------------- dlls/wined3d/nvidia_texture_shader.c | 8 +++--- dlls/wined3d/state.c | 6 ++-- dlls/wined3d/stateblock.c | 2 - dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +- 8 files changed, 32 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8644b6272677e06865b38…

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMImpl typedef.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 3dffb34f7c7ba45f5b4238553ba722d97aebe109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dffb34f7c7ba45f5b4238553… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:07 2013 +0200 d3drm: Get rid of the IDirect3DRMImpl typedef. --- dlls/d3drm/d3drm.c | 754 ++++++++++++++++++++++++---------------------------- 1 files changed, 350 insertions(+), 404 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dffb34f7c7ba45f5b423…

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMDeviceImpl typedef.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 0160b9a3850a6406d57cd3d8026c12bbd5ec2187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0160b9a3850a6406d57cd3d80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:08 2013 +0200 d3drm: Get rid of the IDirect3DRMDeviceImpl typedef. --- dlls/d3drm/device.c | 883 ++++++++++++++++++++++----------------------------- 1 files changed, 382 insertions(+), 501 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0160b9a3850a6406d57cd…

1 0

Dmitry Timoshkov : ntdll/tests: Add a test for file position after NtWriteFile in FILE_APPEND_DATA mode.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: ae3c49d841abf25b1eb618484974477e95a2a6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3c49d841abf25b1eb618484… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 14:39:27 2013 +0900 ntdll/tests: Add a test for file position after NtWriteFile in FILE_APPEND_DATA mode. --- dlls/ntdll/tests/file.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 73b4559..4740d42 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -857,6 +857,7 @@ static void append_file_test(void) IO_STATUS_BLOCK iosb; LARGE_INTEGER offset; char path[MAX_PATH], buffer[MAX_PATH], buf[16]; + DWORD ret; GetTempPathA( MAX_PATH, path ); GetTempFileNameA( path, "foo", 0, buffer ); @@ -866,10 +867,10 @@ static void append_file_test(void) U(iosb).Status = -1; iosb.Information = -1; - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 3, NULL, NULL); + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 2, NULL, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); - ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); CloseHandle(handle); @@ -880,14 +881,33 @@ static void append_file_test(void) U(iosb).Status = -1; iosb.Information = -1; - offset.QuadPart = 0; - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); + offset.QuadPart = 1; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 2, 2, &offset, NULL); todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); todo_wine ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); todo_wine - ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + + ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); +todo_wine + ok(ret == 4, "expected 4, got %u\n", ret); + + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 3; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 4, 2, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); +todo_wine + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + + ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); +todo_wine + ok(ret == 6, "expected 6, got %u\n", ret); CloseHandle(handle);

1 0

Alexandre Julliard : tools: Upgrade the install-sh script.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 2808ba2108eafca6a665e262f31bf3020b55b9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2808ba2108eafca6a665e262f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 22:09:18 2013 +0200 tools: Upgrade the install-sh script. --- tools/install-sh | 538 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 371 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2808ba2108eafca6a665e…

1 0

Alexandre Julliard : configure: Use the standard MKDIR_P macro to create directories.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 69b9c4b1989daaa2e076dc119004f9fd6c5abb5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b9c4b1989daaa2e076dc119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 22:12:22 2013 +0200 configure: Use the standard MKDIR_P macro to create directories. --- Make.rules.in | 2 +- Make.vars.in | 2 +- configure | 56 +++++++++++++++++++++++++++--- configure.ac | 12 ++---- tools/mkinstalldirs | 97 --------------------------------------------------- 5 files changed, 57 insertions(+), 112 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7760778..130abbd 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -180,7 +180,7 @@ clean:: $(EXTRASUBDIRS:%=%/__clean__) # Rules for installing $(INSTALLDIRS): - $(MKINSTALLDIRS) $@ + $(MKDIR_P) -m 755 $@ install install-lib install-dev uninstall:: diff --git a/Make.vars.in b/Make.vars.in index 01498d2..b5cca68 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -41,6 +41,7 @@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ LN_S = @LN_S@ +MKDIR_P = @MKDIR_P@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ PRELINK = @PRELINK@ @@ -57,7 +58,6 @@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ CROSSAR = $(CROSSTARGET)-ar CROSSRANLIB = $(CROSSTARGET)-ranlib -MKINSTALLDIRS = $(top_srcdir)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check BUILDIMAGE = $(top_srcdir)/tools/buildimage C2MAN = $(top_srcdir)/tools/c2man.pl diff --git a/configure b/configure index 73aabf2..8c4175d 100755 --- a/configure +++ b/configure @@ -731,6 +731,7 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM LDCONFIG +MKDIR_P EGREP GREP LN_S @@ -5360,6 +5361,48 @@ $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -5402,7 +5445,7 @@ fi -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="env STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -5496,10 +5539,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -case "$INSTALL" in - [\\/$]* | ?:[\\/]* ) ;; - *) INSTALL="\\\$(top_srcdir)/$INSTALL" ;; -esac for ac_prog in lclint lint do @@ -18000,6 +18039,7 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' test -n "\$AWK" || AWK=awk _ACEOF @@ -18631,6 +18671,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -18685,6 +18730,7 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | diff --git a/configure.ac b/configure.ac index 5bbb5bf..c98e0ea 100644 --- a/configure.ac +++ b/configure.ac @@ -262,16 +262,12 @@ AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_PROG_LN_S AC_PROG_EGREP +AC_PROG_MKDIR_P AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) dnl Use the correct strip to install programs -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="env STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" AC_PROG_INSTALL -dnl Prepend src dir to install path dir if it's a relative path -case "$INSTALL" in - [[\\/$]]* | ?:[[\\/]]* ) ;; - *) INSTALL="\\\$(top_srcdir)/$INSTALL" ;; -esac dnl Check for lint AC_CHECK_PROGS(LINT, lclint lint) @@ -2561,7 +2557,7 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */ #endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) -_AS_ECHO_N([creating Makefile rules...]) +AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD WINE_APPEND_RULE([ # Rules automatically generated by configure @@ -3423,7 +3419,7 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) fi -_AS_ECHO([ done]) +AS_ECHO(" done") >&AS_MESSAGE_FD AC_OUTPUT if test "$no_create" = "yes" diff --git a/tools/mkinstalldirs b/tools/mkinstalldirs deleted file mode 100755 index ec700bd..0000000 --- a/tools/mkinstalldirs +++ /dev/null @@ -1,97 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman <friedman(a)prep.ai.mit.edu> -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) # -h for help - echo "${usage}" 1>&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in -0) exit 0 ;; -esac - -case $dirmode in -'') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi ;; -*) - # We cannot trust mkdir to set the proper permissions on - # parent directories. So create them manually. - ;; -esac - -for file -do - case "$file" in - /* ) pathcomp="/" ;; - -* ) pathcomp="./" ;; - * ) pathcomp="" ;; - esac - - saved_IFS="$IFS" - IFS="/" - for d in $file - do - IFS="$saved_IFS" - if test -n "$d"; then - pathcomp="$pathcomp$d" - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - break - elif test -n "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - if test -n "$lasterr"; then - errstatus=$lasterr - break - fi - fi - fi - pathcomp="$pathcomp/" - fi - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 3 -# End: -# mkinstalldirs ends here

1 0

Alexandre Julliard : makefiles: Define __WINESRC__ globally.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 8d5b8b13460df0eb3c2cec898e9ea1789276f0d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5b8b13460df0eb3c2cec898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 20:58:24 2013 +0200 makefiles: Define __WINESRC__ globally. --- Make.rules.in | 1 + Maketest.rules.in | 2 -- dlls/Makedll.rules.in | 1 - dlls/Makeimplib.rules.in | 1 - libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 2 +- loader/Makefile.in | 1 - programs/Makeprog.rules.in | 1 - server/Makefile.in | 1 - tools/Makefile.in | 2 +- tools/widl/Makefile.in | 2 -- tools/winebuild/Makefile.in | 2 -- tools/winedump/Makefile.in | 2 -- tools/winegcc/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 16 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 130abbd..fd7166f 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -14,6 +14,7 @@ # First some useful definitions INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) +DEFS = -D__WINESRC__ $(EXTRADEFS) ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) diff --git a/Maketest.rules.in b/Maketest.rules.in index 56174d8..7ba3060 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -9,8 +9,6 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = -D__WINESRC__ $(EXTRADEFS) - MODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(C_SRCS:.c=.ok) TESTPROGRAM = $(MODULE)$(DLLEXT) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index b34a35a..dba64f6 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -8,7 +8,6 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 0a22784..5112948 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -7,7 +7,6 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = -D__WINESRC__ $(EXTRADEFS) MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 79bd1fe..3f42fd4 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ DLLFLAGS = @DLLFLAGS@ MODULE = libwine_port.a diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index be5351e..ad9c3c9 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,6 +1,6 @@ DLLFLAGS = @DLLFLAGS@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ -DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" +EXTRADEFS = -DWINE_UNICODE_API="" VERSION = 1.0 SOVERSION = 1 diff --git a/loader/Makefile.in b/loader/Makefile.in index a7859b2..9b0436a 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ $(EXTRADEFS) MODCFLAGS = @BUILTINFLAG@ C_SRCS = \ diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 9c2cb4b..f72ad2e 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -10,7 +10,6 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = -D__WINESRC__ $(EXTRADEFS) ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext) diff --git a/server/Makefile.in b/server/Makefile.in index 2e9bba1..38e79bc 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -D__WINESRC__ EXTRALIBS = @LIBPOLL@ @LIBRT@ C_SRCS = \ diff --git a/tools/Makefile.in b/tools/Makefile.in index 91446d6..02feee9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" +EXTRADEFS = -DWINE_UNICODE_API="" EXTRAINCL = @FREETYPE_CFLAGS@ FREETYPELIBS = @FREETYPE_LIBS@ diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 4bbcf1e..f12916d 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -1,5 +1,3 @@ -DEFS = -D__WINESRC__ $(EXTRADEFS) - PROGRAMS = widl$(EXEEXT) MANPAGE = widl.man diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in index 96bc4f9..190caf3 100644 --- a/tools/winebuild/Makefile.in +++ b/tools/winebuild/Makefile.in @@ -1,5 +1,3 @@ -DEFS = -D__WINESRC__ $(EXTRADEFS) - PROGRAMS = winebuild$(EXEEXT) MANPAGE = winebuild.man diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index ce61682..e8a6ba3 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,5 +1,3 @@ -DEFS = -D__WINESRC__ $(EXTRADEFS) - PROGRAMS = winedump$(EXEEXT) MANPAGE = winedump.man diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 3e8bfdd..dce7ae2 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -1,4 +1,4 @@ -DEFS = \ +EXTRADEFS = \ -DINCLUDEDIR="\"$(includedir)\"" \ -DDLLDIR="\"$(dlldir)\"" \ -DLIBDIR="\"$(libdir)\"" \ diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 324ab51..c302c22 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -1,4 +1,4 @@ -DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" +EXTRADEFS = -DWINE_UNICODE_API="" PROGRAMS = wmc$(EXEEXT) MANPAGE = wmc.man ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE_STATIC) $(LIBPORT) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 2ed0453..a017891 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -1,4 +1,4 @@ -DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API="" +EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API="" PROGRAMS = wrc$(EXEEXT) MANPAGE = wrc.man ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)

1 0

Alexandre Julliard : makefiles: Generate the loader rules from configure.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: c0c7192eaac54af9cbe6300a4114623c5f3be085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c7192eaac54af9cbe6300a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 7 11:34:02 2013 +0200 makefiles: Generate the loader rules from configure. --- configure | 83 ++++++++++++++++++++++++++++++++++++++------------ configure.ac | 75 ++++++++++++++++++++++++++++++++++++++------- loader/Makefile.in | 36 +++------------------ tools/make_makefiles | 1 - 4 files changed, 132 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0c7192eaac54af9cbe63…

1 0

Alexandre Julliard : makefiles: Move l_intl.nls and wine. inf to loader so that they are installed even when tools are not built.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 2292b06281286cacfd9b037b8907ff2f6bf65975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2292b06281286cacfd9b037b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 7 12:07:04 2013 +0200 makefiles: Move l_intl.nls and wine.inf to loader so that they are installed even when tools are not built. --- .gitignore | 2 +- configure | 21 +++++++++++++++------ configure.ac | 15 +++++++++++++-- loader/Makefile.in | 2 ++ {tools => loader}/l_intl.nls | Bin 6086 -> 6086 bytes {tools => loader}/wine.inf.in | 2 +- programs/wineboot/wineboot.c | 4 ++-- tools/Makefile.in | 13 ++----------- tools/make_unicode | 2 +- 9 files changed, 37 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index aa64a29..f7e8b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -282,6 +282,7 @@ libs/wpp/ppy.tab.h loader/wine loader/wine-installed loader/wine-preloader +loader/wine.inf loader/wine64 loader/wine64-preloader loader/wine_info.plist @@ -315,7 +316,6 @@ tools/widl/parser.tab.c tools/widl/parser.tab.h tools/widl/parser.yy.c tools/widl/widl -tools/wine.inf tools/wineapploader tools/winebuild/winebuild tools/winedump/winedump diff --git a/configure b/configure index 102bca4..24ed2a8 100755 --- a/configure +++ b/configure @@ -16607,12 +16607,10 @@ ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/tahomabd.ttf fi +ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" +test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls ac_config_links="$ac_config_links po/LINGUAS:po/LINGUAS" test "$srcdir" = "." || wine_fn_config_symlink po/LINGUAS -if test "x$enable_tools" != xno; then -ac_config_links="$ac_config_links tools/l_intl.nls:tools/l_intl.nls" -test "$srcdir" = "." || wine_fn_config_symlink tools/l_intl.nls -fi ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine if test "x$enable_win64" != xno; then @@ -17490,7 +17488,18 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else as_fn_append LOADER_RULES " -install install-lib:: install-man-pages" +all: wine.inf + +wine.inf: wine.inf.in \$(top_builddir)/include/config.h + LC_ALL=C sed -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' \$(srcdir)/wine.inf.in >\$@ || (\$(RM) \$@ && false) + +install install-lib:: wine.inf \$(DESTDIR)\$(datadir)/wine install-man-pages + \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf + \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls + +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls +" fi $as_echo " done" >&6 @@ -18213,8 +18222,8 @@ do "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; + "loader/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS loader/l_intl.nls:loader/l_intl.nls" ;; "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;; - "tools/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS tools/l_intl.nls:tools/l_intl.nls" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; "dlls/gdi32/dibdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/dibdrv" ;; diff --git a/configure.ac b/configure.ac index 5ce589f..a508f8b 100644 --- a/configure.ac +++ b/configure.ac @@ -2619,8 +2619,8 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) +WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) -WINE_CONFIG_SYMLINK(tools,tools,[l_intl.nls],enable_tools) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) @@ -3467,7 +3467,18 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: install-man-pages"]) +all: wine.inf + +wine.inf: wine.inf.in \$(top_builddir)/include/config.h + LC_ALL=C sed -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' \$(srcdir)/wine.inf.in >\$@ || (\$(RM) \$@ && false) + +install install-lib:: wine.inf \$(DESTDIR)\$(datadir)/wine install-man-pages + \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf + \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls + +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls +"]) fi AS_ECHO(" done") >&AS_MESSAGE_FD diff --git a/loader/Makefile.in b/loader/Makefile.in index e5a6982..450655a 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,6 +9,7 @@ PROGRAMS = \ wine \ wine-installed \ wine-preloader \ + wine.inf \ wine_info.plist \ wine64 \ wine64-preloader @@ -22,6 +23,7 @@ EXTRA_MANPAGES = \ INSTALLDIRS = \ $(DESTDIR)$(bindir) \ + $(DESTDIR)$(datadir)/wine \ $(DESTDIR)$(mandir)/man$(prog_manext) \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) \ diff --git a/tools/l_intl.nls b/loader/l_intl.nls similarity index 100% rename from tools/l_intl.nls rename to loader/l_intl.nls diff --git a/tools/wine.inf.in b/loader/wine.inf.in similarity index 99% rename from tools/wine.inf.in rename to loader/wine.inf.in index 357b35c..1cefe01 100644 --- a/tools/wine.inf.in +++ b/loader/wine.inf.in @@ -161,7 +161,7 @@ HKCR,.hlp,,2,"hlpfile" HKCR,.inf,,2,"inffile" HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" -HKCR,.msi,,2,"Msi.Package" +HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b8512e3..4f9adb0 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -108,10 +108,10 @@ static char *get_wine_inf_path(void) } else if ((build_dir = wine_get_build_dir())) { - if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/tools/wine.inf") ))) + if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/loader/wine.inf") ))) return NULL; strcpy( name, build_dir ); - strcat( name, "/tools/wine.inf" ); + strcat( name, "/loader/wine.inf" ); } return name; } diff --git a/tools/Makefile.in b/tools/Makefile.in index 02feee9..17d70f2 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -8,7 +8,6 @@ PROGRAMS = \ make_xftmpl$(EXEEXT) \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ - wine.inf \ wineapploader MANPAGE = winemaker.man @@ -30,7 +29,6 @@ EXTRASUBDIRS = winapi INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(datadir)/applications \ - $(DESTDIR)$(datadir)/wine \ $(DESTDIR)$(mandir)/man$(prog_manext) \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) @@ -59,15 +57,10 @@ relpath$(EXEEXT): relpath.o sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT) $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) -wine.inf: wine.inf.in - LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false) - wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(srcdir)/wineapploader.in >$@ || ($(RM) $@ && false) -install install-lib:: wine.inf $(INSTALLDIRS) - $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf - $(INSTALL_DATA) $(srcdir)/l_intl.nls $(DESTDIR)$(datadir)/wine/l_intl.nls +install install-lib:: $(DESTDIR)$(datadir)/applications $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) @@ -79,9 +72,7 @@ install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: - $(RM) $(DESTDIR)$(datadir)/wine/wine.inf \ - $(DESTDIR)$(datadir)/wine/l_intl.nls \ - $(DESTDIR)$(datadir)/applications/wine.desktop \ + $(RM) $(DESTDIR)$(datadir)/applications/wine.desktop \ $(DESTDIR)$(bindir)/winemaker \ $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) diff --git a/tools/make_unicode b/tools/make_unicode index b6b1636..1acc424 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2164,7 +2164,7 @@ dump_mirroring( "dlls/usp10/mirror.c" ); dump_shaping( "dlls/usp10/shaping.c" ); dump_linebreak( "dlls/usp10/linebreak.c" ); dump_indic( "dlls/usp10/indicsyllable.c" ); -dump_intl_nls("tools/l_intl.nls"); +dump_intl_nls("loader/l_intl.nls"); dump_nameprep( "dlls/kernel32/nameprep.c" ); foreach my $file (@allfiles) { HANDLE_FILE( @{$file} ); }

1 0