September 2012 - Wine-Commits

Nikolay Sivov : mlang: Forward GetFamilyCodePage() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 76e12944edb0ba342bfa0576d5bf33ee1ed335a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e12944edb0ba342bfa0576d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:53:55 2012 +0400 mlang: Forward GetFamilyCodePage() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6a58b1f..a956e2d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2098,10 +2098,11 @@ static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo( static HRESULT WINAPI fnIMultiLanguage_GetFamilyCodePage( IMultiLanguage* iface, - UINT uiCodePage, - UINT* puiFamilyCodePage) + UINT cp, + UINT* family_cp) { - return GetFamilyCodePage(uiCodePage, puiFamilyCodePage); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_GetFamilyCodePage(&This->IMultiLanguage3_iface, cp, family_cp); } static HRESULT WINAPI fnIMultiLanguage_EnumCodePages(

1 0

Nikolay Sivov : mlang: Forward GetRfc1766FromLcid() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 42db7e4c1d10bdede8954a2765f7dec80d38b329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42db7e4c1d10bdede8954a276… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:59:50 2012 +0400 mlang: Forward GetRfc1766FromLcid() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b8a81f8..0253eec 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2187,18 +2187,8 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( LCID lcid, BSTR* pbstrRfc1766) { - WCHAR buf[MAX_RFC1766_NAME]; - - TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - if (!pbstrRfc1766) - return E_INVALIDARG; - - if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) - { - *pbstrRfc1766 = SysAllocString( buf ); - return S_OK; - } - return E_FAIL; + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_GetRfc1766FromLcid(&This->IMultiLanguage3_iface, lcid, pbstrRfc1766); } static HRESULT WINAPI fnIMultiLanguage_GetLcidFromRfc1766(

1 0

Henri Verbeet : wined3d: Take the data type of registers into account in the GLSL shader backend.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 1ff07a7d6844034f81b2f1bef7c12c456f189b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff07a7d6844034f81b2f1bef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:44 2012 +0200 wined3d: Take the data type of registers into account in the GLSL shader backend. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 77 ++++++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0354b0a..48a6ef4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -113,6 +113,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, + {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 14d165b..e10e207 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1615,7 +1615,36 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); - shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); + + if (wined3d_src->reg.type == WINED3DSPR_IMMCONST) + { + shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); + } + else + { + char param_str[200]; + + shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, param_str); + + switch (wined3d_src->reg.data_type) + { + case WINED3D_DATA_FLOAT: + sprintf(glsl_src->param_str, "%s", param_str); + break; + case WINED3D_DATA_INT: + sprintf(glsl_src->param_str, "floatBitsToInt(%s)", param_str); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + sprintf(glsl_src->param_str, "floatBitsToUint(%s)", param_str); + break; + default: + FIXME("Unhandled data type %#x.\n", wined3d_src->reg.data_type); + sprintf(glsl_src->param_str, "%s", param_str); + break; + } + } } /* From a given parameter token, generate the corresponding GLSL string. @@ -1640,8 +1669,31 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_shader_buffer *buffer, struct glsl_dst_param glsl_dst; DWORD mask; - mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst); - if (mask) shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); + if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) + { + switch (dst->reg.data_type) + { + case WINED3D_DATA_FLOAT: + shader_addline(buffer, "%s%s = %s(", + glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); + break; + case WINED3D_DATA_INT: + shader_addline(buffer, "%s%s = %sintBitsToFloat(", + glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); + break; + case WINED3D_DATA_RESOURCE: + case WINED3D_DATA_SAMPLER: + case WINED3D_DATA_UINT: + shader_addline(buffer, "%s%s = %suintBitsToFloat(", + glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); + break; + default: + FIXME("Unhandled data type %#x.\n", dst->reg.data_type); + shader_addline(buffer, "%s%s = %s(", + glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); + break; + } + } return mask; } @@ -4069,21 +4121,16 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#version 120\n"); + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) - { shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); - } + /* The spec says that it doesn't have to be explicitly enabled, but the + * nvidia drivers write a warning if we don't do so. */ if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - /* The spec says that it doesn't have to be explicitly enabled, but the nvidia - * drivers write a warning if we don't do so - */ shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); - } if (gl_info->supported[EXT_GPU_SHADER4]) - { shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); - } /* Base Declarations */ shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); @@ -4166,6 +4213,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#version 120\n"); + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[EXT_GPU_SHADER4]) shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); @@ -4996,8 +5045,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s { UINT shader_model; - if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_GEOMETRY_SHADER4] - && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) + if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING] + && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 128937a..0730406 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -946,6 +946,7 @@ enum wined3d_gl_extension ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, + ARB_SHADER_BIT_ENCODING, ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100,

