October 2015 - Wine-commits

Alistair Leslie-Hughes : d3dx10_43: Add D3DX10CreateEffectPoolFromMemory stub.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: ed5a375b8a567c53b560026871a057b48d260524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5a375b8a567c53b56002687… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 29 19:10:45 2015 +1100 d3dx10_43: Add D3DX10CreateEffectPoolFromMemory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index ada1fa0..9edcf54 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -27,7 +27,7 @@ @ stub D3DX10CreateEffectFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectPoolFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectPoolFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateFontA(ptr long long long long long long long long long str ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 0e4c580..6637af3 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -103,3 +103,16 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c return E_NOTIMPL; } + +HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, + ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " + "device %p, pump %p, effectpool %p, errors %p, hresult %p.\n", + data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, + pump, effectpool, errors, hresult); + + return E_NOTIMPL; +}

1 0

Sebastian Lackner : server: Add a missing grab_object in cgwe_enum.
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: 9e66d845853fdcae352c22432540b8d7ffc7f850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e66d845853fdcae352c22432… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 30 08:26:07 2015 +0100 server: Add a missing grab_object in cgwe_enum. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 78e91d6..389547d 100644 --- a/server/console.c +++ b/server/console.c @@ -1781,7 +1781,7 @@ static int cgwe_enum( struct process* process, void* user) { if (process->console && process->console->renderer == current) { - *(struct console_input**)user = process->console; + *(struct console_input**)user = (struct console_input *)grab_object( process->console ); return 1; } return 0;

1 0

Alistair Leslie-Hughes : msxml3/tests: Fix memory leaks (valgrind).
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: f912d85deb1da809c42afda88dbdaeec2626b736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f912d85deb1da809c42afda88… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 17:48:36 2015 +1100 msxml3/tests: Fix memory leaks (valgrind). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 75354c5..0958c03 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2391,6 +2391,7 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -2414,6 +2415,7 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_TRUE); EXPECT_HR(hr, S_OK);

1 0

Alistair Leslie-Hughes : xmllite/tests: Fix memory leak (valgrind).
by Alexandre Julliard 30 Oct '15

30 Oct '15

Module: wine Branch: master Commit: 3e9b4c1a1765f87b972a27be89d3df772b6f17c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9b4c1a1765f87b972a27be8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 17:48:38 2015 +1100 xmllite/tests: Fix memory leak (valgrind). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f7c576f..9c0cdec 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1431,6 +1431,7 @@ static void test_readvaluechunk(void) ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); IXmlReader_Release(reader); + IStream_Release(stream); } static struct test_entry cdata_tests[] = {

1 0

Alistair Leslie-Hughes : dpnet: Don't leak entry name.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 54633e3956e6b3c4d8ebbd5d721efa294e9602fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=54633e3956e6b3c4d8ebbd5d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 29 19:21:23 2015 +1100 dpnet: Don't leak entry name. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 4f3a59b..d87d4e7 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -159,6 +159,7 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) break; } + heap_free(entry->name); heap_free(entry); }

1 0

Gerald Pfeifer : gdiplus: Avoid shift overflow in get_gif_background_color.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 8f5b50d46ba09e2699e044fc48ee586f6b1f4ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5b50d46ba09e2699e044fc4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 19 22:06:42 2015 +0200 gdiplus: Avoid shift overflow in get_gif_background_color. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 53ace05..f803efa 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3838,7 +3838,7 @@ static DWORD get_gif_background_color(GpBitmap *bitmap) if(bitmap->prop_item[i].id == PropertyTagGlobalPalette) { if(bitmap->prop_item[i].length/3 > bgcolor_idx) { BYTE *color = ((BYTE*)bitmap->prop_item[i].value)+bgcolor_idx*3; - return color[2] + (color[1]<<8) + (color[0]<<16) + (0xff<<24); + return color[2] + (color[1]<<8) + (color[0]<<16) + (0xffu<<24); } break; }

1 0

