November 2012 - Wine-Commits

Henri Verbeet : d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 4987196e37cf5b123f9a1b0e014f84d96a6179e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4987196e37cf5b123f9a1b0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:06 2012 +0100 d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER. --- include/d3dx9mesh.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 149c199..e0b8557 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -565,7 +565,7 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown) STDMETHOD(UnlockBuffer)(THIS) PURE; STDMETHOD(ScaleBuffer)(THIS_ FLOAT scale) PURE; STDMETHOD(AddBuffer)(THIS_ LPD3DXPRTBUFFER buffer) PURE; - STDMETHOD(AttachGH)(THIS_ LPD3DXTEXTUREGUTTERHELPER) PURE; + STDMETHOD(AttachGH)(THIS_ struct ID3DXTextureGutterHelper *gh) PURE; STDMETHOD(ReleaseGH)(THIS) PURE; STDMETHOD(EvalGH)(THIS) PURE; STDMETHOD(ExtractTexture)(THIS_ UINT channel, UINT start_coefficient, @@ -709,7 +709,8 @@ HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_ HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); -HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT, UINT, LPD3DXMESH, FLOAT, LPD3DXTEXTUREGUTTERHELPER *); +HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, + float gutter_size, ID3DXTextureGutterHelper **gh); HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.18
by Jeremy Newman Nov. 26, 2012

Nov. 26, 2012

Module: website Branch: master Commit: dd6f1364451259e6f0259568a824e9a773dc5760 URL: http://source.winehq.org/git/website.git/?a=commit;h=dd6f1364451259e6f02595… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 24 09:00:19 2012 +0100 Polish translation for release 1.5.18 --- news/pl/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012112301.xml b/news/pl/2012112301.xml new file mode 100644 index 0000000..c73a607 --- /dev/null +++ b/news/pl/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 23, 2012</date> +<title>Wydano Wine 1.5.18</title> +<body> + Wydanie rozwojowe Wine 1.5.18 jest już dostępne. + <a href="{$root}/announce/1.5.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite ulepszenia do kodeków Windowsa.</li> + <li>Poprawki do wsparcia baz danych OLE.</li> + <li>Ulepszenia w zarządzaniu parametrami systemowymi.</li> + <li>Kilka poprawek do wbudowanej przeglądarki sieciowej.</li> + <li>Poprawki we wsparciu XML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.18 freigegeben
by Jeremy Newman Nov. 26, 2012

Nov. 26, 2012

Module: website Branch: master Commit: 6c9371547461d6e370e2447167d4e314c4ad8b44 URL: http://source.winehq.org/git/website.git/?a=commit;h=6c9371547461d6e370e244… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 23 22:55:31 2012 +0100 Wine 1.5.18 freigegeben --- news/de/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012112301.xml b/news/de/2012112301.xml new file mode 100644 index 0000000..0566b31 --- /dev/null +++ b/news/de/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>23. November 2012</date> +<title>Wine 1.5.18 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verschiedene Windows Codecs Verbesserungen.</li> + <li>Fehlerbehebungen für die OLE Datenbank Unterstützung.</li> + <li>Verbesserungen am System Parameter Management.</li> + <li>Einige Fehlerbehebungen am eigenen Webbrowser.</li> + <li>Fehlerbehebungen für die XML Unterstützung.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.18
by Jeremy Newman Nov. 26, 2012

Nov. 26, 2012

Module: website Branch: master Commit: 36ce3bcb80fa1aa2589adc84dd580f20159a27ec URL: http://source.winehq.org/git/website.git/?a=commit;h=36ce3bcb80fa1aa2589adc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 24 00:57:31 2012 +0100 French translation for release 1.5.18 --- news/fr/2012112301.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012112301.xml b/news/fr/2012112301.xml new file mode 100644 index 0000000..9f8c085 --- /dev/null +++ b/news/fr/2012112301.xml @@ -0,0 +1,16 @@ +<news> +<date>23 novembre 2012</date> +<title>Sortie de Wine 1.5.18</title> +<body> + La version de développement 1.5.18 de Wine est disponible. + <a href="{$root}/announce/1.5.18">Nouveautés</a> de cette version : +<ul> + <li>Diverses améliorations aux codecs Windows.</li> + <li>Correctifs pour la prise en charge des bases de données OLE.</li> + <li>Améliorations à la gestion des paramètres système.</li> + <li>Quelques correctifs au navigateur Web intégré.</li> + <li>Correctifs dans la prise en charge de XML.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.18
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: website Branch: master Commit: 9c4c8117b615ff0c4fca13ef5eede8d8890ee53e URL: http://source.winehq.org/git/website.git/?a=commit;h=9c4c8117b615ff0c4fca13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:29:08 2012 +0100 Wine release 1.5.18 --- news/en/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012112301.xml b/news/en/2012112301.xml new file mode 100644 index 0000000..eef8dda --- /dev/null +++ b/news/en/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>November 23, 2012</date> +<title>Wine 1.5.18 Released</title> +<body> + The Wine development release 1.5.18 is now available. + <a href="{$root}/announce/1.5.18">What's new</a> in this release: +<ul> + <li>Various Windows Codecs improvements.</li> + <li>Fixes for OLE database support.</li> + <li>Improvements to system parameters management.</li> + <li>Some fixes to the built-in Web browser.</li> + <li>Fixes for XML support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.18 : Alexandre Julliard : Release 1.5.18
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: refs/tags/wine-1.5.18 Tag: a98e8da63f7501ae1bb16a0de9a2ea38a30eaa95 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a98e8da63f7501ae1bb16a0de9a2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:53 2012 +0100 Release 1.5.18

