June 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : widl: Generate thunks for callas functions using interpreted stubs.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: 01b44d1317b4cc086e53aa020e9b5815dd999c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b44d1317b4cc086e53aa020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 12:00:50 2011 +0200 widl: Generate thunks for callas functions using interpreted stubs. --- tools/widl/proxy.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/typegen.c | 51 ++++++++++++++++++++++-------------- tools/widl/typegen.h | 1 + 3 files changed, 99 insertions(+), 21 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 616b326..27c54aa 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -513,6 +513,31 @@ static void gen_stub(type_t *iface, const var_t *func, const char *cas, print_proxy("\n"); } +static void gen_stub_thunk( type_t *iface, const var_t *func, unsigned int proc_offset ) +{ + int has_ret = !is_void( type_function_get_rettype( func->type )); + const var_t *arg, *callas = is_callas( func->attrs ); + const var_list_t *args = type_get_function_args( func->type ); + + indent = 0; + print_proxy( "void __RPC_API %s_%s_Thunk( PMIDL_STUB_MESSAGE pStubMsg )\n", + iface->name, get_name(func) ); + print_proxy( "{\n"); + indent++; + write_func_param_struct( proxy, iface, func->type, "pParamStruct" ); + print_proxy( "%s%s_%s_Stub( pParamStruct->This", + has_ret ? "pParamStruct->_RetVal = " : "", iface->name, callas->name ); + indent++; + if (args) LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + { + fprintf( proxy, ",\n%*spParamStruct->%s", 4 * indent, "", arg->name ); + } + fprintf( proxy, " );\n" ); + indent--; + indent--; + print_proxy( "}\n\n"); +} + int count_methods(const type_t *iface) { const statement_t *stmt; @@ -594,11 +619,33 @@ static int write_stub_methods(type_t *iface, int skip) return i; } +static void write_thunk_methods( type_t *iface ) +{ + const statement_t *stmt; + int i = 0; + + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + { + var_t *func = stmt->u.var; + const var_t *cas = is_callas(func->attrs); + + if (is_local( func->attrs )) continue; + if (i) fprintf(proxy, ",\n"); + if (cas && is_interpreted_func( iface, func )) + print_proxy( "%s_%s_Thunk", iface->name, func->name ); + else + print_proxy( "0" ); + i++; + } + fputc( '\n', proxy ); +} + static void write_proxy(type_t *iface, unsigned int *proc_offset) { int count; const statement_t *stmt; int first_func = 1; + int needs_stub_thunks = 0; int needs_inline_stubs = need_inline_stubs( iface ); STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { @@ -627,6 +674,11 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) func->procstring_offset = *proc_offset; gen_proxy(iface, func, idx, *proc_offset); gen_stub(iface, func, cname, *proc_offset); + if (cas && is_interpreted_func( iface, func )) + { + needs_stub_thunks = 1; + gen_stub_thunk(iface, func, *proc_offset); + } *proc_offset += get_size_procformatstring_func( iface, func ); } } @@ -654,6 +706,17 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) indent--; print_proxy( "};\n\n"); + /* stub thunk table */ + if (needs_stub_thunks) + { + print_proxy( "static const STUB_THUNK %s_StubThunkTable[] =\n", iface->name); + print_proxy( "{\n"); + indent++; + write_thunk_methods( iface ); + indent--; + print_proxy( "};\n\n"); + } + /* server info */ print_proxy( "static const MIDL_SERVER_INFO %s_ServerInfo =\n", iface->name ); print_proxy( "{\n" ); @@ -662,7 +725,10 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "0,\n" ); print_proxy( "__MIDL_ProcFormatString.Format,\n" ); print_proxy( "&%s_FormatStringOffsetTable[-3],\n", iface->name ); - print_proxy( "0,\n" ); + if (needs_stub_thunks) + print_proxy( "&%s_StubThunkTable[-3],\n", iface->name ); + else + print_proxy( "0,\n" ); print_proxy( "0,\n" ); print_proxy( "0,\n" ); print_proxy( "0\n" ); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 87242d1..7620653 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4632,6 +4632,36 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char } +void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, const char *var_name ) +{ + const var_list_t *args = type_get_function_args( func ); + const var_t *arg; + + print_file(file, 1, "struct _PARAM_STRUCT\n" ); + print_file(file, 1, "{\n" ); + if (is_object( iface )) print_file(file, 2, "%s *This;\n", iface->name ); + + if (args) LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + { + print_file(file, 2, "%s", ""); + write_type_left( file, (type_t *)arg->type, TRUE ); + if (needs_space_after( arg->type )) fputc( ' ', file ); + if (is_array( arg->type ) && !type_array_is_decl_as_ptr( arg->type )) fputc( '*', file ); + /* FIXME: should check for large args being passed by pointer */ + if (is_array( arg->type ) || is_ptr( arg->type ) || type_memsize( arg->type ) == pointer_size) + fprintf( file, "%s;\n", arg->name ); + else + fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); + } + if (!is_void( type_function_get_rettype( func ))) + { + print_file(file, 2, "%s", ""); + write_type_decl( file, type_function_get_rettype( func ), "_RetVal" ); + fprintf( file, ";\n" ); + } + print_file(file, 1, "} *%s = (struct _PARAM_STRUCT *)pStubMsg->StackTop;\n\n", var_name ); +} + int write_expr_eval_routines(FILE *file, const char *iface) { static const char *var_name = "pS"; @@ -4650,26 +4680,7 @@ int write_expr_eval_routines(FILE *file, const char *iface) print_file(file, 0, "{\n"); if (type_get_type( eval->cont_type ) == TYPE_FUNCTION) { - const var_list_t *args = type_get_function_args( eval->cont_type ); - const var_t *arg; - - print_file(file, 1, "struct _PARAM_STRUCT\n" ); - print_file(file, 1, "{\n" ); - if (is_object( eval->iface )) print_file(file, 2, "%s *This;\n", eval->iface->name ); - - if (args) LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - { - print_file(file, 2, "%s", ""); - write_type_left( file, (type_t *)arg->type, TRUE ); - if (needs_space_after( arg->type )) fputc( ' ', file ); - if (is_array( arg->type ) && !type_array_is_decl_as_ptr( arg->type )) fputc( '*', file ); - /* FIXME: should check for large args being passed by pointer */ - if (is_array( arg->type ) || is_ptr( arg->type ) || type_memsize( arg->type ) == pointer_size) - fprintf( file, "%s;\n", arg->name ); - else - fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); - } - print_file(file, 1, "} *pS = (struct _PARAM_STRUCT *)pStubMsg->StackTop;\n" ); + write_func_param_struct( file, eval->iface, eval->cont_type, "pS" ); } else { diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 5920fb1..7f3aed1 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -75,6 +75,7 @@ unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_ unsigned int get_size_typeformatstring(const statement_list_t *stmts, type_pred_t pred); void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char *local_var_prefix ); void declare_stub_args( FILE *file, int indent, const var_t *func ); +void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, const char *var_name ); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface); void write_user_quad_list(FILE *file);

