February 2010 - Wine-commits

Peter Rosin : ntdll: Add RtlSetThreadErrorMode and RtlGetThreadErrorMode.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: bdebad094ce826da0498ccc23b0a054b3636d66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdebad094ce826da0498ccc23… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Tue Feb 2 13:50:16 2010 +0100 ntdll: Add RtlSetThreadErrorMode and RtlGetThreadErrorMode. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/rtl.c | 23 +++++++++++++++++++++++ dlls/ntdll/tests/rtl.c | 2 +- include/winternl.h | 2 ++ 4 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 67a9d13..c7c81e8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -643,6 +643,7 @@ @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) # @ stub RtlGetSecurityDescriptorRMControl # @ stub RtlGetSetBootStatusData +@ stdcall RtlGetThreadErrorMode() # @ stub RtlGetUnloadEventTrace @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @@ -842,6 +843,7 @@ # @ stub RtlSetSecurityDescriptorRMControl @ stub RtlSetSecurityObject # @ stub RtlSetSecurityObjectEx +@ stdcall RtlSetThreadErrorMode(long ptr) # @ stub RtlSetThreadIsCritical # @ stub RtlSetThreadPoolStartFunc @ stdcall RtlSetTimeZoneInformation(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ad4bc10..69a2955 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1165,3 +1165,26 @@ NTSTATUS WINAPI RtlDecompressBuffer(USHORT CompressionFormat, PUCHAR Uncompresse return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * RtlSetThreadErrorMode [NTDLL.@] + */ +NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) +{ + if (mode & ~0x70) + return STATUS_INVALID_PARAMETER_1; + + if (oldmode) + *oldmode = NtCurrentTeb()->HardErrorDisabled; + + NtCurrentTeb()->HardErrorDisabled = mode; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlGetThreadErrorMode [NTDLL.@] + */ +DWORD WINAPI RtlGetThreadErrorMode( void ) +{ + return NtCurrentTeb()->HardErrorDisabled; +} diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 61ceb72..6e76a3c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1039,7 +1039,7 @@ static void test_RtlThreadErrorMode(void) if (!pRtlGetThreadErrorMode || !pRtlSetThreadErrorMode) { - skip("RtlGetThreadErrorMode and/or RtlSetThreadErrorMode not available\n"); + win_skip("RtlGetThreadErrorMode and/or RtlSetThreadErrorMode not available\n"); return; } diff --git a/include/winternl.h b/include/winternl.h index 08172b0..2f88cad 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2273,6 +2273,7 @@ NTSYSAPI ULONG WINAPI RtlGetNtGlobalFlags(void); NTSYSAPI BOOLEAN WINAPI RtlGetNtProductType(LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN); NTSYSAPI ULONG WINAPI RtlGetProcessHeaps(ULONG,HANDLE*); +NTSYSAPI DWORD WINAPI RtlGetThreadErrorMode(void); NTSYSAPI NTSTATUS WINAPI RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlGetVersion(RTL_OSVERSIONINFOEXW*); NTSYSAPI NTSTATUS WINAPI RtlGUIDFromString(PUNICODE_STRING,GUID*); @@ -2364,6 +2365,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMP NTSYSAPI void WINAPI RtlSetLastWin32Error(DWORD); NTSYSAPI void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS); NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING);

1 0

