wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Nikolay Sivov : dwrite: Implement SetFontFallback().
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: fa1fe44c342e1912d54b3cc02281877915735ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa1fe44c342e1912d54b3cc02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 03:52:35 2015 +0300 dwrite: Implement SetFontFallback(). --- dlls/dwrite/layout.c | 26 ++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8e8bc9d..7326aa3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -235,6 +235,16 @@ static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data return S_OK; } +static HRESULT set_fontfallback_for_format(struct dwrite_textformat_data *format, IDWriteFontFallback *fallback) +{ + if (format->fallback) + IDWriteFontFallback_Release(format->fallback); + format->fallback = fallback; + if (fallback) + IDWriteFontFallback_AddRef(fallback); + return S_OK; +} + static struct layout_run *alloc_layout_run(void) { struct layout_run *ret; @@ -1867,8 +1877,8 @@ static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextlayout2_GetOpticalAlignment(IDW static HRESULT WINAPI dwritetextlayout2_SetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback *fallback) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return set_fontfallback_for_format(&This->format, fallback); } static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback **fallback) @@ -2228,15 +2238,15 @@ static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_layout_GetOpticalAlignm static HRESULT WINAPI dwritetextformat1_layout_SetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback *fallback) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return IDWriteTextLayout2_SetFontFallback(&This->IDWriteTextLayout2_iface, fallback); } static HRESULT WINAPI dwritetextformat1_layout_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - TRACE("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return IDWriteTextLayout2_GetFontFallback(&This->IDWriteTextLayout2_iface, fallback); } static const IDWriteTextFormat1Vtbl dwritetextformat1_layout_vtbl = { @@ -3055,8 +3065,8 @@ static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_GetOpticalAlignment(IDW static HRESULT WINAPI dwritetextformat1_SetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback *fallback) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return set_fontfallback_for_format(&This->format, fallback); } static HRESULT WINAPI dwritetextformat1_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b06c6bc..5b15c37 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1204,10 +1204,12 @@ static void test_SetVerticalGlyphOrientation(void) static void test_fallback(void) { static const WCHAR strW[] = {'a','b','c','d',0}; - IDWriteFontFallback *fallback; + IDWriteFontFallback *fallback, *fallback2; IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; IDWriteTextFormat *format; IDWriteTextLayout *layout; + IDWriteFactory2 *factory2; IDWriteFactory *factory; HRESULT hr; @@ -1238,6 +1240,43 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(fallback == NULL, "got %p\n", fallback); + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = NULL; + hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + ok(fallback != NULL, "got %p\n", fallback); + + hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == fallback, "got %p\n", fallback2); + + hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == NULL, "got %p\n", fallback2); + + IDWriteFontFallback_Release(fallback); +} + IDWriteTextFormat1_Release(format1); IDWriteTextLayout2_Release(layout2); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Allow to query for IDWriteTextFormat1 from layout.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: c2c30013870711fdbc9b6aab0997766d9cb14f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c30013870711fdbc9b6aab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 02:38:32 2015 +0300 dwrite: Allow to query for IDWriteTextFormat1 from layout. --- dlls/dwrite/layout.c | 429 ++++++++++++++++++++++++++++++++++++++------- dlls/dwrite/tests/layout.c | 30 +++- 2 files changed, 392 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2c30013870711fdbc9b6…

1 0

Nikolay Sivov : dwrite/tests: Use separate factory for each test in layout tests.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: bd3069c0c1a1c601f5cd5352c19bfd7d86de7d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3069c0c1a1c601f5cd5352c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 01:00:48 2015 +0300 dwrite/tests: Use separate factory for each test in layout tests. --- dlls/dwrite/tests/layout.c | 77 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd3069c0c1a1c601f5cd5…

1 0

Nikolay Sivov : dwrite: Initially format and layout don' t have a fallback set.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 947f8e64d5570edfd9d73f7de891583816391bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947f8e64d5570edfd9d73f7de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 00:43:20 2015 +0300 dwrite: Initially format and layout don't have a fallback set. --- dlls/dwrite/layout.c | 21 +++++++++++++++++---- dlls/dwrite/tests/layout.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 24fb580..32c248b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -57,6 +57,7 @@ struct dwrite_textformat_data { IDWriteInlineObject *trimmingsign; IDWriteFontCollection *collection; + IDWriteFontFallback *fallback; }; enum layout_range_attr_kind { @@ -173,6 +174,7 @@ static const IDWriteTextFormat1Vtbl dwritetextformatvtbl; static void release_format_data(struct dwrite_textformat_data *data) { if (data->collection) IDWriteFontCollection_Release(data->collection); + if (data->fallback) IDWriteFontFallback_Release(data->fallback); if (data->trimmingsign) IDWriteInlineObject_Release(data->trimmingsign); heap_free(data->family_name); heap_free(data->locale); @@ -219,6 +221,14 @@ static inline const char *debugstr_run(const struct layout_run *run) run->descr.stringLength); } +static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) +{ + *fallback = format->fallback; + if (*fallback) + IDWriteFontFallback_AddRef(*fallback); + return S_OK; +} + static struct layout_run *alloc_layout_run(void) { struct layout_run *ret; @@ -1877,8 +1887,8 @@ static HRESULT WINAPI dwritetextlayout2_SetFontFallback(IDWriteTextLayout2 *ifac static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback **fallback) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return get_fontfallback_from_format(&This->format, fallback); } static const IDWriteTextLayout2Vtbl dwritetextlayoutvtbl = { @@ -2194,6 +2204,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); layout->format.readingdir = IDWriteTextFormat_GetReadingDirection(format); layout->format.flow = IDWriteTextFormat_GetFlowDirection(format); + layout->format.fallback = NULL; hr = IDWriteTextFormat_GetLineSpacing(format, &layout->format.spacingmethod, &layout->format.spacing, &layout->format.baseline); if (FAILED(hr)) @@ -2228,6 +2239,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); if (hr == S_OK) { layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + IDWriteTextFormat1_GetFontFallback(format1, &layout->format.fallback); IDWriteTextFormat1_Release(format1); } else @@ -2745,8 +2757,8 @@ static HRESULT WINAPI dwritetextformat1_SetFontFallback(IDWriteTextFormat1 *ifac static HRESULT WINAPI dwritetextformat1_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return get_fontfallback_from_format(&This->format, fallback); } static const IDWriteTextFormat1Vtbl dwritetextformatvtbl = { @@ -2822,6 +2834,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimming.delimiterCount = 0; This->format.trimmingsign = NULL; This->format.collection = collection; + This->format.fallback = NULL; IDWriteFontCollection_AddRef(collection); *format = (IDWriteTextFormat*)&This->IDWriteTextFormat1_iface; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a0de75e..663605e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1122,6 +1122,42 @@ static void test_SetVerticalGlyphOrientation(void) IDWriteTextLayout2_Release(layout2); } +static void test_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteFontFallback *fallback; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("GetFontFallback() is not supported.\n"); + return; + } + +if (0) /* crashes on native */ + hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + IDWriteTextLayout2_Release(layout2); +} + START_TEST(layout) { HRESULT hr; @@ -1150,6 +1186,7 @@ START_TEST(layout) test_SetLocaleName(); test_SetPairKerning(); test_SetVerticalGlyphOrientation(); + test_fallback(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : ole32: Handle ILockBytes creation failure (PVS-Studio).
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 1c2bbe8f650b79d827ecad9277c6e02baf6f152e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2bbe8f650b79d827ecad927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 14 01:15:59 2015 +0300 ole32: Handle ILockBytes creation failure (PVS-Studio). --- dlls/ole32/clipboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index c7d58d6..db1e4a8 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -576,6 +576,12 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) hStorage = GlobalAlloc(GMEM_SHARE|GMEM_MOVEABLE, 0); if (hStorage == NULL) return E_OUTOFMEMORY; hr = CreateILockBytesOnHGlobal(hStorage, FALSE, &ptrILockBytes); + if (FAILED(hr)) + { + GlobalFree(hStorage); + return hr; + } + hr = StgCreateDocfileOnILockBytes(ptrILockBytes, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &std.u.pstg); ILockBytes_Release(ptrILockBytes);

1 0

Francois Gouget : oledb32/tests: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: f597fe8f4f3d78d829a61446b5a9a29f9f804ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f597fe8f4f3d78d829a61446b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:37 2015 +0100 oledb32/tests: Remove unneeded NONAMELESSXXX directives. --- dlls/oledb32/tests/database.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index a46725c..b4ce139 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -21,8 +21,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : oledb32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 11f1a21e9f63fd399f29091afcd439ef9d1264e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f1a21e9f63fd399f29091af… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:29 2015 +0100 oledb32: Remove unneeded NONAMELESSXXX directives. --- dlls/oledb32/convert.c | 2 -- dlls/oledb32/datainit.c | 2 -- dlls/oledb32/main.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 36448d3..11d153c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -20,8 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index dfafeb1..3cd3821 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -18,8 +18,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index 48aa5a3..f28e57a 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -20,8 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : oleaut32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 4d65584f8a593d34456868bb63722e646df3526a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d65584f8a593d34456868bb6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:17 2015 +0100 oleaut32: Remove unneeded NONAMELESSXXX directives. --- dlls/oleaut32/olepicture.c | 1 - dlls/oleaut32/olepropframe.c | 1 - dlls/oleaut32/recinfo.c | 1 - dlls/oleaut32/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 1 - dlls/oleaut32/usrmarshal.c | 1 - dlls/oleaut32/varformat.c | 2 -- dlls/oleaut32/variant.h | 3 +-- 8 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index dfaf6f4..5d0d801 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -48,7 +48,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 9a563f1..b89d3a6 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index be61fd5..f60fb8a 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -20,7 +20,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 89dc894..7bf62b7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -33,7 +33,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c6c539e..54dbc05 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -58,7 +58,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 108f819..3187ca2 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 27bedce..5d220fa 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -32,8 +32,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wine/unicode.h" diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 1e75bd8..e5d9a56 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -17,8 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winerror.h" #include "objbase.h"

1 0

Francois Gouget : ole32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 7fe0600237b924fa1c5282f677e202ac22d8aef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe0600237b924fa1c5282f67… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:07:43 2015 +0100 ole32: Remove unneeded NONAMELESSXXX directives. --- dlls/ole32/antimoniker.c | 1 - dlls/ole32/classmoniker.c | 2 -- dlls/ole32/clipboard.c | 1 - dlls/ole32/compobj.c | 1 - dlls/ole32/compositemoniker.c | 2 -- dlls/ole32/datacache.c | 2 +- dlls/ole32/filemoniker.c | 1 - dlls/ole32/git.c | 2 -- dlls/ole32/hglobalstream.c | 1 - dlls/ole32/itemmoniker.c | 1 - dlls/ole32/memlockbytes.c | 1 - dlls/ole32/ole2.c | 1 - dlls/ole32/ole2impl.c | 1 - dlls/ole32/ole2stubs.c | 2 -- dlls/ole32/oleobj.c | 1 - dlls/ole32/oleproxy.c | 2 -- dlls/ole32/pointermoniker.c | 1 - dlls/ole32/rpc.c | 1 - dlls/ole32/stg_prop.c | 1 - dlls/ole32/stg_stream.c | 1 - dlls/ole32/storage32.c | 1 - dlls/ole32/stubmanager.c | 2 -- dlls/ole32/usrmarshal.c | 1 - 23 files changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 6b62f5e..83eb71b 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 89c7297..1bcf58f 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -24,8 +24,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index d40ee59..c7d58d6 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -65,7 +65,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 82cc77d..e2efe58 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -45,7 +45,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index faadca1..e431bfc 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -23,8 +23,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 3e5e99c..6ae9367 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -43,12 +43,12 @@ * header. I was able to figure-out where the extent of the object * was stored and the aspect, but that's about it. */ + #include <stdarg.h> #include <string.h> #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 732d6ac..c9b4e50 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -25,7 +25,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index b83d415..f7a0460 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -27,8 +27,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ce0f34c..ff1dfa2 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -31,7 +31,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index d5fb0a8..e8e5d23 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 81d3b32..b2fc5b4 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -27,7 +27,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 38b23dc..b0a8c3b 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -33,7 +33,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 152132b..4be79a7 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 5a90e2d..ba32165 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include "windef.h" diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 968456d..edbef55 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -25,7 +25,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 184aca1..8351f27 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -27,8 +27,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 96b580a..212a8aa 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index ce39849..2455464 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -28,7 +28,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index b0cd542..da361ce 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -47,7 +47,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 7738cf1..a3abf46 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -31,7 +31,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b4401a6..f09beec 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -38,7 +38,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index fbbf413..fda4944 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -24,8 +24,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <assert.h> #include <stdarg.h> diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 6687ac2..cd16fb2 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -24,7 +24,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : ole2.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: fe1a57c2903af264c90b2a2b6ee6315624623db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1a57c2903af264c90b2a2b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:06:46 2015 +0100 ole2.dll16: Remove unneeded NONAMELESSXXX directives. --- dlls/ole2.dll16/memlockbytes.c | 2 +- dlls/ole2.dll16/ole2.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 80153df..93f91bc 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -25,7 +25,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 3a27132..0052142 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -29,8 +29,6 @@ #include <stdio.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015