January 2013 - Wine-Commits

Piotr Caban : vbscript: Fixed typo in vbsregexp55.idl.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 2cb3df606f5659b0fac648fe4da0410b0e4e8cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb3df606f5659b0fac648fe4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 22 13:55:54 2013 +0100 vbscript: Fixed typo in vbsregexp55.idl. --- dlls/vbscript/vbsregexp55.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbsregexp55.idl b/dlls/vbscript/vbsregexp55.idl index 0e016b2..c0cf683 100644 --- a/dlls/vbscript/vbsregexp55.idl +++ b/dlls/vbscript/vbsregexp55.idl @@ -122,7 +122,7 @@ library VBScript_RegExp_55 [id(DISPID_REGEXP_REPLACE)] HRESULT Replace( [in] BSTR sourceString, - [in] VARIANT *replaceVar, + [in] VARIANT replaceVar, [out, retval] BSTR *pDestString); }

1 0

André Hentschel : netstat: Implement the UDP stats output.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: b372044c398c74af562e2489e8ca0a2140895d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b372044c398c74af562e2489e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 21 21:12:47 2013 +0100 netstat: Implement the UDP stats output. --- po/ar.po | 20 ++++++++++++++++++++ po/bg.po | 24 ++++++++++++++++++++++++ po/ca.po | 26 ++++++++++++++++++++++++++ po/cs.po | 22 ++++++++++++++++++++++ po/da.po | 26 ++++++++++++++++++++++++++ po/de.po | 26 ++++++++++++++++++++++++++ po/el.po | 22 ++++++++++++++++++++++ po/en.po | 20 ++++++++++++++++++++ po/en_US.po | 20 ++++++++++++++++++++ po/eo.po | 24 ++++++++++++++++++++++++ po/es.po | 26 ++++++++++++++++++++++++++ po/fa.po | 20 ++++++++++++++++++++ po/fi.po | 26 ++++++++++++++++++++++++++ po/fr.po | 26 ++++++++++++++++++++++++++ po/he.po | 24 ++++++++++++++++++++++++ po/hi.po | 20 ++++++++++++++++++++ po/hu.po | 26 ++++++++++++++++++++++++++ po/it.po | 26 ++++++++++++++++++++++++++ po/ja.po | 26 ++++++++++++++++++++++++++ po/ko.po | 26 ++++++++++++++++++++++++++ po/lt.po | 26 ++++++++++++++++++++++++++ po/ml.po | 20 ++++++++++++++++++++ po/nb_NO.po | 26 ++++++++++++++++++++++++++ po/nl.po | 26 ++++++++++++++++++++++++++ po/or.po | 20 ++++++++++++++++++++ po/pa.po | 20 ++++++++++++++++++++ po/pl.po | 26 ++++++++++++++++++++++++++ po/pt_BR.po | 26 ++++++++++++++++++++++++++ po/pt_PT.po | 26 ++++++++++++++++++++++++++ po/rm.po | 20 ++++++++++++++++++++ po/ro.po | 24 ++++++++++++++++++++++++ po/ru.po | 26 ++++++++++++++++++++++++++ po/sk.po | 22 ++++++++++++++++++++++ po/sl.po | 26 ++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 24 ++++++++++++++++++++++++ po/sr_RS(a)latin.po | 24 ++++++++++++++++++++++++ po/sv.po | 26 ++++++++++++++++++++++++++ po/te.po | 20 ++++++++++++++++++++ po/th.po | 22 ++++++++++++++++++++++ po/tr.po | 24 ++++++++++++++++++++++++ po/uk.po | 26 ++++++++++++++++++++++++++ po/wa.po | 20 ++++++++++++++++++++ po/wine.pot | 20 ++++++++++++++++++++ po/zh_CN.po | 24 ++++++++++++++++++++++++ po/zh_TW.po | 26 ++++++++++++++++++++++++++ programs/netstat/netstat.c | 25 +++++++++++++++++++++++++ programs/netstat/netstat.h | 5 +++++ programs/netstat/netstat.rc | 5 +++++ 48 files changed, 1101 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b372044c398c74af562e2…

1 0

