wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Bruno Jesus : ole32: Avoid a possible null dereference.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 959ca6ac0264e5a285d1360598cb813b1956a4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=959ca6ac0264e5a285d136059… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Nov 13 22:13:40 2014 -0200 ole32: Avoid a possible null dereference. --- dlls/ole32/clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 6404f36..0c3be3b 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -210,13 +210,11 @@ UINT ole_private_data_clipboard_format = 0; static UINT wine_marshal_clipboard_format; -static inline char *dump_fmtetc(FORMATETC *fmt) +static inline const char *dump_fmtetc(FORMATETC *fmt) { - static char buf[100]; - - snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", - fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); - return buf; + if (!fmt) return "(null)"; + return wine_dbg_sprintf("cf %04x ptd %p aspect %x lindex %d tymed %x", + fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); } /*---------------------------------------------------------------------*

1 0

Vincent Povirk : ole32: Add support for pasting CF_BITMAP.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: bab4c36d47285f5127544edda8e08f9193870eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab4c36d47285f5127544edda… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 13 15:50:42 2014 -0600 ole32: Add support for pasting CF_BITMAP. --- dlls/ole32/clipboard.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a7308c2..6404f36 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1133,6 +1133,8 @@ static DWORD get_tymed_from_nonole_cf(UINT cf) return TYMED_ENHMF; case CF_METAFILEPICT: return TYMED_MFPICT; + case CF_BITMAP: + return TYMED_GDI; default: FIXME("returning TYMED_NULL for cf %04x\n", cf); return TYMED_NULL; @@ -1310,6 +1312,27 @@ static HRESULT get_stgmed_for_emf(HENHMETAFILE hemf, STGMEDIUM *med) return S_OK; } +/************************************************************************ + * get_stgmed_for_bitmap + * + * Returns a stg medium with a bitmap based on the handle + */ +static HRESULT get_stgmed_for_bitmap(HBITMAP hbmp, STGMEDIUM *med) +{ + HRESULT hr; + + med->pUnkForRelease = NULL; + med->tymed = TYMED_NULL; + + hr = dup_bitmap(hbmp, &med->u.hBitmap); + + if (FAILED(hr)) + return hr; + + med->tymed = TYMED_GDI; + return S_OK; +} + static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const DVTARGETDEVICE *t2, WORD off2) { const WCHAR *str1, *str2; @@ -1401,6 +1424,8 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, hr = get_stgmed_for_stream(h, med); else if(mask & TYMED_ENHMF) hr = get_stgmed_for_emf((HENHMETAFILE)h, med); + else if(mask & TYMED_GDI) + hr = get_stgmed_for_bitmap((HBITMAP)h, med); else { FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed);

1 0

Vincent Povirk : windowscodecs: Add fallback to unknown metadata reader.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: fa455f594bceb085562ae847ad1bcdcca40ecb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa455f594bceb085562ae847a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 16:00:55 2014 -0600 windowscodecs: Add fallback to unknown metadata reader. --- dlls/windowscodecs/imgfactory.c | 25 ++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 444f2e4..42b4e59 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1050,7 +1050,30 @@ start: IEnumUnknown_Release(enumreaders); if (!*reader && !(options & WICMetadataCreationFailUnknown)) - FIXME("create unknown metadata reader\n"); + { + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + if (SUCCEEDED(hr)) + hr = UnknownMetadataReader_CreateInstance(&IID_IWICMetadataReader, (void**)reader); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_QueryInterface(*reader, &IID_IWICPersistStream, (void**)&wicpersiststream); + + if (SUCCEEDED(hr)) + { + hr = IWICPersistStream_LoadEx(wicpersiststream, stream, NULL, options & WICPersistOptionsMask); + + IWICPersistStream_Release(wicpersiststream); + } + + if (FAILED(hr)) + { + IWICMetadataReader_Release(*reader); + *reader = NULL; + } + } + } if (*reader) return S_OK; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 2dc6049..fa9d701 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -876,7 +876,7 @@ static void test_create_reader(void) hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, &GUID_ContainerFormatWmp, NULL, WICPersistOptionsDefault, stream, &reader); - todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); if (SUCCEEDED(hr)) {

1 0

Vincent Povirk : windowscodecs: Implement ComponentFactory_CreateMetadataReaderFromContainer.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 1dee37340d981b98a51c5d44b6b09f538f73e4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dee37340d981b98a51c5d44b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 15:51:09 2014 -0600 windowscodecs: Implement ComponentFactory_CreateMetadataReaderFromContainer. --- dlls/windowscodecs/imgfactory.c | 101 +++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 25 +++++---- 2 files changed, 115 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e7095dd..444f2e4 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -956,9 +956,106 @@ static HRESULT WINAPI ComponentFactory_CreateMetadataReader(IWICComponentFactory static HRESULT WINAPI ComponentFactory_CreateMetadataReaderFromContainer(IWICComponentFactory *iface, REFGUID format, const GUID *vendor, DWORD options, IStream *stream, IWICMetadataReader **reader) { - FIXME("%p,%s,%s,%x,%p,%p: stub\n", iface, debugstr_guid(format), debugstr_guid(vendor), + HRESULT hr; + IEnumUnknown *enumreaders; + IUnknown *unkreaderinfo; + IWICMetadataReaderInfo *readerinfo; + IWICPersistStream *wicpersiststream; + ULONG num_fetched; + GUID decoder_vendor; + BOOL matches; + LARGE_INTEGER zero; + + TRACE("%p,%s,%s,%x,%p,%p\n", iface, debugstr_guid(format), debugstr_guid(vendor), options, stream, reader); - return E_NOTIMPL; + + if (!format || !stream || !reader) + return E_INVALIDARG; + + zero.QuadPart = 0; + + hr = CreateComponentEnumerator(WICMetadataReader, WICComponentEnumerateDefault, &enumreaders); + if (FAILED(hr)) return hr; + + *reader = NULL; + +start: + while (!*reader) + { + hr = IEnumUnknown_Next(enumreaders, 1, &unkreaderinfo, &num_fetched); + + if (hr == S_OK) + { + hr = IUnknown_QueryInterface(unkreaderinfo, &IID_IWICMetadataReaderInfo, (void**)&readerinfo); + + if (SUCCEEDED(hr)) + { + if (vendor) + { + hr = IWICMetadataReaderInfo_GetVendorGUID(readerinfo, &decoder_vendor); + + if (FAILED(hr) || !IsEqualIID(vendor, &decoder_vendor)) + { + IWICMetadataReaderInfo_Release(readerinfo); + IUnknown_Release(unkreaderinfo); + continue; + } + } + + hr = IWICMetadataReaderInfo_MatchesPattern(readerinfo, format, stream, &matches); + + if (SUCCEEDED(hr) && matches) + { + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + if (SUCCEEDED(hr)) + hr = IWICMetadataReaderInfo_CreateInstance(readerinfo, reader); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_QueryInterface(*reader, &IID_IWICPersistStream, (void**)&wicpersiststream); + + if (SUCCEEDED(hr)) + { + hr = IWICPersistStream_LoadEx(wicpersiststream, + stream, vendor, options & WICPersistOptionsMask); + + IWICPersistStream_Release(wicpersiststream); + } + + if (FAILED(hr)) + { + IWICMetadataReader_Release(*reader); + *reader = NULL; + } + } + } + + IUnknown_Release(readerinfo); + } + + IUnknown_Release(unkreaderinfo); + } + else + break; + } + + if (!*reader && vendor) + { + vendor = NULL; + IEnumUnknown_Reset(enumreaders); + goto start; + } + + IEnumUnknown_Release(enumreaders); + + if (!*reader && !(options & WICMetadataCreationFailUnknown)) + FIXME("create unknown metadata reader\n"); + + if (*reader) + return S_OK; + else + return WINCODEC_ERR_COMPONENTNOTFOUND; } static HRESULT WINAPI ComponentFactory_CreateMetadataWriter(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e9ab77c..2dc6049 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -841,17 +841,24 @@ static void test_create_reader(void) stream = create_stream(metadata_tEXt, sizeof(metadata_tEXt)); hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + NULL, NULL, WICPersistOptionsDefault, + stream, &reader); + ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, + NULL, &reader); + ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, + &GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, + stream, NULL); + ok(hr == E_INVALIDARG, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, &GUID_ContainerFormatPng, NULL, WICPersistOptionsDefault, stream, &reader); -todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); - /* NOTE: removed once Wine is fixed */ - if (FAILED(hr)) - { - IStream_Release(stream); - IWICComponentFactory_Release(factory); - return; - } if (SUCCEEDED(hr)) { @@ -869,7 +876,7 @@ todo_wine hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, &GUID_ContainerFormatWmp, NULL, WICPersistOptionsDefault, stream, &reader); - ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); if (SUCCEEDED(hr)) {

1 0

Vincent Povirk : windowscodecs: Don' t check undefined memory in tests on Wine.
by Alexandre Julliard 14 Nov '14

14 Nov '14

Module: wine Branch: master Commit: 8d96b22dd7bdb3a6134820cd374ffec4bd7b207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d96b22dd7bdb3a6134820cd3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 15:52:38 2014 -0600 windowscodecs: Don't check undefined memory in tests on Wine. --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e42b474..e9ab77c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -907,7 +907,7 @@ static void test_metadata_png(void) IWICMetadataReader *reader; GUID containerformat; HRESULT hr; - UINT count; + UINT count=0xdeadbeef; hr = CoCreateInstance(&CLSID_WICPngDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder);

1 0

Jacek Caban : mshtml: Fixed tests on recent IEs.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: ffd313543f2f633dded1a7802ea6b567c03d8b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd313543f2f633dded1a7802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 13 12:50:01 2014 +0100 mshtml: Fixed tests on recent IEs. --- dlls/mshtml/tests/protocol.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 49743d5..00971be 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -137,13 +137,16 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR { CHECK_EXPECT(ReportResult); - if(expect_hr_win32err) + if(expect_hr_win32err) { ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || expect_hrResult, "expected win32 err or %08x got: %08x\n", expect_hrResult, hrResult); - else - ok(hrResult == expect_hrResult || ((expect_hrResult == E_INVALIDARG || - expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && - hrResult == MK_E_SYNTAX), "expected: %08x got: %08x\n", expect_hrResult, hrResult); + }else { + ok(hrResult == expect_hrResult || (expect_hrResult == E_INVALIDARG && hrResult == MK_E_SYNTAX) + || (expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) && + (hrResult == MK_E_SYNTAX || hrResult == HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND))), + "expected: %08x got: %08x\n", expect_hrResult, hrResult); + expect_hrResult = hrResult; + } ok(dwError == 0, "dwError = %d\n", dwError); ok(!szResult, "szResult != NULL\n"); @@ -232,9 +235,7 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT ok((hres&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || hres == expect_hrResult, "expected win32 err or %08x got: %08x\n", expected_hres, hres); else - ok(hres == expected_hres || ((expected_hres == E_INVALIDARG || - expected_hres == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && hres == MK_E_SYNTAX), - "expected: %08x got: %08x\n", expected_hres, hres); + ok(hres == expect_hrResult, "expected: %08x got: %08x\n", expect_hrResult, hres); CHECK_CALLED(GetBindInfo); CHECK_CALLED(ReportResult);

1 0

Jacek Caban : wpcapi.idl: Added WPCFLAG_RESTRICTION declaration.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 949ecc51232b1d08be192f83624c3424d2473de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949ecc51232b1d08be192f836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 13 11:50:23 2014 +0100 wpcapi.idl: Added WPCFLAG_RESTRICTION declaration. --- include/wpcapi.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/wpcapi.idl b/include/wpcapi.idl index 19c5256..db2d991 100644 --- a/include/wpcapi.idl +++ b/include/wpcapi.idl @@ -19,6 +19,15 @@ import "oaidl.idl"; import "ocidl.idl"; +typedef [v1_enum] enum tagWPCFLAG_RESTRICTION { + WPCFLAG_NO_RESTRICTION = 0x0000, + WPCFLAG_LOGGING_REQUIRED = 0x0001, + WPCFLAG_WEB_FILTERED = 0x0002, + WPCFLAG_HOURS_RESTRICTED = 0x0004, + WPCFLAG_GAMES_BLOCKED = 0x0008, + WPCFLAG_APPS_RESTRICTED = 0x0010 +} WPCFLAG_RESTRICTION; + [ uuid(8fdf6ca1-0189-47e4-b670-1a8a4636e340), object

1 0

Jacek Caban : mshtml: Properly handle errors in IHTMLStyleSheet:: get_rules now that Gecko part is fixed.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 6fc5977241bd8e86ba71e1c5b0b07cd9d9c43b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc5977241bd8e86ba71e1c5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 13 11:22:35 2014 +0100 mshtml: Properly handle errors in IHTMLStyleSheet::get_rules now that Gecko part is fixed. --- dlls/mshtml/htmlstylesheet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 8f48a07..6480975 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -649,11 +649,11 @@ static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface, TRACE("(%p)->(%p)\n", This, p); - /* Gecko has buggy security checks and GetCssRules will fail. We have a correct - * implementation and it will work when the bug will be fixed in Gecko. */ nsres = nsIDOMCSSStyleSheet_GetCssRules(This->nsstylesheet, &nslist); - if(NS_FAILED(nsres)) - WARN("GetCssRules failed: %08x\n", nsres); + if(NS_FAILED(nsres)) { + ERR("GetCssRules failed: %08x\n", nsres); + return E_FAIL; + } *p = HTMLStyleSheetRulesCollection_Create(nslist); return S_OK;

1 0

Yifu Wang : msvcp120: Added VS2013 CPP runtime dll.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: c68e8243102d735907abd3299a294bd2393add4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68e8243102d735907abd3299… Author: Yifu Wang <ywang(a)esri.com> Date: Tue Nov 11 09:35:39 2014 -0800 msvcp120: Added VS2013 CPP runtime dll. --- configure | 2 + configure.ac | 1 + dlls/msvcp120/Makefile.in | 14 + dlls/msvcp120/msvcp120.spec | 3846 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 3864 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68e8243102d735907abd…

1 0

Stefan Dösinger : wined3d: Add new D3DCREATE flags.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 06328e91f721ff1b9d44dfd5f30b2787b9e38a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06328e91f721ff1b9d44dfd5f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 12 22:15:34 2014 +0100 wined3d: Add new D3DCREATE flags. --- include/wine/wined3d.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8f563bb..ef9850b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -934,6 +934,12 @@ enum wined3d_display_rotation #define WINED3DCREATE_MIXED_VERTEXPROCESSING 0x00000080 #define WINED3DCREATE_DISABLE_DRIVER_MANAGEMENT 0x00000100 #define WINED3DCREATE_ADAPTERGROUP_DEVICE 0x00000200 +#define WINED3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX 0x00000400 +#define WINED3DCREATE_NOWINDOWCHANGES 0x00000800 +#define WINED3DCREATE_DISABLE_PSGP_THREADING 0x00002000 +#define WINED3DCREATE_ENABLE_PRESENTSTATS 0x00004000 +#define WINED3DCREATE_DISABLE_PRINTSCREEN 0x00008000 +#define WINED3DCREATE_SCREENSAVER 0x10000000 /* VTF defines */ #define WINED3DDMAPSAMPLER 0x100

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
40
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 November 2014