wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Jacek Caban : mshtml: Removed TRACEs from dispex_query_interface.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 7cbb683705487de184f11fb2f33b461dae3160da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbb683705487de184f11fb2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 20 16:24:27 2015 +0100 mshtml: Removed TRACEs from dispex_query_interface. --- dlls/mshtml/dispex.c | 23 +++++++---------------- dlls/mshtml/htmlelem.c | 2 ++ dlls/mshtml/htmlelemcol.c | 2 ++ dlls/mshtml/main.c | 2 ++ dlls/mshtml/mshtml_private.h | 3 +++ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a97f09d..ff4e28a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -649,8 +649,9 @@ static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void { func_disp_t *This = impl_from_IUnknown(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IUnknown_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; @@ -1669,26 +1670,16 @@ static IDispatchExVtbl DispatchExVtbl = { BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) { - static const IID IID_UndocumentedScriptIface = - {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; - static const IID IID_IDispatchJS = - {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; - - if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + if(IsEqualGUID(&IID_IDispatch, riid)) *ppv = &This->IDispatchEx_iface; - }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + else if(IsEqualGUID(&IID_IDispatchEx, riid)) *ppv = &This->IDispatchEx_iface; - }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { - TRACE("(%p)->(IID_IDispatchJS %p) returning NULL\n", This, ppv); + else if(IsEqualGUID(&IID_IDispatchJS, riid)) *ppv = NULL; - }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { - TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); + else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) *ppv = NULL; - }else { + else return FALSE; - } if(*ppv) IUnknown_AddRef((IUnknown*)*ppv); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index da7c0f7..8120761 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4276,6 +4276,8 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { *ppv = &This->IHTMLAttributeCollection_iface; }else if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 1542926..ca5e1d5 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -218,6 +218,8 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { *ppv = &This->IHTMLElementCollection_iface; }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e5cf325..8d9f1ac 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -545,6 +545,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_ICustomDoc); X(IID_IDispatch); X(IID_IDispatchEx); + X(IID_IDispatchJS); + X(IID_UndocumentedScriptIface); X(IID_IEnumConnections); X(IID_IEnumVARIANT); X(IID_IHlinkTarget); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f391a4..a53fcec 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1061,6 +1061,9 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf, 0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58); DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf, 0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8); +DEFINE_GUID(IID_UndocumentedScriptIface,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0); +DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6); + /* memory allocation functions */ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)

1 0

Matteo Bruni : wined3d: Always use the core version of the glPointParameteri function.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 915e0ef0cfc56621d67e6fc65f123cf45d0f5469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915e0ef0cfc56621d67e6fc65… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:08 2015 +0100 wined3d: Always use the core version of the glPointParameteri function. The state function depends on GL 2.0+ so it's unnecessary to check for NV_POINT_SPRITE. --- dlls/wined3d/directx.c | 6 ++---- dlls/wined3d/state.c | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60269f1..8f50b5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2848,9 +2848,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexWeighthNV) USE_GL_FUNC(glVertexWeighthvNV) /* GL_NV_point_sprite */ - USE_GL_FUNC(glPointParameteri) USE_GL_FUNC(glPointParameteriNV) - USE_GL_FUNC(glPointParameteriv) USE_GL_FUNC(glPointParameterivNV) /* GL_NV_register_combiners */ USE_GL_FUNC(glCombinerInputNV) @@ -2889,6 +2887,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ + USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ #undef USE_GL_FUNC @@ -3253,8 +3253,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!gl_info->supported[NV_POINT_SPRITE] && gl_version >= MAKEDWORD_VERSION(1, 4)) { TRACE("GL CORE: GL_NV_point_sprite support.\n"); - gl_info->gl_ops.ext.p_glPointParameterivNV = gl_info->gl_ops.ext.p_glPointParameteriv; - gl_info->gl_ops.ext.p_glPointParameteriNV = gl_info->gl_ops.ext.p_glPointParameteri; gl_info->supported[NV_POINT_SPRITE] = TRUE; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b149a0..f7cf14d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5010,11 +5010,8 @@ static void psorigin(struct wined3d_context *context, const struct wined3d_state const struct wined3d_gl_info *gl_info = context->gl_info; GLint origin = context->render_offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT; - if (gl_info->supported[NV_POINT_SPRITE]) - { - GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, origin)); - checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); - } + GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, origin)); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); } void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Matteo Bruni : wined3d: Use the core version of glDrawElementsInstanced.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: aff0c389ccc9df72624f5f42b7d09319c3011d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0c389ccc9df72624f5f42b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:07 2015 +0100 wined3d: Use the core version of glDrawElementsInstanced. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/drawprim.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b596eac..60269f1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2884,6 +2884,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ + USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ @@ -2919,6 +2920,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); + MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 265942c..12b03f6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -60,9 +60,9 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit } else { - GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype, (const char *)idx_data + (idx_size * start_idx), instance_count)); - checkGLcall("glDrawElementsInstancedARB"); + checkGLcall("glDrawElementsInstanced"); } } }

