June 2011 - Wine-commits - list.winehq.org

Charles Welton : d3dx9/tests: Add tests for ID3DXLine_GetDevice and release methods.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 754df82101f55348a17a2bdd843fba40f41bcde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=754df82101f55348a17a2bdd8… Author: Charles Welton <charleswfb(a)gmail.com> Date: Thu Jun 16 17:19:59 2011 -0300 d3dx9/tests: Add tests for ID3DXLine_GetDevice and release methods. --- dlls/d3dx9_36/tests/line.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 56bc7f6..7523e1f 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -23,6 +23,8 @@ static void test_create_line(IDirect3DDevice9* device) { HRESULT hr; LPD3DXLINE line = NULL; + LPDIRECT3DDEVICE9 return_device; + ULONG ref; hr = D3DXCreateLine(NULL, &line); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -33,8 +35,23 @@ static void test_create_line(IDirect3DDevice9* device) hr = D3DXCreateLine(device, &line); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - if (line) - ID3DXLine_Release(line); + if (FAILED(hr)) + { + return; + } + + hr = ID3DXLine_GetDevice(line, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXLine_GetDevice(line, &return_device); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(return_device == device, "Expected line device %p, got %p\n", device, return_device); + + ref = IDirect3DDevice9_Release(return_device); + ok(ref == 2, "Got %x references to device %p, expected 2\n", ref, return_device); + + ref = ID3DXLine_Release(line); + ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); } START_TEST(line)

1 0