1 0

Nikolay Sivov : mlang: Move IUnknown implementation to IMultiLanguage3 interface implementation and forward to it .
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: fdaf6df67a8cfaf2b21cb4ea6274dd2a3c94f0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdaf6df67a8cfaf2b21cb4ea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:44:15 2012 +0400 mlang: Move IUnknown implementation to IMultiLanguage3 interface implementation and forward to it. --- dlls/mlang/mlang.c | 161 ++++++++++++++++++++-------------------------------- 1 files changed, 61 insertions(+), 100 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 37102a3..31d9985 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1433,88 +1433,6 @@ typedef struct tagMLang_impl DWORD total_cp, total_scripts; } MLang_impl; -static ULONG MLang_AddRef( MLang_impl* This) -{ - return InterlockedIncrement(&This->ref); -} - -static ULONG MLang_Release( MLang_impl* This ) -{ - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("%p ref = %d\n", This, ref); - if (ref == 0) - { - TRACE("Destroying %p\n", This); - HeapFree(GetProcessHeap(), 0, This); - UnlockModule(); - } - - return ref; -} - -static HRESULT MLang_QueryInterface( - MLang_impl* This, - REFIID riid, - void** ppvObject) -{ - TRACE("%p -> %s\n", This, debugstr_guid(riid) ); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IMLangCodePages) - || IsEqualGUID(riid, &IID_IMLangFontLink)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangFontLink %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangFontLink_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMLangFontLink2)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangFontLink2 %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangFontLink2_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage) ) - { - MLang_AddRef(This); - TRACE("Returning IID_IMultiLanguage %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMultiLanguage_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage2) ) - { - MLang_AddRef(This); - *ppvObject = &This->IMultiLanguage3_iface; - TRACE("Returning IID_IMultiLanguage2 %p ref = %d\n", This, This->ref); - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage3) ) - { - MLang_AddRef(This); - *ppvObject = &This->IMultiLanguage3_iface; - TRACE("Returning IID_IMultiLanguage3 %p ref = %d\n", This, This->ref); - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMLangLineBreakConsole)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangLineBreakConsole %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangLineBreakConsole_iface; - return S_OK; - } - - - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); - return E_NOINTERFACE; -} - /******************************************************************************/ typedef struct tagEnumCodePage_impl @@ -1891,21 +1809,21 @@ static HRESULT WINAPI fnIMLangFontLink_QueryInterface( void** ppvObject) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangFontLink_AddRef( IMLangFontLink* iface) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangFontLink_Release( IMLangFontLink* iface) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( @@ -2126,22 +2044,22 @@ static inline MLang_impl *impl_from_IMultiLanguage( IMultiLanguage *iface ) static HRESULT WINAPI fnIMultiLanguage_QueryInterface( IMultiLanguage* iface, REFIID riid, - void** ppvObject) + void** obj) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface(&This->IMultiLanguage3_iface, riid, obj); } static ULONG WINAPI fnIMultiLanguage_AddRef( IMultiLanguage* iface ) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return IMLangFontLink_AddRef( &This->IMLangFontLink_iface ); + return IMultiLanguage3_AddRef(&This->IMultiLanguage3_iface); } static ULONG WINAPI fnIMultiLanguage_Release( IMultiLanguage* iface ) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return IMLangFontLink_Release( &This->IMLangFontLink_iface ); + return IMultiLanguage3_Release(&This->IMultiLanguage3_iface); } static HRESULT WINAPI fnIMultiLanguage_GetNumberOfCodePageInfo( @@ -2627,22 +2545,65 @@ static inline MLang_impl *impl_from_IMultiLanguage3( IMultiLanguage3 *iface ) static HRESULT WINAPI fnIMultiLanguage2_QueryInterface( IMultiLanguage3* iface, REFIID riid, - void** ppvObject) + void** obj) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMultiLanguage)) + { + *obj = &This->IMultiLanguage_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangCodePages) || + IsEqualGUID(riid, &IID_IMLangFontLink)) + { + *obj = &This->IMLangFontLink_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangFontLink2)) + { + *obj = &This->IMLangFontLink2_iface; + } + else if (IsEqualGUID(riid, &IID_IMultiLanguage2) || + IsEqualGUID(riid, &IID_IMultiLanguage3)) + { + *obj = &This->IMultiLanguage3_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangLineBreakConsole)) + { + *obj = &This->IMLangLineBreakConsole_iface; + } + else + { + WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), obj); + *obj = NULL; + return E_NOINTERFACE; + } + + IMultiLanguage3_AddRef(iface); + return S_OK; } static ULONG WINAPI fnIMultiLanguage2_AddRef( IMultiLanguage3* iface ) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_AddRef( This ); + return InterlockedIncrement(&This->ref); } static ULONG WINAPI fnIMultiLanguage2_Release( IMultiLanguage3* iface ) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_Release( This ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); + } + + return ref; } static HRESULT WINAPI fnIMultiLanguage2_GetNumberOfCodePageInfo( @@ -3297,19 +3258,19 @@ static HRESULT WINAPI fnIMLangFontLink2_QueryInterface( void** ppvObject) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangFontLink2_AddRef( IMLangFontLink2* iface ) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangFontLink2_Release( IMLangFontLink2* iface ) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This, @@ -3486,21 +3447,21 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_QueryInterface( void** ppvObject) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangLineBreakConsole_AddRef( IMLangLineBreakConsole* iface ) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangLineBreakConsole_Release( IMLangLineBreakConsole* iface ) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( @@ -3721,7 +3682,7 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) mlang->total_scripts = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; mlang->ref = 1; - *ppObj = mlang; + *ppObj = &mlang->IMultiLanguage_iface; TRACE("returning %p\n", mlang); LockModule();

1 0

Nikolay Sivov : mlang: Forward IsConvertible() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 55d87c050cf3849cf24b82bb595d388a6e077f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d87c050cf3849cf24b82bb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 25 11:57:24 2012 +0400 mlang: Forward IsConvertible() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a956e2d..b8a81f8 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2128,10 +2128,11 @@ static HRESULT WINAPI fnIMultiLanguage_GetCharsetInfo( static HRESULT WINAPI fnIMultiLanguage_IsConvertible( IMultiLanguage* iface, - DWORD dwSrcEncoding, - DWORD dwDstEncoding) + DWORD src_enc, + DWORD dst_enc) { - return IsConvertINetStringAvailable(dwSrcEncoding, dwDstEncoding); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_IsConvertible(&This->IMultiLanguage3_iface, src_enc, dst_enc); } static HRESULT WINAPI fnIMultiLanguage_ConvertString(

1 0

Henri Verbeet : d3d10: Store shaders directly in d3d10_effect_object.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 2a83e1a581585d1d92408200ac5f3abf5701a098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a83e1a581585d1d92408200a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:40 2012 +0200 d3d10: Store shaders directly in d3d10_effect_object. --- dlls/d3d10/d3d10_private.h | 9 ++++ dlls/d3d10/effect.c | 115 +++++++++++++++++++++++++++++++------------ 2 files changed, 92 insertions(+), 32 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 51696ef..417bff3 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -49,6 +49,9 @@ void d3d10_rb_free(void *ptr) DECLSPEC_HIDDEN; enum d3d10_effect_object_type { + D3D10_EOT_RASTERIZER_STATE = 0x0, + D3D10_EOT_DEPTH_STENCIL_STATE = 0x1, + D3D10_EOT_BLEND_STATE = 0x2, D3D10_EOT_VERTEXSHADER = 0x6, D3D10_EOT_PIXELSHADER = 0x7, D3D10_EOT_GEOMETRYSHADER = 0x8, @@ -71,6 +74,12 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; DWORD index; void *data; + union + { + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10GeometryShader *gs; + } object; }; struct d3d10_effect_shader_signature diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index edb216b..18ac964 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1243,19 +1243,16 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr case D3D10_EOT_VERTEXSHADER: TRACE("Vertex shader\n"); o->data = &anonymous_vs; - hr = S_OK; break; case D3D10_EOT_PIXELSHADER: TRACE("Pixel shader\n"); o->data = &anonymous_ps; - hr = S_OK; break; case D3D10_EOT_GEOMETRYSHADER: TRACE("Geometry shader\n"); o->data = &anonymous_gs; - hr = S_OK; break; case D3D10_EOT_STENCIL_REF: @@ -1264,8 +1261,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr ERR("Failed to read stencil ref.\n"); return E_FAIL; } - - hr = S_OK; break; case D3D10_EOT_SAMPLE_MASK: @@ -1274,8 +1269,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr FIXME("Failed to read sample mask.\n"); return E_FAIL; } - - hr = S_OK; break; case D3D10_EOT_BLEND_FACTOR: @@ -1284,14 +1277,11 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr FIXME("Failed to read blend factor.\n"); return E_FAIL; } - - hr = S_OK; break; default: FIXME("Unhandled object type %#x\n", o->type); - hr = E_FAIL; - break; + return E_FAIL; } break; @@ -1300,7 +1290,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr TRACE("Variable name %s.\n", debugstr_a(data + offset)); o->data = e->lpVtbl->GetVariableByName(e, data + offset); - hr = S_OK; break; case D3D10_EOO_PARSED_OBJECT_INDEX: @@ -1311,7 +1300,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr TRACE("Variable name %s[%u].\n", debugstr_a(data + offset), o->index); o->data = e->lpVtbl->GetVariableByName(e, data + offset); - hr = S_OK; break; case D3D10_EOO_ANONYMOUS_SHADER: @@ -1339,34 +1327,66 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr switch (o->type) { case D3D10_EOT_VERTEXSHADER: - TRACE("Vertex shader\n"); - hr = parse_shader(o->data, data_ptr); - break; - case D3D10_EOT_PIXELSHADER: - TRACE("Pixel shader\n"); - hr = parse_shader(o->data, data_ptr); - break; - case D3D10_EOT_GEOMETRYSHADER: - TRACE("Geometry shader\n"); - hr = parse_shader(o->data, data_ptr); + if (FAILED(hr = parse_shader(o->data, data_ptr))) + return hr; break; default: FIXME("Unhandled object type %#x\n", o->type); - hr = E_FAIL; - break; + return E_FAIL; } break; default: - hr = E_FAIL; FIXME("Unhandled operation %#x.\n", operation); + return E_FAIL; + } + + switch (o->type) + { + case D3D10_EOT_VERTEXSHADER: + { + ID3D10EffectVariable *variable = o->data; + ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); + if (FAILED(hr = sv->lpVtbl->GetVertexShader(sv, o->index, &o->object.vs))) + return hr; + break; + } + + case D3D10_EOT_PIXELSHADER: + { + ID3D10EffectVariable *variable = o->data; + ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); + if (FAILED(hr = sv->lpVtbl->GetPixelShader(sv, o->index, &o->object.ps))) + return hr; + break; + } + + case D3D10_EOT_GEOMETRYSHADER: + { + ID3D10EffectVariable *variable = o->data; + ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); + if (FAILED(hr = sv->lpVtbl->GetGeometryShader(sv, o->index, &o->object.gs))) + return hr; break; + } + + case D3D10_EOT_RASTERIZER_STATE: + case D3D10_EOT_DEPTH_STENCIL_STATE: + case D3D10_EOT_BLEND_STATE: + case D3D10_EOT_STENCIL_REF: + case D3D10_EOT_BLEND_FACTOR: + case D3D10_EOT_SAMPLE_MASK: + break; + + default: + FIXME("Unhandled object type %#x.\n", o->type); + return E_FAIL; } - return hr; + return S_OK; } static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, const char *data) @@ -2093,22 +2113,21 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) { ID3D10Device *device = o->pass->technique->effect->device; - struct d3d10_effect_variable *v = (struct d3d10_effect_variable*) o->data; TRACE("effect object %p, type %#x.\n", o, o->type); switch(o->type) { case D3D10_EOT_VERTEXSHADER: - ID3D10Device_VSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.vs); + ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; case D3D10_EOT_PIXELSHADER: - ID3D10Device_PSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.ps); + ID3D10Device_PSSetShader(device, o->object.ps); return S_OK; case D3D10_EOT_GEOMETRYSHADER: - ID3D10Device_GSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.gs); + ID3D10Device_GSSetShader(device, o->object.gs); return S_OK; default: @@ -2198,6 +2217,30 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) } } +static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) +{ + switch (o->type) + { + case D3D10_EOT_VERTEXSHADER: + if (o->object.vs) + ID3D10VertexShader_Release(o->object.vs); + break; + + case D3D10_EOT_PIXELSHADER: + if (o->object.ps) + ID3D10PixelShader_Release(o->object.ps); + break; + + case D3D10_EOT_GEOMETRYSHADER: + if (o->object.gs) + ID3D10GeometryShader_Release(o->object.gs); + break; + + default: + break; + } +} + static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { unsigned int i; @@ -2205,7 +2248,15 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) TRACE("pass %p\n", p); HeapFree(GetProcessHeap(), 0, p->name); - HeapFree(GetProcessHeap(), 0, p->objects); + + if (p->objects) + { + for (i = 0; i < p->object_count; ++i) + { + d3d10_effect_object_destroy(&p->objects[i]); + } + HeapFree(GetProcessHeap(), 0, p->objects); + } if (p->annotations) {

1 0

Henri Verbeet : d3d10: Store shader variables in d3d10_effect_pass instead of d3d10_effect_object .
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: 4f2c93e2487c260aba02bbb5f774ade5d2f17952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2c93e2487c260aba02bbb5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:41 2012 +0200 d3d10: Store shader variables in d3d10_effect_pass instead of d3d10_effect_object. --- dlls/d3d10/d3d10_private.h | 5 +- dlls/d3d10/effect.c | 115 ++++++++++++++------------------------------ 2 files changed, 40 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f2c93e2487c260aba02b…

1 0

Henri Verbeet : wined3d: wined3d_device_set_pixel_shader() never fails.
by Alexandre Julliard Sept. 25, 2012

Sept. 25, 2012

Module: wine Branch: master Commit: fc711d495570297cb32cdc1c699f2ffe75943e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc711d495570297cb32cdc1c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 10:34:42 2012 +0200 wined3d: wined3d_device_set_pixel_shader() never fails. --- dlls/d3d8/device.c | 9 ++++----- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 22 ++++++++-------------- include/wine/wined3d.h | 2 +- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 709ac52..a313654 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2422,7 +2422,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_pixel_shader *shader_impl; - HRESULT hr; TRACE("iface %p, shader %#x.\n", iface, shader); @@ -2430,9 +2429,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD if (!shader) { - hr = wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } if (!(shader_impl = d3d8_get_object(&device->handle_table, shader - (VS_HIGHESTFIXEDFXF + 1), D3D8_HANDLE_PS))) @@ -2443,10 +2442,10 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD } TRACE("Setting shader %p.\n", shader_impl); - hr = wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetPixelShader(IDirect3DDevice8 *iface, DWORD *shader) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0418d69..c166ad4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2564,16 +2564,15 @@ static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDir { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_pixelshader *shader_obj = unsafe_impl_from_IDirect3DPixelShader9(shader); - HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - hr = wined3d_device_set_pixel_shader(device->wined3d_device, + wined3d_device_set_pixel_shader(device->wined3d_device, shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDirect3DPixelShader9 **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 664f1bd..19e21a0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2831,39 +2831,33 @@ void device_update_tex_unit_map(struct wined3d_device *device) device_map_vsamplers(device, ps, gl_info); } -HRESULT CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) +void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->updateStateBlock->state.pixel_shader; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (prev) + wined3d_shader_decref(prev); + device->updateStateBlock->state.pixel_shader = shader; device->updateStateBlock->changed.pixelShader = TRUE; if (device->isRecordingState) { - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } if (shader == prev) { TRACE("Application is setting the old shader over, nothing to do.\n"); - return WINED3D_OK; + return; } - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - device_invalidate_state(device, STATE_PIXELSHADER); - - return WINED3D_OK; } struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3a87b25..040fbfe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2209,7 +2209,7 @@ HRESULT __cdecl wined3d_device_set_light_enable(struct wined3d_device *device, U void __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material); void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device); HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments); -HRESULT __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_topology); HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device,

