August 2012 - Wine-commits - list.winehq.org

Piotr Caban : msvcp90: Reset width value in basic_istream class on error.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: e5d7d65791cb6e8b45e238782b12d897f7317ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d65791cb6e8b45e238782… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:18 2012 +0200 msvcp90: Reset width value in basic_istream class on error. --- dlls/msvcp90/ios.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 43fb46f..78dbd67 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8123,11 +8123,10 @@ basic_istream_char* __cdecl basic_istream_char_read_bstr( state = IOSTATE_goodbit; MSVCP_basic_string_char_append_ch(str, c); } - - ios_base_width_set(&base->base, 0); } basic_istream_char_sentry_destroy(istream); + ios_base_width_set(&base->base, 0); basic_ios_char_setstate(base, state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -8156,12 +8155,11 @@ basic_istream_char* __cdecl basic_istream_char_read_str(basic_istream_char *istr state = IOSTATE_goodbit; *str++ = c; } - - *str = 0; - ios_base_width_set(&base->base, 0); } basic_istream_char_sentry_destroy(istream); + *str = 0; + ios_base_width_set(&base->base, 0); basic_ios_char_setstate(base, state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -9550,11 +9548,10 @@ static basic_istream_wchar* basic_istream_read_bstr(basic_istream_wchar *istream state = IOSTATE_goodbit; MSVCP_basic_string_wchar_append_ch(str, c); } - - ios_base_width_set(&base->base, 0); } basic_istream_wchar_sentry_destroy(istream); + ios_base_width_set(&base->base, 0); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -9594,12 +9591,11 @@ basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_ state = IOSTATE_goodbit; *str++ = c; } - - *str = 0; - ios_base_width_set(&base->base, 0); } basic_istream_wchar_sentry_destroy(istream); + *str = 0; + ios_base_width_set(&base->base, 0); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; }

1 0

Piotr Caban : msvcp90: Added strstreambuf seekpos and seekoff implementation.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 0ef93eb0e5defae95b0fe9fddb2acdf17e190dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef93eb0e5defae95b0fe9fdd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:28 2012 +0200 msvcp90: Added strstreambuf seekpos and seekoff implementation. --- dlls/msvcp90/ios.c | 59 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcp90/msvcp90.h | 6 ++-- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 78dbd67..6491278 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -12714,8 +12714,53 @@ int __thiscall strstreambuf_pbackfail(strstreambuf *this, int c) DEFINE_THISCALL_WRAPPER(strstreambuf_seekoff, 20) fpos_int* __thiscall strstreambuf_seekoff(strstreambuf *this, fpos_int *ret, streamoff off, int way, int mode) { - FIXME("(%p %p %ld %d %d) stub\n", this, ret, off, way, mode); - return NULL; + char *eback = basic_streambuf_char_eback(&this->base); + char *pptr = basic_streambuf_char_pptr(&this->base); + char *gptr = basic_streambuf_char_gptr(&this->base); + + TRACE("(%p %p %ld %d %d)\n", this, ret, off, way, mode); + + ret->off = 0; + ret->state = 0; + + if(pptr > this->seekhigh) + this->seekhigh = pptr; + + if((mode & OPENMODE_in) && gptr) { + if(way==SEEKDIR_cur && !(mode & OPENMODE_out)) + off += gptr-eback; + else if(way == SEEKDIR_end) + off += this->seekhigh-eback; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-eback) { + off = -1; + }else { + basic_streambuf_char_gbump(&this->base, eback-gptr+off); + if((mode & OPENMODE_out) && pptr) { + basic_streambuf_char_setp_next(&this->base, eback, + gptr, basic_streambuf_char_epptr(&this->base)); + } + } + }else if((mode & OPENMODE_out) && pptr) { + if(way == SEEKDIR_cur) + off += pptr-eback; + else if(way == SEEKDIR_end) + off += this->seekhigh-eback; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-eback) + off = -1; + else + basic_streambuf_char_pbump(&this->base, eback-pptr+off); + }else { + off = -1; + } + + ret->pos = off; + return ret; } /* ?seekpos(a)strstreambuf@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z */ @@ -12723,8 +12768,14 @@ fpos_int* __thiscall strstreambuf_seekoff(strstreambuf *this, fpos_int *ret, str DEFINE_THISCALL_WRAPPER(strstreambuf_seekpos, 36) fpos_int* __thiscall strstreambuf_seekpos(strstreambuf *this, fpos_int *ret, fpos_int pos, int mode) { - FIXME("(%p %p %s %d) stub\n", this, ret, debugstr_fpos_int(&pos), mode); - return NULL; + TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode); + + if(pos.off==0 && pos.pos==-1 && pos.state==0) { + *ret = pos; + return ret; + } + + return strstreambuf_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); } /* ?underflow(a)strstreambuf@std@@MAEHXZ */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 9343d16..b91faac 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -246,9 +246,9 @@ typedef enum { } IOSB_openmode; typedef enum { - SEEKDIR_beg = 0x1, - SEEKDIR_cur = 0x2, - SEEKDIR_end = 0x3, + SEEKDIR_beg = 0x0, + SEEKDIR_cur = 0x1, + SEEKDIR_end = 0x2, SEEKDIR_mask = 0x3 } IOSB_seekdir;

