March 2013 - Wine-Commits - list.winehq.org

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeSecurity iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: f44d66c6175240ad037021b9f15f39c652449112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44d66c6175240ad037021b9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:31:56 2013 +0100 inetcomm: COM cleanup for the IMimeSecurity iface. --- dlls/inetcomm/mimeole.c | 55 +++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index d897d38..2b7a0f3 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2592,54 +2592,53 @@ HRESULT WINAPI MimeOleCreateVirtualStream(IStream **ppStream) typedef struct MimeSecurity { - const IMimeSecurityVtbl *lpVtbl; - - LONG refs; + IMimeSecurity IMimeSecurity_iface; + LONG ref; } MimeSecurity; -static HRESULT WINAPI MimeSecurity_QueryInterface( - IMimeSecurity* iface, - REFIID riid, - void** obj) +static inline MimeSecurity *impl_from_IMimeSecurity(IMimeSecurity *iface) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + return CONTAINING_RECORD(iface, MimeSecurity, IMimeSecurity_iface); +} + +static HRESULT WINAPI MimeSecurity_QueryInterface(IMimeSecurity *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMimeSecurity)) { - *obj = iface; + *ppv = iface; IMimeSecurity_AddRef(iface); return S_OK; } FIXME("no interface for %s\n", debugstr_guid(riid)); - *obj = NULL; + *ppv = NULL; return E_NOINTERFACE; } -static ULONG WINAPI MimeSecurity_AddRef( - IMimeSecurity* iface) +static ULONG WINAPI MimeSecurity_AddRef(IMimeSecurity *iface) { - MimeSecurity *This = (MimeSecurity *)iface; - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + MimeSecurity *This = impl_from_IMimeSecurity(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI MimeSecurity_Release( - IMimeSecurity* iface) +static ULONG WINAPI MimeSecurity_Release(IMimeSecurity *iface) { - MimeSecurity *This = (MimeSecurity *)iface; - ULONG refs; + MimeSecurity *This = impl_from_IMimeSecurity(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) - { + if (!ref) HeapFree(GetProcessHeap(), 0, This); - } - return refs; + return ref; } static HRESULT WINAPI MimeSecurity_InitNew( @@ -2764,10 +2763,10 @@ HRESULT MimeSecurity_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MimeSecurityVtbl; - This->refs = 1; + This->IMimeSecurity_iface.lpVtbl = &MimeSecurityVtbl; + This->ref = 1; - *obj = &This->lpVtbl; + *obj = &This->IMimeSecurity_iface; return S_OK; }

1 0

Nikolay Sivov : msxml3: CDATA nodes can't have children.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 431e77bec4a022dbed0dc2ead80d20250193fdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=431e77bec4a022dbed0dc2ead… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 3 21:38:27 2013 +0400 msxml3: CDATA nodes can't have children. --- dlls/msxml3/cdata.c | 20 ++++++++++---------- dlls/msxml3/tests/domdoc.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 6b3c065..7fd4a37 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -290,10 +290,9 @@ static HRESULT WINAPI domcdata_insertBefore( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - - FIXME("(%p)->(%p %s %p) needs test\n", This, newNode, debugstr_variant(&refChild), outOldNode); - - return node_insert_before(&This->node, newNode, &refChild, outOldNode); + TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode); + if (outOldNode) *outOldNode = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_replaceChild( @@ -303,10 +302,9 @@ static HRESULT WINAPI domcdata_replaceChild( IXMLDOMNode** outOldNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - - FIXME("(%p)->(%p %p %p) needs tests\n", This, newNode, oldNode, outOldNode); - - return node_replace_child(&This->node, newNode, oldNode, outOldNode); + TRACE("(%p)->(%p %p %p)\n", This, newNode, oldNode, outOldNode); + if (outOldNode) *outOldNode = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_removeChild( @@ -315,7 +313,8 @@ static HRESULT WINAPI domcdata_removeChild( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p %p)\n", This, child, oldChild); - return node_remove_child(&This->node, child, oldChild); + if (oldChild) *oldChild = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_appendChild( @@ -324,7 +323,8 @@ static HRESULT WINAPI domcdata_appendChild( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p %p)\n", This, child, outChild); - return node_append_child(&This->node, child, outChild); + if (outChild) *outChild = NULL; + return E_FAIL; } static HRESULT WINAPI domcdata_hasChildNodes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 794df03..d69547f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8370,6 +8370,22 @@ static void test_insertBefore(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(cdata != NULL, "got %p\n", cdata); + EXPECT_NO_CHILDREN(cdata); + + /* attribute to cdata */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)attr, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + + /* document to cdata */ + V_VT(&v) = VT_NULL; + node = (void*)0xdeadbeef; + hr = IXMLDOMNode_insertBefore(cdata, (IXMLDOMNode*)doc, v, &node); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(node == NULL, "got %p\n", node); + V_VT(&v) = VT_NULL; node = (void*)0xdeadbeef; hr = IXMLDOMDocument_insertBefore(doc3, cdata, v, &node);

1 0

Nikolay Sivov : msxml3: Filter unsupported child nodes in insertBefore() for elements.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 2d5c9f4f462f50cd82536dee3c5c9e7dfd6ad336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c9f4f462f50cd82536dee3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 3 21:20:13 2013 +0400 msxml3: Filter unsupported child nodes in insertBefore() for elements. --- dlls/msxml3/element.c | 22 +++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 8 +++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 929830b..70360e5 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -301,13 +301,29 @@ static HRESULT WINAPI domelem_get_attributes( static HRESULT WINAPI domelem_insertBefore( IXMLDOMElement *iface, IXMLDOMNode* newNode, VARIANT refChild, - IXMLDOMNode** outOldNode) + IXMLDOMNode** old_node) { domelem *This = impl_from_IXMLDOMElement( iface ); + DOMNodeType type; + HRESULT hr; - TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode); + TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), old_node); + + hr = IXMLDOMNode_get_nodeType(newNode, &type); + if (hr != S_OK) return hr; - return node_insert_before(&This->node, newNode, &refChild, outOldNode); + TRACE("new node type %d\n", type); + switch (type) + { + case NODE_DOCUMENT: + case NODE_DOCUMENT_TYPE: + case NODE_ENTITY: + case NODE_NOTATION: + if (old_node) *old_node = NULL; + return E_FAIL; + default: + return node_insert_before(&This->node, newNode, &refChild, old_node); + } } static HRESULT WINAPI domelem_replaceChild( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c1bfc1a..794df03 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4,7 +4,7 @@ * Copyright 2005 Mike McCormack for CodeWeavers * Copyright 2007-2008 Alistair Leslie-Hughes * Copyright 2010-2011 Adam Martinson for CodeWeavers - * Copyright 2010-2012 Nikolay Sivov for CodeWeavers + * Copyright 2010-2013 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -8484,6 +8484,12 @@ static void test_insertBefore(void) todo_wine EXPECT_REF(elem2, 2); + /* document to element */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)doc, v, NULL); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = NULL; node = NULL;

