October 2009 - Wine-commits

Detlef Riekenberg : winspool/tests: Fix a failure on NT4 for EnumPrintProcessors.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 8c743cb25f2d2c6257f0786b887422d485e84eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c743cb25f2d2c6257f0786b8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 16 15:13:17 2009 +0200 winspool/tests: Fix a failure on NT4 for EnumPrintProcessors. --- dlls/winspool.drv/tests/info.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 37ddd63..b249a00 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1315,9 +1315,10 @@ static void test_EnumPrintProcessors(void) SetLastError(0xdeadbeef); pcbNeeded = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, invalid_env, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); - /* NT5: ERROR_INVALID_ENVIRONMENT, 9x: ERROR_INVALID_PARAMETER */ - ok( !res && ((GetLastError() == ERROR_INVALID_ENVIRONMENT) || - (GetLastError() == ERROR_INVALID_PARAMETER)), + /* NT5: ERROR_INVALID_ENVIRONMENT, NT4: res != 0, 9x: ERROR_INVALID_PARAMETER */ + ok( broken(res) || /* NT4 */ + (GetLastError() == ERROR_INVALID_ENVIRONMENT) || + (GetLastError() == ERROR_INVALID_PARAMETER), "got %u with %u (expected '0' with ERROR_INVALID_ENVIRONMENT or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError());

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

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

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

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

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

Ken Thomases : winmm/tests: Don' t complain for Wine drivers that allow multiple wave-out opens.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 8b086d6050704c4722f7700c9ed64f597133468a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b086d6050704c4722f7700c9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 16 04:10:09 2009 -0500 winmm/tests: Don't complain for Wine drivers that allow multiple wave-out opens. --- dlls/winmm/tests/wave.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 3e3afbd..98a16f5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -59,12 +59,16 @@ static void test_multiple_waveopens(void) } ret = waveOutOpen(&handle2, 0, &wfx, 0, 0, 0); - /* In windows this is most likely allowed, in wine an application can use the waveout - * interface, but so can directsound.. this causes problems if directsound goes active + /* Modern Windows allows for wave-out devices to be opened multiple times. + * Some Wine audio drivers allow that and some don't. To avoid false alarms + * for those that do, don't "todo_wine ok(...)" on success. */ - todo_wine ok(ret == MMSYSERR_NOERROR || broken(ret == MMSYSERR_ALLOCATED), /* winME */ - "waveOutOpen returns: %x\n", ret); - if (ret == MMSYSERR_NOERROR) + if (ret != MMSYSERR_NOERROR) + { + todo_wine ok(ret == MMSYSERR_NOERROR || broken(ret == MMSYSERR_ALLOCATED), /* winME */ + "second waveOutOpen returns: %x\n", ret); + } + else waveOutClose(handle2); waveOutClose(handle1);

1 0

Jeff Zaroyko : d3dxof: Remove unused variable.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 8846f8ac301ec43267035ced95d81aedc9ddb39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8846f8ac301ec43267035ced9… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Oct 16 20:36:48 2009 +1100 d3dxof: Remove unused variable. --- dlls/d3dxof/parsing.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 4a0ecaa..dc7b473 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1020,7 +1020,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) DWORD token; int i; xtemplate* pt = buf->pxt[buf->level]; - DWORD last_dword = 0; for (i = 0; i < pt->nb_members; i++) { @@ -1092,7 +1091,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) if (token == TOKEN_INTEGER) { get_TOKEN(buf); - last_dword = *(DWORD*)buf->value; TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); /* Assume larger size */ if (!check_buffer(buf, 4))

1 0

Henri Verbeet : d3d8: Get rid of some unused variables in IDirect3DDevice8Impl_CopyRects() (LLVM /Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: f4005c371f5b9601ff04f8f5ff8651b60b618332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4005c371f5b9601ff04f8f5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:39 2009 +0200 d3d8: Get rid of some unused variables in IDirect3DDevice8Impl_CopyRects() (LLVM/Clang). --- dlls/d3d8/device.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7993fac..1dcf98b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -882,9 +882,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID HRESULT hr = WINED3D_OK; WINED3DFORMAT srcFormat, destFormat; - UINT srcWidth, destWidth; - UINT srcHeight, destHeight; - UINT srcSize; WINED3DSURFACE_DESC winedesc; TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", iface, @@ -896,14 +893,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID wined3d_mutex_lock(); IWineD3DSurface_GetDesc(Source->wineD3DSurface, &winedesc); srcFormat = winedesc.format; - srcWidth = winedesc.width; - srcHeight = winedesc.height; - srcSize = winedesc.size; IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &winedesc); destFormat = winedesc.format; - destWidth = winedesc.width; - destHeight = winedesc.height; /* Check that the source and destination formats match */ if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { @@ -913,7 +905,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID } else if (WINED3DFMT_UNKNOWN == destFormat) { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat); - destFormat = srcFormat; } /* Quick if complete copy ... */

1 0

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

16 Oct '09

Module: wine Branch: master Commit: c45609f15c18dd0102ee1d6637010e8ab19c1ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45609f15c18dd0102ee1d663… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:40 2009 +0200 ddraw/tests: Check some more return values (LLVM/Clang). --- dlls/ddraw/tests/d3d.c | 5 +++++ dlls/ddraw/tests/dsurface.c | 1 + dlls/ddraw/tests/visual.c | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d9b1c72..9104147 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -961,6 +961,7 @@ static BOOL D3D1_createObjects(void) ddsd.dwWidth = 256; ddsd.dwHeight = 256; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface returned %#x.\n", hr); if (!Surface1) { skip("DDSCAPS_3DDEVICE surface not available\n"); return FALSE; @@ -1388,6 +1389,7 @@ static void Direct3D1Test(void) vp_data.dvScaleX = 1; vp_data.dvScaleY = 1; hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); + ok(SUCCEEDED(hr), "IDirect3DViewport_SetViewport returned %#x.\n", hr); i = 12345; hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(offscreentest) / sizeof(offscreentest[0]), &transformdata, D3DTRANSFORM_CLIPPED, @@ -1397,6 +1399,7 @@ static void Direct3D1Test(void) vp_data.dwWidth = 256; vp_data.dwHeight = 256; hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); + ok(SUCCEEDED(hr), "IDirect3DViewport_SetViewport returned %#x.\n", hr); i = 12345; hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(offscreentest) / sizeof(offscreentest[0]), &transformdata, D3DTRANSFORM_CLIPPED, @@ -2598,10 +2601,12 @@ static void DeviceLoadTest(void) memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[0][i1], &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); memset(&ddsd2, 0, sizeof(DDSURFACEDESC2)); ddsd2.dwSize = sizeof(ddsd2); hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[1][i], &ddsd2); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); if (ddsd.dwWidth == ddsd2.dwWidth && ddsd.dwHeight == ddsd2.dwHeight) { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1feab9b..44be603 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2433,6 +2433,7 @@ static void PrivateDataTest(void) ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref + 1, "Object reference is %d, expected %d\n", ref2, ref + 1); hr = IDirectDrawSurface7_FreePrivateData(surface7, &IID_IDirectDrawSurface7); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_FreePrivateData returned %#x.\n", hr); ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 450d231..ac70b31 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -615,10 +615,12 @@ static void offscreen_test(IDirect3DDevice7 *device) out: hr = IDirect3DDevice7_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice7_SetTexture returned %#x.\n", hr); /* restore things */ if(backbuffer) { hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice7_SetRenderTarget returned %#x.\n", hr); IDirectDrawSurface7_Release(backbuffer); } if(offscreen) {

1 0