1 0

Matteo Bruni : wined3d: Use the core version of glDrawBuffers.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 75b96768e508180f2c9dd0ebeb29674299254c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b96768e508180f2c9dd0ebe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:06 2015 +0100 wined3d: Use the core version of glDrawBuffers. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/directx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d3f7629..b045ce8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2082,7 +2082,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt if (gl_info->supported[ARB_DRAW_BUFFERS]) { - GL_EXTCALL(glDrawBuffersARB(i, context->draw_buffers)); + GL_EXTCALL(glDrawBuffers(i, context->draw_buffers)); checkGLcall("glDrawBuffers()"); } else diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2566f9e..b596eac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2883,6 +2883,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2D) /* OpenGL 1.3 */ USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ + USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ @@ -2917,6 +2918,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glCompressedTexSubImage2D, glCompressedTexSubImage2DARB); MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); + MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB);

1 0

Matteo Bruni : wined3d: Use the core gl*CompressedTex* functions.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 6bb32e47ff1daa0645c4d3ada4e239791c4a8404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb32e47ff1daa0645c4d3ada… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:05 2015 +0100 wined3d: Use the core gl*CompressedTex* functions. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/surface.c | 22 +++++++++++----------- dlls/wined3d/texture.c | 4 ++-- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a91090e..2566f9e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2878,9 +2878,14 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */ USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */ + USE_GL_FUNC(glCompressedTexImage2D) /* OpenGL 1.3 */ + USE_GL_FUNC(glCompressedTexImage3D) /* OpenGL 1.3 */ + USE_GL_FUNC(glCompressedTexSubImage2D) /* OpenGL 1.3 */ + USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ + USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ #undef USE_GL_FUNC @@ -2907,9 +2912,14 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glBufferData, glBufferDataARB); MAP_GL_FUNCTION(glBufferSubData, glBufferSubDataARB); MAP_GL_FUNCTION(glColorMaski, glColorMaskIndexedEXT); + MAP_GL_FUNCTION(glCompressedTexImage2D, glCompressedTexImage2DARB); + MAP_GL_FUNCTION(glCompressedTexImage3D, glCompressedTexImage3DARB); + MAP_GL_FUNCTION(glCompressedTexSubImage2D, glCompressedTexSubImage2DARB); + MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); + MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION(glUnmapBuffer, glUnmapBufferARB); #undef MAP_GL_FUNCTION diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6b73fa8..43dfca0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1334,23 +1334,23 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { - TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", + TRACE("(%p) : Calling glGetCompressedTexImage level %d, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, data.addr); if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); checkGLcall("glBindBuffer"); - GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, surface->texture_level, NULL)); - checkGLcall("glGetCompressedTexImageARB"); + GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, NULL)); + checkGLcall("glGetCompressedTexImage"); GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); checkGLcall("glBindBuffer"); } else { - GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, + GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, data.addr)); - checkGLcall("glGetCompressedTexImageARB"); + checkGLcall("glGetCompressedTexImage"); } } else @@ -1515,30 +1515,30 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w else internal = format->glInternal; - TRACE("glCompressedTexSubImage2DARB, target %#x, level %d, x %d, y %d, w %d, h %d, " + TRACE("glCompressedTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, " "format %#x, image_size %#x, addr %p.\n", surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr); if (row_length == src_pitch) { - GL_EXTCALL(glCompressedTexSubImage2DARB(surface->texture_target, surface->texture_level, + GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr)); } else { UINT row, y; - /* glCompressedTexSubImage2DARB() ignores pixel store state, so we - * can't use the unpack row length like below. */ + /* glCompressedTexSubImage2D() ignores pixel store state, so we + * can't use the unpack row length like for glTexSubImage2D. */ for (row = 0, y = dst_point->y; row < row_count; ++row) { - GL_EXTCALL(glCompressedTexSubImage2DARB(surface->texture_target, surface->texture_level, + GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, y, update_w, format->block_height, internal, row_length, addr)); y += format->block_height; addr += src_pitch; } } - checkGLcall("glCompressedTexSubImage2DARB"); + checkGLcall("glCompressedTexSubImage2D"); } else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9138470..06e5681 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -885,9 +885,9 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (format->flags & WINED3DFMT_FLAG_COMPRESSED && mem) { - GL_EXTCALL(glCompressedTexImage2DARB(surface->texture_target, surface->texture_level, + GL_EXTCALL(glCompressedTexImage2D(surface->texture_target, surface->texture_level, internal, width, height, 0, surface->resource.size, mem)); - checkGLcall("glCompressedTexImage2DARB"); + checkGLcall("glCompressedTexImage2D"); } else {

