September 2009 - Wine-commits

Gerald Pfeifer : oleview: Simplify ENUM_FLAGS in CreateInterfaceInfo.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 2ea07f28bdbd533ed92ac2bc0eb6bbfe2814b998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea07f28bdbd533ed92ac2bc0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 15 22:37:32 2009 +0200 oleview: Simplify ENUM_FLAGS in CreateInterfaceInfo. --- programs/oleview/typelib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 236a670..92834aa 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -984,8 +984,7 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz } if(pTypeAttr->wTypeFlags) { -#define ENUM_FLAGS(x) if(pTypeAttr->wTypeFlags & x &&\ - (pTypeAttr->typekind != TKIND_DISPATCH || x != TYPEFLAG_FDISPATCHABLE))\ +#define ENUM_FLAGS(x) if(pTypeAttr->wTypeFlags & x)\ {\ AddToTLDataStrW(pTLData, wszComa);\ AddToTLDataStrW(pTLData, wszNewLine);\

1 0

Markus Stockhausen : gdi32: Check for NULL pointer in GdiAlphaBlend.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: e51b20bf05ef8ef9aaa1cb1fdf2b44634f9cf3c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51b20bf05ef8ef9aaa1cb1fd… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Fri Sep 18 13:42:11 2009 +0200 gdi32: Check for NULL pointer in GdiAlphaBlend. --- dlls/gdi32/bitblt.c | 10 ++++++---- dlls/gdi32/tests/bitmap.c | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4270f51..46c7f6f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -518,9 +518,11 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig DC *dcDst, *dcSrc; dcSrc = get_dc_ptr( hdcSrc ); + if (!dcSrc) return FALSE; + if ((dcDst = get_dc_ptr( hdcDst ))) { - if (dcSrc) update_dc( dcSrc ); + update_dc( dcSrc ); update_dc( dcDst ); TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d op=%02x flags=%02x srcconstalpha=%02x alphafmt=%02x\n", hdcSrc, xSrc, ySrc, widthSrc, heightSrc, @@ -529,11 +531,11 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig blendFunction.SourceConstantAlpha, blendFunction.AlphaFormat); if (dcDst->funcs->pAlphaBlend) ret = dcDst->funcs->pAlphaBlend( dcDst->physDev, xDst, yDst, widthDst, heightDst, - dcSrc ? dcSrc->physDev : NULL, - xSrc, ySrc, widthSrc, heightSrc, blendFunction ); + dcSrc->physDev, xSrc, ySrc, widthSrc, heightSrc, + blendFunction ); release_dc_ptr( dcDst ); } - if (dcSrc) release_dc_ptr( dcSrc ); + release_dc_ptr( dcSrc ); return ret; } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8666da2..261f6c2 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2393,6 +2393,10 @@ static void test_GdiAlphaBlend(void) expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 30, 30, blend), TRUE, BOOL, "%d"); expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 30, 30, blend), TRUE, BOOL, "%d"); + SetLastError(0xdeadbeef); + expect_eq(pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, NULL, 0, 0, 20, 20, blend), FALSE, BOOL, "%d"); + expect_eq(GetLastError(), 0xdeadbeef, int, "%d"); + SelectObject(hdcDst, oldDst); SelectObject(hdcSrc, oldSrc); DeleteObject(bmpSrc);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_textIndent .
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 7471cfce72d6c9fa1819380412614102e4e2277c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7471cfce72d6c9fa181938041… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 18 20:21:56 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_textIndent. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 737d1c9..dc23e8c 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -417,8 +417,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_lineHeight(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_textIndent(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(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 HTMLCurrentStyle_get_verticalAlign(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9d9ca56..13ac74e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -139,6 +139,8 @@ static const WCHAR attrTextAlign[] = {'t','e','x','t','-','a','l','i','g','n',0}; static const WCHAR attrTextDecoration[] = {'t','e','x','t','-','d','e','c','o','r','a','t','i','o','n',0}; +static const WCHAR attrTextIndent[] = + {'t','e','x','t','-','i','n','d','e','n','t',0}; static const WCHAR attrTop[] = {'t','o','p',0}; static const WCHAR attrVerticalAlign[] = @@ -210,6 +212,7 @@ static const struct{ {attrRight, DISPID_IHTMLSTYLE2_RIGHT}, {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, {attrTextDecoration, DISPID_IHTMLSTYLE_TEXTDECORATION}, + {attrTextIndent, DISPID_IHTMLSTYLE_TEXTINDENT}, {attrTop, DISPID_IHTMLSTYLE_TOP}, {attrVerticalAlign, DISPID_IHTMLSTYLE_VERTICALALIGN}, {attrVisibility, DISPID_IHTMLSTYLE_VISIBILITY}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 994906e..4252caa 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -87,6 +87,7 @@ typedef enum { STYLEID_RIGHT, STYLEID_TEXT_ALIGN, STYLEID_TEXT_DECORATION, + STYLEID_TEXT_INDENT, STYLEID_TOP, STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c91c7d8..d6747d2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2826,6 +2826,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_lineHeight failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_textIndent(current_style, &v); + ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_lineHeight .
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: d35c44221d269989f481783e49186318497e99b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35c44221d269989f481783e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 18 20:18:45 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_lineHeight. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index a17fc48..737d1c9 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -410,8 +410,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_letterSpacing(IHTMLCurrentStyle *ifac static HRESULT WINAPI HTMLCurrentStyle_get_lineHeight(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_LINE_HEIGHT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_textIndent(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4d3d9b1..9d9ca56 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -107,6 +107,8 @@ static const WCHAR attrLeft[] = {'l','e','f','t',0}; static const WCHAR attrLetterSpacing[] = {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; +static const WCHAR attrLineHeight[] = + {'l','i','n','e','-','h','e','i','g','h','t',0}; static const WCHAR attrMargin[] = {'m','a','r','g','i','n',0}; static const WCHAR attrMarginBottom[] = @@ -192,6 +194,7 @@ static const struct{ {attrHeight, DISPID_IHTMLSTYLE_HEIGHT}, {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, + {attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index dbe2970..994906e 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -71,6 +71,7 @@ typedef enum { STYLEID_HEIGHT, STYLEID_LEFT, STYLEID_LETTER_SPACING, + STYLEID_LINE_HEIGHT, STYLEID_MARGIN, STYLEID_MARGIN_BOTTOM, STYLEID_MARGIN_LEFT, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 158c108..c91c7d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2821,6 +2821,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_bottom failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_lineHeight(current_style, &v); + ok(hres == S_OK, "get_lineHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Paul Vriens : msi/tests: Skip some tests on Win9x/WinMe.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 6867de0714cdf717b485c956a28e13434004e896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6867de0714cdf717b485c956a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Sep 18 11:53:52 2009 +0200 msi/tests: Skip some tests on Win9x/WinMe. --- dlls/msi/tests/install.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1e55c81..a2b2dca 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6271,6 +6271,12 @@ static void test_envvar(void) DWORD type, size; char buffer[16]; + if (on_win9x) + { + win_skip("Environment variables are handled differently on Win9x and WinMe\n"); + return; + } + create_test_files(); create_database(msifile, env_tables, sizeof(env_tables) / sizeof(msi_table));

1 0

Nikolay Sivov : comctl32/trackbar: Protect from negative tic count in recalculation helper.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 0f670168e4b52b974cf4df4bbfdaef8442ea8cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f670168e4b52b974cf4df4bb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 18 02:18:48 2009 +0400 comctl32/trackbar: Protect from negative tic count in recalculation helper. Fix for regression introduced in 42c83b9dc7b5094384e718926eddd4b297c7bbae --- dlls/comctl32/tests/trackbar.c | 27 +++++++++++++++++++++++---- dlls/comctl32/trackbar.c | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index d790206..22fbbfe 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -785,22 +785,41 @@ static void test_tic_settings(HWND hWndTrackbar){ /* test TBM_SETTICFREQ */ SendMessage(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10)); SendMessage(hWndTrackbar, TBM_SETTICFREQ, 2, 0); - r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(6, r); SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0); - r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(3, r); SendMessage(hWndTrackbar, TBM_SETTICFREQ, 15, 0); - r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(2, r); /* test TBM_GETNUMTICS */ /* since TIC FREQ is 15, there should be only 2 tics now */ - r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(2, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tic_settings_test_seq, "tic settings test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_tic_settings_test_seq, "parent tic settings test sequence", TRUE); + + /* range [0,0], freq = 1 */ + SendMessage(hWndTrackbar, TBM_SETRANGEMAX, TRUE, 0); + SendMessage(hWndTrackbar, TBM_SETRANGEMIN, TRUE, 0); + SendMessage(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); + expect(2, r); + /* range [0,1], freq = 1 */ + SendMessage(hWndTrackbar, TBM_SETRANGEMAX, TRUE, 1); + SendMessage(hWndTrackbar, TBM_SETRANGEMIN, TRUE, 0); + SendMessage(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); + expect(2, r); + /* range [0,2], freq = 1 */ + SendMessage(hWndTrackbar, TBM_SETRANGEMAX, TRUE, 2); + SendMessage(hWndTrackbar, TBM_SETRANGEMIN, TRUE, 0); + SendMessage(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0, 0); + expect(3, r); } static void test_tic_placement(HWND hWndTrackbar){ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 88f1df1..5abc77f 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -155,7 +155,7 @@ static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr) if (infoPtr->uTicFreq && infoPtr->lRangeMax >= infoPtr->lRangeMin) { nrTics=(infoPtr->lRangeMax - infoPtr->lRangeMin)/infoPtr->uTicFreq; /* don't add extra tic if there's no remainder */ - if ((infoPtr->lRangeMax - infoPtr->lRangeMin) % infoPtr->uTicFreq == 0) + if (nrTics && ((infoPtr->lRangeMax - infoPtr->lRangeMin) % infoPtr->uTicFreq == 0)) nrTics--; } else {

1 0

Henri Verbeet : d3d10: Mark internal symbols hidden.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 891d7629fdf1ecb1a674c4a677391d3ee78d91f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891d7629fdf1ecb1a674c4a67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:34 2009 +0200 d3d10: Mark internal symbols hidden. --- dlls/d3d10/d3d10_private.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 74d4daf..2d664cb 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -30,13 +30,13 @@ #include "d3d10.h" /* TRACE helper functions */ -const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); -const char *debug_d3d10_shader_variable_class(D3D10_SHADER_VARIABLE_CLASS c); -const char *debug_d3d10_shader_variable_type(D3D10_SHADER_VARIABLE_TYPE t); +const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) DECLSPEC_HIDDEN; +const char *debug_d3d10_shader_variable_class(D3D10_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; +const char *debug_d3d10_shader_variable_type(D3D10_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; -void *d3d10_rb_alloc(size_t size); -void *d3d10_rb_realloc(void *ptr, size_t size); -void d3d10_rb_free(void *ptr); +void *d3d10_rb_alloc(size_t size) DECLSPEC_HIDDEN; +void *d3d10_rb_realloc(void *ptr, size_t size) DECLSPEC_HIDDEN; +void d3d10_rb_free(void *ptr) DECLSPEC_HIDDEN; enum d3d10_effect_object_type { @@ -143,7 +143,7 @@ struct d3d10_effect_technique }; /* ID3D10Effect */ -extern const struct ID3D10EffectVtbl d3d10_effect_vtbl; +extern const struct ID3D10EffectVtbl d3d10_effect_vtbl DECLSPEC_HIDDEN; struct d3d10_effect { const struct ID3D10EffectVtbl *vtbl; @@ -173,7 +173,7 @@ struct d3d10_effect struct d3d10_effect_technique *techniques; }; -HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size); +HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,

1 0

Henri Verbeet : wined3d: Move "parent_ops" to IWineD3DResourceClass.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: dbc4dfc495c0af023b35dadd982303fdae9cfd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc4dfc495c0af023b35dadd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:33 2009 +0200 wined3d: Move "parent_ops" to IWineD3DResourceClass. --- dlls/wined3d/basetexture.c | 6 ++++-- dlls/wined3d/buffer.c | 5 ++--- dlls/wined3d/cubetexture.c | 8 +++----- dlls/wined3d/resource.c | 4 +++- dlls/wined3d/surface.c | 6 ++---- dlls/wined3d/texture.c | 8 +++----- dlls/wined3d/volume.c | 5 ++--- dlls/wined3d/volumetexture.c | 8 +++----- dlls/wined3d/wined3d_private.h | 12 +++--------- 9 files changed, 25 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbc4dfc495c0af023b35d…

1 0

Henri Verbeet : wined3d: Don' t free D3D buffers until the wined3d buffer is destroyed.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 93b0600829e7f0906f4c5c73a13c409fccf1287b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b0600829e7f0906f4c5c73a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:32 2009 +0200 wined3d: Don't free D3D buffers until the wined3d buffer is destroyed. --- dlls/d3d10core/buffer.c | 16 ++++++++++++++-- dlls/d3d8/indexbuffer.c | 27 ++++++++++++++++++++++----- dlls/d3d8/vertexbuffer.c | 27 ++++++++++++++++++++++----- dlls/d3d9/indexbuffer.c | 27 ++++++++++++++++++++++----- dlls/d3d9/vertexbuffer.c | 27 ++++++++++++++++++++++----- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/direct3d.c | 5 +++-- dlls/wined3d/buffer.c | 7 +++++-- dlls/wined3d/device.c | 23 +++++++++++++---------- dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.idl | 7 +++++-- 12 files changed, 135 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93b0600829e7f0906f4c5…

1 0

Henri Verbeet : d3d8: Add a separate function for vertex buffer initialization.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: b1bf50d751692e280818e47c88ce7a5fc7973986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1bf50d751692e280818e47c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:31 2009 +0200 d3d8: Add a separate function for vertex buffer initialization. --- dlls/d3d8/d3d8_private.h | 8 ++---- dlls/d3d8/device.c | 51 +++++++++++++++++++-------------------------- dlls/d3d8/vertexbuffer.c | 27 +++++++++++++++++++++++- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index bb035d1..86b936a 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -319,11 +319,6 @@ struct IDirect3DResource8Impl /* ---------------------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl DECLSPEC_HIDDEN; - -/***************************************************************************** * IDirect3DVertexBuffer8 implementation structure */ struct IDirect3DVertexBuffer8Impl @@ -341,6 +336,9 @@ struct IDirect3DVertexBuffer8Impl DWORD fvf; }; +HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Impl *device, + UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) DECLSPEC_HIDDEN; + /* --------------------- */ /* IDirect3DIndexBuffer8 */ /* --------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3356d4f..688ea0d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -749,42 +749,35 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(IDirect3DDevice8 *i return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 iface, UINT Size, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer8** ppVertexBuffer) { - IDirect3DVertexBuffer8Impl *object; +static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(IDirect3DDevice8 *iface, UINT size, DWORD usage, + DWORD fvf, D3DPOOL pool, IDirect3DVertexBuffer8 **buffer) +{ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - HRESULT hrc = D3D_OK; + IDirect3DVertexBuffer8Impl *object; + HRESULT hr; - TRACE("(%p) Relay\n", This); - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexBuffer8Impl)); - if (NULL == object) { - FIXME("Allocation of memory failed\n"); - *ppVertexBuffer = NULL; + TRACE("iface %p, size %u, usage %#x, fvf %#x, pool %#x, buffer %p.\n", + iface, size, usage, fvf, pool, buffer); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DVertexBuffer8_Vtbl; - object->ref = 1; - - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, - 0 /* fvf for ddraw only */, (WINED3DPOOL)Pool, &object->wineD3DVertexBuffer, (IUnknown *)object); - wined3d_mutex_unlock(); - - object->fvf = FVF; - - if (D3D_OK != hrc) { - - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", This); + hr = vertexbuffer_init(object, This, size, usage, fvf, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize vertex buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppVertexBuffer = NULL; - } else { - IUnknown_AddRef(iface); - object->parentDevice = iface; - *ppVertexBuffer = (LPDIRECT3DVERTEXBUFFER8) object; + return hr; } - return hrc; + + TRACE("Created vertex buffer %p.\n", object); + *buffer = (IDirect3DVertexBuffer8 *)object; + + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(IDirect3DDevice8 *iface, UINT size, DWORD usage, diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 617aff3..47ae051 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -210,7 +210,7 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 return hr; } -const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = +static const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = { /* IUnknown */ IDirect3DVertexBuffer8Impl_QueryInterface, @@ -230,3 +230,28 @@ const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = IDirect3DVertexBuffer8Impl_Unlock, IDirect3DVertexBuffer8Impl_GetDesc }; + +HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Impl *device, + UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) +{ + HRESULT hr; + + buffer->lpVtbl = &Direct3DVertexBuffer8_Vtbl; + buffer->ref = 1; + buffer->fvf = fvf; + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, usage & WINED3DUSAGE_MASK, + 0, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d buffer, hr %#x.\n", hr); + return hr; + } + + buffer->parentDevice = (IDirect3DDevice8 *)device; + IUnknown_AddRef(buffer->parentDevice); + + return D3D_OK; +}

1 0