wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Francois Gouget : winex11.drv: Make X11DRV_XROPfunction static.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: c223994b7a78836a03623b92a156b569737f06dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c223994b7a78836a03623b92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:04:52 2015 +0100 winex11.drv: Make X11DRV_XROPfunction static. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/x11drv.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 769fa8a..f23a502 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); #define ABS(x) ((x)<0?(-(x)):(x)) /* ROP code to GC function conversion */ -const int X11DRV_XROPfunction[16] = +static const int X11DRV_XROPfunction[16] = { GXclear, /* R2_BLACK */ GXnor, /* R2_NOTMERGEPEN */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 533af2c..da13c6e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -214,8 +214,6 @@ extern BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ) DECLSPEC_HIDDEN; extern INT X11DRV_XWStoDS( HDC hdc, INT width ) DECLSPEC_HIDDEN; extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; -extern const int X11DRV_XROPfunction[]; - extern BOOL client_side_graphics DECLSPEC_HIDDEN; extern BOOL client_side_with_render DECLSPEC_HIDDEN; extern BOOL shape_layered_windows DECLSPEC_HIDDEN;

1 0

Francois Gouget : dbghelp: pe_unmap_directory() is unused so remove it.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: ba6e4ff66eebb14d783b53d1537501ac2914035e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6e4ff66eebb14d783b53d15… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:04:15 2015 +0100 dbghelp: pe_unmap_directory() is unused so remove it. --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/pe_module.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 74cba88..0d300f3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -646,7 +646,6 @@ extern struct module* extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern const char* pe_map_directory(struct module* module, int dirno, DWORD* size) DECLSPEC_HIDDEN; -extern void pe_unmap_directoy(struct module* module, int dirno) DECLSPEC_HIDDEN; /* source.c */ extern unsigned source_new(struct module* module, const char* basedir, const char* source) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index b793edb..b52d47e 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -322,16 +322,6 @@ const char* pe_map_directory(struct module* module, int dirno, DWORD* size) nth->OptionalHeader.DataDirectory[dirno].VirtualAddress, NULL); } -/****************************************************************** - * pe_unmap_directory - * - * Unmaps a directory content - */ -void pe_unmap_directory(struct image_file_map* fmap, int dirno) -{ - pe_unmap_full(fmap); -} - static void pe_module_remove(struct process* pcs, struct module_format* modfmt) { pe_unmap_file(&modfmt->u.pe_info->fmap);

1 0

Piotr Caban : gdiplus: Fixed palette flags setting.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 59eef10f345ec7162bca4c3e0bf8a436af7f2cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=59eef10f345ec7162bca4c3e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 13 15:14:37 2015 +0100 gdiplus: Fixed palette flags setting. --- dlls/gdiplus/image.c | 34 ++++++++++++++++++++++++---------- dlls/gdiplus/tests/image.c | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4bce334..8eb1419 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -87,22 +87,36 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT } if (hr == S_OK) { + WICBitmapPaletteType type; + BOOL alpha; UINT count; - BOOL mono, gray; - - IWICPalette_IsBlackWhite(wic_palette, &mono); - IWICPalette_IsGrayscale(wic_palette, &gray); IWICPalette_GetColorCount(wic_palette, &count); palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); - if (mono) - palette->Flags = 0; - else if (gray) - palette->Flags = PaletteFlagsGrayScale; - else - palette->Flags = PaletteFlagsHalftone; + IWICPalette_GetType(wic_palette, &type); + switch(type) { + case WICBitmapPaletteTypeFixedGray4: + case WICBitmapPaletteTypeFixedGray16: + case WICBitmapPaletteTypeFixedGray256: + palette->Flags = PaletteFlagsGrayScale; + break; + case WICBitmapPaletteTypeFixedHalftone8: + case WICBitmapPaletteTypeFixedHalftone27: + case WICBitmapPaletteTypeFixedHalftone64: + case WICBitmapPaletteTypeFixedHalftone125: + case WICBitmapPaletteTypeFixedHalftone216: + case WICBitmapPaletteTypeFixedHalftone252: + case WICBitmapPaletteTypeFixedHalftone256: + palette->Flags = PaletteFlagsHalftone; + break; + default: + palette->Flags = 0; + } + IWICPalette_HasAlpha(wic_palette, &alpha); + if(alpha) + palette->Flags |= PaletteFlagsHasAlpha; } IWICPalette_Release(wic_palette); } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 91f70b5..68a06c4 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2487,6 +2487,9 @@ static void test_multiframegif(void) GUID dimension; PixelFormat pixel_format; INT palette_size, i, j; + char palette_buf[256]; + ColorPalette *palette; + ARGB *palette_entries; /* Test frame functions with an animated GIF */ hglob = GlobalAlloc (0, sizeof(gifanimation)); @@ -2644,6 +2647,26 @@ static void test_multiframegif(void) expect(Ok, stat); expect(PixelFormat8bppIndexed, pixel_format); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipGetImagePaletteSize((GpImage*)bmp, &palette_size); + expect(Ok, stat); + ok(palette_size == sizeof(ColorPalette)+sizeof(ARGB), + "palette_size = %d\n", palette_size); + + memset(palette_buf, 0xfe, sizeof(palette_buf)); + palette = (ColorPalette*)palette_buf; + stat = GdipGetImagePalette((GpImage*)bmp, palette, + sizeof(ColorPalette)+sizeof(ARGB)); + palette_entries = palette->Entries; + expect(Ok, stat); + expect(PaletteFlagsHasAlpha, palette->Flags); + expect(2, palette->Count); + expect(0, palette_entries[0]); + expect(0xff000000, palette_entries[1]); + count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); expect(Ok, stat);