1 0

Piotr Caban : msvcp90: Added missing -ret64 option.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: c5f2e6623dde9e536b9dba3552312975b624e009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f2e6623dde9e536b9dba355… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:41 2012 +0200 msvcp90: Added missing -ret64 option. --- dlls/msvcp90/msvcp90.spec | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3b41cbd..680830f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3240,8 +3240,8 @@ @ cdecl ?denorm_min@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_denorm_min -@ cdecl ?denorm_min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_denorm_min -@ cdecl ?denorm_min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_denorm_min +@ cdecl -ret64 ?denorm_min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_denorm_min +@ cdecl -ret64 ?denorm_min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_denorm_min @ thiscall -arch=win32 ?destroy@?$allocator(a)D@std@@QAEXPAD(a)Z(ptr ptr) MSVCP_allocator_char_destroy @@ -3754,8 +3754,8 @@ @ cdecl ?epsilon@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_epsilon @ cdecl ?epsilon@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_epsilon @ cdecl ?epsilon@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_epsilon -@ cdecl ?epsilon@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_epsilon -@ cdecl ?epsilon@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_epsilon +@ cdecl -ret64 ?epsilon@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_epsilon +@ cdecl -ret64 ?epsilon@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_epsilon @ cdecl ?epsilon@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_epsilon @ cdecl ?epsilon@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_epsilon @ cdecl -arch=win32 ?eq@?$char_traits(a)D@std@@SA_NABD0(a)Z(ptr ptr) MSVCP_char_traits_char_eq @@ -4294,8 +4294,8 @@ @ cdecl ?infinity@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_infinity @ cdecl ?infinity@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_infinity @ cdecl ?infinity@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_infinity -@ cdecl ?infinity@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_infinity -@ cdecl ?infinity@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_infinity +@ cdecl -ret64 ?infinity@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_infinity +@ cdecl -ret64 ?infinity@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_infinity @ cdecl ?infinity@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_infinity @ cdecl ?infinity@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_infinity @ thiscall -arch=win32 ?init@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAEXPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)_N@Z(ptr ptr long) basic_ios_char_init @@ -4495,8 +4495,8 @@ @ cdecl ?max@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_max @ cdecl ?max@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_max @ cdecl ?max@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_max -@ cdecl ?max@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_max -@ cdecl ?max@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max +@ cdecl -ret64 ?max@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_max +@ cdecl -ret64 ?max@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max @ cdecl ?max@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_max @ cdecl ?max@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_max @ extern ?max_exponent10@?$numeric_limits(a)M@std@@2HB std_numeric_limits_float_max_exponent10 @@ -4533,8 +4533,8 @@ @ cdecl ?min@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_min @ cdecl ?min@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_min @ cdecl ?min@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_min -@ cdecl ?min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_min -@ cdecl ?min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_min +@ cdecl -ret64 ?min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_min +@ cdecl -ret64 ?min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_min @ cdecl ?min@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_min @ cdecl ?min@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_min @ extern ?min_exponent10@?$numeric_limits(a)M@std@@2HB std_numeric_limits_float_min_exponent10 @@ -4994,8 +4994,8 @@ @ cdecl ?quiet_NaN@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_quiet_NaN -@ cdecl ?quiet_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_quiet_NaN -@ cdecl ?quiet_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_quiet_NaN +@ cdecl -ret64 ?quiet_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_quiet_NaN +@ cdecl -ret64 ?quiet_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_quiet_NaN @ extern ?radix(a)_Num_base@std@@2HB std_Num_base_radix @@ -5222,8 +5222,8 @@ @ cdecl ?round_error@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_round_error @ cdecl ?round_error@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_round_error @ cdecl ?round_error@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_round_error -@ cdecl ?round_error@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_round_error -@ cdecl ?round_error@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_round_error +@ cdecl -ret64 ?round_error@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_round_error +@ cdecl -ret64 ?round_error@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_round_error @ cdecl ?round_error@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_round_error @ cdecl ?round_error@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_round_error @ extern ?round_style(a)_Num_base@std@@2W4float_round_style(a)2@B std_Num_base_round_style @@ -5400,8 +5400,8 @@ @ cdecl ?signaling_NaN@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_signaling_NaN -@ cdecl ?signaling_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_signaling_NaN -@ cdecl ?signaling_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_signaling_NaN +@ cdecl -ret64 ?signaling_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_signaling_NaN +@ cdecl -ret64 ?signaling_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_signaling_NaN @ cdecl ?sin@?$_Ctraits(a)M@std@@SAMM(a)Z(float) std_Ctraits_float_sin

