wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Aric Stewart : strmbase: Implement BaseControlVideo.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 4ae6f928aaec7b6863a2584ca6843498a61e7659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae6f928aaec7b6863a2584ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:24 2012 -0500 strmbase: Implement BaseControlVideo. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/video.c | 480 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 79 ++++++++ 3 files changed, 560 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ae6f928aaec7b6863a25…

1 0

Aric Stewart : strmbase: Implement BaseControlWindow.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 73efbff484fbd6bc6df53df48fb235a85e44f9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73efbff484fbd6bc6df53df48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:14 2012 -0500 strmbase: Implement BaseControlWindow. --- dlls/strmbase/window.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 66 ++++++ 2 files changed, 641 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73efbff484fbd6bc6df53…

1 0

André Hentschel : view: Also show the filename in the window title when loading it from command line .
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 189800e04c43c623f8a9d4d1228e514b95b3efff URL: http://source.winehq.org/git/wine.git/?a=commit;h=189800e04c43c623f8a9d4d12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 21:06:05 2012 +0200 view: Also show the filename in the window title when loading it from command line. --- programs/view/view.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index ebd48aa..d32a10b 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -386,7 +386,10 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline++; cmdline[lstrlenW(cmdline) - 1] = 0; } + szFileTitle[0] = 0; + GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)); DoOpenFile(cmdline); + UpdateWindowCaption(); } }

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DTexture9Impl_QueryInterface ().
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: e1b8573ee80a1c876a0d8a433877456bbc14a4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b8573ee80a1c876a0d8a433… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 28 20:22:40 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DTexture9Impl_QueryInterface(). --- dlls/d3d9/texture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 49a0fe6..12da634 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -33,20 +33,20 @@ static inline IDirect3DTexture9Impl *impl_from_IDirect3DTexture9(IDirect3DTextur static HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(IDirect3DTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) - || IsEqualGUID(riid, &IID_IDirect3DTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DTexture9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p) not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DVertexDeclaration9Impl_QueryInterface ().
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 8e40db2783198fd9e81e5b49ea2e7cf652eb7ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e40db2783198fd9e81e5b49e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 28 20:22:39 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DVertexDeclaration9Impl_QueryInterface(). --- dlls/d3d9/vertexdeclaration.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 3b2198e..3ed9eb7 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -194,20 +194,22 @@ HRESULT vdecl_convert_fvf( } /* IDirect3DVertexDeclaration9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_QueryInterface(LPDIRECT3DVERTEXDECLARATION9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; - - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); +static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_QueryInterface(IDirect3DVertexDeclaration9 *iface, + REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9)) { + if (IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DVertexDeclaration9_AddRef(iface); - *ppobj = This; + *out = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); - *ppobj = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : wined3d: Fix the VBO check in device_stream_info_from_declaration().
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 12369f9f4d598daa1849a8c99c7a4fb3dcb14754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12369f9f4d598daa1849a8c99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 28 20:22:38 2012 +0200 wined3d: Fix the VBO check in device_stream_info_from_declaration(). --- dlls/wined3d/device.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 839e28c..674c528 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -172,7 +172,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) /* Context activation is done by the caller. */ void device_stream_info_from_declaration(struct wined3d_device *device, - struct wined3d_stream_info *stream_info, BOOL *fixup) + struct wined3d_stream_info *stream_info, BOOL *all_vbo) { const struct wined3d_state *state = &device->stateBlock->state; /* We need to deal with frequency data! */ @@ -234,12 +234,6 @@ void device_stream_info_from_declaration(struct wined3d_device *device, FIXME("System memory vertex data load offset is negative!\n"); } } - - if (fixup) - { - if (data.buffer_object) - *fixup = TRUE; - } } data.addr += element->offset; @@ -303,6 +297,8 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (!state->user_stream) { WORD map = stream_info->use_map; + if (all_vbo) + *all_vbo = TRUE; /* PreLoad all the vertex buffers. */ for (i = 0; map; map >>= 1, ++i) @@ -324,10 +320,17 @@ void device_stream_info_from_declaration(struct wined3d_device *device, + (ptrdiff_t)element->data.addr; } + if (!buffer->buffer_object && all_vbo) + *all_vbo = FALSE; + if (buffer->query) device->buffer_queries[device->num_buffer_queries++] = buffer->query; } } + else if (all_vbo) + { + *all_vbo = FALSE; + } } static void stream_info_element_from_strided(const struct wined3d_gl_info *gl_info, @@ -403,7 +406,7 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined { struct wined3d_stream_info *stream_info = &device->strided_streams; const struct wined3d_state *state = &device->stateBlock->state; - BOOL fixup = FALSE; + BOOL all_vbo; if (device->up_strided) { @@ -411,16 +414,17 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined TRACE("=============================== Strided Input ================================\n"); device_stream_info_from_strided(gl_info, device->up_strided, stream_info); if (TRACE_ON(d3d)) device_trace_strided_stream_info(stream_info); + all_vbo = FALSE; } else { TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, stream_info, &fixup); + device_stream_info_from_declaration(device, stream_info, &all_vbo); } if (state->vertex_shader && !stream_info->position_transformed) { - if (state->vertex_declaration->half_float_conv_needed && !fixup) + if (state->vertex_declaration->half_float_conv_needed && !all_vbo) { TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); device->useDrawStridedSlow = TRUE; @@ -436,7 +440,7 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); - if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !fixup) + if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !all_vbo) { device->useDrawStridedSlow = TRUE; }