1 0

Józef Kucia : d3dx9: Implement conversion from D3DFORMAT to DDS pixel format for RGB pixel formats .
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 934293c1ecd3b4cd31043eae44c45792eb3731eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=934293c1ecd3b4cd31043eae4… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:40 2012 +0200 d3dx9: Implement conversion from D3DFORMAT to DDS pixel format for RGB pixel formats. --- dlls/d3dx9_36/surface.c | 71 +++++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 770a2e5..9f215c7 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -166,33 +166,34 @@ static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) return D3DFMT_UNKNOWN; } +static const struct { + DWORD bpp; + DWORD rmask; + DWORD gmask; + DWORD bmask; + DWORD amask; + D3DFORMAT format; +} rgb_pixel_formats[] = { + { 8, 0xe0, 0x1c, 0x03, 0, D3DFMT_R3G3B2 }, + { 16, 0xf800, 0x07e0, 0x001f, 0x0000, D3DFMT_R5G6B5 }, + { 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5 }, + { 16, 0x7c00, 0x03e0, 0x001f, 0x0000, D3DFMT_X1R5G5B5 }, + { 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4 }, + { 16, 0x0f00, 0x00f0, 0x000f, 0x0000, D3DFMT_X4R4G4B4 }, + { 16, 0x00e0, 0x001c, 0x0003, 0xff00, D3DFMT_A8R3G3B2 }, + { 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000, D3DFMT_R8G8B8 }, + { 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8 }, + { 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000, D3DFMT_X8R8G8B8 }, + { 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10 }, + { 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10 }, + { 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000, D3DFMT_G16R16 }, + { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8 }, + { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, +}; + static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format) { int i; - static const struct { - DWORD bpp; - DWORD rmask; - DWORD gmask; - DWORD bmask; - DWORD amask; - D3DFORMAT format; - } rgb_pixel_formats[] = { - { 8, 0xe0, 0x1c, 0x03, 0, D3DFMT_R3G3B2 }, - { 16, 0xf800, 0x07e0, 0x001f, 0x0000, D3DFMT_R5G6B5 }, - { 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5 }, - { 16, 0x7c00, 0x03e0, 0x001f, 0x0000, D3DFMT_X1R5G5B5 }, - { 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4 }, - { 16, 0x0f00, 0x00f0, 0x000f, 0x0000, D3DFMT_X4R4G4B4 }, - { 16, 0x00e0, 0x001c, 0x0003, 0xff00, D3DFMT_A8R3G3B2 }, - { 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000, D3DFMT_R8G8B8 }, - { 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8 }, - { 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000, D3DFMT_X8R8G8B8 }, - { 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10 }, - { 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10 }, - { 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000, D3DFMT_G16R16 }, - { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8 }, - { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, - }; for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) { @@ -277,19 +278,25 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_format, D3DFORMAT d3dformat) { + int i; + memset(pixel_format, 0, sizeof(*pixel_format)); pixel_format->size = sizeof(*pixel_format); - if (d3dformat == D3DFMT_R8G8B8) + for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) { - pixel_format->flags = DDS_PF_RGB; - pixel_format->bpp = 24; - pixel_format->rmask = 0xff0000; - pixel_format->gmask = 0x00ff00; - pixel_format->bmask = 0x0000ff; - pixel_format->amask = 0x000000; - return D3D_OK; + if (rgb_pixel_formats[i].format == d3dformat) + { + pixel_format->flags |= DDS_PF_RGB; + pixel_format->bpp = rgb_pixel_formats[i].bpp; + pixel_format->rmask = rgb_pixel_formats[i].rmask; + pixel_format->gmask = rgb_pixel_formats[i].gmask; + pixel_format->bmask = rgb_pixel_formats[i].bmask; + pixel_format->amask = rgb_pixel_formats[i].amask; + if (pixel_format->amask) pixel_format->flags |= DDS_PF_ALPHA; + return D3D_OK; + } } WARN("Unknown pixel format %#x\n", d3dformat);

1 0

Adrian Bunk : server: Use waitpid() instead of wait4().
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 9d5c178b241e12c601ad4d986e658792932f343a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5c178b241e12c601ad4d986… Author: Adrian Bunk <bunk(a)stusta.de> Date: Mon Sep 24 16:20:09 2012 +0300 server: Use waitpid() instead of wait4(). --- configure | 4 +--- configure.ac | 4 +--- include/config.h.in | 6 ------ server/ptrace.c | 22 +++++++++++----------- server/request.c | 2 +- tools/winapi/nativeapi.dat | 1 - 6 files changed, 14 insertions(+), 25 deletions(-) diff --git a/configure b/configure index 21044af..911f387 100755 --- a/configure +++ b/configure @@ -12994,9 +12994,7 @@ for ac_func in \ thr_kill2 \ timegm \ usleep \ - vsnprintf \ - wait4 \ - waitpid \ + vsnprintf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 84b5de8..79b1175 100644 --- a/configure.ac +++ b/configure.ac @@ -2046,9 +2046,7 @@ AC_CHECK_FUNCS(\ thr_kill2 \ timegm \ usleep \ - vsnprintf \ - wait4 \ - waitpid \ + vsnprintf ) CFLAGS="$ac_save_CFLAGS" diff --git a/include/config.h.in b/include/config.h.in index a00fc1c..c1f29bc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1076,12 +1076,6 @@ /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF -/* Define to 1 if you have the `wait4' function. */ -#undef HAVE_WAIT4 - -/* Define to 1 if you have the `waitpid' function. */ -#undef HAVE_WAITPID - /* Define to 1 if you have the <X11/extensions/shape.h> header file. */ #undef HAVE_X11_EXTENSIONS_SHAPE_H diff --git a/server/ptrace.c b/server/ptrace.c index 912f90e..efcdec0 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -98,7 +98,7 @@ static inline int ptrace(int req, ...) { errno = EPERM; return -1; /*FAIL*/ } #endif /* HAVE_SYS_PTRACE_H */ -/* handle a status returned by wait4 */ +/* handle a status returned by waitpid */ static int handle_child_status( struct thread *thread, int pid, int status, int want_sig ) { if (WIFSTOPPED(status)) @@ -130,20 +130,20 @@ static int handle_child_status( struct thread *thread, int pid, int status, int return 0; } -/* wait4 wrapper to handle missing __WALL flag in older kernels */ -static inline pid_t wait4_wrapper( pid_t pid, int *status, int options, struct rusage *usage ) +/* waitpid wrapper to handle missing __WALL flag in older kernels */ +static inline pid_t waitpid_wrapper( pid_t pid, int *status, int options ) { #ifdef __WALL static int wall_flag = __WALL; for (;;) { - pid_t ret = wait4( pid, status, options | wall_flag, usage ); + pid_t ret = waitpid( pid, status, options | wall_flag ); if (ret != -1 || !wall_flag || errno != EINVAL) return ret; wall_flag = 0; } #else - return wait4( pid, status, options, usage ); + return waitpid( pid, status, options ); #endif } @@ -154,7 +154,7 @@ void sigchld_callback(void) for (;;) { - if (!(pid = wait4_wrapper( -1, &status, WUNTRACED | WNOHANG, NULL ))) break; + if (!(pid = waitpid_wrapper( -1, &status, WUNTRACED | WNOHANG ))) break; if (pid != -1) { struct thread *thread = get_thread_from_tid( pid ); @@ -182,26 +182,26 @@ static int get_ptrace_tid( struct thread *thread ) } /* wait for a ptraced child to get a certain signal */ -static int wait4_thread( struct thread *thread, int signal ) +static int waitpid_thread( struct thread *thread, int signal ) { int res, status; start_watchdog(); for (;;) { - if ((res = wait4_wrapper( get_ptrace_pid(thread), &status, WUNTRACED, NULL )) == -1) + if ((res = waitpid_wrapper( get_ptrace_pid(thread), &status, WUNTRACED )) == -1) { if (errno == EINTR) { if (!watchdog_triggered()) continue; - if (debug_level) fprintf( stderr, "%04x: *watchdog* wait4 aborted\n", thread->id ); + if (debug_level) fprintf( stderr, "%04x: *watchdog* waitpid aborted\n", thread->id ); } else if (errno == ECHILD) /* must have died */ { thread->unix_pid = -1; thread->unix_tid = -1; } - else perror( "wait4" ); + else perror( "waitpid" ); stop_watchdog(); return 0; } @@ -292,7 +292,7 @@ static int suspend_for_ptrace( struct thread *thread ) if (errno == ESRCH) thread->unix_pid = thread->unix_tid = -1; /* thread got killed */ goto error; } - if (wait4_thread( thread, SIGSTOP )) return 1; + if (waitpid_thread( thread, SIGSTOP )) return 1; resume_after_ptrace( thread ); error: set_error( STATUS_ACCESS_DENIED ); diff --git a/server/request.c b/server/request.c index 05c7464..8d6a7f9 100644 --- a/server/request.c +++ b/server/request.c @@ -801,7 +801,7 @@ void open_master_socket(void) if (read( sync_pipe[0], &dummy, 1 ) == 1) _exit(0); /* child terminated, propagate exit status */ - wait4( pid, &status, 0, NULL ); + waitpid( pid, &status, 0 ); if (WIFEXITED(status)) _exit( WEXITSTATUS(status) ); _exit(1); } diff --git a/tools/winapi/nativeapi.dat b/tools/winapi/nativeapi.dat index bc25152..ade20b5 100644 --- a/tools/winapi/nativeapi.dat +++ b/tools/winapi/nativeapi.dat @@ -251,7 +251,6 @@ utime vfprintf vsnprintf vsprintf -wait4 write y0 y1

1 0