wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Henri Verbeet : wined3d: Make the swapchain parameter to x11_copy_to_screen () const.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: a86785d06519ffb9338fcee08492e1ed8fab958f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86785d06519ffb9338fcee08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:31 2011 +0200 wined3d: Make the swapchain parameter to x11_copy_to_screen() const. --- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 405d89f..4752e39 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -644,9 +644,9 @@ static const struct wined3d_swapchain_ops swapchain_gl_ops = }; /* Helper function that blits the front buffer contents to the target window. */ -void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) +void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) { - struct wined3d_surface *front; + const struct wined3d_surface *front; POINT offset = {0, 0}; HDC src_dc, dst_dc; RECT draw_rect; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4c5e9f..f104a19 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2451,7 +2451,7 @@ struct wined3d_swapchain HWND backup_wnd; }; -void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; +void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader().
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: d1b650e9595d0d5aa7c1887c139d620d198de7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b650e9595d0d5aa7c1887c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:30 2011 +0200 wined3d: Explicitly pass gl_info to gen_arbfp_ffp_shader(). --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 66f1695..aef4fab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5952,9 +5952,8 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta } } -static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, struct wined3d_stateblock *stateblock) +static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &stateblock->device->adapter->gl_info; unsigned int stage; struct wined3d_shader_buffer buffer; BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; @@ -6280,7 +6279,7 @@ static void fragment_prog_arbfp(DWORD state_id, struct wined3d_stateblock *state } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); - new_desc->shader = gen_arbfp_ffp_shader(&settings, stateblock); + new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); desc = new_desc;

1 0

Henri Verbeet : wined3d: Only use state contained in the ffp_frag_settings structure in gen_arbfp_ffp_shader ().
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 1f6f94675ec190c00e54578fbb0268f3d2be8096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6f94675ec190c00e54578fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:29 2011 +0200 wined3d: Only use state contained in the ffp_frag_settings structure in gen_arbfp_ffp_shader(). Note that the actual check looks off by one too. --- dlls/wined3d/arb_program_shader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b9586d5..66f1695 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5960,6 +5960,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, str BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; BOOL bump_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; + UINT lowest_disabled_stage; const char *textype; const char *instr, *sat; char colorcor_dst[8]; @@ -6018,6 +6019,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, str tfactor_used = TRUE; } } + lowest_disabled_stage = stage; /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -6063,7 +6065,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, str srgb_sub_high, 0.0, 0.0, 0.0); } - if (ffp_clip_emul(&stateblock->state) && settings->emul_clipplanes) + if (lowest_disabled_stage < 7 && settings->emul_clipplanes) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); /* Generate texture sampling instructions) */

1 0

Frédéric Delanoy : start: Add support for /? command line parameter.
by Alexandre Julliard 11 Jul '11

11 Jul '11

1 0

