February 2014 - Wine-commits

Alexandre Julliard : makedep: Generate rules for bitmap fonts based on pragmas in the .sfd file.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 1cccb5594a5adab129bb2c10db796db14199936b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cccb5594a5adab129bb2c10d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 12:15:07 2014 +0100 makedep: Generate rules for bitmap fonts based on pragmas in the .sfd file. --- fonts/Makefile.in | 216 +--------------------------------------------- fonts/courier.sfd | 1 + fonts/fixedsys.sfd | 1 + fonts/fixedsys_jp.sfd | 1 + fonts/ms_sans_serif.sfd | 1 + fonts/small_fonts.sfd | 1 + fonts/small_fonts_jp.sfd | 1 + fonts/system.sfd | 1 + tools/makedep.c | 126 +++++++++++++++++++++------ 9 files changed, 109 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cccb5594a5adab129bb2…

1 0

Alexandre Julliard : makedep: Generate install rules for TrueType fonts based on pragmas in the .sfd file.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 09e70524f4d7ff0c4adc0b4c2d282201a2e28992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e70524f4d7ff0c4adc0b4c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 13:44:51 2014 +0100 makedep: Generate install rules for TrueType fonts based on pragmas in the .sfd file. --- Makefile.in | 2 +- fonts/Makefile.in | 15 +-------------- fonts/marlett.sfd | 1 + fonts/symbol.sfd | 1 + fonts/tahoma.sfd | 1 + fonts/tahomabd.sfd | 1 + fonts/wingding.sfd | 1 + tools/makedep.c | 38 ++++++++++++++++++++++++-------------- 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2355df9..8d4dec4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,7 @@ distclean:: clean .PHONY: install install-lib install-dev uninstall __uninstall__ uninstall:: __uninstall__ - -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) $(DESTDIR)$(includedir) + -rmdir $(DESTDIR)$(fontdir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) $(DESTDIR)$(includedir) # Dependencies between directories diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 9a10bbf..9d4ea9f 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -12,19 +12,6 @@ FONT_SRCS = \ tahomabd.sfd \ wingding.sfd -TRUETYPE_FONTS = \ - marlett.ttf \ - symbol.ttf \ - tahoma.ttf \ - tahomabd.ttf \ - wingding.ttf - # Make sure that make_makefiles sees the generated rules -clean:: - install install-lib:: - for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done - -uninstall:: - -cd $(DESTDIR)$(fontdir) && $(RM) $(TRUETYPE_FONTS) - -rmdir $(DESTDIR)$(fontdir) +clean:: diff --git a/fonts/marlett.sfd b/fonts/marlett.sfd index 0b2449f..eba4731 100644 --- a/fonts/marlett.sfd +++ b/fonts/marlett.sfd @@ -4,6 +4,7 @@ FullName: Marlett FamilyName: Marlett Weight: Regular Copyright: Copyright (C) TransGaming Technologies. All rights reserved. +UComments: "#pragma makedep install" Version: 0.2 ItalicAngle: 0 UnderlinePosition: 0 diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index a19937e..f77a64b 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -4,6 +4,7 @@ FullName: Symbol FamilyName: Symbol Weight: Book Copyright: WineSymbol © (Jon Parshall for CodeWeavers). 2009. +UComments: "#pragma makedep install" Version: 1.1 February 3, 2009, initial release ItalicAngle: 0 UnderlinePosition: -173 diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index c3bd3d8..47a0651 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -4,6 +4,7 @@ FullName: Tahoma FamilyName: Tahoma Weight: Regular Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regarding this font. +UComments: "#pragma makedep install" Version: 000.001 FONDName: WineTahoma DefaultBaseFilename: tahoma diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index f264481..71f372d 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -4,6 +4,7 @@ FullName: Tahoma Bold FamilyName: Tahoma Weight: Bold Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regarding this font. +UComments: "#pragma makedep install" Version: 000.001 FONDName: WineTahomaBold DefaultBaseFilename: tahomabd diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index ed3400e..f30ffec 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -4,6 +4,7 @@ FullName: Wingdings FamilyName: Wingdings Weight: Regular Copyright: Copyright (C) 2013 Dmitry Timoshkov +UComments: "#pragma makedep install" Version: 001.000 ItalicAngle: 0 UnderlinePosition: -170 diff --git a/tools/makedep.c b/tools/makedep.c index 0e6d6b6..8ce9da0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -51,18 +51,19 @@ struct incl_file struct incl_file **files; }; -#define FLAG_SYSTEM 0x0001 /* is it a system include (#include <name>) */ -#define FLAG_GENERATED 0x0002 /* generated file */ -#define FLAG_IDL_PROXY 0x0004 /* generates a proxy (_p.c) file */ -#define FLAG_IDL_CLIENT 0x0008 /* generates a client (_c.c) file */ -#define FLAG_IDL_SERVER 0x0010 /* generates a server (_s.c) file */ -#define FLAG_IDL_IDENT 0x0020 /* generates an ident (_i.c) file */ -#define FLAG_IDL_REGISTER 0x0040 /* generates a registration (_r.res) file */ -#define FLAG_IDL_TYPELIB 0x0080 /* generates a typelib (.tlb) file */ -#define FLAG_IDL_REGTYPELIB 0x0100 /* generates a registered typelib (_t.res) file */ -#define FLAG_IDL_HEADER 0x0200 /* generates a header (.h) file */ -#define FLAG_RC_PO 0x0400 /* rc file contains translations */ -#define FLAG_C_IMPLIB 0x0800 /* file is part of an import library */ +#define FLAG_SYSTEM 0x000001 /* is it a system include (#include <name>) */ +#define FLAG_GENERATED 0x000002 /* generated file */ +#define FLAG_INSTALL 0x000004 /* file to install */ +#define FLAG_IDL_PROXY 0x000100 /* generates a proxy (_p.c) file */ +#define FLAG_IDL_CLIENT 0x000200 /* generates a client (_c.c) file */ +#define FLAG_IDL_SERVER 0x000400 /* generates a server (_s.c) file */ +#define FLAG_IDL_IDENT 0x000800 /* generates an ident (_i.c) file */ +#define FLAG_IDL_REGISTER 0x001000 /* generates a registration (_r.res) file */ +#define FLAG_IDL_TYPELIB 0x002000 /* generates a typelib (.tlb) file */ +#define FLAG_IDL_REGTYPELIB 0x004000 /* generates a registered typelib (_t.res) file */ +#define FLAG_IDL_HEADER 0x008000 /* generates a header (.h) file */ +#define FLAG_RC_PO 0x010000 /* rc file contains translations */ +#define FLAG_C_IMPLIB 0x020000 /* file is part of an import library */ static const struct { @@ -875,6 +876,8 @@ static void parse_pragma_directive( struct incl_file *source, char *str ) while ((p = strtok( NULL, " \t" ))) add_include( source, p, 0 ); return; } + else if (!strcmp( flag, "install" )) source->flags |= FLAG_INSTALL; + if (strendswith( source->name, ".idl" )) { if (!strcmp( flag, "header" )) source->flags |= FLAG_IDL_HEADER; @@ -1632,14 +1635,21 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "sfd" )) /* font file */ { + char *ttf_file = src_dir_path( strmake( "%s.ttf", obj )); char *fontforge = get_expanded_make_variable( "FONTFORGE" ); if (fontforge && !src_dir) { - output( "%s.ttf: %s\n", obj, source->filename ); + output( "%s: %s\n", ttf_file, source->filename ); output( "\t%s -script %s %s $@\n", fontforge, top_dir_path( "fonts/genttf.ff" ), source->filename ); } - free( fontforge ); + if (source->flags & FLAG_INSTALL) + { + output( "install install-lib::\n" ); + output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s.ttf\n", ttf_file, obj ); + output( "uninstall::\n" ); + output( "\t$(RM) $(DESTDIR)$(fontdir)/%s.ttf\n", obj ); + } continue; /* no dependencies */ } else if (!strcmp( ext, "fon" )) /* bitmap font file */