1 0

Petr Kočandrle : po: Completed WineMine Czech translation.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: ce4291c513ad7bbc010ee9d31614014495a5dd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4291c513ad7bbc010ee9d31… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Fri Mar 1 14:39:18 2013 +0100 po: Completed WineMine Czech translation. --- po/cs.po | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index cc63ae6..4e84598 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13825,7 +13825,7 @@ msgstr "" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "&Hra" #: winemine.rc:35 msgid "&New\tF2" @@ -13833,7 +13833,7 @@ msgstr "&Nová\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "&Otazníky" #: winemine.rc:39 msgid "&Beginner" @@ -13845,28 +13845,25 @@ msgstr "&Pokročilý" #: winemine.rc:41 msgid "&Expert" -msgstr "" +msgstr "E&xpert" #: winemine.rc:42 msgid "&Custom..." -msgstr "&Dle libosti..." +msgstr "&Vlastní..." #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" -msgstr "Ne&jlepší časy" +msgstr "N&ejlepší časy" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "&O Wine" +msgstr "&O WineMinách" #: winemine.rc:56 msgid "Fastest Times" msgstr "Nejlepší časy" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Nejlepší časy" @@ -13884,11 +13881,11 @@ msgstr "Expert" #: winemine.rc:74 msgid "Congratulations!" -msgstr "Gratulujeme !" +msgstr "Gratulace!" #: winemine.rc:76 msgid "Please enter your name" -msgstr "Prosím, zadejte své jméno" +msgstr "Zadej prosím své jméno" #: winemine.rc:84 msgid "Custom Game" @@ -13900,7 +13897,7 @@ msgstr "Řádky" #: winemine.rc:87 msgid "Columns" -msgstr "" +msgstr "Sloupce" #: winemine.rc:88 msgid "Mines" @@ -13908,7 +13905,7 @@ msgstr "Miny" #: winemine.rc:27 msgid "WineMine" -msgstr "WineMine" +msgstr "WineMiny" #: winemine.rc:28 msgid "Nobody"