1 0

Henri Verbeet : wined3d: Drop a questionable FIXME in device_stream_info_from_declaration().
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 7017ed4587ae157ec3d1b34f4f1f6390a454ec41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7017ed4587ae157ec3d1b34f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 28 20:22:37 2012 +0200 wined3d: Drop a questionable FIXME in device_stream_info_from_declaration(). --- dlls/wined3d/device.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4cc80ad..839e28c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -239,18 +239,6 @@ void device_stream_info_from_declaration(struct wined3d_device *device, { if (data.buffer_object) *fixup = TRUE; - else if (*fixup && !use_vshader - && (element->usage == WINED3D_DECL_USAGE_COLOR - || element->usage == WINED3D_DECL_USAGE_POSITIONT)) - { - static BOOL warned = FALSE; - if (!warned) - { - /* This may be bad with the fixed function pipeline. */ - FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); - warned = TRUE; - } - } } } data.addr += element->offset;

1 0

Henri Verbeet : wined3d: Drop the "vbo" check in wined3d_device_process_vertices().
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: c7d3a8a478238097842e8c74d42888be2ffd586e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d3a8a478238097842e8c74d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 28 20:22:36 2012 +0200 wined3d: Drop the "vbo" check in wined3d_device_process_vertices(). We care about individual streams having a VBO or not, and there's no way for device_stream_info_from_declaration() to properly express that, so just check the individual streams. --- dlls/wined3d/device.c | 50 +++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8c99533..4cc80ad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3452,11 +3452,12 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf) { struct wined3d_state *state = &device->stateBlock->state; - BOOL vbo = FALSE, streamWasUP = state->user_stream; struct wined3d_stream_info stream_info; const struct wined3d_gl_info *gl_info; + BOOL streamWasUP = state->user_stream; struct wined3d_context *context; struct wined3d_shader *vs; + unsigned int i; HRESULT hr; TRACE("device %p, src_start_idx %u, dst_idx %u, vertex_count %u, " @@ -3477,38 +3478,35 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->vertex_shader; state->vertex_shader = NULL; state->user_stream = FALSE; - device_stream_info_from_declaration(device, &stream_info, &vbo); + device_stream_info_from_declaration(device, &stream_info, NULL); state->user_stream = streamWasUP; state->vertex_shader = vs; - if (vbo || src_start_idx) + /* We can't convert FROM a VBO, and vertex buffers used to source into + * process_vertices() are unlikely to ever be used for drawing. Release + * VBOs in those buffers and fix up the stream_info structure. + * + * Also apply the start index. */ + for (i = 0; i < (sizeof(stream_info.elements) / sizeof(*stream_info.elements)); ++i) { - unsigned int i; - /* ProcessVertices can't convert FROM a vbo, and vertex buffers used to source into ProcessVertices are - * unlikely to ever be used for drawing. Release vbos in those buffers and fix up the stream_info structure - * - * Also get the start index in, but only loop over all elements if there's something to add at all. - */ - for (i = 0; i < (sizeof(stream_info.elements) / sizeof(*stream_info.elements)); ++i) - { - struct wined3d_stream_info_element *e; + struct wined3d_stream_info_element *e; - if (!(stream_info.use_map & (1 << i))) continue; + if (!(stream_info.use_map & (1 << i))) + continue; - e = &stream_info.elements[i]; - if (e->data.buffer_object) - { - struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; - e->data.buffer_object = 0; - e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); - vb->buffer_object = 0; - LEAVE_GL(); - } - if (e->data.addr) - e->data.addr += e->stride * src_start_idx; + e = &stream_info.elements[i]; + if (e->data.buffer_object) + { + struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; + e->data.buffer_object = 0; + e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); + vb->buffer_object = 0; + LEAVE_GL(); } + if (e->data.addr) + e->data.addr += e->stride * src_start_idx; } hr = process_vertices_strided(device, dst_idx, vertex_count,

1 0

Andrew Eikum : mciqtz32: Stop the graph when the file is no longer playing.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 8e88a5a6fab162913a204638bd62953e6fb10445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e88a5a6fab162913a204638b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 28 11:09:32 2012 -0500 mciqtz32: Stop the graph when the file is no longer playing. --- dlls/mciqtz32/mciqtz.c | 26 ++++++++++++++++++++++++-- dlls/mciqtz32/mciqtz_private.h | 1 + 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 3e16235..b05e681 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -180,6 +180,12 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaEvent, (void**)&wma->mevent); + if (FAILED(hr)) { + TRACE("Cannot get IMediaEvent interface (hr = %x)\n", hr); + goto err; + } + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&wma->vidwin); if (FAILED(hr)) { TRACE("Cannot get IVideoWindow interface (hr = %x)\n", hr); @@ -246,6 +252,9 @@ err: if (wma->pgraph) IGraphBuilder_Release(wma->pgraph); wma->pgraph = NULL; + if (wma->mevent) + IMediaEvent_Release(wma->mevent); + wma->mevent = NULL; if (wma->pmctrl) IMediaControl_Release(wma->pmctrl); wma->pmctrl = NULL; @@ -276,6 +285,7 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP IUnknown_Release(wma->vidwin); IUnknown_Release(wma->vidbasic); IUnknown_Release(wma->seek); + IMediaEvent_Release(wma->mevent); IGraphBuilder_Release(wma->pgraph); IMediaControl_Release(wma->pmctrl); if (wma->uninit) @@ -654,9 +664,21 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS IMediaControl_GetState(wma->pmctrl, -1, &state); if (state == State_Stopped) lpParms->dwReturn = MCI_MODE_STOP; - else if (state == State_Running) + else if (state == State_Running) { + LONG code; + LONG_PTR p1, p2; + lpParms->dwReturn = MCI_MODE_PLAY; - else if (state == State_Paused) + + do { + hr = IMediaEvent_GetEvent(wma->mevent, &code, &p1, &p2, 0); + if (hr == S_OK && code == EC_COMPLETE){ + lpParms->dwReturn = MCI_MODE_STOP; + IMediaControl_Stop(wma->pmctrl); + } + } while (hr == S_OK); + + } else if (state == State_Paused) lpParms->dwReturn = MCI_MODE_PAUSE; break; } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 93834fb..35adc42 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -32,6 +32,7 @@ typedef struct { IGraphBuilder* pgraph; IMediaControl* pmctrl; IMediaSeeking* seek; + IMediaEvent* mevent; IVideoWindow* vidwin; IBasicVideo* vidbasic; DWORD time_format;

1 0

Huw Davies : gdi32: Implement CreateScalableFontResource.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 105caa28bfaad9d468af2e44b73ad4551b3b48b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=105caa28bfaad9d468af2e44b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 28 14:49:24 2012 +0100 gdi32: Implement CreateScalableFontResource. Based on patches by Jeremy White and Dmitry Timoshkov. --- dlls/gdi32/font.c | 30 +--- dlls/gdi32/freetype.c | 328 +++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/tests/font.c | 2 - 4 files changed, 335 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=105caa28bfaad9d468af2…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012