1 0

Matteo Bruni : dxgi: Fix a comment typo.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 5883c9ece3a205f8357a239ec4432408610928d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5883c9ece3a205f8357a239ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:04 2015 +0100 dxgi: Fix a comment typo. --- dlls/dxgi/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7976a91..a6f72ca 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -326,7 +326,7 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_QueryResourceResidency, dxgi_device_SetGPUThreadPriority, dxgi_device_GetGPUThreadPriority, - /* IWineDXGIAdapter methods */ + /* IWineDXGIDevice methods */ dxgi_device_create_surface, dxgi_device_create_swapchain, };

1 0

Piotr Caban : msvcrt: Add _vscprintf_p implementation.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: bd1428ef50a49b2f99505e9be39c24faf0a33c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1428ef50a49b2f99505e9be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 20 13:43:09 2015 +0100 msvcrt: Add _vscprintf_p implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 36 ++++++++++++++++++++++++++++++++++++ 8 files changed, 49 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 29cbe7f..c1eb594 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1446,8 +1446,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9017921..c0bc9e1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1804,8 +1804,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c675436..0faf1f0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1819,8 +1819,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 760f8f9..eddb27d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1516,8 +1516,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) msvcr120._vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) msvcr120._vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) msvcr120._vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcr120._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcr120._vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) msvcr120._vscwprintf_p diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fbe42f3..13a2270 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1126,8 +1126,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9623aa5..e53f622 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1101,8 +1101,8 @@ @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf @ stub _vscprintf_l -@ stub _vscprintf_p -@ stub _vscprintf_p_l +@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 141cd9e..7156a50 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1059,7 +1059,7 @@ @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf # stub _vscprintf_l(str ptr ptr) -# stub _vscprintf_p_l(str ptr ptr) +@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 935c264..771f6f6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -825,6 +825,42 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) } /********************************************************************* + * _vscprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscprintf_p_l(const char *format, + MSVCRT__locale_t locale, __ms_va_list args) +{ + printf_arg args_ctx[MSVCRT__ARGMAX+1]; + struct _str_ctx_a puts_ctx = {INT_MAX, NULL}; + int ret; + + memset(args_ctx, 0, sizeof(args_ctx)); + + ret = create_positional_ctx_a(args_ctx, format, args); + if(ret < 0) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *MSVCRT__errno() = MSVCRT_EINVAL; + return ret; + } else if(ret == 0) { + ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, FALSE, TRUE, + arg_clbk_valist, NULL, &args); + } else { + ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, TRUE, TRUE, + arg_clbk_positional, args_ctx, NULL); + } + + return ret; +} + +/********************************************************************* + * _vscprintf_p (MSVCR80.@) + */ +int CDECL MSVCRT__vscprintf_p(const char *format, __ms_va_list argptr) +{ + return MSVCRT__vscprintf_p_l(format, NULL, argptr); +} + +/********************************************************************* * _snprintf (MSVCRT.@) */ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)

1 0