1 0

Jeff Muizelaar : dbghelp: Store the vendor id in the correct order.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 03cae026114b175dfe15a68c5a9ae16b575c9c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cae026114b175dfe15a68c5… Author: Jeff Muizelaar <jmuizelaar(a)mozilla.com> Date: Fri Mar 1 10:12:10 2013 -0500 dbghelp: Store the vendor id in the correct order. --- dlls/dbghelp/minidump.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 7a21e8b..b00f9e2 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -635,8 +635,8 @@ static unsigned dump_system_info(struct dump_context* dc) do_x86cpuid(0, regs0); mdSysInfo.Cpu.X86CpuInfo.VendorId[0] = regs0[1]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[2]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[2]; do_x86cpuid(1, regs1); mdSysInfo.Cpu.X86CpuInfo.VersionInformation = regs1[0]; mdSysInfo.Cpu.X86CpuInfo.FeatureInformation = regs1[3];

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeBody iface.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 4e35ec47773ed9bb84180ec867a2a39b6278e4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e35ec47773ed9bb84180ec86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:33:16 2013 +0100 inetcomm: COM cleanup for the IMimeBody iface. --- dlls/inetcomm/mimeole.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c1fed51..58a4a5f 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -94,8 +94,8 @@ typedef struct typedef struct MimeBody { - const IMimeBodyVtbl *lpVtbl; - LONG refs; + IMimeBody IMimeBody_iface; + LONG ref; HBODY handle; @@ -110,9 +110,9 @@ typedef struct MimeBody BODYOFFSETS body_offsets; } MimeBody; -static inline MimeBody *impl_from_IMimeBody( IMimeBody *iface ) +static inline MimeBody *impl_from_IMimeBody(IMimeBody *iface) { - return (MimeBody *)((char*)iface - FIELD_OFFSET(MimeBody, lpVtbl)); + return CONTAINING_RECORD(iface, MimeBody, IMimeBody_iface); } static LPSTR strdupA(LPCSTR str) @@ -523,22 +523,24 @@ static HRESULT WINAPI MimeBody_QueryInterface(IMimeBody* iface, return E_NOINTERFACE; } -static ULONG WINAPI MimeBody_AddRef(IMimeBody* iface) +static ULONG WINAPI MimeBody_AddRef(IMimeBody *iface) { MimeBody *This = impl_from_IMimeBody(iface); - TRACE("(%p)->()\n", iface); - return InterlockedIncrement(&This->refs); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } -static ULONG WINAPI MimeBody_Release(IMimeBody* iface) +static ULONG WINAPI MimeBody_Release(IMimeBody *iface) { MimeBody *This = impl_from_IMimeBody(iface); - ULONG refs; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->()\n", iface); + TRACE("(%p) ref=%d\n", This, ref); - refs = InterlockedDecrement(&This->refs); - if (!refs) + if (!ref) { empty_header_list(&This->headers); empty_new_prop_list(&This->new_props); @@ -551,7 +553,7 @@ static ULONG WINAPI MimeBody_Release(IMimeBody* iface) HeapFree(GetProcessHeap(), 0, This); } - return refs; + return ref; } static HRESULT WINAPI MimeBody_GetClassID( @@ -1109,8 +1111,8 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &body_vtbl; - This->refs = 1; + This->IMimeBody_iface.lpVtbl = &body_vtbl; + This->ref = 1; This->handle = NULL; list_init(&This->headers); list_init(&This->new_props); @@ -1125,7 +1127,7 @@ HRESULT MimeBody_create(IUnknown *outer, void **obj) body_offsets.cbBodyStart = body_offsets.cbBodyEnd = 0; MimeBody_set_offsets(This, &body_offsets); - *obj = &This->lpVtbl; + *obj = &This->IMimeBody_iface; return S_OK; }

1 0

Michael Stefaniuc : inetcomm: Use a static interface instance for IMimeAllocator.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 3a9d744f126c8bc0ab2708ef312149faecac8ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9d744f126c8bc0ab2708ef3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:32:40 2013 +0100 inetcomm: Use a static interface instance for IMimeAllocator. --- dlls/inetcomm/mimeole.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 2b7a0f3..c1fed51 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2778,11 +2778,6 @@ HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) return MimeSecurity_create(NULL, (void **)ppSecurity); } -typedef struct -{ - IMimeAllocatorVtbl *lpVtbl; -} MimeAllocator; - static HRESULT WINAPI MimeAlloc_QueryInterface( IMimeAllocator* iface, REFIID riid, @@ -2964,7 +2959,7 @@ static IMimeAllocatorVtbl mime_alloc_vtbl = MimeAlloc_PropVariantClear }; -static MimeAllocator mime_allocator = +static IMimeAllocator mime_allocator = { &mime_alloc_vtbl };