Stefan Leichter : gdi32: Add stub for GetFontResourceInfoW.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 83846cd131aac33228bf08aefae0bf0ea93d4273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83846cd131aac33228bf08aef… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jan 21 22:44:52 2013 +0100 gdi32: Add stub for GetFontResourceInfoW. --- dlls/gdi32/font.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a24acd4..b274b83 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3602,6 +3602,15 @@ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) } /*********************************************************************** + * GetFontResourceInfoW (GDI32.@) + */ +BOOL WINAPI GetFontResourceInfoW( LPCWSTR str, LPDWORD size, PVOID buffer, DWORD type ) +{ + FIXME("%s %p(%d) %p %d\n", debugstr_w(str), size, size ? *size : 0, buffer, type); + return FALSE; +} + +/*********************************************************************** * GetTextCharset (GDI32.@) */ UINT WINAPI GetTextCharset(HDC hdc) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 80b1b68..65f1d0c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -279,7 +279,7 @@ @ stdcall GetFontData(long long long ptr long) @ stdcall GetFontLanguageInfo(long) @ stub GetFontResourceInfo -@ stub GetFontResourceInfoW +@ stdcall GetFontResourceInfoW(wstr ptr ptr long) @ stdcall GetFontUnicodeRanges(ptr ptr) @ stdcall GetGlyphIndicesA(long ptr long ptr long) @ stdcall GetGlyphIndicesW(long ptr long ptr long)

1 0

André Hentschel : netstat: Implement the TCP stats output.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 709b9ee819557d447055f645469728f6a1284cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709b9ee819557d447055f6454… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 21 21:12:36 2013 +0100 netstat: Implement the TCP stats output. --- po/ar.po | 40 +++++++++++++++++++++++++++++++++++ po/bg.po | 44 +++++++++++++++++++++++++++++++++++++++ po/ca.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 40 +++++++++++++++++++++++++++++++++++ po/da.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/de.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/el.po | 40 +++++++++++++++++++++++++++++++++++ po/en.po | 36 ++++++++++++++++++++++++++++++++ po/en_US.po | 36 ++++++++++++++++++++++++++++++++ po/eo.po | 44 +++++++++++++++++++++++++++++++++++++++ po/es.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 40 +++++++++++++++++++++++++++++++++++ po/fi.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/he.po | 44 +++++++++++++++++++++++++++++++++++++++ po/hi.po | 36 ++++++++++++++++++++++++++++++++ po/hu.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/it.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 36 ++++++++++++++++++++++++++++++++ po/nb_NO.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/or.po | 36 ++++++++++++++++++++++++++++++++ po/pa.po | 36 ++++++++++++++++++++++++++++++++ po/pl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 36 ++++++++++++++++++++++++++++++++ po/ro.po | 44 +++++++++++++++++++++++++++++++++++++++ po/ru.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sl.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 44 +++++++++++++++++++++++++++++++++++++++ po/sv.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/te.po | 36 ++++++++++++++++++++++++++++++++ po/th.po | 40 +++++++++++++++++++++++++++++++++++ po/tr.po | 44 +++++++++++++++++++++++++++++++++++++++ po/uk.po | 48 +++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 36 ++++++++++++++++++++++++++++++++ po/wine.pot | 36 ++++++++++++++++++++++++++++++++ po/zh_CN.po | 44 +++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 48 +++++++++++++++++++++++++++++++++++++++++++ programs/netstat/netstat.c | 33 +++++++++++++++++++++++++++++ programs/netstat/netstat.h | 9 ++++++++ programs/netstat/netstat.rc | 9 ++++++++ 48 files changed, 2015 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=709b9ee819557d447055f…

1 0