Andrew Eikum : winecoreaudio.drv: Make AudioSessionManager methods static.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 05df7e0b94ea0cfba375823dc9e1a4902c4f980e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05df7e0b94ea0cfba375823dc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 11 08:37:30 2011 -0500 winecoreaudio.drv: Make AudioSessionManager methods static. --- dlls/winecoreaudio.drv/mmdevdrv.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 261bb2b..0f73095 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2790,7 +2790,7 @@ static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl = ChannelAudioVolume_GetAllVolumes }; -HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, +static HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, REFIID riid, void **ppv) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -2812,7 +2812,7 @@ HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, return E_NOINTERFACE; } -ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -2821,7 +2821,7 @@ ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) return ref; } -ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) +static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; @@ -2832,7 +2832,7 @@ ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) return ref; } -HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( +static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, IAudioSessionControl **out) { @@ -2859,7 +2859,7 @@ HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( +static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, ISimpleAudioVolume **out) { @@ -2886,7 +2886,7 @@ HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( return S_OK; } -HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( +static HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( IAudioSessionManager2 *iface, IAudioSessionEnumerator **out) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2894,7 +2894,7 @@ HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2902,7 +2902,7 @@ HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( IAudioSessionManager2 *iface, IAudioSessionNotification *notification) { SessionMgr *This = impl_from_IAudioSessionManager2(iface); @@ -2910,7 +2910,7 @@ HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( IAudioSessionManager2 *iface, const WCHAR *session_id, IAudioVolumeDuckNotification *notification) { @@ -2919,7 +2919,7 @@ HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( return E_NOTIMPL; } -HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( +static HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( IAudioSessionManager2 *iface, IAudioVolumeDuckNotification *notification) {

1 0

Frédéric Delanoy : mmdevapi/tests: Remove dead assignment (Clang).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: d473d02c64dc1f78363bfdef4bf978f7ce07dc30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d473d02c64dc1f78363bfdef4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 17:26:55 2011 +0200 mmdevapi/tests: Remove dead assignment (Clang). --- dlls/mmdevapi/tests/render.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 6e83f5c..ad81709 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -618,7 +618,6 @@ static void test_clock(void) hr = IAudioClock_GetPosition(acl, &pos, NULL); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); - last = pos; hr = IAudioRenderClient_GetBuffer(arc, pwfx->nSamplesPerSec / 2., &data); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr);

1 0

Frédéric Delanoy : ole32/tests: Remove dead assignment (Clang).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 8f32948d9afd1b9a29a79bb25b62c103a02ec5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f32948d9afd1b9a29a79bb25… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 16:58:46 2011 +0200 ole32/tests: Remove dead assignment (Clang). --- dlls/ole32/tests/usrmarshal.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 7fdbdb6..ed09558 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -580,7 +580,6 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) ok(size == 0, "size should be 0 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); - wireip = buffer; HeapFree(GetProcessHeap(), 0, buffer); /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then

1 0

Frédéric Delanoy : winhlp32: Remove dead assignment (Clang).
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: dcf9d74be7ade2a71d8a787a104b561120138d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf9d74be7ade2a71d8a787a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 14:49:50 2011 +0200 winhlp32: Remove dead assignment (Clang). --- programs/winhlp32/hlpfile.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 5146c38..cf7bcdc 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -2646,7 +2646,6 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_Uncompress_Topic(hlpfile)) return FALSE; if (!HLPFILE_ReadFont(hlpfile)) return FALSE; - buf = hlpfile->topic_map[0]; old_index = -1; offs = 0; do

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10Device iface.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: eeacb8f2c9a9f7c1c09566eaf494aa705664ade5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeacb8f2c9a9f7c1c09566eaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 11 12:13:25 2011 +0200 d3d10core: COM cleanup for the ID3D10Device iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 109 +++++++++++++++++++++--------------- dlls/d3d10core/texture.c | 3 +- 3 files changed, 66 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eeacb8f2c9a9f7c1c0956…

1 0

Jacek Caban : d3d10.idl: Added CD3D10_TEXTURE1D_DESC declaration.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 7b49ddbababa22eb3dd8ac59c29293afb6ece0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b49ddbababa22eb3dd8ac59c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 11 12:13:23 2011 +0200 d3d10.idl: Added CD3D10_TEXTURE1D_DESC declaration. --- include/d3d10.idl | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index f8a83ef..51b92bd 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -514,6 +514,29 @@ typedef struct D3D10_TEXTURE1D_DESC { UINT MiscFlags; } D3D10_TEXTURE1D_DESC; +cpp_quote("#if !defined(D3D10_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("struct CD3D10_TEXTURE1D_DESC : public D3D10_TEXTURE1D_DESC {") +cpp_quote(" CD3D10_TEXTURE1D_DESC() {}") +cpp_quote(" explicit CD3D10_TEXTURE1D_DESC(const D3D10_TEXTURE1D_DESC &o) : D3D10_TEXTURE1D_DESC(o) {}") +cpp_quote(" explicit CD3D10_TEXTURE1D_DESC(DXGI_FORMAT format, UINT width, UINT arraySize = 1, UINT mipLevels = 0,") +cpp_quote(" UINT bindFlags = D3D10_BIND_SHADER_RESOURCE, D3D10_USAGE usage = D3D10_USAGE_DEFAULT, UINT cpuaccessFlags = 0,") +cpp_quote(" UINT miscFlags = 0) {") +cpp_quote(" Width = width;") +cpp_quote(" MipLevels = mipLevels;") +cpp_quote(" ArraySize = arraySize;") +cpp_quote(" Format = format;") +cpp_quote(" Usage = usage;") +cpp_quote(" BindFlags = bindFlags;") +cpp_quote(" CPUAccessFlags = cpuaccessFlags;") +cpp_quote(" MiscFlags = miscFlags;") +cpp_quote(" }") +cpp_quote(" ~CD3D10_TEXTURE1D_DESC() {}") +cpp_quote(" operator const D3D10_TEXTURE1D_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D10_TEXTURE2D_DESC { UINT Width; UINT Height;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
84
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 July 2011