Stephane Bacri : winealsa.drv: Add midi MTC Quarter Frame messages support.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: d8ccfafd5be39c642ce3844a6a5c565029e459c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ccfafd5be39c642ce3844a6… Author: Stephane Bacri <stephanebacri(a)gmail.com> Date: Sun Jun 12 12:36:55 2011 +0200 winealsa.drv: Add midi MTC Quarter Frame messages support. --- dlls/winealsa.drv/midi.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 8bd048e..1e5b436 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -362,14 +362,17 @@ static DWORD WINAPI midRecThread(LPVOID arg) toSend = 0xFC; break; case SND_SEQ_EVENT_SONGPOS: - toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | 0xF2; + toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; break; case SND_SEQ_EVENT_SONGSEL: - toSend = ((ev->data.control.value & 0x7f) << 8) | 0xF3; + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; break; case SND_SEQ_EVENT_RESET: toSend = 0xFF; break; + case SND_SEQ_EVENT_QFRAME: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; + break; case SND_SEQ_EVENT_SYSEX: { int pos = 0; @@ -864,7 +867,6 @@ static DWORD modData(WORD wDevID, DWORD dwParam) switch (evt & 0x0F) { case 0x00: /* System Exclusive, don't do it on modData, * should require modLongData*/ - case 0x01: /* Undefined */ case 0x04: /* Undefined. */ case 0x05: /* Undefined. */ case 0x07: /* End of Exclusive. */ @@ -890,6 +892,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) snd_seq_ev_set_sysex(&event, sizeof(reset_sysex_seq), reset_sysex_seq); } break; + case 0x01: /* MTC Quarter frame */ case 0x03: /* Song Select. */ { BYTE buf[2];

1 0

Alexandre Julliard : rpcrt4: Add support for 64-bit conformance values.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 4f247d3130b1a9299ecb20cd7bcac26f4e7b83c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f247d3130b1a9299ecb20cd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 14:11:12 2011 +0200 rpcrt4: Add support for 64-bit conformance values. --- dlls/rpcrt4/ndr_marshall.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c62675d..85d0a3c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -536,7 +536,7 @@ PFORMAT_STRING ComputeConformanceOrVariance( BYTE dtype = pFormat[0] & 0xf; short ofs = *(const short *)&pFormat[2]; LPVOID ptr = NULL; - DWORD data = 0; + ULONG_PTR data = 0; if (!IsConformanceOrVariancePresent(pFormat)) { /* null descriptor */ @@ -565,7 +565,7 @@ PFORMAT_STRING ComputeConformanceOrVariance( break; case RPC_FC_CONSTANT_CONFORMANCE: data = ofs | ((DWORD)pFormat[1] << 16); - TRACE("constant conformance, val=%d\n", data); + TRACE("constant conformance, val=%ld\n", data); *pCount = data; goto finish_conf; case RPC_FC_TOP_LEVEL_MULTID_CONFORMANCE: @@ -630,11 +630,14 @@ PFORMAT_STRING ComputeConformanceOrVariance( case RPC_FC_USMALL: data = *(UCHAR*)ptr; break; + case RPC_FC_HYPER: + data = *(ULONGLONG *)ptr; + break; default: FIXME("unknown conformance data type %x\n", dtype); goto done_conf_grab; } - TRACE("dereferenced data type %x at %p, got %d\n", dtype, ptr, data); + TRACE("dereferenced data type %x at %p, got %ld\n", dtype, ptr, data); done_conf_grab: switch (pFormat[1]) {

1 0

Jörg Höhle : winealsa: Fix mmdevapi memory allocations.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 26efb871d3d7f5163b636ee5d3c4f695e865eeee URL: http://source.winehq.org/git/wine.git/?a=commit;h=26efb871d3d7f5163b636ee5d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 14 21:44:46 2011 +0200 winealsa: Fix mmdevapi memory allocations. --- dlls/winealsa.drv/mmdevdrv.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index df3a526..b96e5f5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -496,6 +496,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) } HeapFree(GetProcessHeap(), 0, This->vols); HeapFree(GetProcessHeap(), 0, This->local_buffer); + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); HeapFree(GetProcessHeap(), 0, This->hw_params); CoTaskMemFree(This->fmt); HeapFree(GetProcessHeap(), 0, This); @@ -897,7 +898,7 @@ exit: This->local_buffer = NULL; } if(This->fmt){ - HeapFree(GetProcessHeap(), 0, This->fmt); + CoTaskMemFree(This->fmt); This->fmt = NULL; } if(This->vols){

1 0

Stefan Dösinger : wined3d: Add STATE_BASEVERTEXINDEX to debug_d3dstate.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 19a1b74252747fc7a49860eddc1990cd0708db30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a1b74252747fc7a49860edd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 14 15:42:42 2011 +0200 wined3d: Add STATE_BASEVERTEXINDEX to debug_d3dstate. --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a72999c..f86a047 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2244,6 +2244,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_FRONTFACE"; if (STATE_IS_POINTSPRITECOORDORIGIN(state)) return "STATE_POINTSPRITECOORDORIGIN"; + if (STATE_IS_BASEVERTEXINDEX(state)) + return "STATE_BASEVERTEXINDEX"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); }

1 0

Stefan Dösinger : ddraw: Implement IDirect3D7:: EvictManagedTextures.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 07c761a6a14a6fda05ed19bdaac399d1f117aca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c761a6a14a6fda05ed19bda… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 14 20:21:08 2011 +0200 ddraw: Implement IDirect3D7::EvictManagedTextures. --- dlls/ddraw/ddraw.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2dbad98..0474d19 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5126,12 +5126,16 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device *****************************************************************************/ static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) { - FIXME("iface %p stub!\n", iface); + IDirectDrawImpl *This = impl_from_IDirect3D7(iface); + HRESULT hr; + TRACE("iface %p!\n", iface); - /* TODO: Just enumerate resources using IWineD3DDevice_EnumResources(), - * then unload surfaces / textures. */ + EnterCriticalSection(&ddraw_cs); + if (!This->d3d_initialized) hr = D3D_OK; + else hr = wined3d_device_evict_managed_resources(This->wined3d_device); + LeaveCriticalSection(&ddraw_cs); - return D3D_OK; + return hr; } static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface)

1 0

Stefan Dösinger : d3d8: Don' t print the ResourceManagerDiscardBytes fixme when Bytes == 0.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: ae5ca837d54753d29692e6c715b0ffcb526c7092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5ca837d54753d29692e6c71… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 14 20:36:08 2011 +0200 d3d8: Don't print the ResourceManagerDiscardBytes fixme when Bytes == 0. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6266bfa..902c56b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -364,7 +364,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D HRESULT hr; TRACE("iface %p, byte_count %u.\n", iface, Bytes); - FIXME("Byte count ignored.\n"); + if (Bytes) FIXME("Byte count ignored.\n"); wined3d_mutex_lock(); hr = wined3d_device_evict_managed_resources(This->wined3d_device);

1 0

Stefan Dösinger : wined3d: Drop the VBO when the GL alignment doesn't fit on dynamic buffers.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 12140b515871bd4cf672a7776f350b40c89b7cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=12140b515871bd4cf672a7776… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 19 21:23:15 2011 +0200 wined3d: Drop the VBO when the GL alignment doesn't fit on dynamic buffers. --- dlls/wined3d/buffer.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2f6ff2a..d9d9a2a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1053,8 +1053,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (((DWORD_PTR)buffer->resource.allocatedMemory) & (RESOURCE_ALIGNMENT - 1)) { - WARN("Pointer %p is not %u byte aligned, falling back to double buffered operation.\n", - buffer->resource.allocatedMemory, RESOURCE_ALIGNMENT); + WARN("Pointer %p is not %u byte aligned.\n", buffer->resource.allocatedMemory, RESOURCE_ALIGNMENT); ENTER_GL(); GL_EXTCALL(glUnmapBufferARB(buffer->buffer_type_hint)); @@ -1062,7 +1061,21 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN LEAVE_GL(); buffer->resource.allocatedMemory = NULL; - buffer_get_sysmem(buffer, gl_info); + if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + { + /* The extra copy is more expensive than not using VBOs at + * all on the Nvidia Linux driver, which is the only driver + * that returns unaligned pointers + */ + TRACE("Dynamic buffer, dropping VBO\n"); + buffer_unload(&buffer->resource); + buffer->flags &= ~WINED3D_BUFFER_CREATEBO; + } + else + { + TRACE("Falling back to doublebuffered operation\n"); + buffer_get_sysmem(buffer, gl_info); + } TRACE("New pointer is %p.\n", buffer->resource.allocatedMemory); } context_release(context);

1 0

Stefan Dösinger : wined3d: Give GL_ARB_map_buffer_range another try.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 68b15bc5ffe6ddf5d08cbc13479eaf718ad5e39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b15bc5ffe6ddf5d08cbc134… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 19 21:24:26 2011 +0200 wined3d: Give GL_ARB_map_buffer_range another try. Nvidia's 270.xx.yy driver series fix the glMapBuffer alignment issues that caused major performance problems. If the user is using an older driver we now drop the VBO instead of using doublebuffered loading, which means that we fall back to the current behavior(no dynamic VBO) as needed. Dynamic VBOs are needed on Nvidia drivers for GL_ARB_instanced_arrays. --- dlls/wined3d/buffer.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d9d9a2a..58352c9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1212,8 +1212,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.allocatedMemory, buffer); - /* GL_ARB_map_buffer_range is disabled for now due to numerous bugs and no gains */ - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others).

1 0

Henri Verbeet : wined3d: Use surface_load_location() instead of surface_internal_preload() in wined3d_device_update_surface().
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 3a1d151561dc48243009d105a5f3adb6221515c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1d151561dc48243009d105a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 22:38:24 2011 +0200 wined3d: Use surface_load_location() instead of surface_internal_preload() in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed52831..67c38aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4834,7 +4834,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, LEAVE_GL(); /* Make sure the surface is loaded and up to date */ - surface_internal_preload(dst_surface, SRGB_RGB); + surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); surface_bind(dst_surface, gl_info, FALSE); data.buffer_object = 0;

1 0