1 0

Alexandre Julliard : widl: Add support for generating new-style interpreted stubs for proxies.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: 609602cb38c089a27b4edd0775d153f3e2138601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=609602cb38c089a27b4edd077… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 13:00:51 2011 +0200 widl: Add support for generating new-style interpreted stubs for proxies. --- tools/widl/proxy.c | 59 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 13 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 27c54aa..e889423 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -73,7 +73,7 @@ static void write_stubdesc(int expr_eval_routines) print_proxy( "{0}, 0, 0, %s, 0,\n", expr_eval_routines ? "ExprEvalRoutines" : "0"); print_proxy( "__MIDL_TypeFormatString.Format,\n"); print_proxy( "1, /* -error bounds_check flag */\n"); - print_proxy( "0x10001, /* Ndr library version */\n"); + print_proxy( "0x%x, /* Ndr library version */\n", stub_mode == MODE_Oif ? 0x50002 : 0x10001); print_proxy( "0,\n"); print_proxy( "0x50100a4, /* MIDL Version 5.1.164 */\n"); print_proxy( "0,\n"); @@ -100,6 +100,7 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "#endif /* __REDQ_RPCPROXY_H_VERSION__ */\n"); print_proxy( "\n"); print_proxy( "#define __midl_proxy\n"); + if (stub_mode == MODE_Oif) print_proxy( "#define USE_STUBLESS_PROXY\n"); print_proxy( "#include \"objbase.h\"\n"); print_proxy( "#include \"rpcproxy.h\"\n"); print_proxy( "#ifndef __RPCPROXY_H_VERSION__\n"); @@ -271,6 +272,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, indent = 0; if (is_interpreted_func( iface, func )) { + if (stub_mode == MODE_Oif && !is_callas( func->attrs )) return; write_type_decl_left(proxy, type_function_get_rettype(func->type)); print_proxy( " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); write_args(proxy, args, iface->name, 1, TRUE); @@ -278,8 +280,10 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( "{\n"); indent++; if (has_ret) print_proxy( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_proxy( "%sNdrClientCall( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", - has_ret ? "_RetVal = " : "", proc_offset ); + print_proxy( "%s%s( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + has_ret ? "_RetVal = " : "", + stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", + proc_offset ); fprintf( proxy, "(unsigned char *)&This );\n" ); if (has_ret) { @@ -575,12 +579,24 @@ static int write_proxy_methods(type_t *iface, int skip) STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { - if (i != func->type->details.function->idx ) - error("widl internal error: method index mismatch\n"); - if (i) fprintf(proxy, ",\n"); - if (skip || (is_local(func->attrs) && !get_callas_source(iface, func))) - print_proxy( "0 /* %s_%s_Proxy */", iface->name, get_name(func)); - else print_proxy( "%s_%s_Proxy", iface->name, get_name(func)); + int missing = 0; + const char * fname = get_name(func); + if (is_local(func->attrs)) { + const statement_t * callas_source = get_callas_source(iface, func); + if(!callas_source) + missing = 1; + else + fname = get_name(callas_source->u.var); + } + if (skip || missing) print_proxy( "0, /* %s::%s */\n", iface->name, get_name(func)); + else if (is_interpreted_func( iface, func )) + { + if (!is_local( func->attrs ) && type_iface_get_inherit(iface)) + print_proxy( "(void *)-1, /* %s::%s */\n", iface->name, get_name(func)); + else + print_proxy( "%s_%s_Proxy,\n", iface->name, fname); + } + else print_proxy( "%s_%s_Proxy,\n", iface->name, get_name(func)); i++; } } @@ -611,7 +627,8 @@ static int write_stub_methods(type_t *iface, int skip) } if (i) fprintf(proxy,",\n"); if (skip || missing) print_proxy("STUB_FORWARDING_FUNCTION"); - else if (is_interpreted_func( iface, func )) print_proxy( "(PRPC_STUB_FUNCTION)NdrStubCall" ); + else if (is_interpreted_func( iface, func )) + print_proxy( "(PRPC_STUB_FUNCTION)%s", stub_mode == MODE_Oif ? "NdrStubCall2" : "NdrStubCall" ); else print_proxy( "%s_%s_Stub", iface->name, fname); i++; } @@ -646,7 +663,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) const statement_t *stmt; int first_func = 1; int needs_stub_thunks = 0; - int needs_inline_stubs = need_inline_stubs( iface ); + int needs_inline_stubs = need_inline_stubs( iface ) || need_delegation( iface ); STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { var_t *func = stmt->u.var; @@ -687,6 +704,22 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) write_procformatstring_offsets( proxy, iface ); + /* proxy info */ + if (stub_mode == MODE_Oif) + { + print_proxy( "static const MIDL_STUBLESS_PROXY_INFO %s_ProxyInfo =\n", iface->name ); + print_proxy( "{\n" ); + indent++; + print_proxy( "&Object_StubDesc,\n" ); + print_proxy( "__MIDL_ProcFormatString.Format,\n" ); + print_proxy( "&%s_FormatStringOffsetTable[-3],\n", iface->name ); + print_proxy( "0,\n" ); + print_proxy( "0,\n" ); + print_proxy( "0\n" ); + indent--; + print_proxy( "};\n\n" ); + } + /* proxy vtable */ print_proxy( "static %sCINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", need_delegation_indirect(iface) ? "" : "const ", count, iface->name); @@ -694,13 +727,13 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) indent++; print_proxy( "{\n"); indent++; + if (stub_mode == MODE_Oif) print_proxy( "&%s_ProxyInfo,\n", iface->name ); print_proxy( "&IID_%s,\n", iface->name); indent--; print_proxy( "},\n"); print_proxy( "{\n"); indent++; write_proxy_methods(iface, FALSE); - fprintf(proxy, "\n"); indent--; print_proxy( "}\n"); indent--; @@ -999,7 +1032,7 @@ static void write_proxy_routines(const statement_list_t *stmts) else fprintf(proxy, " 0,\n"); fprintf(proxy, " _%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", count); - fprintf(proxy, " 1,\n"); + fprintf(proxy, " %d,\n", stub_mode == MODE_Oif ? 2 : 1); fprintf(proxy, " 0,\n"); fprintf(proxy, " 0,\n"); fprintf(proxy, " 0,\n");

1 0

Piotr Caban : comctl32: Improve LISTVIEW_MarqueeHighlight performance.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: a87e726d6b2a7ec4b86cb01a3267237fb366427b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a87e726d6b2a7ec4b86cb01a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 6 20:52:34 2011 +0200 comctl32: Improve LISTVIEW_MarqueeHighlight performance. --- dlls/comctl32/listview.c | 74 +++++++++++++++++++++++++++++++++------------- 1 files changed, 53 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 86c3f76..2f20f8e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1497,6 +1497,37 @@ static BOOL iterator_visibleitems(ITERATOR *i, const LISTVIEW_INFO *infoPtr, HDC return TRUE; } +/* Remove common elements from two iterators */ +/* Passed iterators have to point on the first elements */ +static BOOL iterator_remove_common_items(ITERATOR *iter1, ITERATOR *iter2) +{ + iterator_next(iter1); + iterator_next(iter2); + + while(1) { + if(iter1->nItem==-1 || iter2->nItem==-1) + break; + + if(iter1->nItem == iter2->nItem) { + int delete = iter1->nItem; + + iterator_prev(iter1); + iterator_prev(iter2); + ranges_delitem(iter1->ranges, delete); + ranges_delitem(iter2->ranges, delete); + iterator_next(iter1); + iterator_next(iter2); + } else if(iter1->nItem > iter2->nItem) + iterator_next(iter2); + else + iterator_next(iter1); + } + + iter1->nItem = iter1->range.lower = iter1->range.upper = -1; + iter2->nItem = iter2->range.lower = iter2->range.upper = -1; + return TRUE; +} + /******** Misc helper functions ************************************/ static inline LRESULT CallWindowProcT(WNDPROC proc, HWND hwnd, UINT uMsg, @@ -3733,7 +3764,7 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord { BOOL controlDown = FALSE; LVITEMW item; - ITERATOR i; + ITERATOR old_elems, new_elems; RECT rect; if (coords_offs->x > infoPtr->marqueeOrigin.x) @@ -3776,54 +3807,55 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord if ((scroll & SCROLL_DOWN) && (coords_orig->y >= infoPtr->rcList.bottom)) LISTVIEW_Scroll(infoPtr, 0, (coords_orig->y - infoPtr->rcList.bottom)); - /* Invert the items in the old marquee rectangle */ - iterator_frameditems_absolute(&i, infoPtr, &infoPtr->marqueeRect); + iterator_frameditems_absolute(&old_elems, infoPtr, &infoPtr->marqueeRect); + + CopyRect(&infoPtr->marqueeRect, &rect); - while (iterator_next(&i)) + CopyRect(&infoPtr->marqueeDrawRect, &rect); + OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); + + iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); + iterator_remove_common_items(&old_elems, &new_elems); + + /* Iterate over no longer selected items */ + while (iterator_next(&old_elems)) { - if (i.nItem > -1) + if (old_elems.nItem > -1) { - if (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED) == LVIS_SELECTED) + if (LISTVIEW_GetItemState(infoPtr, old_elems.nItem, LVIS_SELECTED) == LVIS_SELECTED) item.state = 0; else item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + LISTVIEW_SetItemState(infoPtr, old_elems.nItem, &item); } } + iterator_destroy(&old_elems); - iterator_destroy(&i); - - CopyRect(&infoPtr->marqueeRect, &rect); - - CopyRect(&infoPtr->marqueeDrawRect, &rect); - OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); - - /* Iterate over the items within our marquee rectangle */ - iterator_frameditems_absolute(&i, infoPtr, &infoPtr->marqueeRect); + /* Iterate over newly selected items */ if (GetKeyState(VK_CONTROL) & 0x8000) controlDown = TRUE; - while (iterator_next(&i)) + while (iterator_next(&new_elems)) { - if (i.nItem > -1) + if (new_elems.nItem > -1) { /* If CTRL is pressed, invert. If not, always select the item. */ - if ((controlDown) && (LISTVIEW_GetItemState(infoPtr, i.nItem, LVIS_SELECTED))) + if ((controlDown) && (LISTVIEW_GetItemState(infoPtr, new_elems.nItem, LVIS_SELECTED))) item.state = 0; else item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); + LISTVIEW_SetItemState(infoPtr, new_elems.nItem, &item); } } + iterator_destroy(&new_elems); - iterator_destroy(&i); LISTVIEW_InvalidateRect(infoPtr, &rect); }