1 0

Michael Stefaniuc : winefile: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: f6cd3e874b6d975cf2fdc93edc90bc4ed9f48ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cd3e874b6d975cf2fdc93ed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 14 23:43:24 2012 +0200 winefile: Avoid a TRUE:FALSE conditional expression. --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 2537f62..366aa9c 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3675,7 +3675,7 @@ static BOOL is_directory(LPCWSTR target) if (target_attr == INVALID_FILE_ATTRIBUTES) return FALSE; - return target_attr&FILE_ATTRIBUTE_DIRECTORY? TRUE: FALSE; + return (target_attr & FILE_ATTRIBUTE_DIRECTORY) != 0; } static BOOL prompt_target(Pane* pane, LPWSTR source, LPWSTR target)

1 0

Michael Stefaniuc : widl: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 2c97f3fcb5ecc73db7b1ab601dac00f93eb8a60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c97f3fcb5ecc73db7b1ab601… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 14 23:56:28 2012 +0200 widl: Avoid FALSE:TRUE conditional expressions. --- tools/widl/server.c | 5 ++--- tools/widl/typegen.c | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 7f817b0..29b5bec 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -175,11 +175,10 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - int is_ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; + const char *ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? "*" : ""; print_server("("); write_type_decl_left(server, var->type); - fprintf(server, ")%sNDRSContextValue(__frame->%s)", - is_ch_ptr ? "" : "*", var->name); + fprintf(server, ")%sNDRSContextValue(__frame->%s)", ch_ptr, var->name); } else { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 516d8e7..280bd05 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4146,10 +4146,11 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - int is_ch_ptr = is_aliaschain_attr(type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; + const char *ch_ptr = is_aliaschain_attr(type, ATTR_CONTEXTHANDLE) ? "" : "*"; print_file(file, indent, "NdrClientContextMarshall(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); - print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s%s,\n", is_ch_ptr ? "*" : "", local_var_prefix, var->name); + print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s%s,\n", ch_ptr, local_var_prefix, + var->name); print_file(file, indent + 1, "%s);\n", in_attr && out_attr ? "1" : "0"); } else

1 0

Matteo Bruni : wined3d: Use GL_FRAMEBUFFER_SRGB when possible.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 152a09ce75b97b1139e358428cea2c371a8b6804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152a09ce75b97b1139e358428… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:23 2012 +0200 wined3d: Use GL_FRAMEBUFFER_SRGB when possible. --- dlls/wined3d/arb_program_shader.c | 15 +++++++++++++++ dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/shader.c | 13 +++++++++++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_gl.h | 7 +++++++ include/wine/wined3d.h | 1 + 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 744b6af..c8799df 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6495,6 +6495,20 @@ static void textransform(struct wined3d_context *context, const struct wined3d_s fragment_prog_arbfp(context, state, state_id); } +static void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_surface *rt = state->fb->render_targets[0]; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] + && rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); + else + gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); +} + static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, @@ -6624,6 +6638,7 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), { STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGSTART), { STATE_RENDER(WINED3D_RS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGEND), { STATE_RENDER(WINED3D_RS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), state_srgbwrite }, ARB_FRAMEBUFFER_SRGB }, {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGCOLOR), { STATE_RENDER(WINED3D_RS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGDENSITY), { STATE_RENDER(WINED3D_RS_FOGDENSITY), state_fogdensity }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e47b4e1..58397e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -100,6 +100,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, + {"GL_ARB_framebuffer_sRGB", ARB_FRAMEBUFFER_SRGB }, {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4 }, {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, @@ -2731,6 +2732,13 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float. */ gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; } + if (gl_info->supported[ARB_FRAMEBUFFER_SRGB] && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + { + /* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode + * for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode + * we never render to sRGB surfaces). */ + gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; + } ENTER_GL(); @@ -4608,6 +4616,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; if (gl_info->supported[EXT_DRAW_BUFFERS2]) caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS; + if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; caps->RasterCaps = WINED3DPRASTERCAPS_DITHER | WINED3DPRASTERCAPS_PAT | diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1abafbb..2244ccd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1901,14 +1901,23 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct ps_compile_args *args) { struct wined3d_device *device = shader->device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_texture *texture; UINT i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (state->render_states[WINED3D_RS_SRGBWRITEENABLE]) + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE]) { const struct wined3d_surface *rt = state->fb->render_targets[0]; - if (rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) args->srgb_correction = 1; + if (rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + { + static unsigned int warned = 0; + + args->srgb_correction = 1; + if (state->render_states[WINED3D_RS_ALPHABLENDENABLE] && !warned++) + WARN("Blending into a sRGB render target with no GL_ARB_framebuffer_sRGB " + "support, expect rendering artifacts.\n"); + } } if (shader->reg_maps.shader_version.major == 1 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0be3972..0dcb431 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3138,7 +3138,8 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s break; } } - if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] + && state->render_states[WINED3D_RS_SRGBWRITEENABLE] && rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) { settings->sRGB_write = 1; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b87bc63..128937a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -933,6 +933,7 @@ enum wined3d_gl_extension ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT, + ARB_FRAMEBUFFER_SRGB, ARB_GEOMETRY_SHADER4, ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, @@ -1255,6 +1256,12 @@ enum wined3d_gl_extension #define GL_TEXTURE_STENCIL_SIZE 0x88f1 #endif +/* GL_ARB_framebuffer_sRGB */ +#ifndef GL_ARB_framebuffer_sRGB +#define GL_ARB_framebuffer_sRGB 1 +#define GL_FRAMEBUFFER_SRGB 0x8db9 +#endif + /* GL_ARB_geometry_shader4 */ #ifndef GL_ARB_geometry_shader4 #define GL_ARB_geometry_shader4 1 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5208a79..4a11ff2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1015,6 +1015,7 @@ enum wined3d_display_rotation #define WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS 0x00040000 #define WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000 #define WINED3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000 +#define WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT 0x00200000 #define WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 #define WINED3DPS20_MIN_DYNAMICFLOWCONTROLDEPTH 0

1 0

Matteo Bruni : wined3d: Dump postblend color.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 0a37a86f356e84b14187165a5cf67042ae8a7d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a37a86f356e84b14187165a5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:24 2012 +0200 wined3d: Dump postblend color. --- dlls/wined3d/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0dcb431..92a8b48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1158,6 +1158,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined else { TRACE("Format supports post-pixelshader blending.\n"); + TRACE("Color output: %#x\n", color); format->flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; }

1 0

Matteo Bruni : wined3d: Fix pixel format masks.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 902049c054f6b4d59287efb209604459227e6c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=902049c054f6b4d59287efb20… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:25 2012 +0200 wined3d: Fix pixel format masks. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 6 +- dlls/wined3d/surface.c | 20 +++- dlls/wined3d/utils.c | 207 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 12 ++- 5 files changed, 127 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=902049c054f6b4d59287e…

1 0

Matteo Bruni : wined3d: Improve post-pixelshader blending test.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: a488e574497d674631b4036d4b179ce349ddb764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a488e574497d674631b4036d4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 15 00:38:26 2012 +0200 wined3d: Improve post-pixelshader blending test. --- dlls/wined3d/utils.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 03c5b59..4f8108f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1067,10 +1067,11 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined if (status == GL_FRAMEBUFFER_COMPLETE && ((format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) && format->id != WINED3DFMT_NULL && format->id != WINED3DFMT_P8_UINT - && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA) + && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA + && (format->red_size || format->alpha_size)) { GLuint rb, tex2; - DWORD readback[16 * 16], color; + DWORD readback[16 * 16], color, r_range, a_range; BYTE r, a; BOOL match = TRUE; @@ -1096,6 +1097,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } else { + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); gl_info->gl_ops.gl.p_glViewport(0, 0, 16, 16); gl_info->gl_ops.gl.p_glDisable(GL_LIGHTING); gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); @@ -1107,28 +1109,24 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined /* Draw a full-black quad */ gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); + gl_info->gl_ops.gl.p_glColor4f(0.0f, 0.0f, 0.0f, 1.0f); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); gl_info->gl_ops.gl.p_glVertex3f(1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, 1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0x00, 0x00, 0x00, 0xff); gl_info->gl_ops.gl.p_glVertex3f(1.0f, 1.0f, 0.0f); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glEnable(GL_BLEND); /* Draw a half-transparent red quad */ gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); + gl_info->gl_ops.gl.p_glColor4f(1.0f, 0.0f, 0.0f, 0.5f); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); gl_info->gl_ops.gl.p_glVertex3f(1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); gl_info->gl_ops.gl.p_glVertex3f(-1.0f, 1.0f, 0.0f); - gl_info->gl_ops.gl.p_glColor4ub(0xff, 0x00, 0x00, 0x80); gl_info->gl_ops.gl.p_glVertex3f(1.0f, 1.0f, 0.0f); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glDisable(GL_BLEND); gl_info->gl_ops.gl.p_glGenTextures(1, &tex2); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex2); @@ -1140,9 +1138,11 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined a = color >> 24; r = (color & 0x00ff0000) >> 16; - if (format->red_size && (r < 0x7b || r > 0x84)) + r_range = format->red_size < 8 ? 1 << (8 - format->red_size - 1) : 1; + a_range = format->alpha_size < 8 ? 1 << (8 - format->alpha_size - 1) : 1; + if (format->red_size && (r < 0x80 - r_range || r > 0x80 + r_range)) match = FALSE; - else if (format->alpha_size > 1 && (a < 0x9f || a > 0xdf)) + else if (format->alpha_size > 1 && (a < 0xbf - a_range || a > 0xbf + a_range)) match = FALSE; if (!match) {

1 0

Nikolay Sivov : quartz: Use proper method macros.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 17450f0be05fc331ed026d61f7ea9678a1e356c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17450f0be05fc331ed026d61f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 15 08:24:18 2012 +0400 quartz: Use proper method macros. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/filtergraph.c | 14 +++++++------- dlls/quartz/vmr9.c | 30 +++++++++++++++--------------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0b5463e..0a498b0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -656,7 +656,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) hr = IDirectSound_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); if (SUCCEEDED(hr)) { IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); - IUnknown_Release(buf); + IDirectSoundBuffer_Release(buf); } hr = S_OK; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 375ce04..e5a5d3c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -517,7 +517,7 @@ static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin } *ppPin = This->pOutputPin; - IUnknown_AddRef(*ppPin); + IPin_AddRef(*ppPin); return S_OK; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6b0085d..1cc1df9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -772,13 +772,13 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) { DWORD miscflags; IAMFilterMiscFlags *flags = NULL; - IUnknown_QueryInterface(This->ppFiltersInGraph[i], &IID_IAMFilterMiscFlags, (void**)&flags); + IBaseFilter_QueryInterface(This->ppFiltersInGraph[i], &IID_IAMFilterMiscFlags, (void**)&flags); if (!flags) continue; miscflags = IAMFilterMiscFlags_GetMiscFlags(flags); - IUnknown_Release(flags); + IAMFilterMiscFlags_Release(flags); if (miscflags == AM_FILTER_MISC_FLAGS_IS_RENDERER) - IUnknown_QueryInterface(This->ppFiltersInGraph[i], &IID_IReferenceClock, (void**)&pClock); + IBaseFilter_QueryInterface(This->ppFiltersInGraph[i], &IID_IReferenceClock, (void**)&pClock); if (pClock) break; } @@ -1039,7 +1039,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (FAILED(rc)) { TRACE("Filter rejected by IAMGraphBuilderCallback_SelectedFilter\n"); - IUnknown_Release(callback); + IAMGraphBuilderCallback_Release(callback); goto error; } } @@ -1055,7 +1055,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, { HRESULT rc; rc = IAMGraphBuilderCallback_CreatedFilter(callback, pfilter); - IUnknown_Release(callback); + IAMGraphBuilderCallback_Release(callback); if (FAILED(rc)) { IBaseFilter_Release(pfilter); @@ -2200,11 +2200,11 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, IBaseFilter* pfilter = This->ppFiltersInGraph[i]; IAMFilterMiscFlags *flags = NULL; ULONG filterflags; - IUnknown_QueryInterface(pfilter, &IID_IAMFilterMiscFlags, (void**)&flags); + IBaseFilter_QueryInterface(pfilter, &IID_IAMFilterMiscFlags, (void**)&flags); if (!flags) continue; filterflags = IAMFilterMiscFlags_GetMiscFlags(flags); - IUnknown_Release(flags); + IAMFilterMiscFlags_Release(flags); if (filterflags != AM_FILTER_MISC_FLAGS_IS_RENDERER) continue; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f197878..847b460 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -293,7 +293,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(BaseRenderer *iface, IMediaSample * pS info.szAspectRatio.cx = This->bmiheader.biWidth; info.szAspectRatio.cy = This->bmiheader.biHeight; - hr = IVMRSurfaceAllocator9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); + hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); if (FAILED(hr)) return hr; @@ -794,14 +794,14 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) CloseHandle(This->hD3d9); if (This->allocator) - IVMRSurfaceAllocator9_Release(This->allocator); + IVMRSurfaceAllocatorEx9_Release(This->allocator); if (This->presenter) IVMRImagePresenter9_Release(This->presenter); This->num_surfaces = 0; if (This->allocator_d3d9_dev) { - IUnknown_Release(This->allocator_d3d9_dev); + IDirect3DDevice9_Release(This->allocator_d3d9_dev); This->allocator_d3d9_dev = NULL; } @@ -1146,7 +1146,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface } if (This->allocator) - IVMRSurfaceAllocator9_Release(This->allocator); + IVMRSurfaceAllocatorEx9_Release(This->allocator); if (This->presenter) IVMRImagePresenter9_Release(This->presenter); @@ -1166,12 +1166,12 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface if (FAILED(hr)) { ERR("Unable to find Presenter interface\n"); - IVMRSurfaceAllocatorEx9_Release(This->presenter); + IVMRImagePresenter9_Release(This->presenter); This->allocator = NULL; This->presenter = NULL; } else - hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); + hr = IVMRSurfaceAllocatorEx9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; case VMR9Mode_Renderless: break; @@ -1449,15 +1449,15 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurf if (This->presenter) return VFW_E_WRONG_STATE; - if (FAILED(IUnknown_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) + if (FAILED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) return E_NOINTERFACE; - if (SUCCEEDED(IUnknown_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) + if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) This->allocator_is_ex = 1; else { This->allocator = (IVMRSurfaceAllocatorEx9 *)alloc; - IUnknown_AddRef(alloc); + IVMRSurfaceAllocator9_AddRef(alloc); This->allocator_is_ex = 0; } @@ -1694,7 +1694,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) int i; TRACE("Destroying\n"); CloseHandle(This->ack); - IUnknown_Release(This->d3d9_ptr); + IDirect3D9_Release(This->d3d9_ptr); TRACE("Number of surfaces: %u\n", This->num_surfaces); for (i = 0; i < This->num_surfaces; ++i) @@ -1702,7 +1702,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9 *surface = This->d3d9_surfaces[i]; TRACE("Releasing surface %p\n", surface); if (surface) - IUnknown_Release(surface); + IDirect3DSurface9_Release(surface); } CoTaskMemFree(This->d3d9_surfaces); @@ -1710,7 +1710,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) This->num_surfaces = 0; if (This->d3d9_vertex) { - IUnknown_Release(This->d3d9_vertex); + IDirect3DVertexBuffer9_Release(This->d3d9_vertex); This->d3d9_vertex = NULL; } CoTaskMemFree(This); @@ -2118,7 +2118,7 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPrese IDirect3DSurface9 *surface = This->d3d9_surfaces[i]; TRACE("Releasing surface %p\n", surface); if (surface) - IUnknown_Release(surface); + IDirect3DSurface9_Release(surface); } ZeroMemory(This->d3d9_surfaces, sizeof(IDirect3DSurface9 *) * This->num_surfaces); @@ -2215,7 +2215,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * return E_FAIL; } *surface = This->d3d9_surfaces[surfaceindex]; - IUnknown_AddRef(*surface); + IDirect3DSurface9_AddRef(*surface); return S_OK; } @@ -2283,7 +2283,7 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID if (hr == D3DERR_NOTAVAILABLE) { ERR("Format not supported\n"); - IUnknown_Release(This->d3d9_ptr); + IDirect3D9_Release(This->d3d9_ptr); CoTaskMemFree(This); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; }

1 0