Alexandre Julliard : makefiles: Simplify the installation of program binaries by not attempting to hardlink them .
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 7b7444fbcad4a0a56e842f645e42a28fa18be1bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7444fbcad4a0a56e842f645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 11:50:24 2010 +0100 makefiles: Simplify the installation of program binaries by not attempting to hardlink them. --- Make.rules.in | 1 - aclocal.m4 | 17 ----------------- configure | 17 ----------------- configure.ac | 1 - programs/Makefile.in | 17 ++++------------- 5 files changed, 4 insertions(+), 49 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c7813b0..e155d88 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -40,7 +40,6 @@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ -LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ diff --git a/aclocal.m4 b/aclocal.m4 index aedffae..a88883a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -118,23 +118,6 @@ LIBS="$LIBS $2" AC_CHECK_FUNCS([$1],[$3],[$4]) LIBS="$ac_wine_check_funcs_save_LIBS"]) -dnl **** Check for ln **** -dnl -dnl Usage: WINE_PROG_LN -dnl -AC_DEFUN([WINE_PROG_LN], -[AC_MSG_CHECKING([whether ln works]) -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - AC_SUBST(LN,ln) - AC_MSG_RESULT([yes]) -else - AC_SUBST(LN,["cp -p"]) - AC_MSG_RESULT([no, using $LN]) -fi -rm -f conf$$ conf$$.file]) - dnl **** Check for a mingw program, trying the various mingw prefixes **** dnl dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) diff --git a/configure b/configure index 2ae042f..537eb04 100755 --- a/configure +++ b/configure @@ -694,7 +694,6 @@ INSTALL_PROGRAM LDCONFIG EGREP GREP -LN LN_S STRIP RANLIB @@ -4572,22 +4571,6 @@ else $as_echo "no, using $LN_S" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5 -$as_echo_n "checking whether ln works... " >&6; } -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - LN=ln - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - LN="cp -p" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN" >&5 -$as_echo "no, using $LN" >&6; } -fi -rm -f conf$$ conf$$.file { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } if test "${ac_cv_path_GREP+set}" = set; then : diff --git a/configure.ac b/configure.ac index f823045..b8b04c2 100644 --- a/configure.ac +++ b/configure.ac @@ -246,7 +246,6 @@ AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_CHECK_TOOL(STRIP,strip,strip) AC_PROG_LN_S -WINE_PROG_LN AC_PROG_EGREP AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) AC_PROG_INSTALL diff --git a/programs/Makefile.in b/programs/Makefile.in index b339aa3..eff82f9 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -20,25 +20,16 @@ wineapploader: wineapploader.in # Rules for installation -.PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) +.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) -install-apploader: wineapploader $(INSTALLDIRS) dummy - $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/wineapploader - -$(INSTALLPROGS:%=%/__installprog__): install-apploader - $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(LN) $(DESTDIR)$(bindir)/wineapploader $(DESTDIR)$(bindir)/`dirname $@` +$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy + $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@` install-progs.so: $(INSTALLPROGS:%=%/__installprog__) - $(RM) $(DESTDIR)$(bindir)/wineapploader - install-progs: # nothing to do here @WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) + -cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS) -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) - -# Rules for testing - -check test:: $(SUBDIRS:%=%/__test__)

1 0

Alexandre Julliard : makefiles: Get rid of the (broken) aclocal installation rules.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 303b79afa6cd7ff2dc36632b79f4d68ea4493f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=303b79afa6cd7ff2dc36632b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 11:50:37 2010 +0100 makefiles: Get rid of the (broken) aclocal installation rules. --- Makefile.in | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2d2d8b7..febb03e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,8 +51,6 @@ all: Make.rules $(PROGRAMS) WINAPI_CHECK_EXTRA_FLAGS = --global -INSTALLDIRS = $(DESTDIR)$(datadir)/aclocal - @MAKE_RULES@ $(SRCDIR)/configure: @MAINTAINER_MODE@ configure.ac aclocal.m4 @@ -75,15 +73,8 @@ wine: $(WINEWRAPPER) # Installation rules -install-aclocal: $(DESTDIR)$(datadir)/aclocal dummy - -.PHONY: install-aclocal - -(a)WOW64_DISABLE@ install install-dev:: install-aclocal - uninstall:: - $(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4 - -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(datadir)/aclocal + -rmdir $(DESTDIR)$(datadir)/wine # Dependencies between directories

1 0

Alexandre Julliard : makefiles: Generate the config. status dependency as part of the makefile dependencies.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 03e01a2987738ff98ead1c51e1237723d946e020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e01a2987738ff98ead1c51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:40:57 2010 +0100 makefiles: Generate the config.status dependency as part of the makefile dependencies. --- Makefile.in | 2 +- aclocal.m4 | 4 +- configure | 1088 +++++++++++++++++++++++++++++----------------------------- 3 files changed, 547 insertions(+), 547 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03e01a2987738ff98ead1…

1 0