1 0

Piotr Caban : comctl32: Fix listview horizontal scrolling.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: b2cb04b4e6b9dc4901545ecb9ecae8f885cb7b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2cb04b4e6b9dc4901545ecb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 6 21:45:25 2011 +0200 comctl32: Fix listview horizontal scrolling. --- dlls/comctl32/listview.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2f20f8e..6c7e26e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9608,6 +9608,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, { INT nOldScrollPos, nNewScrollPos; SCROLLINFO scrollInfo; + BOOL is_an_icon; TRACE("(nScrollCode=%d(%s), nScrollDiff=%d)\n", nScrollCode, debugscrollcode(nScrollCode), nScrollDiff); @@ -9617,6 +9618,8 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, scrollInfo.cbSize = sizeof(SCROLLINFO); scrollInfo.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_TRACKPOS; + is_an_icon = ((infoPtr->uView == LV_VIEW_ICON) || (infoPtr->uView == LV_VIEW_SMALLICON)); + if (!GetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &scrollInfo)) return 1; nOldScrollPos = scrollInfo.nPos; @@ -9627,11 +9630,11 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, break; case SB_LINELEFT: - nScrollDiff = -1; + nScrollDiff = (is_an_icon) ? -LISTVIEW_SCROLL_ICON_LINE_SIZE : -1; break; case SB_LINERIGHT: - nScrollDiff = 1; + nScrollDiff = (is_an_icon) ? LISTVIEW_SCROLL_ICON_LINE_SIZE : 1; break; case SB_PAGELEFT:

