December 2013 - Wine-Commits

Alexandre Julliard : makefiles: Automatically create object sub-directories when needed.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 73d1fa977a4907a73007a800c4355dcef7049a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d1fa977a4907a73007a800c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 21:10:55 2013 +0100 makefiles: Automatically create object sub-directories when needed. --- aclocal.m4 | 7 ------- configure | 36 ------------------------------------ configure.ac | 8 -------- tools/makedep.c | 47 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 35 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73d1fa977a4907a73007a…

1 0

Alexandre Julliard : makefiles: Get rid of the VPATH directive.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 070147a0341769234a52f83f298ab5a39a60a66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=070147a0341769234a52f83f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 20:08:02 2013 +0100 makefiles: Get rid of the VPATH directive. --- Make.vars.in | 1 - configure | 8 ++++---- configure.ac | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index a002c92..ac74f1f 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -15,7 +15,6 @@ fakedlldir = $(dlldir)/fakedlls top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ -VPATH = @srcdir@ SHELL = /bin/sh RM = rm -f MV = mv diff --git a/configure b/configure index c080f84..1f541e1 100755 --- a/configure +++ b/configure @@ -7268,10 +7268,10 @@ fi LIBWINE_RULES=" all: libwine.dll libwine.a -libwine.a: wine.def +libwine.a: \$(srcdir)/wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def +libwine.dll: \$(OBJS) \$(srcdir)/wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -7994,7 +7994,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } LIBWINE_RULES=" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map +libwine.so.\$(VERSION): \$(OBJS) \$(srcdir)/wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -17539,7 +17539,7 @@ if test "x$enable_tools" != xno then ac_config_commands="$ac_config_commands tools" - wine_fn_append_rule "tools/makedep$ac_exeext: tools/makedep.c include/config.h + wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext" diff --git a/configure.ac b/configure.ac index 38594e4..b6b9653 100644 --- a/configure.ac +++ b/configure.ac @@ -722,10 +722,10 @@ case $host_os in AC_SUBST(LIBWINE_RULES,[" all: libwine.dll libwine.a -libwine.a: wine.def +libwine.a: \$(srcdir)/wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def +libwine.dll: \$(OBJS) \$(srcdir)/wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -990,7 +990,7 @@ wine-installed: main.o AC_SUBST(LIBWINE_RULES,[" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map +libwine.so.\$(VERSION): \$(OBJS) \$(srcdir)/wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -3509,7 +3509,7 @@ if test "x$enable_tools" != xno then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( -[tools/makedep$ac_exeext: tools/makedep.c include/config.h +[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext])

1 0

Alexandre Julliard : makefiles: Generate rules from makedep for .in files.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: c2efb3b382aa10d2474d5e4a719b87c1929c6afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2efb3b382aa10d2474d5e4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 20:04:53 2013 +0100 makefiles: Generate rules from makedep for .in files. --- Make.rules.in | 2 +- Make.vars.in | 2 +- configure | 6 ------ configure.ac | 6 ------ loader/Makefile.in | 4 ++++ tools/Makefile.in | 6 +++--- tools/make_makefiles | 8 +++++++- tools/makedep.c | 12 +++++++----- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 6b9a996..27e5667 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -78,7 +78,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS) $(IDL_TLB_SRCS) \ - $(BISON_SRCS) $(LEX_SRCS) $(XTEMPLATE_SRCS) $(EXTRA_OBJS) $(MANPAGES) + $(BISON_SRCS) $(LEX_SRCS) $(XTEMPLATE_SRCS) $(IN_SRCS) $(EXTRA_OBJS) $(MANPAGES) depend: dummy $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(PARENTSRC:%=-P%) $(EXTRAINCL) $(DEPEND_SRCS) diff --git a/Make.vars.in b/Make.vars.in index 73bb0ae..a002c92 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -70,7 +70,7 @@ LIBWINE = -L$(top_builddir)/libs/wine -lwine LIBWINE_STATIC = $(top_builddir)/libs/wine/libwine_static.a WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a -SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' +SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ INSTALL = @INSTALL@ $(INSTALL_FLAGS) diff --git a/configure b/configure index 1b160db..c080f84 100755 --- a/configure +++ b/configure @@ -7493,9 +7493,6 @@ $wine_binary: main.o 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 - LC_ALL=C sed -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g' \$(srcdir)/wine_info.plist.in >\$@ || (\$(RM) \$@ && false) " ;; @@ -17566,9 +17563,6 @@ else as_fn_append LOADER_RULES " 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 diff --git a/configure.ac b/configure.ac index c2c7460..38594e4 100644 --- a/configure.ac +++ b/configure.ac @@ -878,9 +878,6 @@ $wine_binary: main.o 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 - LC_ALL=C sed -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g' \$(srcdir)/wine_info.plist.in >\$@ || (\$(RM) \$@ && false) "]) ;; @@ -3538,9 +3535,6 @@ else AS_VAR_APPEND([LOADER_RULES],[" 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 diff --git a/loader/Makefile.in b/loader/Makefile.in index df8d0fd..1bdefb2 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -20,6 +20,10 @@ MANPAGES = \ wine.man.in \ wine.pl.UTF-8.man.in +IN_SRCS = \ + wine.inf.in \ + wine_info.plist.in + INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(datadir)/wine diff --git a/tools/Makefile.in b/tools/Makefile.in index ec6921a..6d889b0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -20,6 +20,9 @@ C_SRCS = \ makedep.c \ sfnt2fnt.c +IN_SRCS = \ + wineapploader.in + INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(datadir)/applications @@ -42,9 +45,6 @@ fnt2fon$(EXEEXT): fnt2fon.o sfnt2fnt$(EXEEXT): sfnt2fnt.o $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) -wineapploader: wineapploader.in - sed -e 's,@bindir\@,$(bindir),g' $(srcdir)/wineapploader.in >$@ || ($(RM) $@ && false) - install install-lib:: $(DESTDIR)$(datadir)/applications $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) diff --git a/tools/make_makefiles b/tools/make_makefiles index d24dffc..8d94bfe 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -328,7 +328,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -422,6 +422,7 @@ sub assign_sources_to_makefiles(@) foreach my $file (@_) { next if defined $ignored_source_files{$file}; + next if $file =~ /Makefile\.in$/; my $dir = dirname( $file ); my $subdir = $dir; @@ -501,6 +502,10 @@ sub assign_sources_to_makefiles(@) push @{${$make}{"=MANPAGES"}}, $name; ${${$make}{"=flags"}}{"manpage"} = 1; } + elsif ($name =~ /\.in$/) + { + push @{${$make}{"=IN_SRCS"}}, $name; + } } } @@ -625,6 +630,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IDL_S_SRCS" ); replace_makefile_variable( $file, "IDL_TLB_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); + replace_makefile_variable( $file, "IN_SRCS" ); replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); replace_makefile_variable( $file, "MANPAGES" ); diff --git a/tools/makedep.c b/tools/makedep.c index 32383f4..f29aa44 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -914,15 +914,17 @@ static void parse_rc_file( struct incl_file *pFile, FILE *file ) /******************************************************************* - * parse_man_page + * parse_in_file */ -static void parse_man_page( struct incl_file *source, FILE *file ) +static void parse_in_file( struct incl_file *source, FILE *file ) { char *p, *buffer; /* make sure it gets rebuilt when the version changes */ add_include( source, "config.h", 1 ); + if (!strendswith( source->filename, ".man.in" )) return; /* not a man page */ + input_line = 0; while ((buffer = get_line( file ))) { @@ -1012,8 +1014,8 @@ static void parse_file( struct incl_file *source, int src ) parse_c_file( source, file ); else if (strendswith( source->filename, ".rc" )) parse_rc_file( source, file ); - else if (strendswith( source->filename, ".man.in" )) - parse_man_page( source, file ); + else if (strendswith( source->filename, ".in" )) + parse_in_file( source, file ); fclose(file); input_file_name = NULL; } @@ -1269,7 +1271,7 @@ static void output_sources(void) } column += output( " %s", source->filename ); } - else if (!strcmp( ext, "in" )) /* man page */ + else if (!strcmp( ext, "in" )) /* .in file or man page */ { if (strendswith( obj, ".man" ) && source->sourcename) {

1 0

Dmitry Timoshkov : include: Add more Task Scheduler interface definitions.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 870f289680e1d03dc050849514896f5880aa24d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870f289680e1d03dc05084951… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 13 18:55:18 2013 +0900 include: Add more Task Scheduler interface definitions. --- include/taskschd.idl | 286 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 285 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=870f289680e1d03dc0508…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 09b817aaf80d4fdc59e414fa05e21cb2dfd710fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b817aaf80d4fdc59e414fa0… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Dec 12 22:10:45 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index c01331c..4aef8c5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-03 20:42+0300\n" +"PO-Revision-Date: 2013-12-12 22:08+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10082,7 +10082,7 @@ msgstr "„Wine“ komandų interpretatorius" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? "

1 0

Michael Stefaniuc : oleaut32: Cast to the correct type instead to void pointer.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 4281d19d7634ed15f2031828b6c4fcdce8963dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4281d19d7634ed15f2031828b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 12 23:56:47 2013 +0100 oleaut32: Cast to the correct type instead to void pointer. --- dlls/oleaut32/connpt.c | 10 ++++------ dlls/oleaut32/olefont.c | 14 ++++++-------- dlls/oleaut32/olepicture.c | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 59768a0..1d7b05c 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -254,9 +254,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); TRACE("(%p)->(%p)\n", This, ppCPC); - return IUnknown_QueryInterface(This->Obj, - &IID_IConnectionPointContainer, - (LPVOID)ppCPC); + return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC); } /************************************************************************ @@ -273,7 +271,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie); *pdwCookie = 0; - if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (LPVOID)&lpSink))) + if(FAILED(IUnknown_QueryInterface(lpUnk, &This->iid, (void**)&lpSink))) return CONNECT_E_CANNOTCONNECT; for(i = 0; i < This->maxSinks; i++) { @@ -349,7 +347,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD); hr = IEnumConnections_QueryInterface(&EnumObj->IEnumConnections_iface, - &IID_IEnumConnections, (LPVOID)ppEnum); + &IID_IEnumConnections, (void**)ppEnum); IEnumConnections_Release(&EnumObj->IEnumConnections_iface); HeapFree(GetProcessHeap(), 0, pCD); @@ -623,7 +621,7 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, if(!Obj) return E_OUTOFMEMORY; hr = IConnectionPoint_QueryInterface(&Obj->IConnectionPoint_iface, - &IID_IConnectionPoint, (LPVOID)pCP); + &IID_IConnectionPoint, (void**)pCP); IConnectionPoint_Release(&Obj->IConnectionPoint_iface); return hr; } diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index c0925a2..ba873ec 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -414,7 +414,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IPropertyNotifySink *sink; - IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (LPVOID)&sink); + IUnknown_QueryInterface(CD.pUnk, &IID_IPropertyNotifySink, (void**)&sink); IPropertyNotifySink_OnChanged(sink, dispID); IPropertyNotifySink_Release(sink); IUnknown_Release(CD.pUnk); @@ -440,7 +440,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IFontEventsDisp *disp; - IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (LPVOID)&disp); + IUnknown_QueryInterface(CD.pUnk, &IID_IFontEventsDisp, (void**)&disp); IFontEventsDisp_Invoke(disp, DISPID_FONT_CHANGED, &IID_NULL, LOCALE_NEUTRAL, INVOKE_FUNC, &dispparams, NULL, NULL, NULL); @@ -1848,13 +1848,11 @@ static HRESULT WINAPI OLEFontImpl_FindConnectionPoint( TRACE("(%p)->(%s, %p)\n", this, debugstr_guid(riid), ppCp); if(IsEqualIID(riid, &IID_IPropertyNotifySink)) { - return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, - &IID_IConnectionPoint, - (LPVOID)ppCp); + return IConnectionPoint_QueryInterface(this->pPropertyNotifyCP, &IID_IConnectionPoint, + (void**)ppCp); } else if(IsEqualIID(riid, &IID_IFontEventsDisp)) { - return IConnectionPoint_QueryInterface(this->pFontEventsCP, - &IID_IConnectionPoint, - (LPVOID)ppCp); + return IConnectionPoint_QueryInterface(this->pFontEventsCP, &IID_IConnectionPoint, + (void**)ppCp); } else { FIXME("no connection point for %s\n", debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5e81766..2139fde 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -923,7 +923,7 @@ static HRESULT WINAPI OLEPictureImpl_FindConnectionPoint( return E_POINTER; *ppCP = NULL; if (IsEqualGUID(riid,&IID_IPropertyNotifySink)) - return IConnectionPoint_QueryInterface(This->pCP,&IID_IConnectionPoint,(LPVOID)ppCP); + return IConnectionPoint_QueryInterface(This->pCP, &IID_IConnectionPoint, (void**)ppCP); FIXME("no connection point for %s\n",debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; }

1 0

Henri Verbeet : ddraw: Unset the primary surface' s palette when the palette is released.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: c5a8b933afb0d671da1084e4964cf1be26318369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a8b933afb0d671da1084e49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:45 2013 +0100 ddraw: Unset the primary surface's palette when the palette is released. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/palette.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b24376d..fb3755f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -379,6 +379,7 @@ struct ddraw_palette LONG ref; struct wined3d_palette *wineD3DPalette; + struct ddraw *ddraw; IUnknown *ifaceToRelease; DWORD flags; }; diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 0c9534d..f35531e 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -94,10 +94,10 @@ static ULONG WINAPI ddraw_palette_Release(IDirectDrawPalette *iface) { wined3d_mutex_lock(); wined3d_palette_decref(This->wineD3DPalette); - if(This->ifaceToRelease) - { + if ((This->flags & DDPCAPS_PRIMARYSURFACE) && This->ddraw->primary) + This->ddraw->primary->palette = NULL; + if (This->ifaceToRelease) IUnknown_Release(This->ifaceToRelease); - } wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, This); @@ -251,6 +251,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, return hr; } + palette->ddraw = ddraw; palette->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface; IUnknown_AddRef(palette->ifaceToRelease);

1 0

Henri Verbeet : ddraw/tests: Add a test for palettes on primary surfaces.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: b9ab54a09af1600adf58133d3c3dfa8c9f2004a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ab54a09af1600adf58133d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:46 2013 +0100 ddraw/tests: Add a test for palettes on primary surfaces. --- dlls/ddraw/tests/ddraw1.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 98 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 398 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9ab54a09af1600adf581…

1 0

Henri Verbeet : wined3d: Explicitly pass the palette size to wined3d_palette_create().
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: f27bb660b3046e6df18e61bc006ad7f222b28547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27bb660b3046e6df18e61bc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:48 2013 +0100 wined3d: Explicitly pass the palette size to wined3d_palette_create(). --- dlls/ddraw/palette.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/palette.c | 33 ++++++++------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index f35531e..214c912 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -236,16 +236,41 @@ struct ddraw_palette *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *if return CONTAINING_RECORD(iface, struct ddraw_palette, IDirectDrawPalette_iface); } +static unsigned int palette_size(DWORD flags) +{ + switch (flags & (DDPCAPS_1BIT | DDPCAPS_2BIT | DDPCAPS_4BIT | DDPCAPS_8BIT)) + { + case DDPCAPS_1BIT: + return 2; + case DDPCAPS_2BIT: + return 4; + case DDPCAPS_4BIT: + return 16; + case DDPCAPS_8BIT: + return 256; + default: + return ~0u; + } +} + HRESULT ddraw_palette_init(struct ddraw_palette *palette, struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) { + unsigned int entry_count; HRESULT hr; + if ((entry_count = palette_size(flags)) == ~0u) + { + WARN("Invalid flags %#x.\n", flags); + return DDERR_INVALIDPARAMS; + } + palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; palette->flags = flags; - if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, flags, entries, &palette->wineD3DPalette))) + if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, + flags, entry_count, entries, &palette->wineD3DPalette))) { WARN("Failed to create wined3d palette, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 555a962..27e6b24 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define SIZE_BITS (WINEDDPCAPS_1BIT | WINEDDPCAPS_2BIT | WINEDDPCAPS_4BIT | WINEDDPCAPS_8BIT) - ULONG CDECL wined3d_palette_incref(struct wined3d_palette *palette) { ULONG refcount = InterlockedIncrement(&palette->ref); @@ -55,28 +53,15 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) return refcount; } -static WORD wined3d_palette_size(DWORD flags) -{ - switch (flags & SIZE_BITS) - { - case WINEDDPCAPS_1BIT: return 2; - case WINEDDPCAPS_2BIT: return 4; - case WINEDDPCAPS_4BIT: return 16; - case WINEDDPCAPS_8BIT: return 256; - default: - FIXME("Unhandled size bits %#x.\n", flags & SIZE_BITS); - return 256; - } -} - HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries) { TRACE("palette %p, flags %#x, start %u, count %u, entries %p.\n", palette, flags, start, count, entries); - if (flags) return WINED3DERR_INVALIDCALL; /* unchecked */ - if (start + count > wined3d_palette_size(palette->flags)) + if (flags) + return WINED3DERR_INVALIDCALL; /* unchecked */ + if (start > palette->palNumEntries || count > palette->palNumEntries - start) return WINED3DERR_INVALIDCALL; if (palette->flags & WINEDDPCAPS_8BITENTRIES) @@ -146,7 +131,7 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, } static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wined3d_device *device, - DWORD flags, const PALETTEENTRY *entries) + DWORD flags, unsigned int entry_count, const PALETTEENTRY *entries) { HRESULT hr; @@ -154,7 +139,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine palette->device = device; palette->flags = flags; - palette->palNumEntries = wined3d_palette_size(flags); + palette->palNumEntries = entry_count; palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); if (!palette->hpal) { @@ -162,8 +147,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine return E_FAIL; } - hr = wined3d_palette_set_entries(palette, 0, 0, wined3d_palette_size(flags), entries); - if (FAILED(hr)) + if (FAILED(hr = wined3d_palette_set_entries(palette, 0, 0, entry_count, entries))) { WARN("Failed to set palette entries, hr %#x.\n", hr); DeleteObject(palette->hpal); @@ -174,7 +158,7 @@ static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wine } HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, - const PALETTEENTRY *entries, struct wined3d_palette **palette) + unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette) { struct wined3d_palette *object; HRESULT hr; @@ -186,8 +170,7 @@ HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags, if (!object) return E_OUTOFMEMORY; - hr = wined3d_palette_init(object, device, flags, entries); - if (FAILED(hr)) + if (FAILED(hr = wined3d_palette_init(object, device, flags, entry_count, entries))) { WARN("Failed to initialize palette, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bbd5775..a1a99d9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -156,7 +156,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) -@ cdecl wined3d_palette_create(ptr long ptr ptr) +@ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) @ cdecl wined3d_palette_incref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4599678..52f8e52 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2234,7 +2234,7 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, - const PALETTEENTRY *entries, struct wined3d_palette **palette); + unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette); ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries);

1 0

Henri Verbeet : wined3d: Get rid of unused palette flags.
by Alexandre Julliard Dec. 13, 2013

Dec. 13, 2013

Module: wine Branch: master Commit: 4e7b62a46da52e1cbc9cffd4ebc3b46c06f16edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7b62a46da52e1cbc9cffd4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 13 09:07:49 2013 +0100 wined3d: Get rid of unused palette flags. --- dlls/ddraw/palette.c | 10 +++++++++- dlls/wined3d/palette.c | 8 ++++---- dlls/wined3d/surface.c | 11 +---------- include/wine/wined3d.h | 15 +++------------ 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 214c912..d04f426 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -257,6 +257,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, struct ddraw *ddraw, DWORD flags, PALETTEENTRY *entries) { unsigned int entry_count; + DWORD wined3d_flags = 0; HRESULT hr; if ((entry_count = palette_size(flags)) == ~0u) @@ -265,12 +266,19 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette, return DDERR_INVALIDPARAMS; } + if (flags & DDPCAPS_8BITENTRIES) + wined3d_flags |= WINED3D_PALETTE_8BIT_ENTRIES; + if (flags & DDPCAPS_ALLOW256) + wined3d_flags |= WINED3D_PALETTE_ALLOW_256; + if (flags & DDPCAPS_ALPHA) + wined3d_flags |= WINED3D_PALETTE_ALPHA; + palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; palette->flags = flags; if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, - flags, entry_count, entries, &palette->wineD3DPalette))) + wined3d_flags, entry_count, entries, &palette->wineD3DPalette))) { WARN("Failed to create wined3d palette, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 27e6b24..e659952 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -64,7 +64,7 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, if (start > palette->palNumEntries || count > palette->palNumEntries - start) return WINED3DERR_INVALIDCALL; - if (palette->flags & WINEDDPCAPS_8BITENTRIES) + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { BYTE *entry = (BYTE *)entries; unsigned int i; @@ -87,7 +87,7 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette, flags, start, count, entries); TRACE("Palette flags: %#x.\n", palette->flags); - if (palette->flags & WINEDDPCAPS_8BITENTRIES) + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { const BYTE *entry = (const BYTE *)entries; unsigned int i; @@ -100,9 +100,9 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, memcpy(palette->palents + start, entries, count * sizeof(*palette->palents)); /* When WINEDDCAPS_ALLOW256 isn't set we need to override entry 0 with black and 255 with white */ - if (!(palette->flags & WINEDDPCAPS_ALLOW256)) + if (!(palette->flags & WINED3D_PALETTE_ALLOW_256)) { - TRACE("WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white\n"); + TRACE("WINED3D_PALETTE_ALLOW_256 not set, overriding palette entry 0 with black and 255 with white.\n"); palette->palents[0].peRed = 0; palette->palents[0].peGreen = 0; palette->palents[0].peBlue = 0; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ec9ac6c..8c40516 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2498,18 +2498,9 @@ void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct w return; } - if (surface->palette && (surface->resource.usage & WINED3DUSAGE_RENDERTARGET)) - surface->palette->flags &= ~WINEDDPCAPS_PRIMARYSURFACE; - surface->palette = palette; - if (palette) - { - if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - palette->flags |= WINEDDPCAPS_PRIMARYSURFACE; - surface->surface_ops->surface_realize_palette(surface); - } } HRESULT CDECL wined3d_surface_set_color_key(struct wined3d_surface *surface, @@ -3777,7 +3768,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 table[i][3] = i; else if (colorkey && color_in_range(&surface->src_blt_color_key, i)) table[i][3] = 0x00; - else if (pal->flags & WINEDDPCAPS_ALPHA) + else if (pal->flags & WINED3D_PALETTE_ALPHA) table[i][3] = pal->palents[i].peFlags; else table[i][3] = 0xff; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 52f8e52..47dde06 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1481,18 +1481,9 @@ enum wined3d_display_rotation #define WINEDDCAPS2_STEREO 0x02000000 #define WINEDDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL 0x04000000 -/* DDCAPS.d */ -#define WINEDDPCAPS_4BIT 0x00000001 -#define WINEDDPCAPS_8BITENTRIES 0x00000002 -#define WINEDDPCAPS_8BIT 0x00000004 -#define WINEDDPCAPS_INITIALIZE 0x00000008 -#define WINEDDPCAPS_PRIMARYSURFACE 0x00000010 -#define WINEDDPCAPS_PRIMARYSURFACELEFT 0x00000020 -#define WINEDDPCAPS_ALLOW256 0x00000040 -#define WINEDDPCAPS_VSYNC 0x00000080 -#define WINEDDPCAPS_1BIT 0x00000100 -#define WINEDDPCAPS_2BIT 0x00000200 -#define WINEDDPCAPS_ALPHA 0x00000400 +#define WINED3D_PALETTE_8BIT_ENTRIES 0x00000001 +#define WINED3D_PALETTE_ALLOW_256 0x00000002 +#define WINED3D_PALETTE_ALPHA 0x00000004 #define WINED3D_SURFACE_MAPPABLE 0x00000001 #define WINED3D_SURFACE_DISCARD 0x00000002

1 0