1 0

Michael Stefaniuc : inetcomm: Pass the object instead of an iface to a helper function.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: d50b3b20682822d61a4605398723648b92fb0c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50b3b20682822d61a4605398… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 4 00:29:53 2013 +0100 inetcomm: Pass the object instead of an iface to a helper function. --- dlls/inetcomm/mimeole.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 3e23fc0..d897d38 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1996,9 +1996,8 @@ static HRESULT WINAPI MimeMessage_CountBodies(IMimeMessage *iface, HBODY hParent return S_OK; } -static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY *out) +static HRESULT find_next(MimeMessage *This, body_t *body, FINDBODY *find, HBODY *out) { - MimeMessage *This = (MimeMessage *)msg; struct list *ptr; HBODY next; @@ -2027,15 +2026,14 @@ static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY return MIME_E_NOT_FOUND; } -static HRESULT WINAPI MimeMessage_FindFirst( - IMimeMessage *iface, - LPFINDBODY pFindBody, - LPHBODY phBody) +static HRESULT WINAPI MimeMessage_FindFirst(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) { + MimeMessage *This = impl_from_IMimeMessage(iface); + TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); pFindBody->dwReserved = 0; - return find_next( iface, NULL, pFindBody, phBody ); + return find_next(This, NULL, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindBody, HBODY *phBody) @@ -2048,7 +2046,7 @@ static HRESULT WINAPI MimeMessage_FindNext(IMimeMessage *iface, FINDBODY *pFindB hr = find_body( &This->body_tree, UlongToHandle( pFindBody->dwReserved ), &body ); if (hr != S_OK) return MIME_E_NOT_FOUND; - return find_next( iface, body, pFindBody, phBody ); + return find_next(This, body, pFindBody, phBody); } static HRESULT WINAPI MimeMessage_ResolveURL(

1 0

Alexandre Julliard : vbscript: Tweak enum macros to avoid confusing winapi_extract.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 1e7d7d098529da37bf64deea86caef08692bce9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7d7d098529da37bf64deea8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 11:19:50 2013 +0100 vbscript: Tweak enum macros to avoid confusing winapi_extract. --- dlls/vbscript/vbregexp.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 0aaa140..02e63ab 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -25,21 +25,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define REGEXP_TID_LIST \ - XDIID(RegExp2) \ - XDIID(Match2) \ - XDIID(MatchCollection2) \ + XDIID(RegExp2), \ + XDIID(Match2), \ + XDIID(MatchCollection2), \ XDIID(SubMatches) typedef enum { -#define XDIID(iface) iface ## _tid, -REGEXP_TID_LIST +#define XDIID(iface) iface ## _tid + REGEXP_TID_LIST, #undef XDIID REGEXP_LAST_tid } regexp_tid_t; static REFIID tid_ids[] = { -#define XDIID(iface) &IID_I ## iface, -REGEXP_TID_LIST +#define XDIID(iface) &IID_I ## iface + REGEXP_TID_LIST #undef XDIID };

1 0

Dmitry Timoshkov : gdiplus: GdipDrawString should not clip the string if StringFormatFlagsNoClip is specified .
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 9fb88c79994c8d5a1561ca446139bbf99386e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb88c79994c8d5a1561ca446… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 4 17:52:24 2013 +0900 gdiplus: GdipDrawString should not clip the string if StringFormatFlagsNoClip is specified. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 806cfa9..a450ded 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4907,7 +4907,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GpPointF pt[3], rectcpy[4]; POINT corners[4]; REAL rel_width, rel_height, margin_x; - INT save_state; + INT save_state, format_flags = 0; REAL offsety = 0.0; struct draw_string_args args; RectF scaled_rect; @@ -4932,6 +4932,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + format_flags = format->attr; + /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ @@ -4985,7 +4987,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - if (scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + if (!(format_flags & StringFormatFlagsNoClip) && + scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0