April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetDepthStencilSurface ().
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 7024ffac9af3c94e16158c19e28ad77854d13218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7024ffac9af3c94e16158c19e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:41 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetDepthStencilSurface(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e10c83c..d50acd5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1172,6 +1172,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(IDirect3DDevic { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, ppZStencilSurface); @@ -1184,7 +1185,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(IDirect3DDevic hr = wined3d_device_get_depth_stencil(This->wined3d_device, &wined3d_surface); if (SUCCEEDED(hr)) { - *ppZStencilSurface = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppZStencilSurface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*ppZStencilSurface); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetTexture( ).
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: dd8ed6f8a91abeedb2b13337d9a82f5a592a189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8ed6f8a91abeedb2b13337d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:42 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetTexture(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d50acd5..7d7b454 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1706,6 +1706,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(IDirect3DDevice8 *iface, { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); struct wined3d_texture *wined3d_texture; + struct d3d8_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture); @@ -1726,7 +1727,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(IDirect3DDevice8 *iface, if (wined3d_texture) { - *ppTexture = wined3d_texture_get_parent(wined3d_texture); + texture_impl = wined3d_texture_get_parent(wined3d_texture); + *ppTexture = &texture_impl->IDirect3DBaseTexture8_iface; IDirect3DBaseTexture8_AddRef(*ppTexture); wined3d_texture_decref(wined3d_texture); }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DTexture9Impl.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 5569db9a98be7a84b6e8a54416e493696c9b1079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5569db9a98be7a84b6e8a5441… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:43 2012 +0200 d3d9: Get rid of IDirect3DTexture9Impl. --- dlls/d3d9/d3d9_private.h | 26 ++---- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 223 ++++++++++++++++++++++----------------------- 3 files changed, 119 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5569db9a98be7a84b6e8a…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DCubeTexture9Impl.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 21c65893c950402b8bb6fa096a5b513dcf78e2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c65893c950402b8bb6fa096… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:44 2012 +0200 d3d9: Get rid of IDirect3DCubeTexture9Impl. --- dlls/d3d9/cubetexture.c | 229 ++++++++++++++++++++++----------------------- dlls/d3d9/d3d9_private.h | 19 +---- dlls/d3d9/device.c | 6 +- dlls/d3d9/texture.c | 4 +- 4 files changed, 119 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c65893c950402b8bb6f…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 5e1784dde7d9b6e68ec2d551557b165e8601493d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1784dde7d9b6e68ec2d5515… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Apr 20 22:00:52 2012 +0300 po: Update Finnish translation. --- po/fi.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index e97f67d..3b8e15e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3526,16 +3526,12 @@ msgid "URI to be decoded is incorrect" msgstr "Dekoodattava URI on virheellinen" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Arvo on luettelon ulkopuolella.\n" +msgstr "Desimaalien määrä ei kelpaa" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Indeksi alueen ulkopuolella" +msgstr "Tarkkuus ei kelpaa" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 9095669cc592a16c3ffd72464c97c6b8f78caec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9095669cc592a16c3ffd72464… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Apr 22 13:29:47 2012 +0300 po: Update Swedish translation. --- po/sv.po | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/po/sv.po b/po/sv.po index 93f1f73..62186cd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3521,16 +3521,12 @@ msgid "URI to be decoded is incorrect" msgstr "Den URI som ska avkodas är felaktig" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Uppräkningsvärde utanför giltigt intervall.\n" +msgstr "Antal decimaler är utanför giltigt intervall" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Index utanför giltigt intervall" +msgstr "Precision är utanför giltigt intervall" #: jscript.rc:59 msgid "Array length must be a finite positive integer" @@ -7907,14 +7903,12 @@ msgid "Links" msgstr "Länkar" #: shell32.rc:223 -#, fuzzy msgid "Slide Shows" -msgstr "Bilder\\Slide Shows" +msgstr "Bildspel" #: shell32.rc:224 -#, fuzzy msgid "Playlists" -msgstr "Musik\\Playlists" +msgstr "Spellistor" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -7929,24 +7923,20 @@ msgid "Model" msgstr "Modell" #: shell32.rc:225 -#, fuzzy msgid "Sample Music" -msgstr "Musik\\Sample Music" +msgstr "Exempelmusik" #: shell32.rc:226 -#, fuzzy msgid "Sample Pictures" -msgstr "Bilder\\Sample Pictures" +msgstr "Exempelbilder" #: shell32.rc:227 -#, fuzzy msgid "Sample Playlists" -msgstr "Musik\\Sample Playlists" +msgstr "Exempelspellistor" #: shell32.rc:228 -#, fuzzy msgid "Sample Videos" -msgstr "Videoklipp\\Sample Videos" +msgstr "Exempelvideoklipp" #: shell32.rc:229 msgid "Saved Games"

1 0

Christian Costa : dmusic: Fix IDirectMusic8Impl_CreateMusicBuffer buffer signature.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: acea60ca85321e18521cb597a1ab6c3f1a6ad741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acea60ca85321e18521cb597a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Apr 21 14:19:35 2012 +0200 dmusic: Fix IDirectMusic8Impl_CreateMusicBuffer buffer signature. --- dlls/dmusic/dmusic.c | 3 ++- include/dmusicc.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 253ef1a..f6b7e04 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -153,7 +153,8 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind return S_FALSE; } -static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter) { +static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER* ppBuffer, LPUNKNOWN pUnkOuter) +{ IDirectMusic8Impl *This = (IDirectMusic8Impl *)iface; TRACE("(%p, %p, %p, %p)\n", This, pBufferDesc, ppBuffer, pUnkOuter); diff --git a/include/dmusicc.h b/include/dmusicc.h index 9c07737..cdae16c 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -378,7 +378,7 @@ DECLARE_INTERFACE_(IDirectMusic,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusic methods ***/ STDMETHOD(EnumPort)(THIS_ DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) PURE; - STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER **ppBuffer, LPUNKNOWN pUnkOuter) PURE; + STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER *ppBuffer, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(CreatePort)(THIS_ REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT *ppPort, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(EnumMasterClock)(THIS_ DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo) PURE; STDMETHOD(GetMasterClock)(THIS_ LPGUID pguidClock, struct IReferenceClock **ppReferenceClock) PURE; @@ -419,7 +419,7 @@ DECLARE_INTERFACE_(IDirectMusic8,IDirectMusic) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectMusic methods ***/ STDMETHOD(EnumPort)(THIS_ DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps) PURE; - STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER **ppBuffer, LPUNKNOWN pUnkOuter) PURE; + STDMETHOD(CreateMusicBuffer)(THIS_ LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER *ppBuffer, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(CreatePort)(THIS_ REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT *ppPort, LPUNKNOWN pUnkOuter) PURE; STDMETHOD(EnumMasterClock)(THIS_ DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo) PURE; STDMETHOD(GetMasterClock)(THIS_ LPGUID pguidClock, struct IReferenceClock **ppReferenceClock) PURE;

1 0

André Hentschel : dbghelp: Assorted fixes for shadow variables.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 89cb501927833ed57132a4bb5b4eb77cc1b89e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89cb501927833ed57132a4bb5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 19 23:22:33 2012 +0200 dbghelp: Assorted fixes for shadow variables. --- dlls/dbghelp/dwarf.c | 4 ++-- dlls/dbghelp/msc.c | 11 +++++++---- dlls/dbghelp/path.c | 1 - dlls/dbghelp/stabs.c | 1 - 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a7a7001..2ce26fa 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2188,7 +2188,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, vector_init(&files, sizeof(unsigned), 16); while (*traverse.data) { - unsigned int dir_index, mod_time, length; + unsigned int dir_index, mod_time; const char* name; const char* dir; unsigned* psrc; @@ -2199,7 +2199,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, mod_time = dwarf2_leb128_as_unsigned(&traverse); length = dwarf2_leb128_as_unsigned(&traverse); dir = *(const char**)vector_at(&dirs, dir_index); - TRACE("Got file %s/%s (%u,%u)\n", dir, name, mod_time, length); + TRACE("Got file %s/%s (%u,%lu)\n", dir, name, mod_time, length); psrc = vector_add(&files, &ctx->pool); *psrc = source_new(ctx->module, dir, name); } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 53bf6bf..e32c463 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1551,7 +1551,6 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root int i, length; struct symt_block* block = NULL; struct symt* symt; - const char* name; struct symt_compiland* compiland = NULL; struct location loc; @@ -1947,9 +1946,13 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root case S_PROCREF_V1: case S_DATAREF_V1: case S_LPROCREF_V1: - name = (const char*)sym + length; - length += (*name + 1 + 3) & ~3; - break; + { + const char* name; + + name = (const char*)sym + length; + length += (*name + 1 + 3) & ~3; + break; + } case S_MSTOOL_V3: /* just to silence a few warnings */ case S_MSTOOLINFO_V3: diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index f16eb00..5bd260e 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -479,7 +479,6 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) { HANDLE hFile, hMap; void* mapping; - DWORD timestamp; timestamp = ~mf->dw1; size = ~mf->dw2; diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b4188d1..3546cff 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -604,7 +604,6 @@ static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd) if (mthd == '*') { long int ofs; - struct symt* dt; PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &ofs) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ';');

1 0

Dmitry Timoshkov : include/wine/test.h: Fix tests compilation with a PSDK compiler.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 3068ae8bce32f3d41d8b88057e59e07284274ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3068ae8bce32f3d41d8b88057… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:14:45 2012 +0900 include/wine/test.h: Fix tests compilation with a PSDK compiler. --- include/wine/test.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bee9c23..b3113a8 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -590,7 +590,9 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_EXECUTE_HANDLER; } +#ifdef __GNUC__ void _fpreset(void) {} /* override the mingw fpu init code */ +#endif /* main function */ int main( int argc, char **argv )

1 0

Aric Stewart : strmbase: Have PassThruImpl use BaseDispatch.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: d080774e75d8310a8deaaad3a4722b1c3e0e666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d080774e75d8310a8deaaad3a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 20 07:26:53 2012 -0500 strmbase: Have PassThruImpl use BaseDispatch. --- dlls/strmbase/pospass.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 6a5efb9..71c1dc6 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -40,6 +40,7 @@ typedef struct PassThruImpl { ISeekingPassThru ISeekingPassThru_iface; IMediaSeeking IMediaSeeking_iface; IMediaPosition IMediaPosition_iface; + BaseDispatch baseDispatch; LONG ref; IUnknown * outer_unk; @@ -121,6 +122,7 @@ static ULONG WINAPI SeekInner_Release(IUnknown * iface) { if (ref == 0) { + BaseDispatch_Destroy(&This->baseDispatch); This->time_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->time_cs); CoTaskMemFree(This); @@ -264,6 +266,7 @@ HRESULT WINAPI PosPassThru_Construct(IUnknown *pUnkOuter, LPVOID *ppPassThru) fimpl->timevalid = 0; InitializeCriticalSection(&fimpl->time_cs); fimpl->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PassThruImpl.time_cs"); + BaseDispatch_Init(&fimpl->baseDispatch, &IID_IMediaPosition); return S_OK; } @@ -681,36 +684,37 @@ static HRESULT WINAPI MediaPositionPassThru_GetTypeInfoCount(IMediaPosition *ifa { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); - *pctinfo = 0; - - return S_OK; + return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); } static HRESULT WINAPI MediaPositionPassThru_GetTypeInfo(IMediaPosition *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo) { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); - - return S_OK; + return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI MediaPositionPassThru_GetIDsOfNames(IMediaPosition *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId) { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); - - return S_OK; + return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI MediaPositionPassThru_Invoke(IMediaPosition *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS*pDispParams, VARIANT*pVarResult, EXCEPINFO*pExepInfo, UINT*puArgErr) { PassThruImpl *This = impl_from_IMediaPosition(iface); - FIXME("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + HRESULT hr = S_OK; + ITypeInfo *pTypeInfo; - return S_OK; + hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(pTypeInfo, &This->IMediaPosition_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + ITypeInfo_Release(pTypeInfo); + } + + return hr; } static HRESULT WINAPI MediaPositionPassThru_get_Duration(IMediaPosition *iface, REFTIME *plength)

1 0