August 2014 - Wine-Commits - list.winehq.org

André Hentschel : wpcap: Implement pcap_major_version and pcap_minor_version.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: 0cbd82f6298ad9f953dad17a3be92bccff30c1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbd82f6298ad9f953dad17a3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 10 23:08:20 2014 +0200 wpcap: Implement pcap_major_version and pcap_minor_version. --- dlls/wpcap/wpcap.c | 12 ++++++++++++ dlls/wpcap/wpcap.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e143294..a317e5f 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -29,3 +29,15 @@ const char* CDECL wine_pcap_lib_version(void) TRACE("%s\n", debugstr_a(ret)); return ret; } + +int CDECL wine_pcap_major_version(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_major_version(p); +} + +int CDECL wine_pcap_minor_version(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_minor_version(p); +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 1b36f33..bcf8ea4 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -40,8 +40,8 @@ @ stub pcap_lookupdev @ stub pcap_lookupnet @ stub pcap_loop -@ stub pcap_major_version -@ stub pcap_minor_version +@ cdecl pcap_major_version(ptr) wine_pcap_major_version +@ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @ stub pcap_next @ stub pcap_next_etherent @ stub pcap_next_ex

1 0

Thomas Faber : rpcrt4: Correctly check for in-buffer memory in PointerFree.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: 6a30cde7b04c3b8a28e93557ce5ce18d1e45931f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a30cde7b04c3b8a28e93557c… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Aug 11 10:59:20 2014 +0200 rpcrt4: Correctly check for in-buffer memory in PointerFree. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 481b426..3f1762a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1138,7 +1138,7 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, * BufferStart and BufferEnd won't be reset when allocating memory for * sending the response. we don't have to check for the new buffer here as * it won't be used a type memory, only for buffer memory */ - if (Pointer >= pStubMsg->BufferStart && Pointer < pStubMsg->BufferEnd) + if (Pointer >= pStubMsg->BufferStart && Pointer <= pStubMsg->BufferEnd) goto notfree; if (attr & RPC_FC_P_ONSTACK) {

1 0

Erich E. Hoover : ddraw: Return empty D3D hardware flags for RGB device enumeration.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: 45147b82efeceea76b37147f56e7088a27d18663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45147b82efeceea76b37147f5… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sun Feb 16 14:14:42 2014 -0700 ddraw: Return empty D3D hardware flags for RGB device enumeration. --- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/tests/d3d.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 011c115..df74122 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3683,6 +3683,8 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); /* RGB, RAMP and MMX devices have a HAL dcmColorModel of 0 */ hal_desc.dcmColorModel = 0; + /* RGB, RAMP and MMX devices cannot report HAL hardware flags */ + hal_desc.dwFlags = 0; hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description, device_name, &hal_desc, &hel_desc, context); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9940b63..ec4197a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -537,12 +537,18 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, ok(hal->dcmColorModel == 0, "RGB Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); ok(hel->dcmColorModel == D3DCOLOR_RGB, "RGB Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); + + ok(hal->dwFlags == 0, "RGB Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); + ok(hel->dwFlags != 0, "RGB Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); } else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) { trace("HAL Device %d\n", ver); ok(hal->dcmColorModel == D3DCOLOR_RGB, "HAL Device %u hal caps has colormodel %u\n", ver, hel->dcmColorModel); ok(hel->dcmColorModel == 0, "HAL Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); + + ok(hal->dwFlags != 0, "HAL Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); + ok(hel->dwFlags != 0, "HAL Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); } else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) { @@ -587,6 +593,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, ok(hal->dcmColorModel == 0, "Ramp Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); ok(hel->dcmColorModel == D3DCOLOR_MONO, "Ramp Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); + + ok(hal->dwFlags == 0, "Ramp Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); + ok(hel->dwFlags != 0, "Ramp Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); } else if(IsEqualGUID(&IID_IDirect3DMMXDevice, Guid)) { @@ -610,6 +619,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, ok(hal->dcmColorModel == 0, "MMX Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); ok(hel->dcmColorModel == D3DCOLOR_RGB, "MMX Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); + + ok(hal->dwFlags == 0, "MMX Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); + ok(hel->dwFlags != 0, "MMX Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); } else {

1 0

Erich E. Hoover : ddraw/tests: Remove broken tests of D3DTRANSFORM_UNCLIPPED.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: a56ea6e5d97cf393a7a87adc5310d280627b9d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56ea6e5d97cf393a7a87adc5… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sun Feb 16 14:14:13 2014 -0700 ddraw/tests: Remove broken tests of D3DTRANSFORM_UNCLIPPED. --- dlls/ddraw/tests/d3d.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 209555a..9940b63 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1236,14 +1236,6 @@ static void Direct3D1Test(void) &i); ok(hr == D3D_OK, "IDirect3DViewport_TransformVertices returned %08x\n", hr); - transformdata.lpHOut = outH; - memset(outH, 0xcc, sizeof(outH)); - hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(testverts) / sizeof(testverts[0]), - &transformdata, D3DTRANSFORM_UNCLIPPED, - &i); - ok(hr == D3D_OK, "IDirect3DViewport_TransformVertices returned %08x\n", hr); - ok(i == 0, "Offscreen is %d\n", i); - for(i = 0; i < sizeof(testverts) / sizeof(testverts[0]); i++) { static const struct v_out cmp[] = { {128.0, 128.0, 0.0, 1}, {129.0, 127.0, 1.0, 1}, {127.0, 129.0, -1, 1}, @@ -1256,12 +1248,6 @@ static void Direct3D1Test(void) out[i].x, out[i].y, out[i].z, out[i].rhw, cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } - for(i = 0; i < sizeof(outH); i++) { - if(((unsigned char *) outH)[i] != 0xcc) { - ok(FALSE, "Homogeneous output was generated despite UNCLIPPED flag\n"); - break; - } - } SET_VP_DATA(vp_data); hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); @@ -1306,6 +1292,7 @@ static void Direct3D1Test(void) cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } + transformdata.lpHOut = outH; memset(out, 0xcc, sizeof(out)); hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(testverts) / sizeof(testverts[0]), &transformdata, D3DTRANSFORM_CLIPPED,