Henri Verbeet : wined3d: Get rid of CheckSrgbReadCapability().
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: c90a1e5e218705c225e91f7d0f0df3fbc44e2334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90a1e5e218705c225e91f7d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:09 2013 +0100 wined3d: Get rid of CheckSrgbReadCapability(). --- dlls/wined3d/directx.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f763c12..aa11116 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3527,11 +3527,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - return format->flags & WINED3DFMT_FLAG_SRGB_READ; -} - /* Check if a format support blending in combination with pixel shaders */ static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) @@ -3998,7 +3993,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4164,7 +4159,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4332,7 +4327,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_SRGBREAD) { - if (!CheckSrgbReadCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_SRGB_READ)) { TRACE("[FAILED] - No sRGB read support.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileData_GetChildren and ID3DXFileData_GetChild.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 5db342168d7e362af544e57792b31cfd0cf78a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db342168d7e362af544e5779… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:36:19 2013 +0100 d3dx9_36: Implement ID3DXFileData_GetChildren and ID3DXFileData_GetChild. --- dlls/d3dx9_36/xfile.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8020467..82c7495 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -243,17 +243,32 @@ static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) static HRESULT WINAPI ID3DXFileDataImpl_GetChildren(ID3DXFileData *iface, SIZE_T *children) { - TRACE("(%p)->(%p): stub\n", iface, children); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, children); + + if (!children) + return E_POINTER; + + *children = This->nb_children; + + return S_OK; } static HRESULT WINAPI ID3DXFileDataImpl_GetChild(ID3DXFileData *iface, SIZE_T id, ID3DXFileData **object) { - TRACE("(%p)->(%lu, %p): stub\n", iface, id, object); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%lu, %p)\n", iface, id, object); + + if (!object) + return E_POINTER; + + *object = This->children[id]; + (*object)->lpVtbl->AddRef(*object); + + return S_OK; }

1 0

Alexandre Julliard : gdi32: Fix copy/ paste typo in get_char_positions_indices.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: f496a5a0e69ac21a45c9048131ef59469c45f8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f496a5a0e69ac21a45c904813… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 22 12:13:19 2013 +0100 gdi32: Fix copy/paste typo in get_char_positions_indices. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 68559f1..a24acd4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -358,7 +358,7 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev->funcs->pGetTextMetrics( dev, &tm ); - dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPointI ); if (!dev->funcs->pGetTextExtentExPointI( dev, indices, count, dx )) return FALSE; if (dc->breakExtra || dc->breakRem)

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_IsReference.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 8f6eee5a731d3789e72cd961f3240a6498f0ce35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6eee5a731d3789e72cd961f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:36:28 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_IsReference. --- dlls/d3dx9_36/xfile.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 82c7495..81f9da3 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -235,9 +235,11 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) { - TRACE("(%p)->(): stub\n", iface); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); - return E_NOTIMPL; + TRACE("(%p)->()\n", iface); + + return This->reference; } @@ -320,6 +322,7 @@ static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DX HeapFree(GetProcessHeap(), 0, object); return E_FAIL; } + object->reference = TRUE; } else {

1 0

Christian Costa : dmusic: Add support for loading articulations.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 2562969804782c043f6e676339c742cac5a11a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2562969804782c043f6e67633… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jan 22 08:35:56 2013 +0100 dmusic: Add support for loading articulations. --- dlls/dmusic/dmusic_private.h | 7 ++++ dlls/dmusic/instrument.c | 69 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index ff16833..badc2df 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -85,6 +85,11 @@ typedef struct instrument_region { BOOL loop_present; } instrument_region; +typedef struct instrument_articulation { + CONNECTIONLIST connections_list; + CONNECTION *connections; +} instrument_articulation; + /***************************************************************************** * ClassFactory */ @@ -245,6 +250,8 @@ struct IDirectMusicInstrumentImpl { /* instrument data */ BOOL loaded; instrument_region *regions; + ULONG nb_articulations; + instrument_articulation *articulations; }; static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDirectMusicInstrument *iface) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index d6de0db..9df3e0c 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -76,7 +76,12 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i if (!ref) { + ULONG i; + HeapFree(GetProcessHeap(), 0, This->regions); + for (i = 0; i < This->nb_articulations; i++) + HeapFree(GetProcessHeap(), 0, This->articulations->connections); + HeapFree(GetProcessHeap(), 0, This->articulations); HeapFree(GetProcessHeap(), 0, This); } @@ -243,6 +248,42 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in return S_OK; } +static HRESULT load_articulation(IDirectMusicInstrumentImpl *This, IStream *stream, ULONG length) +{ + HRESULT ret; + instrument_articulation *articulation; + + if (!This->articulations) + This->articulations = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->articulations)); + else + This->articulations = HeapReAlloc(GetProcessHeap(), 0, This->articulations, sizeof(*This->articulations) * (This->nb_articulations + 1)); + if (!This->articulations) + return E_OUTOFMEMORY; + + articulation = &This->articulations[This->nb_articulations]; + + ret = read_from_stream(stream, &articulation->connections_list, sizeof(CONNECTIONLIST)); + if (FAILED(ret)) + return ret; + + articulation->connections = HeapAlloc(GetProcessHeap(), 0, sizeof(CONNECTION) * articulation->connections_list.cConnections); + if (!articulation->connections) + return E_OUTOFMEMORY; + + ret = read_from_stream(stream, articulation->connections, sizeof(CONNECTION) * articulation->connections_list.cConnections); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, articulation->connections); + return ret; + } + + subtract_bytes(length, sizeof(CONNECTIONLIST) + sizeof(CONNECTION) * articulation->connections_list.cConnections); + + This->nb_articulations++; + + return S_OK; +} + /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) { @@ -323,7 +364,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt if (chunk.fccID == FOURCC_RGN) { - TRACE("RGN chunk (region list): %u bytes\n", chunk.dwSize); + TRACE("RGN chunk (region): %u bytes\n", chunk.dwSize); hr = load_region(This, stream, &This->regions[i++], chunk.dwSize - sizeof(chunk.fccID)); } else @@ -338,6 +379,32 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt } break; + case FOURCC_LART: + TRACE("LART chunk (articulations list): %u bytes\n", size); + + while (size) + { + hr = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(hr)) + goto error; + + if (chunk.fccID == FOURCC_ART1) + { + TRACE("ART1 chunk (level 1 articulation): %u bytes\n", chunk.dwSize); + hr = load_articulation(This, stream, chunk.dwSize); + } + else + { + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + hr = advance_stream(stream, chunk.dwSize); + } + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, chunk.dwSize + sizeof(chunk)); + } + break; + default: TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);