1 0

Alexandre Julliard : Release 1.5.18.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: abbf827178843d3b5988b463b129dc3379f28d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbf827178843d3b5988b463b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:51 2012 +0100 Release 1.5.18. --- ANNOUNCE | 854 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 422 insertions(+), 452 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abbf827178843d3b5988b…

1 0

Andrew Talbot : wininet: Remove unused variable.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 2691e580a0f5f00be94985266fdf08745f99c85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2691e580a0f5f00be94985266… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:02:08 2012 +0000 wininet: Remove unused variable. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d04e825..8d610c3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -430,11 +430,11 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP /* It wasn't found: look for no protocol */ for (ptr = szProxy; !ret && ptr && *ptr; ) { - LPCWSTR end, equal; + LPCWSTR end; if (!(end = strchrW(ptr, ' '))) end = ptr + strlenW(ptr); - if (!(equal = strchrW(ptr, '='))) + if (!strchrW(ptr, '=')) { if (end - ptr + 1 > *foundProxyLen) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SOGetTargets().
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: dc67be012fe780306e6d1e16a8d9369da716d161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc67be012fe780306e6d1e16a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 21:13:38 2012 +0100 d3d10core: Implement d3d10_device_SOGetTargets(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3b09a04..0623ee5 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -713,8 +713,27 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device * static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device *iface, UINT buffer_count, ID3D10Buffer **buffers, UINT *offsets) { - FIXME("iface %p, buffer_count %u, buffers %p, offsets %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_stream_output(device->wined3d_device, i, &offsets[i]))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device *iface, ID3D10RasterizerState **rasterizer_state) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0e7ac2..20c535c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1600,6 +1600,21 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT } } +struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, + UINT idx, UINT *offset) +{ + TRACE("device %p, idx %u, offset %p.\n", device, idx, offset); + + if (idx >= MAX_STREAM_OUT) + { + WARN("Invalid stream output %u.\n", idx); + return NULL; + } + + *offset = device->stateBlock->state.stream_output[idx].offset; + return device->stateBlock->state.stream_output[idx].buffer; +} + HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 56e73e9..549a444 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -81,6 +81,7 @@ @ cdecl wined3d_device_get_sampler_state(ptr long long) @ cdecl wined3d_device_get_scissor_rect(ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) +@ cdecl wined3d_device_get_stream_output(ptr long ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_stream_source_freq(ptr long ptr) @ cdecl wined3d_device_get_surface_from_dc(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 76e44f1..dd4d29b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2150,6 +2150,8 @@ DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *devi UINT sampler_idx, enum wined3d_sampler_state state); void __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_stream_output(struct wined3d_device *device, + UINT idx, UINT *offset); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device,

1 0

Christian Costa : strmbase: Display iface in TRACEs.
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Module: wine Branch: master Commit: 9bde31b3eeec1d42fcc0c5d73ae6dbad883d644a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bde31b3eeec1d42fcc0c5d73… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 23 09:46:58 2012 +0100 strmbase: Display iface in TRACEs. --- dlls/strmbase/mediatype.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 82c7d23..a168755 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -147,7 +147,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, LPVOID * ppv) { - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -201,12 +201,13 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM ULONG cFetched; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched); + cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; - TRACE("(%u, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched); TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched); if (cFetched > 0) @@ -236,7 +237,8 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cM { IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("(%u)\n", cMediaTypes); + TRACE("(%p)->(%u)\n", iface, cMediaTypes); + if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; @@ -254,7 +256,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) AM_MEDIA_TYPE amt; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("()\n"); + TRACE("(%p)->()\n", iface); for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); @@ -288,7 +290,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMe HRESULT hr; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("(%p)\n", ppEnum); + TRACE("(%p)->(%p)\n", iface, ppEnum); hr = EnumMediaTypes_Construct(This->basePin, This->enumMediaFunction, This->mediaVersionFunction, ppEnum); if (FAILED(hr))

1 0