1 0

Łukasz Wojniłowicz : loader: Add Polish translation.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 441f735f418f347ded3ba3f2cfa1643cc449fac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441f735f418f347ded3ba3f2c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jun 5 18:58:34 2011 +0200 loader: Add Polish translation. --- loader/Makefile.in | 8 +- loader/wine.pl.man.in | 327 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 333 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=441f735f418f347ded3ba…

1 0

Ričardas Barkauskas : ddraw: Separate IDirectDrawSurface4 vtable.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: bb063b994cd3ee05815994e88e339c84a1598847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb063b994cd3ee05815994e88… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 14:39:04 2011 +0300 ddraw: Separate IDirectDrawSurface4 vtable. --- dlls/ddraw/ddraw.c | 6 +- dlls/ddraw/ddraw_private.h | 6 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 505 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 511 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb063b994cd3ee0581599…

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface4.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 4582562f5504e4edf8bccaa9255924f69ddf7f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4582562f5504e4edf8bccaa92… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 14:08:23 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface4. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 7 +++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a8f5418..a265afd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4243,7 +4243,7 @@ static HRESULT WINAPI ddraw4_DuplicateSurface(IDirectDraw4 *iface, IDirectDrawSu IDirectDrawSurface4 **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); - IDirectDrawSurfaceImpl *src_impl = (IDirectDrawSurfaceImpl *)src; + IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface4(src); IDirectDrawSurface7 *dst7; IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; @@ -4879,7 +4879,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, IDirectDrawSurface4 *surface, IDirect3DDevice3 **device, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirect3D3(iface); - IDirectDrawSurfaceImpl *surface_impl = (IDirectDrawSurfaceImpl *)surface; + IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface4(surface); HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p, outer_unknown %p.\n", diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 3a8ba04..ff7e2ed 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -231,6 +231,7 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface7(IDirectDrawS } IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) DECLSPEC_HIDDEN; +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface) DECLSPEC_HIDDEN; /* Get the number of bytes per pixel for a given surface */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e0569e7..28477b0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1889,7 +1889,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetRenderTarget(IDirect3DDevice3 *if IDirectDrawSurface4 *NewRenderTarget, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirectDrawSurfaceImpl *Target = (IDirectDrawSurfaceImpl *)NewRenderTarget; + IDirectDrawSurfaceImpl *Target = unsafe_impl_from_IDirectDrawSurface4(NewRenderTarget); TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f5f5ceb..5e57518 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3465,6 +3465,13 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface7_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == (struct IDirectDrawSurface4Vtbl *)&ddraw_surface7_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface7_iface); +} + IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) { if (!iface) return NULL;