Alexandre Julliard : makefiles: Create the wine symlink from configure.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 7d020c9f088af3e2d8d6e75c2d088f430fcf4af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d020c9f088af3e2d8d6e75c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:12:12 2010 +0100 makefiles: Create the wine symlink from configure. --- Make.rules.in | 1 - Makefile.in | 12 ++++-------- aclocal.m4 | 8 ++++++++ configure | 46 +++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 3 +++ tools/make_makefiles | 1 + 6 files changed, 61 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index e155d88..6a52a01 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -65,7 +65,6 @@ TARGETFLAGS = @TARGETFLAGS@ WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check -WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper C2MAN = $(TOPSRCDIR)/tools/c2man.pl RUNTEST = $(TOPSRCDIR)/tools/runtest WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) diff --git a/Makefile.in b/Makefile.in index 9dd1bd9..08349b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +26,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none -PROGRAMS = wine # Sub-directories to run make depend/clean into SUBDIRS = \ @@ -46,7 +45,7 @@ INSTALLSUBDIRS = @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls -all: Make.rules $(PROGRAMS) +all: wine @echo "Wine build complete." WINAPI_CHECK_EXTRA_FLAGS = --global @@ -68,9 +67,6 @@ include/config.h: include/stamp-h include/stamp-h: include/config.h.in config.status @./config.status include/config.h include/stamp-h -wine: $(WINEWRAPPER) - $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ - # Installation rules uninstall:: @@ -138,10 +134,10 @@ distclean:: clean # Makefile rules -ALL_MAKERULES = @ALL_MAKERULES@ ALL_MAKEFILES = @ALL_MAKEFILES@ +ALL_CONFIGS = Makefile $(ALL_MAKEFILES) @ALL_MAKERULES@ @ALL_SYMLINKS@ -Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): +$(ALL_CONFIGS): @./config.status $@ .INIT: Makefile .BEGIN: Makefile @@ -150,6 +146,6 @@ Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): $(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES) distclean:: - $(RM) Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES) + $(RM) $(ALL_CONFIGS) @ALL_MAKEFILE_DEPENDS@ diff --git a/aclocal.m4 b/aclocal.m4 index 76af863..3240435 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -142,6 +142,14 @@ dnl AC_DEFUN([WINE_CONFIG_EXTRA_DIR], [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) +dnl **** Create symlinks from config.status **** +dnl +dnl Usage: WINE_CONFIG_SYMLINK(name,target) +dnl +AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl +ALL_SYMLINKS="$ALL_SYMLINKS \\ + $1"]) + dnl **** Create a make rules file from config.status **** dnl dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps) diff --git a/configure b/configure index 0e68b55..5aac1cf 100755 --- a/configure +++ b/configure @@ -608,6 +608,7 @@ ALL_IMPLIB_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_MAKEFILE_DEPENDS +ALL_SYMLINKS ALL_MAKEFILES ALL_MAKERULES DEPENDENCIES @@ -13653,6 +13654,8 @@ ALL_MAKERULES="" ALL_MAKEFILES="" +ALL_SYMLINKS="" + ALL_MAKEFILE_DEPENDS="# Makefile dependencies" @@ -13682,6 +13685,10 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links wine:tools/winewrapper" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + wine" + ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv" ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv" @@ -19438,6 +19445,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" +config_links="$ac_config_links" config_commands="$ac_config_commands" _ACEOF @@ -19468,6 +19476,9 @@ $config_files Configuration headers: $config_headers +Configuration links: +$config_links + Configuration commands: $config_commands @@ -19596,6 +19607,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; @@ -20159,6 +20171,7 @@ done if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -20480,7 +20493,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_HEADERS" -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -20721,7 +20734,38 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} || as_fn_error "could not create -" "$LINENO" 5 fi ;; + :L) + # + # CONFIG_LINK + # + + if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then + : + else + # Prefer the file from the source tree if names are identical. + if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then + ac_source=$srcdir/$ac_source + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then + as_fn_error "$ac_source: file not found" "$LINENO" 5 + fi + rm -f "$ac_file" + # Try a relative symlink, then a hard link, then a copy. + case $srcdir in + [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; + *) ac_rel_source=$ac_top_build_prefix$ac_source ;; + esac + ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || + ln "$ac_source" "$ac_file" 2>/dev/null || + cp -p "$ac_source" "$ac_file" || + as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 + fi + ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; diff --git a/configure.ac b/configure.ac index b8b04c2..733c028 100644 --- a/configure.ac +++ b/configure.ac @@ -2096,6 +2096,7 @@ Makefile: dummy AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_MAKEFILES,"") +AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_TOP_DIRS,"") @@ -2113,6 +2114,8 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(wine,tools/winewrapper) + WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls) diff --git a/tools/make_makefiles b/tools/make_makefiles index fec44f6..2a05442 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -86,6 +86,7 @@ my @ignores = ( "/configure.lineno", "/TAGS", "/tags", + "/wine", "Makefile", "dlldata.c", "dlls/*/*.def",

1 0

Alexandre Julliard : makefiles: Create the fonts symlinks from configure.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: ce12296ce1544e665194488577b7e52a1df01006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce12296ce1544e66519448857… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:13:16 2010 +0100 makefiles: Create the fonts symlinks from configure. --- configure | 16 ++++++++++++++++ configure.ac | 4 ++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5aac1cf..25ea483 100755 --- a/configure +++ b/configure @@ -13685,6 +13685,18 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/marlett.ttf" +ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/symbol.ttf" +ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/tahoma.ttf" +ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + fonts/tahomabd.ttf" ac_config_links="$ac_config_links wine:tools/winewrapper" ALL_SYMLINKS="$ALL_SYMLINKS \\ wine" @@ -19607,6 +19619,10 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; + "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" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; diff --git a/configure.ac b/configure.ac index 733c028..f6c4d34 100644 --- a/configure.ac +++ b/configure.ac @@ -2114,6 +2114,10 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(fonts/marlett.ttf) +WINE_CONFIG_SYMLINK(fonts/symbol.ttf) +WINE_CONFIG_SYMLINK(fonts/tahoma.ttf) +WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