1 0

Frédéric Delanoy : wrc: Remove unused variables.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 4d3ba0310eee3f27d7226daa405e641bb04b57b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3ba0310eee3f27d7226daa4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 4 21:13:58 2014 +0100 wrc: Remove unused variables. --- tools/wrc/wrc.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 5892daf..4a0a749 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -36,9 +36,7 @@ extern int debuglevel; #define DEBUGLEVEL_PPTRACE 0x0020 extern int win32; -extern int create_res; extern int extensions; -extern int create_s; extern int pedantic; extern int byteorder; extern int preprocess_only;

1 0

Michael Stefaniuc : shlwapi/tests: COM cleanup for the dummy IStream iface.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 3879d98de4593a07ef7e2586dc21920f88d40036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3879d98de4593a07ef7e2586d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 5 00:15:05 2014 +0100 shlwapi/tests: COM cleanup for the dummy IStream iface. --- dlls/shlwapi/tests/clist.c | 93 ++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 37 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 65d3178..44ca0bb 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <stdarg.h> #include "wine/test.h" @@ -50,9 +51,9 @@ static const SHLWAPI_CLIST SHLWAPI_CLIST_items[] = }; /* Dummy IStream object for testing calls */ -typedef struct +typedef struct dummystream { - void* lpVtbl; + IStream IStream_iface; LONG ref; int readcalls; BOOL failreadcall; @@ -69,28 +70,43 @@ typedef struct ULARGE_INTEGER pos; } _IDummyStream; -static -HRESULT WINAPI QueryInterface(_IDummyStream *This,REFIID riid, LPVOID *ppvObj) +static inline struct dummystream *impl_from_IStream(IStream *iface) { - return S_OK; + return CONTAINING_RECORD(iface, struct dummystream, IStream_iface); } -static ULONG WINAPI AddRef(_IDummyStream *This) +static HRESULT WINAPI QueryInterface(IStream *iface, REFIID riid, void **ret_iface) { - return InterlockedIncrement(&This->ref); + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IStream, riid)) { + *ret_iface = iface; + IStream_AddRef(iface); + return S_OK; + } + trace("Unexpected REFIID %s\n", wine_dbgstr_guid(riid)); + *ret_iface = NULL; + return E_NOINTERFACE; } -static ULONG WINAPI Release(_IDummyStream *This) +static ULONG WINAPI AddRef(IStream *iface) { - return InterlockedDecrement(&This->ref); + struct dummystream *This = impl_from_IStream(iface); + + return InterlockedIncrement(&This->ref); } -static HRESULT WINAPI Read(_IDummyStream* This, LPVOID lpMem, ULONG ulSize, - PULONG lpRead) +static ULONG WINAPI Release(IStream *iface) { + struct dummystream *This = impl_from_IStream(iface); + + return InterlockedDecrement(&This->ref); +} + +static HRESULT WINAPI Read(IStream *iface, void *lpMem, ULONG ulSize, ULONG *lpRead) +{ + struct dummystream *This = impl_from_IStream(iface); HRESULT hRet = S_OK; - ++This->readcalls; + ++This->readcalls; if (This->failreadcall) { return STG_E_ACCESSDENIED; @@ -136,9 +152,9 @@ static HRESULT WINAPI Read(_IDummyStream* This, LPVOID lpMem, ULONG ulSize, return hRet; } -static HRESULT WINAPI Write(_IDummyStream* This, LPVOID lpMem, ULONG ulSize, - PULONG lpWritten) +static HRESULT WINAPI Write(IStream *iface, const void *lpMem, ULONG ulSize, ULONG *lpWritten) { + struct dummystream *This = impl_from_IStream(iface); HRESULT hRet = S_OK; ++This->writecalls; @@ -155,9 +171,11 @@ static HRESULT WINAPI Write(_IDummyStream* This, LPVOID lpMem, ULONG ulSize, return hRet; } -static HRESULT WINAPI Seek(_IDummyStream* This, LARGE_INTEGER dlibMove, - DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) +static HRESULT WINAPI Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) { + struct dummystream *This = impl_from_IStream(iface); + ++This->seekcalls; This->pos.QuadPart = dlibMove.QuadPart; if (plibNewPosition) @@ -165,9 +183,10 @@ static HRESULT WINAPI Seek(_IDummyStream* This, LARGE_INTEGER dlibMove, return S_OK; } -static HRESULT WINAPI Stat(_IDummyStream* This, STATSTG* pstatstg, - DWORD grfStatFlag) +static HRESULT WINAPI Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { + struct dummystream *This = impl_from_IStream(iface); + ++This->statcalls; if (This->failstatcall) return E_FAIL; @@ -177,7 +196,7 @@ static HRESULT WINAPI Stat(_IDummyStream* This, STATSTG* pstatstg, } /* VTable */ -static void* iclvt[] = +static IStreamVtbl iclvt = { QueryInterface, AddRef, @@ -248,23 +267,23 @@ static BOOL InitFunctionPtrs(void) return TRUE; } -static void InitDummyStream(_IDummyStream* iface) +static void InitDummyStream(struct dummystream *obj) { - iface->lpVtbl = (void*)iclvt; - iface->ref = 1; - iface->readcalls = 0; - iface->failreadcall = FALSE; - iface->failreadsize = FALSE; - iface->readbeyondend = FALSE; - iface->readreturnlarge = FALSE; - iface->writecalls = 0; - iface->failwritecall = FALSE; - iface->failwritesize = FALSE; - iface->seekcalls = 0; - iface->statcalls = 0; - iface->failstatcall = FALSE; - iface->item = SHLWAPI_CLIST_items; - iface->pos.QuadPart = 0; + obj->IStream_iface.lpVtbl = &iclvt; + obj->ref = 1; + obj->readcalls = 0; + obj->failreadcall = FALSE; + obj->failreadsize = FALSE; + obj->readbeyondend = FALSE; + obj->readreturnlarge = FALSE; + obj->writecalls = 0; + obj->failwritecall = FALSE; + obj->failwritesize = FALSE; + obj->seekcalls = 0; + obj->statcalls = 0; + obj->failstatcall = FALSE; + obj->item = SHLWAPI_CLIST_items; + obj->pos.QuadPart = 0; } @@ -585,7 +604,7 @@ static void test_SHLWAPI_213(void) InitDummyStream(&streamobj); ll.QuadPart = 5000l; - Seek(&streamobj, ll, 0, NULL); /* Seek to 5000l */ + Seek(&streamobj.IStream_iface, ll, 0, NULL); /* Seek to 5000l */ streamobj.seekcalls = 0; pSHLWAPI_213(&streamobj); /* Should rewind */ @@ -612,7 +631,7 @@ static void test_SHLWAPI_214(void) InitDummyStream(&streamobj); ll.QuadPart = 5000l; - Seek(&streamobj, ll, 0, NULL); + Seek(&streamobj.IStream_iface, ll, 0, NULL); ul.QuadPart = 0; streamobj.seekcalls = 0; hRet = pSHLWAPI_214(&streamobj, &ul);