1 0

Ričardas Barkauskas : ddraw: Change lpVtbl to IDirectDrawSurface7_iface.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 2f02bbb41fce3ee3eb8fe89a8eac24927bd4f11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f02bbb41fce3ee3eb8fe89a8… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sun Jun 5 19:55:04 2011 +0300 ddraw: Change lpVtbl to IDirectDrawSurface7_iface. --- dlls/ddraw/ddraw.c | 36 +++++++----- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 66 +++++++++++---------- dlls/ddraw/surface.c | 140 ++++++++++++++++++++++---------------------- 4 files changed, 128 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f02bbb41fce3ee3eb8fe…

1 0

Ričardas Barkauskas : ddraw: Pass an object instead of iface to helper function CreateSurface.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 4123c7a38a119318620d669f9acd432ab9b3ae35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4123c7a38a119318620d669f9… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sat Jun 4 15:33:23 2011 +0300 ddraw: Pass an object instead of iface to helper function CreateSurface. --- dlls/ddraw/ddraw.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9c32723..8b39147 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3045,7 +3045,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur * *****************************************************************************/ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, - IDirectDrawSurface7 **Surf, IUnknown *UnkOuter) + IDirectDrawSurfaceImpl **Surf, IUnknown *UnkOuter) { IDirectDrawSurfaceImpl *object = NULL; HRESULT hr; @@ -3310,7 +3310,7 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, } object->is_complex_root = TRUE; - *Surf = (IDirectDrawSurface7 *)object; + *Surf = object; /* Create Additional surfaces if necessary * This applies to Primary surfaces which have a back buffer count @@ -3434,6 +3434,8 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * IDirectDrawSurface7 **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + IDirectDrawSurfaceImpl *impl; + HRESULT hr; TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); @@ -3456,7 +3458,16 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDCAPS; } - return CreateSurface(This, surface_desc, surface, outer_unknown); + hr = CreateSurface(This, surface_desc, &impl, outer_unknown); + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + + *surface = (IDirectDrawSurface7 *)impl; + + return hr; } static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, @@ -3487,16 +3498,19 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(This, surface_desc, (IDirectDrawSurface7 **)surface, outer_unknown); - impl = (IDirectDrawSurfaceImpl *)*surface; - if (SUCCEEDED(hr) && impl) + hr = CreateSurface(This, surface_desc, &impl, outer_unknown); + if (FAILED(hr)) { - ddraw_set_surface_version(impl, 4); - IDirectDraw7_Release(&This->IDirectDraw7_iface); - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + *surface = NULL; + return hr; } + *surface = (IDirectDrawSurface4 *)impl; + ddraw_set_surface_version(impl, 4); + IDirectDraw7_Release(&This->IDirectDraw7_iface); + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; + return hr; } @@ -3504,7 +3518,6 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s IDirectDrawSurface **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); - IDirectDrawSurface7 *surface7; IDirectDrawSurfaceImpl *impl; HRESULT hr; @@ -3529,14 +3542,13 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s return DDERR_INVALIDCAPS; } - hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &impl, outer_unknown); if (FAILED(hr)) { *surface = NULL; return hr; } - impl = (IDirectDrawSurfaceImpl *)surface7; *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 3); IDirectDraw7_Release(&This->IDirectDraw7_iface); @@ -3550,7 +3562,6 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, DDSURFACEDESC *surface_desc, IDirectDrawSurface **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); - IDirectDrawSurface7 *surface7; IDirectDrawSurfaceImpl *impl; HRESULT hr; @@ -3575,14 +3586,13 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &impl, outer_unknown); if (FAILED(hr)) { *surface = NULL; return hr; } - impl = (IDirectDrawSurfaceImpl *)surface7; *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 2); IDirectDraw7_Release(&This->IDirectDraw7_iface); @@ -3595,7 +3605,6 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSURFACEDESC *surface_desc, IDirectDrawSurface **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw(iface); - IDirectDrawSurface7 *surface7; IDirectDrawSurfaceImpl *impl; HRESULT hr; @@ -3611,14 +3620,13 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, /* Remove front buffer flag, this causes failure in v7, and its added to normal * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; - hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &impl, outer_unknown); if (FAILED(hr)) { *surface = NULL; return hr; } - impl = (IDirectDrawSurfaceImpl *)surface7; *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 1); IDirectDraw7_Release(&This->IDirectDraw7_iface);

1 0

Ričardas Barkauskas : ddraw: Separate conversion from IDirectDrawSurface7 iface to object and conversion to other iface .
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 705548a6ef1419a1379a026c6a80f735a2ecf5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=705548a6ef1419a1379a026c6… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 13:08:56 2011 +0300 ddraw: Separate conversion from IDirectDrawSurface7 iface to object and conversion to other iface. --- dlls/ddraw/ddraw.c | 52 ++++++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/device.c | 9 +++++-- dlls/ddraw/surface.c | 14 +++++++++--- 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8b39147..393f4ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2047,12 +2047,19 @@ static HRESULT WINAPI ddraw3_GetGDISurface(IDirectDraw3 *iface, IDirectDrawSurfa { IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + *surface = (IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -2061,12 +2068,19 @@ static HRESULT WINAPI ddraw2_GetGDISurface(IDirectDraw2 *iface, IDirectDrawSurfa { IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + *surface = (IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -2075,12 +2089,19 @@ static HRESULT WINAPI ddraw1_GetGDISurface(IDirectDraw *iface, IDirectDrawSurfac { IDirectDrawImpl *This = impl_from_IDirectDraw(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + *surface = (IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -2438,6 +2459,7 @@ static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, dc %p, surface %p.\n", iface, dc, surface); @@ -2445,7 +2467,14 @@ static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, if (!surface) return E_INVALIDARG; hr = ddraw7_GetSurfaceFromDC(&This->IDirectDraw7_iface, dc, &surface7); - *surface = surface7 ? (IDirectDrawSurface4 *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + /* Tests say this is true */ + *surface = (IDirectDrawSurface4 *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -3756,9 +3785,10 @@ struct surfacescallback_context static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *context) { + IDirectDrawSurfaceImpl *surface_impl = (IDirectDrawSurfaceImpl *)surface; struct surfacescallback_context *cbcontext = context; - return cbcontext->func((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_iface, + return cbcontext->func((IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface, (DDSURFACEDESC *)surface_desc, cbcontext->context); } @@ -4199,13 +4229,15 @@ static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, IDirectDrawSu IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); IDirectDrawSurface7 *dst7; + IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; + dst_impl = (IDirectDrawSurfaceImpl *)dst7; + *dst = (IDirectDrawSurface *)&dst_impl->IDirectDrawSurface3_iface; return hr; } @@ -4215,13 +4247,15 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); IDirectDrawSurface7 *dst7; + IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; + dst_impl = (IDirectDrawSurfaceImpl *)dst7; + *dst = (IDirectDrawSurface *)&dst_impl->IDirectDrawSurface3_iface; return hr; } @@ -4231,13 +4265,15 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur IDirectDrawImpl *This = impl_from_IDirectDraw(iface); IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); IDirectDrawSurface7 *dst7; + IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; + dst_impl = (IDirectDrawSurfaceImpl *)dst7; + *dst = (IDirectDrawSurface *)&dst_impl->IDirectDrawSurface3_iface; return hr; } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7b8f975..a2eefd0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1960,14 +1960,15 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *if IDirectDrawSurface **RenderTarget) { IDirect3DDeviceImpl *This = device_from_device2(iface); + IDirectDrawSurfaceImpl *RenderTargetImpl; HRESULT hr; TRACE("iface %p, target %p.\n", iface, RenderTarget); hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 **)RenderTarget); if(hr != D3D_OK) return hr; - *RenderTarget = *RenderTarget ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)*RenderTarget)->IDirectDrawSurface3_iface : NULL; + RenderTargetImpl = (IDirectDrawSurfaceImpl *)RenderTarget; + *RenderTarget = (IDirectDrawSurface *)&RenderTargetImpl->IDirectDrawSurface3_iface; return D3D_OK; } @@ -4483,12 +4484,14 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTexture(IDirect3DDevice3 *iface, { HRESULT ret; IDirectDrawSurface7 *ret_val; + IDirectDrawSurfaceImpl *ret_val_impl; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture2); ret = IDirect3DDevice7_GetTexture((IDirect3DDevice7 *)device_from_device3(iface), Stage, &ret_val); - *Texture2 = ret_val ? (IDirect3DTexture2 *)&((IDirectDrawSurfaceImpl *)ret_val)->IDirect3DTexture2_vtbl : NULL; + ret_val_impl = unsafe_impl_from_IDirectDrawSurface7(ret_val); + *Texture2 = ret_val_impl ? (IDirect3DTexture2 *)&ret_val_impl->IDirect3DTexture2_vtbl : NULL; TRACE("Returning texture %p.\n", *Texture2); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5874333..8b4cfa7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -553,6 +553,7 @@ static HRESULT WINAPI ddraw_surface3_GetAttachedSurface(IDirectDrawSurface3 *ifa { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); IDirectDrawSurface7 *attachment7; + IDirectDrawSurfaceImpl *attachment_impl; DDSCAPS2 caps2; HRESULT hr; @@ -565,9 +566,13 @@ static HRESULT WINAPI ddraw_surface3_GetAttachedSurface(IDirectDrawSurface3 *ifa hr = ddraw_surface7_GetAttachedSurface((IDirectDrawSurface7 *)This, &caps2, &attachment7); - if (FAILED(hr)) *attachment = NULL; - else *attachment = attachment7 ? - &((IDirectDrawSurfaceImpl *)attachment7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *attachment = NULL; + return hr; + } + attachment_impl = (IDirectDrawSurfaceImpl *)attachment7; + *attachment = &attachment_impl->IDirectDrawSurface3_iface; return hr; } @@ -1559,9 +1564,10 @@ struct callback_info static HRESULT CALLBACK EnumCallback(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *context) { + IDirectDrawSurfaceImpl *surface_impl = (IDirectDrawSurfaceImpl *)surface; const struct callback_info *info = context; - return info->callback((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_iface, + return info->callback((IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface, (DDSURFACEDESC *)surface_desc, info->context); }

1 0