1 0

Alexandre Julliard : configure: Create a symlink for generic.ppd.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: a632052692d033820805e1d3910bad6ccd90eb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a632052692d033820805e1d39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:14:03 2010 +0100 configure: Create a symlink for generic.ppd. --- configure | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 25ea483..2cd384d 100755 --- a/configure +++ b/configure @@ -13685,6 +13685,9 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + dlls/wineps.drv/generic.ppd" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ALL_SYMLINKS="$ALL_SYMLINKS \\ fonts/marlett.ttf" @@ -19619,6 +19622,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "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" ;; diff --git a/configure.ac b/configure.ac index f6c4d34..8016dd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2114,6 +2114,7 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) WINE_CONFIG_SYMLINK(fonts/marlett.ttf) WINE_CONFIG_SYMLINK(fonts/symbol.ttf) WINE_CONFIG_SYMLINK(fonts/tahoma.ttf)

1 0

Alexandre Julliard : winex11: Synchronize the shaped flag with the window region before determining the window size .
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: aa4778413025a5b93695cd97ab39fc77e3e838fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4778413025a5b93695cd97a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 22:35:32 2010 +0100 winex11: Synchronize the shaped flag with the window region before determining the window size. --- dlls/winex11.drv/window.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ec7f6dd..1dfecce 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1444,6 +1444,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat COLORREF key; BYTE alpha; DWORD layered_flags; + HRGN win_rgn; if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) { @@ -1452,6 +1453,14 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); } + if ((win_rgn = CreateRectRgn( 0, 0, 0, 0 )) && + GetWindowRgn( data->hwnd, win_rgn ) == ERROR) + { + DeleteObject( win_rgn ); + win_rgn = 0; + } + data->shaped = (win_rgn != 0); + mask = get_window_attributes( display, data, &attr ); data->whole_rect = data->window_rect; @@ -1471,7 +1480,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat if (data->whole_window) XSaveContext( display, data->whole_window, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); - if (!data->whole_window) return 0; + if (!data->whole_window) goto done; if (!create_client_window( display, data, NULL )) { @@ -1480,7 +1489,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat XDestroyWindow( display, data->whole_window ); data->whole_window = 0; wine_tsx11_unlock(); - return 0; + goto done; } set_initial_wm_hints( display, data ); @@ -1493,7 +1502,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat sync_window_text( display, data->whole_window, text ); /* set the window region */ - sync_window_region( display, data, (HRGN)1 ); + if (win_rgn) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; @@ -1502,6 +1511,8 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); +done: + if (win_rgn) DeleteObject( win_rgn ); return data->whole_window; }

1 0

Alexandre Julliard : user32: Fix the WM_CONTEXTMENU parameter for 64-bit.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 48ab8eb3fd088df66f65205da88fdfce00851b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ab8eb3fd088df66f65205da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 23:44:10 2010 +0100 user32: Fix the WM_CONTEXTMENU parameter for 64-bit. --- dlls/user32/defwnd.c | 2 +- dlls/user32/tests/msg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index e3736fc..0101ee2 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -563,7 +563,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa else if( wParam == VK_F10 ) { if (GetKeyState(VK_SHIFT) & 0x8000) - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 ); iF10Key = 1; } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 96b9ccc..76fef3b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6910,7 +6910,7 @@ static const struct message WmShiftF10Seq[] = { { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, - { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, MAKELPARAM(-1, -1) }, + { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, -1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 },

1 0

Alexandre Julliard : advapi32/tests: Fix the service inactive state check to match the documentation.
by Alexandre Julliard 03 Feb '10

03 Feb '10

Module: wine Branch: master Commit: 823edff3127740633611fe89fe5c203a356b1e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823edff3127740633611fe89f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 23:44:32 2010 +0100 advapi32/tests: Fix the service inactive state check to match the documentation. --- dlls/advapi32/tests/service.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 17f89d1..605f384 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1315,10 +1315,10 @@ static void test_enum_svc(void) */ if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState == SERVICE_RUNNING) - servicecountactive--; - else + if (status.dwCurrentState == SERVICE_STOPPED) servicecountinactive--; + else + servicecountactive--; } } HeapFree(GetProcessHeap(), 0, services); @@ -1661,7 +1661,7 @@ static void test_enum_svc(void) if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { - if (status.dwCurrentState == SERVICE_RUNNING) + if (status.dwCurrentState != SERVICE_STOPPED) { /* We expect a process id for every running service */ ok(status.dwProcessId > 0, "Expected a process id for this running service (%s)\n",

1 0