1 0

Marcus Meissner : dwrite: Fixed paste error (Coverity).
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: d1749b548b95a4888a2c8157d574d11aea7e2866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1749b548b95a4888a2c8157d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Aug 11 09:00:31 2014 +0200 dwrite: Fixed paste error (Coverity). --- dlls/dwrite/tests/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f4cd903..dc5f477 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -613,7 +613,7 @@ static void test_SetInlineObject(void) hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); - ok(inlinetest == NULL, "got %p\n", inlineobj); + ok(inlinetest == NULL, "got %p\n", inlinetest); } range.startPosition = 0; range.length = 2;

1 0

Gerald Pfeifer : gdi32: Remove unused constant bit_fields_565.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: ff05f2dec69d9b1c28b710c425c4e1eff3c7a9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff05f2dec69d9b1c28b710c42… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 10 20:11:19 2014 -0500 gdi32: Remove unused constant bit_fields_565. --- dlls/gdi32/dib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index dd7a7f1..708a9a8 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -961,7 +961,6 @@ UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *col } static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; -static const DWORD bit_fields_565[3] = {0xf800, 0x07e0, 0x001f}; static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; static int fill_query_info( BITMAPINFO *info, BITMAPOBJ *bmp )

1 0

Gerald Pfeifer : xmllite: Remove unused function reader_get_len.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: a8975f7dffad04d827f8fd6876bcecfc00d930d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8975f7dffad04d827f8fd687… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 9 17:24:18 2014 +0900 xmllite: Remove unused function reader_get_len. --- dlls/xmllite/reader.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index af92fa2..cf61939 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -372,12 +372,6 @@ static void reader_free_strvalued(xmlreader *reader, strval *v) } } -/* returns length in WCHARs from 'start' to current buffer offset */ -static inline UINT reader_get_len(const xmlreader *reader, UINT start) -{ - return reader->input->buffer->utf16.cur - start; -} - static inline void reader_init_strvalue(UINT start, UINT len, strval *v) { v->start = start;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: 2e86504eb779fff3fce1d2e372389be22fbff7c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e86504eb779fff3fce1d2e37… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 9 09:40:36 2014 +0200 po: Update French translation. --- po/fr.po | 87 ++++++++++++++++++++-------------------------------------------- 1 file changed, 27 insertions(+), 60 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6fa6c2a..973824e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1045,10 +1045,8 @@ msgid "Open File" msgstr "Ouvrir le fichier" #: comdlg32.rc:147 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "Nouveau dossier" +msgstr "Sélectionnez un dossier" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready" @@ -6629,10 +6627,8 @@ msgid "This network connection does not exist.\n" msgstr "Cette connexion réseau n'existe pas.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Connexion refusée.\n" +msgstr "Connexion cloturée par le pair.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -7167,25 +7163,19 @@ msgid "outline button" msgstr "bouton de résumé" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Normale" +msgstr "normal" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Indisponible" +msgstr "indisponible" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Sélectionner" +msgstr "sélectionné" #: oleacc.rc:100 #, fuzzy @@ -7195,30 +7185,24 @@ msgid "focused" msgstr "En pause" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "&Compressé" +msgstr "pressé" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "coché" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Mixte" +msgstr "mixte" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "Lectu&re seule" +msgstr "lecture seule" #: oleacc.rc:105 #, fuzzy @@ -7228,31 +7212,30 @@ msgid "hot tracked" msgstr "Élément actif" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Valeurs par défaut" +msgstr "valeur par défaut" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "développé" #: oleacc.rc:108 +#, fuzzy msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "réduit" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "occupé" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "flottant" #: oleacc.rc:111 msgctxt "object state" @@ -7260,35 +7243,30 @@ msgid "marqueed" msgstr "" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animation" +msgstr "animé" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "invisible" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "hors écran" #: oleacc.rc:115 #, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" msgstr "&activer" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&activer" +msgstr "déplaçable" #: oleacc.rc:117 msgctxt "object state" @@ -7303,18 +7281,14 @@ msgid "focusable" msgstr "En pause" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "table" +msgstr "sélectionnable" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "lien" +msgstr "lié" #: oleacc.rc:121 msgctxt "object state" @@ -7336,37 +7310,30 @@ msgid "extended selectable" msgstr "Sélectionnez un fichier." #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "alerte" +msgstr "alerte basse" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "alerte" +msgstr "alerte moyenne" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "alerte" +msgstr "alerte haute" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Protégé contre l'écriture.\n" +msgstr "protégé" #: oleacc.rc:128 +#, fuzzy msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "avec popup" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Zhenbo Li : mshtml: Added IHTMLStyle::textIndent property implementation.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: aa41321f49ceee98a6f038a3fff714bd7ba9fa77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa41321f49ceee98a6f038a3f… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 9 08:31:31 2014 +0800 mshtml: Added IHTMLStyle::textIndent property implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 580b73c..6731149 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1489,15 +1489,19 @@ static HRESULT WINAPI HTMLStyle_get_textAlign(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_textIndent(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_TEXT_INDENT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_textIndent(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_TEXT_INDENT, p, 0); } static HRESULT WINAPI HTMLStyle_put_lineHeight(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 62a6336..bd4b200 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1248,6 +1248,23 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "center"), "textAlign = %s\n", wine_dbgstr_w(V_BSTR(&v))); SysFreeString(str); + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_textIndent(style, &v); + ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(textIndent) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(textIndent) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_textIndent(style, v); + ok(hres == S_OK, "put_textIndent failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_textIndent(style, &v); + ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(textIndent) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(textIndent) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_textTransform(style, &str); ok(hres == S_OK, "get_textTransform failed: %08x\n", hres);

1 0

Gerald Pfeifer : winedbg: Add explicit return in the error case of print_typed_basic.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: c24bd744867771b9f047c4e664bcea5120255810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24bd744867771b9f047c4e66… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 9 20:38:49 2014 -0500 winedbg: Add explicit return in the error case of print_typed_basic. --- programs/winedbg/memory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index af99229..78a0493 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -367,6 +367,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) { WINE_ERR("Couldn't get information\n"); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); + return; } size = (DWORD)size64; switch (bt)

1 0