Alexandre Julliard : makefiles: Generate rules for installing programs.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: da340169d6518cf42f1cbe169fbf120383202bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=da340169d6518cf42f1cbe169… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:32:45 2015 +0900 makefiles: Generate rules for installing programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +---- configure.ac | 15 +---- server/Makefile.in | 8 +-- tools/make_makefiles | 5 ++ tools/makedep.c | 135 ++++++++++++++++++++++++++++++++++++-------- tools/widl/Makefile.in | 8 +-- tools/winebuild/Makefile.in | 8 +-- tools/winedump/Makefile.in | 7 +-- tools/winegcc/Makefile.in | 9 ++- tools/winemaker/Makefile.in | 4 +- tools/wmc/Makefile.in | 8 +-- tools/wrc/Makefile.in | 8 +-- 12 files changed, 133 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da340169d6518cf42f1cb…

1 0

Alexandre Julliard : makefiles: Generate rules for installing scripts.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 5cd3395975f687ba8390fddda38bd110d98b30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd3395975f687ba8390fddda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:43:54 2015 +0900 makefiles: Generate rules for installing scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++++ tools/winedump/Makefile.in | 9 ++------- tools/winemaker/Makefile.in | 10 +++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9a21397..ffd286f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -150,6 +150,7 @@ struct makefile struct strarray include_args; struct strarray define_args; struct strarray programs; + struct strarray scripts; struct strarray appmode; struct strarray imports; struct strarray delayimports; @@ -2488,6 +2489,10 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strmake( "p$(bindir)/%s", program )); } + for (i = 0; i < make->scripts.count; i++) + add_install_rule( make, make->scripts.str[i], make->scripts.str[i], + strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (all_targets.count) { output( "all:" ); @@ -2775,6 +2780,7 @@ static void update_makefile( const char *path ) make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); + make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); make->appmode = get_expanded_make_var_array( make, "APPMODE" ); make->imports = get_expanded_make_var_array( make, "IMPORTS" ); make->delayimports = get_expanded_make_var_array( make, "DELAYIMPORTS" ); diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index a93f078..b55ac72 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,5 +1,6 @@ PROGRAMS = winedump MANPAGES = winedump.man.in +SCRIPTS = function_grep.pl C_SRCS = \ debug.c \ @@ -23,10 +24,4 @@ C_SRCS = \ symbol.c \ tlb.c -INSTALL_DEV = $(PROGRAMS) - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/function_grep.pl +INSTALL_DEV = $(PROGRAMS) $(SCRIPTS) diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in index 6afa016..37e345d 100644 --- a/tools/winemaker/Makefile.in +++ b/tools/winemaker/Makefile.in @@ -1,12 +1,8 @@ +SCRIPTS = winemaker + MANPAGES = \ winemaker.de.UTF-8.man.in \ winemaker.fr.UTF-8.man.in \ winemaker.man.in -INSTALL_DEV = winemaker - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker +INSTALL_DEV = $(SCRIPTS)

1 0