1 0

Jacek Caban : wmsdkidl.idl: Added IWMWriterAdvanced* interfaces declarations.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: d6e2b5b1ffc79adf46eb3f196298ed5ca6416caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e2b5b1ffc79adf46eb3f196… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 13 13:56:52 2015 +0100 wmsdkidl.idl: Added IWMWriterAdvanced* interfaces declarations. --- include/wmsdkidl.idl | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index da228e7..1618f86 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -35,6 +35,31 @@ typedef struct _WMMediaType [size_is(cbFormat)] BYTE *pbFormat; } WM_MEDIA_TYPE; +typedef struct _WMWriterStatistics +{ + QWORD qwSampleCount; + QWORD qwByteCount; + QWORD qwDroppedSampleCount; + QWORD qwDroppedByteCount; + DWORD dwCurrentBitrate; + DWORD dwAverageBitrate; + DWORD dwExpectedBitrate; + DWORD dwCurrentSampleRate; + DWORD dwAverageSampleRate; + DWORD dwExpectedSampleRate; +} WM_WRITER_STATISTICS; + +typedef struct _WMWriterStatisticsEx +{ + DWORD dwBitratePlusOverhead; + DWORD dwCurrentSampleDropRateInQueue; + DWORD dwCurrentSampleDropRateInCodec; + DWORD dwCurrentSampleDropRateInMultiplexer; + DWORD dwTotalSampleDropsInQueue; + DWORD dwTotalSampleDropsInCodec; + DWORD dwTotalSampleDropsInMultiplexer; +} WM_WRITER_STATISTICS_EX; + typedef enum WMT_ATTR_DATATYPE { WMT_TYPE_DWORD = 0, @@ -535,6 +560,30 @@ interface IWMInputMediaProps : IWMMediaProps [ object, + uuid(96406be4-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterSink : IUnknown +{ + HRESULT OnHeader( + [in] INSSBuffer *pHeader); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT AllocateDataUnit( + [in] DWORD cbDataUnit, + [out] INSSBuffer **ppDataUnit); + + HRESULT OnDataUnit( + [in] INSSBuffer *pDataUnit); + + HRESULT OnEndWriting(); +} + +[ + object, uuid(96406bd4-2b2b-11d3-b36b-00c04f6108ff), pointer_default(unique), local @@ -587,6 +636,93 @@ interface IWMWriter : IUnknown HRESULT Flush(); } +[ + object, + uuid(96406be3-2b2b-11d3-b36b-00C04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterAdvanced : IUnknown +{ + HRESULT GetSinkCount( + [out] DWORD *pcSinks); + + HRESULT GetSink( + [in] DWORD dwSinkNum, + [out] IWMWriterSink **ppSink); + + HRESULT AddSink( + [in] IWMWriterSink *pSink); + + HRESULT RemoveSink( + [in] IWMWriterSink *pSink); + + HRESULT WriteStreamSample( + [in] WORD wStreamNum, + [in] QWORD cnsSampleTime, + [in] DWORD msSampleSendTime, + [in] QWORD cnsSampleDuration, + [in] DWORD dwFlags, + [in] INSSBuffer *pSample); + + HRESULT SetLiveSource( + BOOL fIsLiveSource); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT GetWriterTime( + [out] QWORD *pCurrentTime); + + HRESULT GetStatistics( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS *pStats); + + HRESULT SetSyncTolerance( + [in] DWORD msWindow); + + HRESULT GetSyncTolerance( + [out] DWORD *pmsWindow); +} + +[ + object, + uuid(962dc1ec-c046-4db8-9cc7-26ceae500817), + pointer_default(unique), + local +] +interface IWMWriterAdvanced2 : IWMWriterAdvanced +{ + HRESULT GetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [out] WMT_ATTR_DATATYPE *pType, + [out, size_is(*pcbLength)] BYTE *pValue, + [in, out] WORD *pcbLength); + + HRESULT SetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [in] WMT_ATTR_DATATYPE Type, + [in, size_is(cbLength)] const BYTE *pValue, + [in] WORD cbLength); +} + +[ + object, + uuid(2cd6492d-7c37-4e76-9d3b-59261183a22e), + pointer_default(unique), + local +] +interface IWMWriterAdvanced3 : IWMWriterAdvanced2 +{ + HRESULT GetStatisticsEx( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS_EX *pStats); + + HRESULT SetNonBlocking(); +} + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Jacek Caban : mshtml: Added IHTMLTextAreaElement:: defaultValue property implementation.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 14e62a0e2d2d410350b9eaeb877ef194a0927f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e62a0e2d2d410350b9eaeb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 13 13:07:25 2015 +0100 mshtml: Added IHTMLTextAreaElement::defaultValue property implementation. --- dlls/mshtml/htmltextarea.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 43086f9..6a2d1f0 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -229,15 +229,28 @@ static HRESULT WINAPI HTMLTextAreaElement_get_form(IHTMLTextAreaElement *iface, static HRESULT WINAPI HTMLTextAreaElement_put_defaultValue(IHTMLTextAreaElement *iface, BSTR v) { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLTextAreaElement_SetDefaultValue(This->nstextarea, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLTextAreaElement_get_defaultValue(IHTMLTextAreaElement *iface, BSTR *p) { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTextAreaElement_GetDefaultValue(This->nstextarea, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLTextAreaElement_select(IHTMLTextAreaElement *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fca96a0..bcb97b9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1670,6 +1670,38 @@ static void _test_textarea_put_value(unsigned line, IUnknown *unk, const char *v _test_textarea_value(line, unk, value); } +#define test_textarea_defaultvalue(t,v) _test_textarea_defaultvalue(__LINE__,t,v) +static void _test_textarea_defaultvalue(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR value = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLTextAreaElement_get_defaultValue(textarea, &value); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "get_defaultValue failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(value, exval), "defaultValue = %s, expected %s\n", wine_dbgstr_w(value), exval); + else + ok_(__FILE__,line)(!value, "value = %p\n", value); + SysFreeString(value); +} + +#define test_textarea_put_defaultvalue(t,v) _test_textarea_put_defaultvalue(__LINE__,t,v) +static void _test_textarea_put_defaultvalue(unsigned line, IUnknown *unk, const char *value) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR tmp = a2bstr(value); + HRESULT hres; + + hres = IHTMLTextAreaElement_put_defaultValue(textarea, tmp); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "put_defaultValue failed: %08x\n", hres); + SysFreeString(tmp); + + _test_textarea_defaultvalue(line, unk, value); +} + #define test_textarea_readonly(t,v) _test_textarea_readonly(__LINE__,t,v) static void _test_textarea_readonly(unsigned line, IUnknown *unk, VARIANT_BOOL ex) { @@ -8172,6 +8204,9 @@ static void test_elems2(IHTMLDocument2 *doc) test_textarea_value((IUnknown*)elem, NULL); test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_defaultvalue((IUnknown*)elem, NULL); + test_textarea_put_defaultvalue((IUnknown*)elem, "defval text"); + test_textarea_put_value((IUnknown*)elem, "test"); test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); @@ -8185,6 +8220,13 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\">default text</textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + if(elem) { + test_textarea_defaultvalue((IUnknown*)elem, "default text"); + IHTMLElement_Release(elem); + } + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); elem = get_elem_by_id(doc, "ta", TRUE); if(elem) {

1 0

André Hentschel : Add WWN 387
by Jeremy Newman 16 Mar '15

16 Mar '15

Module: website Branch: master Commit: d7a9512c6e134ab0e034f73eb26a58ef246388a1 URL: http://source.winehq.org/git/website.git/?a=commit;h=d7a9512c6e134ab0e034f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 14 13:57:27 2015 +0100 Add WWN 387 --- news/de/2015031401.xml | 11 + news/en/2015031401.xml | 11 + wwn/en/wn20150314_387.xml | 538 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 560 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d7a9512c6e134ab0e0…

1 0

Jactry Zeng : Update Simplified Chinese download page.
by Jeremy Newman 16 Mar '15

16 Mar '15

Module: website Branch: master Commit: e1a59f1e1f0a6a4aaee9aeab78c5e05bc31a44d8 URL: http://source.winehq.org/git/website.git/?a=commit;h=e1a59f1e1f0a6a4aaee9ae… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Mar 16 08:56:52 2015 +0800 Update Simplified Chinese download page. --- templates/zh-cn/download.template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 8ac0172..d3d51ca 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -36,6 +36,8 @@ requested in exchange for hosting the Wine web site.</p> <h2 style="margin-bottom: 5px;"><a name="binary"></a> Wine 的二进制下载</h2> +<p>由发行版构建和维护的二进制可能包含不被 Wine 上游支持的补丁。以下链接只是为了方便用户而提供，不代表 Wine 上游的认可。</p> + <table style="margin: 0 0 15px 0;" width="100%"> <tr> <td width="200">最新的稳定版：</td><td>Wine {$config_stable_release}</td> @@ -61,7 +63,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux"border="0"></a> </td> <td> <b><a href="{$root}/download/ubuntu">下载 Ubuntu 安装包</a></b> - - Ubuntu Oneiric（11.10), Precise（12.04）和 Saucy（13.10）的二进制和源码 .debs + - Ubuntu Trusty (14.04 LTS) 的二进制和源码 .debs</td> <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> </tr> @@ -83,7 +85,7 @@ requested in exchange for hosting the Wine web site.</p> wine 的元包可以通过 <tt>yum</tt> 来安装，运行“<tt>$ yum install wine</tt>”从 EPEL / Fedora Extras / Fedora 的仓库获取。 </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> + <td><a href="mailto:andreas.bierfert@lowlatency.de">Andreas Bierfert</a></td> </tr> <tr bgcolor="#ffffff"> @@ -101,7 +103,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">下载 Slackware 安装包</a></b> - - 二进制 txz（Slackware 14.0），和 tgz （支持旧版本）</td> + - 二进制 txz（Slackware 14.1），和 tgz （支持旧版本）</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr>

1 0

Nikolay Sivov : ole32: Handle Stat() failure in OleLoad() (PVS-Studio).
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 0e24c33332ce560033795cf831a2d87c41625a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e24c33332ce560033795cf83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:52:27 2015 +0300 ole32: Handle Stat() failure in OleLoad() (PVS-Studio). --- dlls/ole32/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b9cc1f0..38b23dc 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1279,6 +1279,8 @@ HRESULT WINAPI OleLoad( * Get the class ID for the object. */ hres = IStorage_Stat(pStg, &storageInfo, STATFLAG_NONAME); + if (FAILED(hres)) + return hres; /* * Now, try and create the handler for the object

1 0

Nikolay Sivov : ole32: Handle some failures in Inverse() for composite moniker (PVS-Studio).
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 24dce2b2295ed660d6c3408aedaf44183369eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dce2b2295ed660d6c3408ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:47:55 2015 +0300 ole32: Handle some failures in Inverse() for composite moniker (PVS-Studio). --- dlls/ole32/compositemoniker.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 40d3568..faadca1 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -778,9 +778,16 @@ CompositeMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /* This method returns a composite moniker that consists of the inverses of each of the components */ /* of the original composite, stored in reverse order */ + *ppmk = NULL; + res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + if (FAILED(res)) + return res; + + res=IMoniker_ComposeWith(iface,antiMk,FALSE,&tempMk); IMoniker_Release(antiMk); + if (FAILED(res)) + return res; if (tempMk==NULL)

1 0

Nikolay Sivov : ole32: Check ComposeWith() return value too (PVS-Studio).
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 46914d8794ec98b8d96d46f6713a6a6221dfb39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46914d8794ec98b8d96d46f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:32:47 2015 +0300 ole32: Check ComposeWith() return value too (PVS-Studio). --- dlls/ole32/compositemoniker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 3e6788e..40d3568 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -722,6 +722,8 @@ CompositeMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, IRunningObjectTable* rot; res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk); + if (FAILED(res)) + return res; res = IBindCtx_GetRunningObjectTable(pbc,&rot); if (FAILED(res))

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
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