wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Tony Wasserka : d3dx9: Add tests for ARGB pixel format conversion in D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 7f8e4e275db8070743b64c8856e85a5da6773a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8e4e275db8070743b64c885… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Oct 13 14:02:35 2009 +0200 d3dx9: Add tests for ARGB pixel format conversion in D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/tests/texture.c | 165 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 156 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f8e4e275db8070743b64…

1 0

Tony Wasserka : d3dx9: Implement converting and copying ARGB surface data in D3DXLoadSurfaceFromMemory .
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 56e86b3df1c83bdf015b937dbd15ad5fb033e39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e86b3df1c83bdf015b937db… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Oct 13 13:58:29 2009 +0200 d3dx9: Implement converting and copying ARGB surface data in D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/d3dx9_36_private.h | 16 +++++ dlls/d3dx9_36/surface.c | 118 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/util.c | 50 ++++++++++++++++ 3 files changed, 181 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56e86b3df1c83bdf015b9…

1 0

Alexandre Julliard : widl: Use write_pointer_description_offsets() to output no_repeat descriptors for consistency.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 942ec30a4d8e2880b351f2396562e4b3da4bebe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942ec30a4d8e2880b351f2396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 16 15:00:27 2009 +0200 widl: Use write_pointer_description_offsets() to output no_repeat descriptors for consistency. --- tools/widl/typegen.c | 133 +++++++++++++++++++------------------------------ 1 files changed, 52 insertions(+), 81 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b868651..bcf2bf5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1614,87 +1614,6 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) } } -static int write_no_repeat_pointer_descriptions( - FILE *file, const attr_list_t *attrs, type_t *type, - unsigned int *offset_in_memory, unsigned int *offset_in_buffer, - unsigned int *typestring_offset) -{ - int written = 0; - unsigned int align; - - if (is_ptr(type) || - (is_conformant_array(type) && type_array_is_decl_as_ptr(type))) - { - unsigned int memsize; - - print_file(file, 2, "0x%02x, /* FC_NO_REPEAT */\n", RPC_FC_NO_REPEAT); - print_file(file, 2, "0x%02x, /* FC_PAD */\n", RPC_FC_PAD); - - /* pointer instance */ - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); - *typestring_offset += 6; - - if (is_ptr(type)) - { - if (is_string_type(attrs, type)) - write_string_tfs(file, attrs, type, FALSE, NULL, typestring_offset); - else - write_pointer_tfs(file, attrs, type, FALSE, typestring_offset); - } - else - { - unsigned int offset = type->typestring_offset; - /* skip over the pointer that is written for strings, since a - * pointer has to be written in-place here */ - if (is_string_type(attrs, type)) - offset += 4; - write_nonsimple_pointer(file, attrs, type, FALSE, offset, typestring_offset); - } - - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - - return 1; - } - - if (is_non_complex_struct(type)) - { - const var_t *v; - LIST_FOR_EACH_ENTRY( v, type_struct_get_fields(type), const var_t, entry ) - { - if (offset_in_memory && offset_in_buffer) - { - unsigned int padding; - align = 0; - type_memsize(v->type, &align); - padding = ROUNDING(*offset_in_memory, align); - *offset_in_memory += padding; - *offset_in_buffer += padding; - } - written += write_no_repeat_pointer_descriptions( - file, v->attrs, v->type, - offset_in_memory, offset_in_buffer, typestring_offset); - } - } - else - { - unsigned int memsize; - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - } - - return written; -} - static int write_pointer_description_offsets( FILE *file, const attr_list_t *attrs, type_t *type, unsigned int *offset_in_memory, unsigned int *offset_in_buffer, @@ -1793,6 +1712,58 @@ static int write_pointer_description_offsets( return written; } +static int write_no_repeat_pointer_descriptions( + FILE *file, const attr_list_t *attrs, type_t *type, + unsigned int *offset_in_memory, unsigned int *offset_in_buffer, + unsigned int *typestring_offset) +{ + int written = 0; + unsigned int align; + + if (is_ptr(type) || + (is_conformant_array(type) && type_array_is_decl_as_ptr(type))) + { + print_file(file, 2, "0x%02x, /* FC_NO_REPEAT */\n", RPC_FC_NO_REPEAT); + print_file(file, 2, "0x%02x, /* FC_PAD */\n", RPC_FC_PAD); + *typestring_offset += 2; + + return write_pointer_description_offsets(file, attrs, type, + offset_in_memory, offset_in_buffer, typestring_offset); + } + + if (is_non_complex_struct(type)) + { + const var_t *v; + LIST_FOR_EACH_ENTRY( v, type_struct_get_fields(type), const var_t, entry ) + { + if (offset_in_memory && offset_in_buffer) + { + unsigned int padding; + align = 0; + type_memsize(v->type, &align); + padding = ROUNDING(*offset_in_memory, align); + *offset_in_memory += padding; + *offset_in_buffer += padding; + } + written += write_no_repeat_pointer_descriptions( + file, v->attrs, v->type, + offset_in_memory, offset_in_buffer, typestring_offset); + } + } + else + { + unsigned int memsize; + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } + + return written; +} + /* Note: if file is NULL return value is number of pointers to write, else * it is the number of type format characters written */ static int write_fixed_array_pointer_descriptions(

1 0

Alexandre Julliard : widl: Output a pointer description for arrays declared as pointers.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 916461d92632019c041d661f63729a4595320aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=916461d92632019c041d661f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 16 14:59:01 2009 +0200 widl: Output a pointer description for arrays declared as pointers. --- tools/widl/typegen.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e7e8980..b868651 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -529,8 +529,7 @@ static int type_has_pointers(const type_t *type) case TGT_POINTER: return TRUE; case TGT_ARRAY: - /* FIXME: array can be pointer */ - return type_has_pointers(type_array_get_element(type)); + return type_array_is_decl_as_ptr(type) || type_has_pointers(type_array_get_element(type)); case TGT_STRUCT: { var_list_t *fields = type_struct_get_fields(type); @@ -1704,10 +1703,9 @@ static int write_pointer_description_offsets( int written = 0; unsigned int align; - if (is_ptr(type) && type_get_type(type_pointer_get_ref(type)) != TYPE_INTERFACE) + if ((is_ptr(type) && type_get_type(type_pointer_get_ref(type)) != TYPE_INTERFACE) || + (is_array(type) && type_array_is_decl_as_ptr(type))) { - type_t *ref = type_pointer_get_ref(type); - if (offset_in_memory && offset_in_buffer) { unsigned int memsize; @@ -1726,12 +1724,28 @@ static int write_pointer_description_offsets( } *typestring_offset += 4; - if (is_string_type(attrs, type)) - write_string_tfs(file, attrs, type, FALSE, NULL, typestring_offset); - else if (processed(ref) || type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM) - write_pointer_tfs(file, attrs, type, FALSE, typestring_offset); + if (is_ptr(type)) + { + type_t *ref = type_pointer_get_ref(type); + + if (is_string_type(attrs, type)) + write_string_tfs(file, attrs, type, FALSE, NULL, typestring_offset); + else if (processed(ref)) + write_nonsimple_pointer(file, attrs, type, FALSE, ref->typestring_offset, typestring_offset); + else if (type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM) + *typestring_offset += write_simple_pointer(file, attrs, type, FALSE); + else + error("write_pointer_description_offsets: type format string unknown\n"); + } else - error("write_pointer_description_offsets: type format string unknown\n"); + { + unsigned int offset = type->typestring_offset; + /* skip over the pointer that is written for strings, since a + * pointer has to be written in-place here */ + if (is_string_type(attrs, type)) + offset += 4; + write_nonsimple_pointer(file, attrs, type, FALSE, offset, typestring_offset); + } return 1; } @@ -1935,7 +1949,7 @@ static int write_varying_array_pointer_descriptions( *typestring_offset += 8; pointer_count = write_pointer_description_offsets( - file, attrs, type, offset_in_memory, + file, attrs, type_array_get_element(type), offset_in_memory, offset_in_buffer, typestring_offset); } }

1 0

Roderick Colenbrander : winex11: Use get_xrender_picture in X11DRV_AlphaBlend.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: a9cafb8f2e2eaa674a808e8b7d91c2d5dfe3373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9cafb8f2e2eaa674a808e8b7… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Oct 15 20:38:52 2009 +0200 winex11: Use get_xrender_picture in X11DRV_AlphaBlend. --- dlls/winex11.drv/xrender.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index aac0411..391c15a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1895,8 +1895,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid int y, y2; POINT pts[2]; BOOL top_down = FALSE; - RGNDATA *rgndata; - const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(devDst->depth, devDst->color_shifts); const WineXRenderFormat *src_format; int repeat_src; @@ -2008,7 +2006,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid } - rgndata = X11DRV_GetRegionData( devDst->region, 0 ); + dst_pict = get_xrender_picture(devDst); wine_tsx11_lock(); image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0, @@ -2022,15 +2020,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid return FALSE; } - pa.subwindow_mode = IncludeInferiors; - pa.repeat = repeat_src ? RepeatNormal : RepeatNone; - - /* FIXME use devDst->xrender->pict ? */ - dst_pict = pXRenderCreatePicture(gdi_display, - devDst->drawable, - dst_format->pict_format, - CPSubwindowMode, &pa); - TRACE("dst_pict %08lx\n", dst_pict); TRACE("src_drawable = %08lx\n", devSrc->drawable); xpm = XCreatePixmap(gdi_display, root_window, @@ -2040,20 +2029,13 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid TRACE("xpm = %08lx\n", xpm); XPutImage(gdi_display, xpm, gc, image, 0, 0, 0, 0, widthSrc, heightSrc); + pa.subwindow_mode = IncludeInferiors; + pa.repeat = repeat_src ? RepeatNormal : RepeatNone; src_pict = pXRenderCreatePicture(gdi_display, xpm, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); TRACE("src_pict %08lx\n", src_pict); - if (rgndata) - { - pXRenderSetPictureClipRectangles( gdi_display, dst_pict, - devDst->dc_rect.left, devDst->dc_rect.top, - (XRectangle *)rgndata->Buffer, - rgndata->rdh.nCount ); - HeapFree( GetProcessHeap(), 0, rgndata ); - } - /* Make sure we ALWAYS set the transformation matrix even if we don't need to scale. The reason is * that later on we want to reuse pictures (it can bring a lot of extra performance) and each time * a different transformation matrix might have been used. */ @@ -2069,7 +2051,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid pXRenderFreePicture(gdi_display, src_pict); XFreePixmap(gdi_display, xpm); XFreeGC(gdi_display, gc); - pXRenderFreePicture(gdi_display, dst_pict); image->data = NULL; XDestroyImage(image);

1 0

Juan Lang : crypt32: Don' t pass CRYPT_DECODE_ALLOC_FLAG to array item decoders.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 7a33b61f343280fcc4e3b4fb986ad85f5454dbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a33b61f343280fcc4e3b4fb9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 15 08:57:13 2009 -0700 crypt32: Don't pass CRYPT_DECODE_ALLOC_FLAG to array item decoders. --- dlls/crypt32/decode.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index beb33f1..9da367b 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -671,7 +671,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, } if (ret) ret = arrayDesc->decodeFunc(ptr, itemEncoded, - dwFlags, NULL, &size, &itemDecoded); + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &size, + &itemDecoded); if (ret) { cItems++; @@ -741,7 +742,8 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, *(BYTE **)((BYTE *)rgItems + i * arrayDesc->itemSize + arrayDesc->pointerOffset) = nextData; ret = arrayDesc->decodeFunc(ptr, - itemSizes[i].encodedLen, 0, + itemSizes[i].encodedLen, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, (BYTE *)rgItems + i * arrayDesc->itemSize, &itemSizes[i].size, &itemDecoded); if (ret)

1 0

Alexandre Julliard : ntdll: Assume leaf function when we can' t find exception information for an ELF module.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 905609b73bfdedf9b409a3ff86ac9767d9a00af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905609b73bfdedf9b409a3ff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 16 13:39:15 2009 +0200 ntdll: Assume leaf function when we can't find exception information for an ELF module. --- dlls/ntdll/signal_x86_64.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b5ff237..94b3d3c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1849,9 +1849,10 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases ); if (!fde) { - ERR( "no exception data found in %s for function %lx\n", - module ? debugstr_w(module->BaseDllName.Buffer) : "system library", context.Rip ); - break; + /* assume leaf function */ + context.Rip = *(ULONG64 *)context.Rsp; + context.Rsp += sizeof(ULONG64); + continue; } status = dwarf_virtual_unwind( context.Rip, &dispatch.EstablisherFrame, &new_context, fde, &bases, &dispatch.LanguageHandler, &dispatch.HandlerData ); @@ -2712,9 +2713,10 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases ); if (!fde) { - ERR( "no exception data found in %s for function %lx\n", - module ? debugstr_w(module->BaseDllName.Buffer) : "system library", context.Rip ); - raise_status( STATUS_BAD_FUNCTION_TABLE, rec ); + /* assume leaf function */ + context.Rip = *(ULONG64 *)context.Rsp; + context.Rsp += sizeof(ULONG64); + continue; } dispatch.FunctionEntry = NULL; status = dwarf_virtual_unwind( context.Rip, &dispatch.EstablisherFrame, &new_context, fde,

1 0

Henri Verbeet : wined3d: Printing a FIXME once only works if the relevant BOOL is static (LLVM/ Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 9dd78e13d5c06cd374f313e721e2fe8a47eea403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd78e13d5c06cd374f313e72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:43 2009 +0200 wined3d: Printing a FIXME once only works if the relevant BOOL is static (LLVM/Clang). --- dlls/wined3d/state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e7723ee..194cb9e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1549,7 +1549,8 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, str static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - BOOL warned = FALSE; + static BOOL warned; + /* TODO: NV_POINT_SPRITE */ if (!warned && stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { /* A FIXME, not a WARN because point sprites should be software emulated if not supported by HW */ @@ -1561,7 +1562,8 @@ static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { - BOOL warned = FALSE; + static BOOL warned; + if(GL_LIMITS(point_sprite_units) < GL_LIMITS(textures) && !warned) { if(use_ps(stateblock) || stateblock->lowest_disabled_stage > GL_LIMITS(point_sprite_units)) { FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n");

1 0

Henri Verbeet : d3d9/tests: Check some more return values (LLVM/Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 023446f109e11c74cf49709145ac9f738c20b759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023446f109e11c74cf4970914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:42 2009 +0200 d3d9/tests: Check some more return values (LLVM/Clang). --- dlls/d3d9/tests/surface.c | 1 + dlls/d3d9/tests/texture.c | 1 + dlls/d3d9/tests/visual.c | 85 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 79 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=023446f109e11c74cf497…

1 0

Henri Verbeet : d3d8/tests: Check some more return values (LLVM/Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: ec5c4170191be4915d279c134c8ff6cdb0835b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5c4170191be4915d279c134… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:41 2009 +0200 d3d8/tests: Check some more return values (LLVM/Clang). --- dlls/d3d8/tests/visual.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 07b8810..b74867a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -433,6 +433,7 @@ static void fog_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 2 /*PrimCount */, Indices, D3DFMT_INDEX16, transformed_2, sizeof(transformed_2[0])); + ok(SUCCEEDED(hr), "IDirect3DDevice8_DrawIndexedPrimitiveUP returned %#x.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); @@ -477,7 +478,9 @@ static void present_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.75, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %08x\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice8_Present returned %#x.\n", hr); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.4, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice8_Clear returned %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %08x\n", hr); @@ -726,10 +729,12 @@ static void offscreen_test(IDirect3DDevice8 *device) out: hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetTexture returned %#x.\n", hr); /* restore things */ if(backbuffer) { hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depthstencil); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget returned %#x.\n", hr); IDirect3DSurface8_Release(backbuffer); } if(offscreenTexture) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009