1 0

Michael Stefaniuc : shlwapi/tests: Fix the type of the first param of some shlwapi functions.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 1b0e893d27d72b4e7d40580117c70fe70f524f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0e893d27d72b4e7d4058011… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 5 00:17:33 2014 +0100 shlwapi/tests: Fix the type of the first param of some shlwapi functions. --- dlls/shlwapi/tests/clist.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 44ca0bb..fa55983 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -221,14 +221,14 @@ static VOID (WINAPI *pSHLWAPI_19)(LPSHLWAPI_CLIST); static HRESULT (WINAPI *pSHLWAPI_20)(LPSHLWAPI_CLIST*,LPCSHLWAPI_CLIST); static BOOL (WINAPI *pSHLWAPI_21)(LPSHLWAPI_CLIST*,ULONG); static LPSHLWAPI_CLIST (WINAPI *pSHLWAPI_22)(LPSHLWAPI_CLIST,ULONG); -static HRESULT (WINAPI *pSHLWAPI_17)(_IDummyStream*,LPSHLWAPI_CLIST); -static HRESULT (WINAPI *pSHLWAPI_18)(_IDummyStream*,LPSHLWAPI_CLIST*); +static HRESULT (WINAPI *pSHLWAPI_17)(IStream*, SHLWAPI_CLIST*); +static HRESULT (WINAPI *pSHLWAPI_18)(IStream*, SHLWAPI_CLIST**); -static BOOL (WINAPI *pSHLWAPI_166)(_IDummyStream*); -static HRESULT (WINAPI *pSHLWAPI_184)(_IDummyStream*,LPVOID,ULONG); -static HRESULT (WINAPI *pSHLWAPI_212)(_IDummyStream*,LPCVOID,ULONG); -static HRESULT (WINAPI *pSHLWAPI_213)(_IDummyStream*); -static HRESULT (WINAPI *pSHLWAPI_214)(_IDummyStream*,ULARGE_INTEGER*); +static BOOL (WINAPI *pSHLWAPI_166)(IStream*); +static HRESULT (WINAPI *pSHLWAPI_184)(IStream*, void*, ULONG); +static HRESULT (WINAPI *pSHLWAPI_212)(IStream*, const void*, ULONG); +static HRESULT (WINAPI *pSHLWAPI_213)(IStream*); +static HRESULT (WINAPI *pSHLWAPI_214)(IStream*, ULARGE_INTEGER*); static BOOL InitFunctionPtrs(void) @@ -357,7 +357,7 @@ static void test_CList(void) /* Write the list */ InitDummyStream(&streamobj); - hRet = pSHLWAPI_17(&streamobj, list); + hRet = pSHLWAPI_17(&streamobj.IStream_iface, list); ok(hRet == S_OK, "write failed\n"); if (hRet == S_OK) { @@ -371,7 +371,7 @@ static void test_CList(void) /* Failure cases for writing */ InitDummyStream(&streamobj); streamobj.failwritecall = TRUE; - hRet = pSHLWAPI_17(&streamobj, list); + hRet = pSHLWAPI_17(&streamobj.IStream_iface, list); ok(hRet == STG_E_ACCESSDENIED, "changed object failure return\n"); ok(streamobj.writecalls == 1, "called object after failure\n"); ok(streamobj.readcalls == 0,"called Read() after failure\n"); @@ -379,7 +379,7 @@ static void test_CList(void) InitDummyStream(&streamobj); streamobj.failwritesize = TRUE; - hRet = pSHLWAPI_17(&streamobj, list); + hRet = pSHLWAPI_17(&streamobj.IStream_iface, list); ok(hRet == STG_E_MEDIUMFULL || broken(hRet == E_FAIL) /* Win7 */, "changed size failure return\n"); ok(streamobj.writecalls == 1, "called object after size failure\n"); @@ -427,7 +427,7 @@ static void test_CList(void) /* Create a list by reading in data */ InitDummyStream(&streamobj); - hRet = pSHLWAPI_18(&streamobj, &list); + hRet = pSHLWAPI_18(&streamobj.IStream_iface, &list); ok(hRet == S_OK, "failed create from Read()\n"); if (hRet == S_OK) { @@ -480,7 +480,7 @@ static void test_CList(void) /* Failure cases for reading */ InitDummyStream(&streamobj); streamobj.failreadcall = TRUE; - hRet = pSHLWAPI_18(&streamobj, &list); + hRet = pSHLWAPI_18(&streamobj.IStream_iface, &list); ok(hRet == STG_E_ACCESSDENIED, "changed object failure return\n"); ok(streamobj.readbeyondend == FALSE, "read beyond end\n"); ok(streamobj.readcalls == 1, "called object after read failure\n"); @@ -490,7 +490,7 @@ static void test_CList(void) /* Read returns large object */ InitDummyStream(&streamobj); streamobj.readreturnlarge = TRUE; - hRet = pSHLWAPI_18(&streamobj, &list); + hRet = pSHLWAPI_18(&streamobj.IStream_iface, &list); ok(hRet == S_OK, "failed create from Read() with large item\n"); ok(streamobj.readbeyondend == FALSE, "read beyond end\n"); ok(streamobj.readcalls == 1,"wrong call count\n"); @@ -509,7 +509,7 @@ static BOOL test_SHLWAPI_166(void) return FALSE; InitDummyStream(&streamobj); - bRet = pSHLWAPI_166(&streamobj); + bRet = pSHLWAPI_166(&streamobj.IStream_iface); if (bRet != TRUE) return FALSE; /* This version doesn't support stream ops on clists */ @@ -522,7 +522,7 @@ static BOOL test_SHLWAPI_166(void) streamobj.statcalls = 0; streamobj.pos.QuadPart = 50001; - bRet = pSHLWAPI_166(&streamobj); + bRet = pSHLWAPI_166(&streamobj.IStream_iface); ok(bRet == FALSE, "failed after seek adjusted\n"); ok(streamobj.readcalls == 0, "called Read()\n"); @@ -534,7 +534,7 @@ static BOOL test_SHLWAPI_166(void) InitDummyStream(&streamobj); streamobj.pos.QuadPart = 50001; streamobj.failstatcall = TRUE; /* 1: Stat() Bad, Read() OK */ - bRet = pSHLWAPI_166(&streamobj); + bRet = pSHLWAPI_166(&streamobj.IStream_iface); ok(bRet == FALSE, "should be FALSE after read is OK\n"); ok(streamobj.readcalls == 1, "wrong call count\n"); ok(streamobj.writecalls == 0, "called Write()\n"); @@ -546,7 +546,7 @@ static BOOL test_SHLWAPI_166(void) streamobj.pos.QuadPart = 50001; streamobj.failstatcall = TRUE; streamobj.failreadcall = TRUE; /* 2: Stat() Bad, Read() Bad Also */ - bRet = pSHLWAPI_166(&streamobj); + bRet = pSHLWAPI_166(&streamobj.IStream_iface); ok(bRet == TRUE, "Should be true after read fails\n"); ok(streamobj.readcalls == 1, "wrong call count\n"); ok(streamobj.writecalls == 0, "called Write()\n"); @@ -566,7 +566,7 @@ static void test_SHLWAPI_184(void) return; InitDummyStream(&streamobj); - hRet = pSHLWAPI_184(&streamobj, buff, sizeof(buff)); + hRet = pSHLWAPI_184(&streamobj.IStream_iface, buff, sizeof(buff)); ok(hRet == S_OK, "failed Read()\n"); ok(streamobj.readcalls == 1, "wrong call count\n"); @@ -584,7 +584,7 @@ static void test_SHLWAPI_212(void) return; InitDummyStream(&streamobj); - hRet = pSHLWAPI_212(&streamobj, buff, sizeof(buff)); + hRet = pSHLWAPI_212(&streamobj.IStream_iface, buff, sizeof(buff)); ok(hRet == S_OK, "failed Write()\n"); ok(streamobj.readcalls == 0, "called Read()\n"); @@ -607,14 +607,14 @@ static void test_SHLWAPI_213(void) Seek(&streamobj.IStream_iface, ll, 0, NULL); /* Seek to 5000l */ streamobj.seekcalls = 0; - pSHLWAPI_213(&streamobj); /* Should rewind */ + pSHLWAPI_213(&streamobj.IStream_iface); /* Should rewind */ ok(streamobj.statcalls == 0, "called Stat()\n"); ok(streamobj.readcalls == 0, "called Read()\n"); ok(streamobj.writecalls == 0, "called Write()\n"); ok(streamobj.seekcalls == 1, "wrong call count\n"); ul.QuadPart = 50001; - hRet = pSHLWAPI_214(&streamobj, &ul); + hRet = pSHLWAPI_214(&streamobj.IStream_iface, &ul); ok(hRet == S_OK, "failed Stat()\n"); ok(ul.QuadPart == 0, "213 didn't rewind stream\n"); } @@ -634,7 +634,7 @@ static void test_SHLWAPI_214(void) Seek(&streamobj.IStream_iface, ll, 0, NULL); ul.QuadPart = 0; streamobj.seekcalls = 0; - hRet = pSHLWAPI_214(&streamobj, &ul); + hRet = pSHLWAPI_214(&streamobj.IStream_iface, &ul); ok(hRet == S_OK, "failed Stat()\n"); ok(streamobj.statcalls == 1, "wrong call count\n");

1 0

Michael Stefaniuc : shlwapi/tests: Remove a typedef for a struct.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 8612c266db0714690ea7d75ae966988276c24c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8612c266db0714690ea7d75ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 5 00:18:29 2014 +0100 shlwapi/tests: Remove a typedef for a struct. --- dlls/shlwapi/tests/clist.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index fa55983..b930470 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -51,7 +51,7 @@ static const SHLWAPI_CLIST SHLWAPI_CLIST_items[] = }; /* Dummy IStream object for testing calls */ -typedef struct dummystream +struct dummystream { IStream IStream_iface; LONG ref; @@ -68,7 +68,7 @@ typedef struct dummystream BOOL failstatcall; LPCSHLWAPI_CLIST item; ULARGE_INTEGER pos; -} _IDummyStream; +}; static inline struct dummystream *impl_from_IStream(IStream *iface) { @@ -289,7 +289,7 @@ static void InitDummyStream(struct dummystream *obj) static void test_CList(void) { - _IDummyStream streamobj; + struct dummystream streamobj; LPSHLWAPI_CLIST list = NULL; LPCSHLWAPI_CLIST item = SHLWAPI_CLIST_items; HRESULT hRet; @@ -502,7 +502,7 @@ static void test_CList(void) static BOOL test_SHLWAPI_166(void) { - _IDummyStream streamobj; + struct dummystream streamobj; BOOL bRet; if (!pSHLWAPI_166) @@ -558,7 +558,7 @@ static BOOL test_SHLWAPI_166(void) static void test_SHLWAPI_184(void) { - _IDummyStream streamobj; + struct dummystream streamobj; char buff[256]; HRESULT hRet; @@ -576,7 +576,7 @@ static void test_SHLWAPI_184(void) static void test_SHLWAPI_212(void) { - _IDummyStream streamobj; + struct dummystream streamobj; char buff[256]; HRESULT hRet; @@ -594,7 +594,7 @@ static void test_SHLWAPI_212(void) static void test_SHLWAPI_213(void) { - _IDummyStream streamobj; + struct dummystream streamobj; ULARGE_INTEGER ul; LARGE_INTEGER ll; HRESULT hRet; @@ -621,7 +621,7 @@ static void test_SHLWAPI_213(void) static void test_SHLWAPI_214(void) { - _IDummyStream streamobj; + struct dummystream streamobj; ULARGE_INTEGER ul; LARGE_INTEGER ll; HRESULT hRet;

1 0

Michael Stefaniuc : qedit: Don't dereference NULL on alloc failure.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 183bd439fa18053dc6f96e224d33817090dcffd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183bd439fa18053dc6f96e224… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 5 00:20:22 2014 +0100 qedit: Don't dereference NULL on alloc failure. --- dlls/qedit/samplegrabber.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index d2523a8..d4c9ddd 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -173,20 +173,24 @@ static const IEnumPinsVtbl IEnumPins_VTable = static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount) { + PE_Impl *obj; ULONG len = sizeof(PE_Impl) + (pinCount * sizeof(IPin *)); - PE_Impl *obj = CoTaskMemAlloc(len); - if (obj) { - ULONG i; - ZeroMemory(obj, len); - obj->pe.lpVtbl = &IEnumPins_VTable; - obj->refCount = 1; - obj->filter = filter; - obj->numPins = pinCount; - obj->index = 0; - for (i=0; i<pinCount; i++) - obj->pins[i] = pins[i]; - IBaseFilter_AddRef(filter); - } + ULONG i; + + obj = CoTaskMemAlloc(len); + if (!obj) + return NULL; + + ZeroMemory(obj, len); + obj->pe.lpVtbl = &IEnumPins_VTable; + obj->refCount = 1; + obj->filter = filter; + obj->numPins = pinCount; + obj->index = 0; + for (i = 0; i < pinCount; i++) + obj->pins[i] = pins[i]; + IBaseFilter_AddRef(filter); + return &obj->pe; }

1 0

Michael Stefaniuc : qedit: Use offsetof for the size of a struct with a varlen array.
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: d436ea9597e7d8578570c8d2a3db0d40a98e5af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d436ea9597e7d8578570c8d2a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 5 00:22:53 2014 +0100 qedit: Use offsetof for the size of a struct with a varlen array. --- dlls/qedit/samplegrabber.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index d4c9ddd..15a3471 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -46,7 +46,7 @@ typedef struct _PE_Impl { LONG refCount; ULONG numPins; ULONG index; - IPin *pins[0]; + IPin *pins[1]; } PE_Impl; @@ -174,7 +174,7 @@ static const IEnumPinsVtbl IEnumPins_VTable = static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount) { PE_Impl *obj; - ULONG len = sizeof(PE_Impl) + (pinCount * sizeof(IPin *)); + ULONG len = offsetof(PE_Impl, pins[pinCount]); ULONG i; obj = CoTaskMemAlloc(len);

1 0

Bruno Jesus : wininet/tests: Add tests for InternetGetConnectedStateEx[A|W ].
by Alexandre Julliard 05 Feb '14

05 Feb '14

Module: wine Branch: master Commit: 7f97339208d8771225985a3da6c8a90e74a969ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f97339208d8771225985a3da… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 4 21:37:03 2014 -0200 wininet/tests: Add tests for InternetGetConnectedStateEx[A|W]. --- dlls/wininet/tests/internet.c | 140 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index ad5df6d..837e429 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -43,6 +43,8 @@ static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); static BOOL (WINAPI *pInternetGetCookieExA)(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); static BOOL (WINAPI *pInternetGetCookieExW)(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID); +static BOOL (WINAPI *pInternetGetConnectedStateExA)(LPDWORD,LPSTR,DWORD,DWORD); +static BOOL (WINAPI *pInternetGetConnectedStateExW)(LPDWORD,LPWSTR,DWORD,DWORD); /* ############################### */ @@ -1452,6 +1454,140 @@ static void test_InternetErrorDlg(void) ok(res == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); } +static void test_InternetGetConnectedStateExA(void) +{ + BOOL res; + CHAR buffer[256]; + DWORD flags, sz; + + if(!pInternetGetConnectedStateExA) { + win_skip("InternetGetConnectedStateExA is not supported\n"); + return; + } + + res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); + if(!res) { + win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); + return; + } + trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); + + res = pInternetGetConnectedStateExA(NULL, NULL, 0, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + + flags = 0; + res = pInternetGetConnectedStateExA(&flags, NULL, 0, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, 0, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(!buffer[0], "Buffer must not change, got %02X\n", buffer[0]); + + buffer[0] = 0; + res = pInternetGetConnectedStateExA(NULL, buffer, sizeof(buffer), 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + sz = strlen(buffer); + ok(sz > 0, "Expected a connection name\n"); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + sz = strlen(buffer); + ok(sz > 0, "Expected a connection name\n"); + + /* no space for complete string this time */ + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, sz, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz - 1 == strlen(buffer), "Expected %u bytes, got %u\n", sz - 1, lstrlenA(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(strlen(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenA(buffer)); +} + +static void test_InternetGetConnectedStateExW(void) +{ + BOOL res; + WCHAR buffer[256]; + DWORD flags, sz; + + if(!pInternetGetConnectedStateExW) { + win_skip("InternetGetConnectedStateExW is not supported\n"); + return; + } + + res = pInternetGetConnectedStateExW(&flags, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + if(!res) { + win_skip("InternetGetConnectedStateExW tests require a valid connection\n"); + return; + } + trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); + + res = pInternetGetConnectedStateExW(NULL, NULL, 0, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + + flags = 0; + res = pInternetGetConnectedStateExW(&flags, NULL, 0, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 0, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); +todo_wine + ok(!buffer[0], "Buffer must not change, got %02X\n", buffer[0]); + + buffer[0] = 0; + res = pInternetGetConnectedStateExW(NULL, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + sz = lstrlenW(buffer); + ok(sz > 0, "Expected a connection name\n"); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, sizeof(buffer) / sizeof(buffer[0]), 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + sz = lstrlenW(buffer); + ok(sz > 0, "Expected a connection name\n"); + + /* no space for complete string this time */ + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, sz, 0); + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(sz - 1 == lstrlenW(buffer), "Expected %u bytes, got %u\n", sz - 1, lstrlenW(buffer)); + + buffer[0] = 0; + flags = 0; + res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); +todo_wine + ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(flags, "Expected at least one flag set\n"); + ok(lstrlenW(buffer) == 0, "Expected 0 bytes, got %u\n", lstrlenW(buffer)); +} + /* ############################### */ START_TEST(internet) @@ -1470,6 +1606,8 @@ START_TEST(internet) pPrivacySetZonePreferenceW = (void*)GetProcAddress(hdll, "PrivacySetZonePreferenceW"); pInternetGetCookieExA = (void*)GetProcAddress(hdll, "InternetGetCookieExA"); pInternetGetCookieExW = (void*)GetProcAddress(hdll, "InternetGetCookieExW"); + pInternetGetConnectedStateExA = (void*)GetProcAddress(hdll, "InternetGetConnectedStateExA"); + pInternetGetConnectedStateExW = (void*)GetProcAddress(hdll, "InternetGetConnectedStateExW"); if(!pInternetGetCookieExW) { win_skip("Too old IE (older than 6.0)\n"); @@ -1478,6 +1616,8 @@ START_TEST(internet) test_InternetCanonicalizeUrlA(); test_InternetQueryOptionA(); + test_InternetGetConnectedStateExA(); + test_InternetGetConnectedStateExW(); test_get_cookie(); test_complicated_cookie(); test_cookie_url();

1 0

Martin Storsjo : api-ms-win-ntuser-dc-access-l1-1-0: Add stub dll.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: c2df36dfc56cf9a556415660432cc61e24cc19f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2df36dfc56cf9a5564156604… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:22 2014 +0200 api-ms-win-ntuser-dc-access-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-ntuser-dc-access-l1-1-0/Makefile.in | 1 + .../api-ms-win-ntuser-dc-access-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 6f5652a..caccedc 100755 --- a/configure +++ b/configure @@ -873,6 +873,7 @@ enable_api_ms_win_downlevel_shlwapi_l1_1_0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 enable_api_ms_win_downlevel_user32_l1_1_0 enable_api_ms_win_downlevel_version_l1_1_0 +enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_apphelp enable_appwiz_cpl @@ -16599,6 +16600,7 @@ wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlev wine_fn_config_dll api-ms-win-downlevel-shlwapi-l2-1-0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 +wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test diff --git a/configure.ac b/configure.ac index 9a8393c..43b9052 100644 --- a/configure.ac +++ b/configure.ac @@ -2642,6 +2642,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) diff --git a/dlls/api-ms-win-ntuser-dc-access-l1-1-0/Makefile.in b/dlls/api-ms-win-ntuser-dc-access-l1-1-0/Makefile.in new file mode 100644 index 0000000..896ce1c --- /dev/null +++ b/dlls/api-ms-win-ntuser-dc-access-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-ntuser-dc-access-l1-1-0.dll diff --git a/dlls/api-ms-win-ntuser-dc-access-l1-1-0/api-ms-win-ntuser-dc-access-l1-1-0.spec b/dlls/api-ms-win-ntuser-dc-access-l1-1-0/api-ms-win-ntuser-dc-access-l1-1-0.spec new file mode 100644 index 0000000..076c822 --- /dev/null +++ b/dlls/api-ms-win-ntuser-dc-access-l1-1-0/api-ms-win-ntuser-dc-access-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetDC(long) user32.GetDC +@ stdcall ReleaseDC(long long) user32.ReleaseDC diff --git a/tools/make_specfiles b/tools/make_specfiles index f587f39..f6c10e5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -161,6 +161,7 @@ my @dll_groups = [ "user32", "api-ms-win-downlevel-user32-l1-1-0", + "api-ms-win-ntuser-dc-access-l1-1-0", ], [ "version",

1 0