February 2014 - Wine-Commits

Alexandre Julliard : tools: Remove no longer used fnt2fon tool.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: ab588410917dcae4ec1d769c5375c2fc6718183c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab588410917dcae4ec1d769c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 10:53:04 2014 +0100 tools: Remove no longer used fnt2fon tool. --- tools/Makefile.in | 5 - tools/fnt2fon.c | 388 ----------------------------------------------------- 2 files changed, 393 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab588410917dcae4ec1d7…

1 0

Alexandre Julliard : tools: Move sfnt2fnt to its own directory.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 7307e2be69db349ec98f75a91308e608da22e260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7307e2be69db349ec98f75a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 6 10:44:47 2014 +0100 tools: Move sfnt2fnt to its own directory. Also rename to sfnt2fon to better reflect usage and avoid conflicts with the previous binary on updates. --- Make.vars.in | 1 - Makefile.in | 6 +++--- configure | 1 + configure.ac | 1 + tools/Makefile.in | 12 ++---------- tools/makedep.c | 4 ++-- tools/sfnt2fon/Makefile.in | 9 +++++++++ tools/{sfnt2fnt.c => sfnt2fon/sfnt2fon.c} | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index a0727bd..684d673 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -50,7 +50,6 @@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) LIBPORT = $(top_builddir)/libs/port/libwine_port.a diff --git a/Makefile.in b/Makefile.in index 8d4dec4..5c163b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,11 +53,11 @@ __builddeps__: __tooldeps__ include .PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools -fonts: tools +fonts: tools/sfnt2fon include: tools tools/widl -libs/wine: libs/port +libs/wine tools: libs/port tools/wmc tools/wrc: tools -tools tools/wmc tools/wrc: libs/wine +tools/sfnt2fon tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp libs/port libs/wine libs/wpp: include/config.h diff --git a/configure b/configure index 8c3e28e..d2c416e 100755 --- a/configure +++ b/configure @@ -17331,6 +17331,7 @@ wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage wine_fn_config_tool tools clean,install-dev,install-lib,manpage +wine_fn_config_tool tools/sfnt2fon clean wine_fn_config_tool tools/widl clean,install-dev,manpage wine_fn_config_tool tools/winebuild clean,install-dev,manpage wine_fn_config_tool tools/winedump clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index c6769fc..de6c687 100644 --- a/configure.ac +++ b/configure.ac @@ -3356,6 +3356,7 @@ WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage]) +WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) diff --git a/tools/Makefile.in b/tools/Makefile.in index a7cc154..582b140 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,11 +1,7 @@ -EXTRAINCL = $(FREETYPE_CFLAGS) -FREETYPELIBS = $(FREETYPE_LIBS) - PROGRAMS = \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ - make_xftmpl$(EXEEXT) \ - sfnt2fnt$(EXEEXT) + make_xftmpl$(EXEEXT) MANPAGES = \ winemaker.de.UTF-8.man.in \ @@ -16,8 +12,7 @@ C_SRCS = \ fnt2fon.c \ make_ctests.c \ make_xftmpl.c \ - makedep.c \ - sfnt2fnt.c + makedep.c IN_SRCS = \ wineapploader.in @@ -35,9 +30,6 @@ make_xftmpl$(EXEEXT): make_xftmpl.o fnt2fon$(EXEEXT): fnt2fon.o $(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT) $(LDFLAGS) -sfnt2fnt$(EXEEXT): sfnt2fnt.o - $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) - .PHONY: install install-lib install-dev uninstall install install-lib:: diff --git a/tools/makedep.c b/tools/makedep.c index 8ce9da0..11c921c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1655,9 +1655,9 @@ static struct strarray output_sources(void) else if (!strcmp( ext, "fon" )) /* bitmap font file */ { strarray_add( &all_targets, source->name ); - output( "%s.fon: %s %s\n", obj, tools_dir_path( "sfnt2fnt" ), + output( "%s.fon: %s %s\n", obj, tools_path( "sfnt2fon" ), src_dir_path( source->sourcename )); - output( "\t%s -o $@ %s %s\n", tools_dir_path( "sfnt2fnt" ), + output( "\t%s -o $@ %s %s\n", tools_path( "sfnt2fon" ), src_dir_path( source->sourcename ), source->args ); output( "install install-lib:: %s\n", source->name ); output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", source->name, source->name ); diff --git a/tools/sfnt2fon/Makefile.in b/tools/sfnt2fon/Makefile.in new file mode 100644 index 0000000..a975154 --- /dev/null +++ b/tools/sfnt2fon/Makefile.in @@ -0,0 +1,9 @@ +PROGRAMS = sfnt2fon$(EXEEXT) + +C_SRCS = sfnt2fon.c + +EXTRAINCL = $(FREETYPE_CFLAGS) +EXTRALIBS = $(FREETYPE_LIBS) + +sfnt2fon$(EXEEXT): sfnt2fon.o + $(CC) $(CFLAGS) -o $@ sfnt2fon.o $(LIBWINE_STATIC) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fon/sfnt2fon.c similarity index 99% rename from tools/sfnt2fnt.c rename to tools/sfnt2fon/sfnt2fon.c index 925855f..4b47682 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -1,5 +1,5 @@ /* - * sfnttofnt. Bitmap only ttf to Window fnt file converter + * sfnt2fon. Bitmap-only ttf to Windows font file converter * * Copyright 2004 Huw Davies *

1 0

Ken Thomases : wined3d: Don't clear the GL context such that it can' t be restored.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 75d53c9aed0b93b5a3607d2949d04d0570e781b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d53c9aed0b93b5a3607d294… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 5 14:01:15 2014 -0600 wined3d: Don't clear the GL context such that it can't be restored. --- dlls/wined3d/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 256052f..4cd6342 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1016,9 +1016,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; - /* Force making the context current again, to verify it is still valid - * (workaround for broken drivers) */ - context_set_current(NULL); /* I don't think that the interface guarantees that the device is destroyed from the same thread * it was created. Thus make sure a context is active for the glDelete* calls */

1 0

André Hentschel : Fix link to wwn xml source
by Jeremy Newman Feb. 6, 2014

Feb. 6, 2014

Module: website Branch: master Commit: 231725e7e23281e62bc25e839a08b086d3ff81b2 URL: http://source.winehq.org/git/website.git/?a=commit;h=231725e7e23281e62bc25e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 5 00:32:59 2014 +0100 Fix link to wwn xml source --- templates/en/wwn_content.template | 2 +- templates/he/wwn_content.template | 2 +- templates/tr/wwn_content.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/wwn_content.template b/templates/en/wwn_content.template index 5707b77..9a3110c 100644 --- a/templates/en/wwn_content.template +++ b/templates/en/wwn_content.template @@ -6,7 +6,7 @@ <div style="width: 250px; float: left; padding: 0 10px 0 10px;"> {$summary} - <p class="small"><a href="{$root}/wwn/source/{$xml}">XML source</a><br> + <p class="small"><a href="{$root}/wwn/en/{$xml}.xml">XML source</a><br> <a href="{$root}/wwn/">More Issues...</a></p> </div> diff --git a/templates/he/wwn_content.template b/templates/he/wwn_content.template index d6c2ae1..dc36383 100644 --- a/templates/he/wwn_content.template +++ b/templates/he/wwn_content.template @@ -6,7 +6,7 @@ <div style="width: 250px; float: left; padding: 0 10px 0 10px;"> {$summary} - <p class="small"><a href="{$root}/wwn/source/{$xml}">מקור XML</a><br> + <p class="small"><a href="{$root}/wwn/en/{$xml}.xml">מקור XML</a><br> <a href="{$root}/wwn/">דיווחים נוספים...</a></p> </div> diff --git a/templates/tr/wwn_content.template b/templates/tr/wwn_content.template index 6188d48..a1d7757 100644 --- a/templates/tr/wwn_content.template +++ b/templates/tr/wwn_content.template @@ -6,7 +6,7 @@ <div style="width: 250px; float: left; padding: 0 10px 0 10px;"> {$summary} - <p class="small"><a href="{$root}/wwn/source/{$xml}">XML kaynağı</a><br> + <p class="small"><a href="{$root}/wwn/en/{$xml}.xml">XML kaynağı</a><br> <a href="{$root}/wwn/">Daha Fazla Sorun...</a></p> </div>

1 0

Dmitry Timoshkov : msxml3: Don' t return implementation pointer as an interface.
by Alexandre Julliard Feb. 5, 2014

Feb. 5, 2014

Module: wine Branch: master Commit: de3ec1c55c65de9811001094945debf5145daf38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3ec1c55c65de98110010949… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 15:18:02 2014 +0900 msxml3: Don't return implementation pointer as an interface. --- dlls/msxml3/xmlelem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 2130c713..cdb7805 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -663,8 +663,8 @@ static HRESULT WINAPI xmlelem_collection_get__newEnum(IXMLElementCollection *ifa if (!ppUnk) return E_INVALIDARG; - *ppUnk = (IUnknown *)This; - IUnknown_AddRef(*ppUnk); + IXMLElementCollection_AddRef(iface); + *ppUnk = (IUnknown *)&This->IEnumVARIANT_iface; return S_OK; }

1 0

Hans Leidekker : winhttp/tests: Move the remaining tests to test.winehq.org.
by Alexandre Julliard Feb. 5, 2014

Feb. 5, 2014

Module: wine Branch: master Commit: 97505a7475a5c7fcfa2cc03bcea0438aa5af5e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97505a7475a5c7fcfa2cc03bc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 5 15:31:51 2014 +0100 winhttp/tests: Move the remaining tests to test.winehq.org. --- dlls/winhttp/tests/winhttp.c | 57 +++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97505a7475a5c7fcfa2cc…

1 0

Dmitry Timoshkov : msxml3: IXMLElementCollection:: QueryInterface should return NULL interface on error.
by Alexandre Julliard Feb. 5, 2014

Feb. 5, 2014

Module: wine Branch: master Commit: fdba11a263f9a1f447f7b7aedc4f2b20836aa920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdba11a263f9a1f447f7b7aed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 15:18:57 2014 +0900 msxml3: IXMLElementCollection::QueryInterface should return NULL interface on error. --- dlls/msxml3/xmlelem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 52eef62..e1ef0eb 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -573,6 +573,7 @@ static HRESULT WINAPI xmlelem_collection_QueryInterface(IXMLElementCollection *i else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Dmitry Timoshkov : msxml3/tests: Add a test to show that IXMLElementCollection enumerator doesn' t recognize IID_IXMLElementCollection.
by Alexandre Julliard Feb. 5, 2014

Feb. 5, 2014

Module: wine Branch: master Commit: 41d34aa69bebfda0e88fcdf05c7b6fb50b8cc2d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d34aa69bebfda0e88fcdf05… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 15:17:53 2014 +0900 msxml3/tests: Add a test to show that IXMLElementCollection enumerator doesn't recognize IID_IXMLElementCollection. --- dlls/msxml3/tests/xmldoc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 4130ea4..ea05dd8 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -727,6 +727,13 @@ static void test_xmlelem_collection(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(unk != NULL, "Expected non-NULL unk\n"); + enumVar = (void *)0xdeadbeef; + hr = IUnknown_QueryInterface(unk, &IID_IXMLElementCollection, (LPVOID *)&enumVar); +todo_wine + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); +todo_wine + ok(enumVar == NULL || broken(enumVar == (void *)0xdeadbeef) /* XP */, "Expected NULL, got %p\n", enumVar); + hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (LPVOID *)&enumVar); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(enumVar != NULL, "Expected non-NULL enumVar\n");

1 0

Nikolay Sivov : crypt32/tests: Accept another error code on Win8.
by Alexandre Julliard Feb. 5, 2014

Feb. 5, 2014

Module: wine Branch: master Commit: c7a11f9ed619dfd586e96917faa1ee83d64c7352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a11f9ed619dfd586e96917f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 21:50:32 2014 +0400 crypt32/tests: Accept another error code on Win8. --- dlls/crypt32/tests/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index bd67c18..9c95629 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3724,7 +3724,7 @@ static void testAcquireCertPrivateKey(void) &keyProvInfo); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); - ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_KEYSET /* win8 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Dmitry Timoshkov : msxml3: Add separate QueryInterface implementation for IEnumVARIANT interface exported by IXMLElementCollection.
by Alexandre Julliard Feb. 5, 2014

Feb. 5, 2014

Module: wine Branch: master Commit: 9ab9aebf65d9641b7594c7596256570c54608fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab9aebf65d9641b7594c7596… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 15:18:26 2014 +0900 msxml3: Add separate QueryInterface implementation for IEnumVARIANT interface exported by IXMLElementCollection. --- dlls/msxml3/tests/xmldoc.c | 2 -- dlls/msxml3/xmlelem.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index ea05dd8..2478a57 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -729,9 +729,7 @@ static void test_xmlelem_collection(void) enumVar = (void *)0xdeadbeef; hr = IUnknown_QueryInterface(unk, &IID_IXMLElementCollection, (LPVOID *)&enumVar); -todo_wine ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); -todo_wine ok(enumVar == NULL || broken(enumVar == (void *)0xdeadbeef) /* XP */, "Expected NULL, got %p\n", enumVar); hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (LPVOID *)&enumVar); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index cdb7805..f188ca1 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -718,7 +718,20 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_QueryInterface( IEnumVARIANT *iface, REFIID riid, LPVOID *ppvObj) { xmlelem_collection *this = impl_from_IEnumVARIANT(iface); - return IXMLDocument_QueryInterface((IXMLDocument *)this, riid, ppvObj); + + TRACE("(%p)->(%s %p)\n", this, debugstr_guid(riid), ppvObj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IEnumVARIANT)) + { + *ppvObj = iface; + IEnumVARIANT_AddRef(iface); + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObj = NULL; + return E_NOINTERFACE; } static ULONG WINAPI xmlelem_collection_IEnumVARIANT_AddRef(

1 0