January 2012 - Wine-commits

Jacek Caban : mshtml: Reimplement nsIURL::GetFileBaseName on top of IUri.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: fc899dfa995bce1deb5de783d18c9d737572c546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc899dfa995bce1deb5de783d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:28 2012 +0100 mshtml: Reimplement nsIURL::GetFileBaseName on top of IUri. --- dlls/mshtml/nsio.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 09ee17b..4ef2752 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2662,14 +2662,19 @@ static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileNa static nsresult NSAPI nsURL_GetFileBaseName(nsIURL *iface, nsACString *aFileBaseName) { nsWineURI *This = impl_from_nsIURL(iface); + const WCHAR *file, *ext; + BSTR path; + nsresult nsres; TRACE("(%p)->(%p)\n", This, aFileBaseName); - if(This->nsurl) - return nsIURL_GetFileBaseName(This->nsurl, aFileBaseName); + nsres = get_uri_path(This, &path, &file, &ext); + if(NS_FAILED(nsres)) + return nsres; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsres = return_wstr_nsacstr(aFileBaseName, file, ext-file); + SysFreeString(path); + return nsres; } static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFileBaseName)

1 0

Jacek Caban : mshtml: Get rid of wrapped nsurl.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 88d75f1107f03a5b8ccc8304ba846fb81865788f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d75f1107f03a5b8ccc8304b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:42 2012 +0100 mshtml: Get rid of wrapped nsurl. --- dlls/mshtml/nsio.c | 61 ++++----------------------------------------------- 1 files changed, 5 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4ef2752..2ea7efd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -59,7 +59,6 @@ struct nsWineURI { LONG ref; nsIURI *nsuri; - nsIURL *nsurl; NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; @@ -1792,8 +1791,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) windowref_release(This->window_ref); if(This->container) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); - if(This->nsurl) - nsIURL_Release(This->nsurl); if(This->nsuri) nsIURI_Release(This->nsuri); if(This->uri) @@ -2644,18 +2641,7 @@ static nsresult NSAPI nsURL_GetFileName(nsIURL *iface, nsACString *aFileName) static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileName) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); - - if(!This->is_mutable) - return NS_ERROR_UNEXPECTED; - - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFileName(This->nsurl, aFileName); - } - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2680,18 +2666,7 @@ static nsresult NSAPI nsURL_GetFileBaseName(nsIURL *iface, nsACString *aFileBase static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFileBaseName) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); - - if(!This->is_mutable) - return NS_ERROR_UNEXPECTED; - - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFileBaseName(This->nsurl, aFileBaseName); - } - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2707,44 +2682,21 @@ static nsresult NSAPI nsURL_GetFileExtension(nsIURL *iface, nsACString *aFileExt static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aFileExtension) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); - - if(!This->is_mutable) - return NS_ERROR_UNEXPECTED; - - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFileExtension(This->nsurl, aFileExtension); - } - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); return NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURL_GetCommonBaseSpec(nsIURL *iface, nsIURI *aURIToCompare, nsACString *_retval) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p %p)\n", This, aURIToCompare, _retval); - - if(This->nsurl) - return nsIURL_GetCommonBaseSpec(This->nsurl, aURIToCompare, _retval); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p %p)\n", This, aURIToCompare, _retval); return NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURL_GetRelativeSpec(nsIURL *iface, nsIURI *aURIToCompare, nsACString *_retval) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p %p)\n", This, aURIToCompare, _retval); - - if(This->nsurl) - return nsIURL_GetRelativeSpec(This->nsurl, aURIToCompare, _retval); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p %p)\n", This, aURIToCompare, _retval); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2879,9 +2831,6 @@ static nsresult create_nsuri(IUri *iuri, nsIURI *nsuri, HTMLWindow *window, NSCo IUri_AddRef(iuri); ret->uri = iuri; - if(nsuri) - nsIURI_QueryInterface(nsuri, &IID_nsIURL, (void**)&ret->nsurl); - TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK;

1 0

Jörg Höhle : winmm: GetCurrentPadding is superfluous while recording.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: d8d4aed8453aa56c091485e89958e6082d83800e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d4aed8453aa56c091485e89… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jan 9 18:40:51 2012 +0100 winmm: GetCurrentPadding is superfluous while recording. --- dlls/winmm/waveform.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index fe07e9e..383c75f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1453,19 +1453,11 @@ static void WID_PullACMData(WINMM_Device *device) MMRESULT mr; if(device->acm_hdr.cbDstLength == 0){ - hr = IAudioClient_GetCurrentPadding(device->client, &packet); - if(FAILED(hr)){ - ERR("GetCurrentPadding failed: %08x\n", hr); - return; - } - - if(packet == 0) - return; - hr = IAudioCaptureClient_GetBuffer(device->capture, &data, &packet, &flags, NULL, NULL); - if(FAILED(hr)){ - ERR("GetBuffer failed: %08x\n", hr); + if(hr != S_OK){ + if(FAILED(hr)) + ERR("GetBuffer failed: %08x\n", hr); return; } @@ -1566,26 +1558,20 @@ static void WID_PullData(WINMM_Device *device) while(device->first){ BYTE *data; - UINT32 pad, packet_len, packet; + UINT32 packet_len, packet; DWORD flags; - hr = IAudioClient_GetCurrentPadding(device->client, &pad); - if(FAILED(hr)){ - ERR("GetCurrentPadding failed: %08x\n", hr); - goto exit; - } - - if(pad == 0) - goto exit; - - hr = IAudioCaptureClient_GetBuffer(device->capture, &data, &packet, + hr = IAudioCaptureClient_GetBuffer(device->capture, &data, &packet_len, &flags, NULL, NULL); - if(FAILED(hr)){ - ERR("GetBuffer failed: %08x\n", hr); + if(hr != S_OK){ + if(FAILED(hr)) + ERR("GetBuffer failed: %08x\n", hr); + else /* AUDCLNT_S_BUFFER_EMPTY success code */ + IAudioCaptureClient_ReleaseBuffer(device->capture, 0); goto exit; } - packet_len = packet; + packet = packet_len; queue = device->first; while(queue && packet > 0){ UINT32 to_copy_bytes; @@ -1612,6 +1598,8 @@ static void WID_PullData(WINMM_Device *device) if(FAILED(hr)) ERR("ReleaseBuffer failed: %08x\n", hr); + if(packet > 0) + WARN("losing %u frames\n", packet); device->played_frames += packet_len; }

1 0

Alexandre Julliard : wininet: Don't free name before the IPv6 lookup.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 2329f91998c6c61ba6960e9d6dfd62a7a014a640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2329f91998c6c61ba6960e9d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 20:09:42 2012 +0100 wininet: Don't free name before the IPv6 lookup. --- dlls/wininet/utility.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 96b8d31..9a70e62 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -184,17 +184,17 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, hints.ai_family = AF_INET; ret = getaddrinfo( name, NULL, &hints, &res ); - heap_free( name ); if (ret != 0) { TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(lpszServerName), gai_strerror(ret)); hints.ai_family = AF_INET6; ret = getaddrinfo( name, NULL, &hints, &res ); - if (ret != 0) - { - TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); - return FALSE; - } + } + heap_free( name ); + if (ret != 0) + { + TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); + return FALSE; } if (*sa_len < res->ai_addrlen) {

1 0

Henri Verbeet : wined3d: Set SFLAG_PIN_SYSMEM when the application tries to use surfaces that are currently mapped .
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: b55e3d82cfae2cb8370d1b929ae4bb1bf9941591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55e3d82cfae2cb8370d1b929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 20:36:58 2012 +0100 wined3d: Set SFLAG_PIN_SYSMEM when the application tries to use surfaces that are currently mapped. --- dlls/wined3d/surface.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1ff5521..f2a09dc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2283,7 +2283,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -static void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, +static void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) { @@ -2294,6 +2294,12 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); + if (surface->flags & SFLAG_LOCKED) + { + WARN("Uploading a surface that is currently mapped, setting SFLAG_PIN_SYSMEM.\n"); + surface->flags |= SFLAG_PIN_SYSMEM; + } + if (format->heightscale != 1.0f && format->heightscale != 0.0f) update_h *= format->heightscale;

1 0

Henri Verbeet : d3d8: Don' t expose wined3d internal flags to the application.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: ef9be113e231d4a706f8ca49a1106c9329e6fe96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9be113e231d4a706f8ca49a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 20:36:59 2012 +0100 d3d8: Don't expose wined3d internal flags to the application. --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 6d9040d..3f0a657 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -243,7 +243,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, wined3d_mutex_unlock(); desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; @@ -539,7 +539,7 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 6b5f223..f092f35 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -268,7 +268,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(IDirect3DCubeTextur wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 47258de..d60f820 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -226,7 +226,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(IDirect3DSurface8 *iface, D3 desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 9e25f8f..f3f2b20 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -265,7 +265,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(IDirect3DTexture8 *ifac wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 505e17b..71923f5 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -207,7 +207,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DV desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index f223462..a713f16 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -265,7 +265,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(IDirect3DVolumeTe wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width;

1 0

Henri Verbeet : d3d9: Don' t expose wined3d internal flags to the application.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: bd3b0ba69712102d480ced2faddf44ebc23c92d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3b0ba69712102d480ced2fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 21:40:48 2012 +0100 d3d9: Don't expose wined3d internal flags to the application. --- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 6 ++++-- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 84ee9a1..a951130 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -245,7 +245,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, wined3d_mutex_unlock(); desc->Format = D3DFMT_VERTEXDATA; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Type = D3DRTYPE_VERTEXBUFFER; @@ -540,7 +540,7 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Type = D3DRTYPE_INDEXBUFFER; diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 2fdf065..f318cf9 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -311,7 +311,7 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(IDirect3DCubeTextur wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index c538ec7..1272543 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -275,7 +275,7 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(IDirect3DSurface9 *iface, D3 desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 6801058..49e5691 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -305,7 +305,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(IDirect3DTexture9 *ifac wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 60d8e12..0ef2ee3 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -206,7 +206,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(IDirect3DVolume9 *iface, D3DV desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 0cf0ed0..803ec87 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -304,7 +304,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(IDirect3DVolumeTe wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index af0a9e8..390197d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -328,7 +328,8 @@ static void compare_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mes name, index_buffer_description.Format, D3DFMT_INDEX16); ok(index_buffer_description.Type == D3DRTYPE_INDEXBUFFER, "Test %s, result %x, expected %x (D3DRTYPE_INDEXBUFFER)\n", name, index_buffer_description.Type, D3DRTYPE_INDEXBUFFER); - todo_wine ok(index_buffer_description.Usage == 0, "Test %s, result %x, expected %x\n", name, index_buffer_description.Usage, 0); + ok(index_buffer_description.Usage == 0, "Test %s, result %#x, expected %#x.\n", + name, index_buffer_description.Usage, 0); ok(index_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_MANAGED)\n", name, index_buffer_description.Pool, D3DPOOL_MANAGED); expected = number_of_faces * sizeof(WORD) * 3; @@ -3676,7 +3677,8 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str name, index_buffer_description.Format, D3DFMT_INDEX16); ok(index_buffer_description.Type == D3DRTYPE_INDEXBUFFER, "Test %s, result %x, expected %x (D3DRTYPE_INDEXBUFFER)\n", name, index_buffer_description.Type, D3DRTYPE_INDEXBUFFER); - todo_wine ok(index_buffer_description.Usage == 0, "Test %s, result %x, expected %x\n", name, index_buffer_description.Usage, 0); + ok(index_buffer_description.Usage == 0, "Test %s, result %#x, expected %#x.\n", + name, index_buffer_description.Usage, 0); ok(index_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_MANAGED)\n", name, index_buffer_description.Pool, D3DPOOL_MANAGED); expected = number_of_faces * sizeof(WORD) * 3;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTUREOP typedef.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: b6431d9493204a471369688ba223cdba71d3a865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6431d9493204a471369688ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 20:37:01 2012 +0100 wined3d: Get rid of the WINED3DTEXTUREOP typedef. --- dlls/ddraw/device.c | 58 +++++------ dlls/wined3d/arb_program_shader.c | 144 ++++++++++++++----------- dlls/wined3d/ati_fragment_shader.c | 193 +++++++++++++++++++--------------- dlls/wined3d/device.c | 30 +++--- dlls/wined3d/nvidia_texture_shader.c | 106 ++++++++++--------- dlls/wined3d/state.c | 141 +++++++++++++------------ dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/utils.c | 105 ++++++++++--------- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.h | 57 +++++----- 10 files changed, 445 insertions(+), 401 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6431d9493204a4713696…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTUREADDRESS typedef.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 2650ba4b17087aee1c16caafc8fdd4a19a2672b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2650ba4b17087aee1c16caafc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 20:37:02 2012 +0100 wined3d: Get rid of the WINED3DTEXTUREADDRESS typedef. --- dlls/wined3d/directx.c | 10 +++++----- dlls/wined3d/stateblock.c | 6 +++--- dlls/wined3d/texture.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 15 +++++++-------- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 25b4b2b..fd628e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2809,13 +2809,13 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) device = wined3d_guess_card(gl_info, gl_renderer_str, &gl_vendor, &card_vendor); TRACE_(d3d_caps)("FOUND (fake) card: 0x%x (vendor id), 0x%x (device id)\n", card_vendor, device); - gl_info->wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; - gl_info->wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3D_TADDRESS_WRAP - WINED3D_TADDRESS_WRAP] = GL_REPEAT; + gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR - WINED3D_TADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; - gl_info->wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; - gl_info->wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3D_TADDRESS_CLAMP - WINED3D_TADDRESS_WRAP] = GL_CLAMP_TO_EDGE; + gl_info->wrap_lookup[WINED3D_TADDRESS_BORDER - WINED3D_TADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - gl_info->wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; /* Make sure there's an active HDC else the WGL extensions will fail */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c1a863d..a3fd858 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1278,9 +1278,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) for (i = 0 ; i < MAX_COMBINED_SAMPLERS; ++i) { TRACE("Setting up default samplers states for sampler %u.\n", i); - state->sampler_states[i][WINED3D_SAMP_ADDRESS_U] = WINED3DTADDRESS_WRAP; - state->sampler_states[i][WINED3D_SAMP_ADDRESS_V] = WINED3DTADDRESS_WRAP; - state->sampler_states[i][WINED3D_SAMP_ADDRESS_W] = WINED3DTADDRESS_WRAP; + state->sampler_states[i][WINED3D_SAMP_ADDRESS_U] = WINED3D_TADDRESS_WRAP; + state->sampler_states[i][WINED3D_SAMP_ADDRESS_V] = WINED3D_TADDRESS_WRAP; + state->sampler_states[i][WINED3D_SAMP_ADDRESS_W] = WINED3D_TADDRESS_WRAP; state->sampler_states[i][WINED3D_SAMP_BORDER_COLOR] = 0; state->sampler_states[i][WINED3D_SAMP_MAG_FILTER] = WINED3DTEXF_POINT; state->sampler_states[i][WINED3D_SAMP_MIN_FILTER] = WINED3DTEXF_POINT; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2b7f9d1..4d571f8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -167,9 +167,9 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, } /* Initialise the state of the texture object to the OpenGL defaults, * not the D3D defaults. */ - gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3DTADDRESS_WRAP; - gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3DTADDRESS_WRAP; - gl_tex->states[WINED3DTEXSTA_ADDRESSW] = WINED3DTADDRESS_WRAP; + gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3D_TADDRESS_WRAP; + gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3D_TADDRESS_WRAP; + gl_tex->states[WINED3DTEXSTA_ADDRESSW] = WINED3D_TADDRESS_WRAP; gl_tex->states[WINED3DTEXSTA_BORDERCOLOR] = 0; gl_tex->states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_LINEAR; gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; /* GL_NEAREST_MIPMAP_LINEAR */ @@ -237,22 +237,22 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, /* GL locking is done by the caller */ static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, - WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) + enum wined3d_texture_address d3d_wrap, GLenum param, BOOL cond_np2) { GLint gl_wrap; - if (d3d_wrap < WINED3DTADDRESS_WRAP || d3d_wrap > WINED3DTADDRESS_MIRRORONCE) + if (d3d_wrap < WINED3D_TADDRESS_WRAP || d3d_wrap > WINED3D_TADDRESS_MIRROR_ONCE) { - FIXME("Unrecognized or unsupported WINED3DTEXTUREADDRESS %#x.\n", d3d_wrap); + FIXME("Unrecognized or unsupported texture address mode %#x.\n", d3d_wrap); return; } /* Cubemaps are always set to clamp, regardless of the sampler state. */ if (target == GL_TEXTURE_CUBE_MAP_ARB - || (cond_np2 && d3d_wrap == WINED3DTADDRESS_WRAP)) + || (cond_np2 && d3d_wrap == WINED3D_TADDRESS_WRAP)) gl_wrap = GL_CLAMP_TO_EDGE; else - gl_wrap = gl_info->wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; + gl_wrap = gl_info->wrap_lookup[d3d_wrap - WINED3D_TADDRESS_WRAP]; TRACE("Setting param %#x to %#x for target %#x.\n", param, gl_wrap, target); glTexParameteri(target, param, gl_wrap); @@ -635,8 +635,8 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); checkGLcall("glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST)"); LEAVE_GL(); - gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3DTADDRESS_CLAMP; - gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3DTADDRESS_CLAMP; + gl_tex->states[WINED3DTEXSTA_ADDRESSU] = WINED3D_TADDRESS_CLAMP; + gl_tex->states[WINED3DTEXSTA_ADDRESSV] = WINED3D_TADDRESS_CLAMP; gl_tex->states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4fc6912..c9bd795 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1519,7 +1519,7 @@ struct wined3d_gl_info DWORD reserved_glsl_constants; DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; - GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; + GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1]; struct wined3d_fbo_ops fbo_ops; #define USE_GL_FUNC(type, pfn, ext, replace) type pfn; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bfc14e3..f80a64a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -612,15 +612,14 @@ enum wined3d_texture_op WINED3D_TOP_LERP = 26, }; -typedef enum _WINED3DTEXTUREADDRESS -{ - WINED3DTADDRESS_WRAP = 1, - WINED3DTADDRESS_MIRROR = 2, - WINED3DTADDRESS_CLAMP = 3, - WINED3DTADDRESS_BORDER = 4, - WINED3DTADDRESS_MIRRORONCE = 5, - WINED3DTADDRESS_FORCE_DWORD = 0x7fffffff -} WINED3DTEXTUREADDRESS; +enum wined3d_texture_address +{ + WINED3D_TADDRESS_WRAP = 1, + WINED3D_TADDRESS_MIRROR = 2, + WINED3D_TADDRESS_CLAMP = 3, + WINED3D_TADDRESS_BORDER = 4, + WINED3D_TADDRESS_MIRROR_ONCE = 5, +}; typedef enum _WINED3DTRANSFORMSTATETYPE {

1 0

André Hentschel : kernel32: No need for WINE_ prefixed debug output macros.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 3a82d3b23a8d8de6b83d249d678cecc3ea9b11a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a82d3b23a8d8de6b83d249d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:29:08 2012 +0100 kernel32: No need for WINE_ prefixed debug output macros. --- dlls/kernel32/term.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 5123090..814b937 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -177,15 +177,14 @@ static BOOL TERM_bind_libcurses(void) if (!(nc_handle = wine_dlopen(ncname, RTLD_NOW, NULL, 0))) { - WINE_MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", - ncname); + MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", ncname); return FALSE; } #define LOAD_FUNCPTR(f) \ if((p_##f = wine_dlsym(nc_handle, #f, NULL, 0)) == NULL) \ { \ - WINE_WARN("Can't find symbol %s\n", #f); \ + WARN("Can't find symbol %s\n", #f); \ goto sym_not_found; \ } @@ -199,7 +198,7 @@ static BOOL TERM_bind_libcurses(void) return TRUE; sym_not_found: - WINE_MESSAGE( + MESSAGE( "Wine cannot find certain functions that it needs inside the " CURSES_NAME "\nlibrary. To enable Wine to use " CURSES_NAME " please upgrade your " CURSES_NAME "\nlibraries\n");

1 0