Alexandre Julliard : makefiles: Generate rules for installing symlinks.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 356e46a1ef9f866f4a548674b4811a98d1b1847c URL: http://source.winehq.org/git/wine.git/?a=commit;h=356e46a1ef9f866f4a548674b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 18:06:35 2015 +0900 makefiles: Generate rules for installing symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++++++++- tools/winegcc/Makefile.in | 21 +++------------------ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index ffd286f..30bbc3e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1831,6 +1831,9 @@ static void output_install_rules( struct makefile *make, struct strarray files, output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s\n", install_sh, src_dir_path( make, file ), dest + 1 ); break; + case 'y': /* symlink */ + output( "\t$(RM) $(DESTDIR)%s && $(LN_S) %s $(DESTDIR)%s\n", dest + 1, file, dest + 1 ); + break; default: assert(0); } @@ -1853,7 +1856,7 @@ static void output_install_rules( struct makefile *make, struct strarray files, static struct strarray output_sources( struct makefile *make, struct strarray *testlist_files ) { struct incl_file *source; - unsigned int i; + unsigned int i, j; struct strarray object_files = empty_strarray; struct strarray crossobj_files = empty_strarray; struct strarray res_files = empty_strarray; @@ -2018,6 +2021,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t { if (strendswith( obj, ".man" ) && source->file->args) { + struct strarray symlinks; char *dir, *dest = replace_extension( obj, ".man", "" ); char *lang = strchr( dest, '.' ); char *section = source->file->args; @@ -2028,6 +2032,10 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t } else dir = strmake( "$(mandir)/man%s", section ); add_install_rule( make, dest, xstrdup(obj), strmake( "d%s/%s.%s", dir, dest, section )); + symlinks = get_expanded_make_var_array( make, file_local_var( dest, "SYMLINKS" )); + for (j = 0; j < symlinks.count; j++) + add_install_rule( make, symlinks.str[j], strmake( "%s.%s", dest, section ), + strmake( "y%s/%s.%s", dir, symlinks.str[j], section )); free( dest ); free( dir ); strarray_add( &all_targets, xstrdup(obj) ); @@ -2447,6 +2455,8 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t struct strarray all_libs = empty_strarray; struct strarray objs = get_expanded_make_var_array( make, file_local_var( make->programs.str[i], "OBJS" )); + struct strarray symlinks = get_expanded_make_var_array( make, + file_local_var( make->programs.str[i], "SYMLINKS" )); if (!objs.count) objs = object_files; output( "%s:", obj_dir_path( make, program ) ); @@ -2485,8 +2495,19 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t output( "\n" ); strarray_add( &all_targets, program ); + if (symlinks.count) + { + output_filenames_obj_dir( make, symlinks ); + output( ": %s\n", obj_dir_path( make, program )); + output( "\t$(RM) $@ && $(LN_S) %s $@\n", obj_dir_path( make, program )); + strarray_addall( &all_targets, symlinks ); + } + add_install_rule( make, program, program_installed ? program_installed : program, strmake( "p$(bindir)/%s", program )); + for (j = 0; j < symlinks.count; j++) + add_install_rule( make, symlinks.str[j], program, + strmake( "y$(bindir)/%s%s", symlinks.str[j], exe_ext )); } for (i = 0; i < make->scripts.count; i++) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 1a3b2a7..daeb91b 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -2,6 +2,8 @@ PROGRAMS = winegcc MANPAGES = winegcc.man.in +winegcc_SYMLINKS = winecpp wineg++ + C_SRCS = \ utils.c \ winegcc.c @@ -16,21 +18,4 @@ winegcc_EXTRADEFS = \ -DLD="\"$(LD)\"" \ -DPRELINK="\"$(PRELINK)\"" -INSTALL_DEV = $(PROGRAMS) - -EXTRA_TARGETS = winecpp$(EXEEXT) wineg++$(EXEEXT) - -all: $(EXTRA_TARGETS) - -winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) - $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@ - -install install-dev:: - cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT) - cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) - cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext) - cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) winecpp.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) winecpp.$(prog_manext) - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/wineg++$(EXEEXT) $(DESTDIR)$(bindir)/winecpp$(EXEEXT) - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/winecpp.$(prog_manext) +INSTALL_DEV = $(PROGRAMS) $(winegcc_SYMLINKS)

1 0

Dmitry Timoshkov : ole32: Fallback to parsing the Presentation streams ff parsing of the "CONTENTS" stream fails.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 421b3ca3eb16a3ca254b615f6c7dfc1619c973e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421b3ca3eb16a3ca254b615f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 23 18:32:22 2015 +0800 ole32: Fallback to parsing the Presentation streams ff parsing of the "CONTENTS" stream fails. I have an application that tries to load an existing object from the file using OleLoad() and fails because the "CONTENTS" stream has clsid set to "Microsoft Photo Editor 3.0 Picture". I've dumped the contents of the OLE storage to disk for investigation, and under Windows (where Microsoft Photo Editor is not installed, and registry has no traces of its class guids) OleLoad() is able to load objects from this storage, and after that OleDraw() successfully paints the object contents on the screen. I've written an application to play with the dumped storage, and under Windows the "CONTENTS" stream also can't be loaded, but the storage also contains the "OlePres000" stream which contains an object in CF_METAFILEPICT format, and this one can be loaded and painted. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index caabd10..9284410 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1368,7 +1368,8 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) hr = parse_contents_stream( This, pStg, stm ); IStream_Release( stm ); } - else + + if (FAILED(hr)) hr = parse_pres_streams( This, pStg ); if (SUCCEEDED( hr ))

1 0