1 0

Henri Verbeet : d3drm: Avoid LPD3DRECT.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: c309046cb1b9b29526db5314a7e00880001d9d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c309046cb1b9b29526db5314a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 22 11:34:05 2013 +0100 d3drm: Avoid LPD3DRECT. --- include/d3drmobj.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5e50abe..11922c5 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -157,8 +157,9 @@ typedef struct IDirect3DRMClippedVisual *LPDIRECT3DRMCLIPPEDVISUAL, **LPLPDIRE typedef void (__cdecl *D3DRMOBJECTCALLBACK)(LPDIRECT3DRMOBJECT obj, LPVOID arg); typedef void (__cdecl *D3DRMFRAMEMOVECALLBACK)(LPDIRECT3DRMFRAME obj, LPVOID arg, D3DVALUE delta); typedef void (__cdecl *D3DRMFRAME3MOVECALLBACK)(LPDIRECT3DRMFRAME3 obj, LPVOID arg, D3DVALUE delta); -typedef void (__cdecl *D3DRMUPDATECALLBACK)(LPDIRECT3DRMDEVICE obj, LPVOID arg, int, LPD3DRECT); -typedef void (__cdecl *D3DRMDEVICE3UPDATECALLBACK)(LPDIRECT3DRMDEVICE3 obj, LPVOID arg, int, LPD3DRECT); +typedef void (__cdecl *D3DRMUPDATECALLBACK)(struct IDirect3DRMDevice *device, void *ctx, int count, D3DRECT *rects); +typedef void (__cdecl *D3DRMDEVICE3UPDATECALLBACK)(struct IDirect3DRMDevice3 *device, void *ctx, + int count, D3DRECT *rects); typedef int (__cdecl *D3DRMUSERVISUALCALLBACK)(LPDIRECT3DRMUSERVISUAL obj, LPVOID arg, D3DRMUSERVISUALREASON reason, LPDIRECT3DRMDEVICE dev, LPDIRECT3DRMVIEWPORT view); typedef HRESULT (__cdecl *D3DRMLOADTEXTURECALLBACK)(char *tex_name, void *arg, LPDIRECT3DRMTEXTURE *);

1 0