Francois Gouget : dsound: Make some DirectSoundDevice_*() functions static.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 57582b37b3e74dab410cc6c70a2aaa8fa905ea2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=57582b37b3e74dab410cc6c70… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:28:05 2015 +0100 dsound: Make some DirectSoundDevice_*() functions static. --- dlls/dsound/dsound.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 2a41967..7e53f91 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -199,7 +199,7 @@ static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) return ref; } -ULONG DirectSoundDevice_Release(DirectSoundDevice * device) +static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); @@ -271,7 +271,7 @@ BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, return hr == S_OK; } -HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcGUID) +static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcGUID) { HRESULT hr = DS_OK; GUID devGUID; @@ -398,7 +398,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG return hr; } -HRESULT DirectSoundDevice_CreateSoundBuffer( +static HRESULT DirectSoundDevice_CreateSoundBuffer( DirectSoundDevice * device, LPCDSBUFFERDESC dsbd, LPLPDIRECTSOUNDBUFFER ppdsb, @@ -539,7 +539,7 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( return hres; } -HRESULT DirectSoundDevice_DuplicateSoundBuffer( +static HRESULT DirectSoundDevice_DuplicateSoundBuffer( DirectSoundDevice * device, LPDIRECTSOUNDBUFFER psb, LPLPDIRECTSOUNDBUFFER ppdsb)

1 0

Francois Gouget : dsound: Reorder the interfaces to remove the need for forward declarations.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: dfaef5306f2e96dc3cddf530e5f63f01a048c47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaef5306f2e96dc3cddf530e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:28:02 2015 +0100 dsound: Reorder the interfaces to remove the need for forward declarations. --- dlls/dsound/dsound.c | 1675 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 14 - 2 files changed, 838 insertions(+), 851 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfaef5306f2e96dc3cddf…

1 0

Francois Gouget : dsound: Make DSOUND_FindSpeakerConfig() static.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 82c298ee6ed0199e15be26e8c7c31d8ef9137d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c298ee6ed0199e15be26e8c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:25:49 2015 +0100 dsound: Make DSOUND_FindSpeakerConfig() static. --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 98 ++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 52b2847..af2034a 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -219,7 +219,6 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; -DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 7d05efd..52d00f9 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -79,6 +79,55 @@ static DWORD speaker_config_to_channel_mask(DWORD speaker_config) return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; } +static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) +{ + IPropertyStore *store; + HRESULT hr; + PROPVARIANT pv; + ULONG phys_speakers; + + const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + + hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); + if (FAILED(hr)) { + WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); + return def; + } + + hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); + + if (FAILED(hr)) { + WARN("IPropertyStore_GetValue failed: %08x\n", hr); + IPropertyStore_Release(store); + return def; + } + + if (pv.vt != VT_UI4) { + WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt); + PropVariantClear(&pv); + IPropertyStore_Release(store); + return def; + } + + phys_speakers = pv.u.ulVal; + + PropVariantClear(&pv); + IPropertyStore_Release(store); + + if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) + return DSSPEAKER_5POINT1_BACK; + else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) + return DSSPEAKER_5POINT1_SURROUND; + else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + return DSSPEAKER_QUAD; + else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) + return DSSPEAKER_MONO; + + return def; +} + static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client, BOOL forcewave, WAVEFORMATEX **wfx) { @@ -166,55 +215,6 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } -DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) -{ - IPropertyStore *store; - HRESULT hr; - PROPVARIANT pv; - ULONG phys_speakers; - - const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - - hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); - if (FAILED(hr)) { - WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); - return def; - } - - hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); - - if (FAILED(hr)) { - WARN("IPropertyStore_GetValue failed: %08x\n", hr); - IPropertyStore_Release(store); - return def; - } - - if (pv.vt != VT_UI4) { - WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt); - PropVariantClear(&pv); - IPropertyStore_Release(store); - return def; - } - - phys_speakers = pv.u.ulVal; - - PropVariantClear(&pv); - IPropertyStore_Release(store); - - if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) - return DSSPEAKER_5POINT1_BACK; - else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) - return DSSPEAKER_5POINT1_SURROUND; - else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) - return DSSPEAKER_QUAD; - else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) - return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) - return DSSPEAKER_MONO; - - return def; -} - HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { UINT prebuf_frames;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
31
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 January 2015