March 2016 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml/tests: Fixed remaining xmlhttprequest test failures.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: f24526e79f1c57e559c3a35ab69b85dabc57d59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24526e79f1c57e559c3a35ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 10:31:14 2016 +0100 mshtml/tests: Fixed remaining xmlhttprequest test failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 3153804..7e75b79 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -566,7 +566,7 @@ static void test_responseXML(const char *expect_text) ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, "Expected supported: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got %08x\n", supported); - ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), + ok(enabled == ((INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) & supported), "Expected enabled: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got 0x%08x\n", enabled); IObjectSafety_Release(safety); @@ -585,9 +585,9 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Accept-Ranges", "bytes"}, + {"Accept-Ranges", "bytes", TRUE}, {"Content-Length", "51"}, - {"Content-Type", "application/xml", TRUE} + {"Content-Type", "application/xml"} }; trace("test_sync_xhr\n");

1 0

Nikolay Sivov : xmllite/writer: Properly fail on initial state in WriteEndElement().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 6ca1ebdd25756a797c55c4d10b91b3bab61b646d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca1ebdd25756a797c55c4d10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:28 2016 +0300 xmllite/writer: Properly fail on initial state in WriteEndElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 1 - dlls/xmllite/writer.c | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index e6ffbeb..a5d5b31a 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -89,7 +89,6 @@ todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteEndElement(writer); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); todo_wine { diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 90e965f..0e55b42 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -784,6 +784,14 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) TRACE("%p\n", This); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + default: + ; + } + element = pop_element(This); if (!element) return WR_E_INVALIDACTION;

1 0

Nikolay Sivov : xmllite/tests: A test for Write* behaviour on initial writer state.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 8ad295ed709f894359d531391e66970386e72093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad295ed709f894359d531391… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 23 13:07:26 2016 +0300 xmllite/tests: A test for Write* behaviour on initial writer state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 93 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 4071d61..2015109 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -54,6 +54,85 @@ static void check_output(IStream *stream, const char *expected, int line) } #define CHECK_OUTPUT(stream, expected) check_output(stream, expected, __LINE__) +/* used to test all Write* methods for consistent error state */ +static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) +{ + static const WCHAR aW[] = {'a',0}; + HRESULT hr; + + /* FIXME: add WriteAttributes */ + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteCData(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteCharEntity(writer, aW[0]); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteChars(writer, aW, 1); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteComment(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + /* FIXME: add WriteDocType */ + + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteEndElement(writer); +todo_wine + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + +todo_wine { + hr = IXmlWriter_WriteEntityRef(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteName(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteNmToken(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + /* FIXME: add WriteNode */ + /* FIXME: add WriteNodeShallow */ + + hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteRaw(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteRawChars(writer, aW, 1); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); + + hr = IXmlWriter_WriteString(writer, aW); + ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); +} + /* FIXME: add WriteSurrogateCharEntity */ + /* FIXME: add WriteWhitespace */ +} + static IStream *writer_set_output(IXmlWriter *writer) { IStream *stream; @@ -831,9 +910,23 @@ static void test_WriteRaw(void) IStream_Release(stream); } +static void test_writer_state(void) +{ + IXmlWriter *writer; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + check_writer_state(writer, E_UNEXPECTED); + + IXmlWriter_Release(writer); +} + START_TEST(writer) { test_writer_create(); + test_writer_state(); test_writeroutput(); test_writestartdocument(); test_writestartelement();

1 0

Alexandre Julliard : winebuild: Add a common helper to find an imported dll.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 59b5c52f1dc57cf7ef525d9d958e09684bb04e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b5c52f1dc57cf7ef525d9d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 16:50:44 2016 +0900 winebuild: Add a common helper to find an imported dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 69d4765..1d561c4 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -154,15 +154,15 @@ static int is_delayed_import( const char *name ) return 0; } -/* check whether a given dll has already been imported */ -static struct import *is_already_imported( const char *name ) +/* find an imported dll from its name */ +static struct import *find_import_dll( const char *name ) { struct import *import; LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) - if (!strcmp( import->dll_name, name )) return import; + if (!strcasecmp( import->dll_name, name )) return import; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) - if (!strcmp( import->dll_name, name )) return import; + if (!strcasecmp( import->dll_name, name )) return import; return NULL; } @@ -215,7 +215,7 @@ static DLLSPEC *read_import_lib( struct import *imp ) close_input_file( f ); /* check if we already imported that library from a different file */ - if ((prev_imp = is_already_imported( spec->file_name ))) + if ((prev_imp = find_import_dll( spec->file_name ))) { if (prev_imp->dev != imp->dev || prev_imp->ino != imp->ino) fatal_error( "%s and %s have the same export name '%s'\n", @@ -292,7 +292,7 @@ void add_delayed_import( const char *name ) char *fullname = get_dll_name( name, NULL ); strarray_add( &delayed_imports, fullname, NULL ); - if ((imp = is_already_imported( fullname ))) + if ((imp = find_import_dll( fullname ))) { list_remove( &imp->entry ); list_add_tail( &dll_delayed, &imp->entry ); @@ -389,25 +389,14 @@ static void check_undefined_forwards( DLLSPEC *spec ) api_name = p + 1; dll_name = get_dll_name( link_name, NULL ); - LIST_FOR_EACH_ENTRY( imp, &dll_imports, struct import, entry ) + if ((imp = find_import_dll( dll_name ))) { - if (strcasecmp( imp->dll_name, dll_name )) continue; if (!find_export( api_name, imp->exports, imp->nb_exports )) warning( "%s:%d: forward '%s' not found in %s\n", spec->src_name, odp->lineno, odp->link_name, imp->dll_name ); - goto done; } - LIST_FOR_EACH_ENTRY( imp, &dll_delayed, struct import, entry ) - { - if (strcasecmp( imp->dll_name, dll_name )) continue; - if (!find_export( api_name, imp->exports, imp->nb_exports )) - warning( "%s:%d: forward '%s' not found in %s\n", - spec->src_name, odp->lineno, odp->link_name, imp->dll_name ); - goto done; - } - warning( "%s:%d: forward '%s' not found in the imported dll list\n", - spec->src_name, odp->lineno, odp->link_name ); - done: + else warning( "%s:%d: forward '%s' not found in the imported dll list\n", + spec->src_name, odp->lineno, odp->link_name ); free( link_name ); free( dll_name ); }

1 0

Austin English : crypt32: Add CryptMsgVerifyCountersignatureEncoded stub.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 9fd90749c2c635573c234aba7b92064f7bc5ffc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd90749c2c635573c234aba7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 16:19:18 2016 -0500 crypt32: Add CryptMsgVerifyCountersignatureEncoded stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index e639d7c..0d2a477 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -160,7 +160,7 @@ @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) @ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ stdcall CryptMsgUpdate(ptr ptr long long) -@ stub CryptMsgVerifyCountersignatureEncoded +@ stdcall CryptMsgVerifyCountersignatureEncoded(ptr long ptr long ptr long ptr) @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptProtectMemory(ptr long long) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 13f5934..80b2de7 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3737,6 +3737,17 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, return ret; } +BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV_LEGACY hCryptProv, + DWORD dwEncodingType, BYTE *pbSignerInfo, DWORD cbSignerInfo, + PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, + CERT_INFO *pciCountersigner) +{ + FIXME("(%08lx, %08x, %p, %d, %p, %d, %p): stub\n", hCryptProv, + dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature, + cbSignerInfoCountersignature, pciCountersigner); + return FALSE; +} + BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv, DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_depth_blt().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 9868969211012f95f7034cbf0f22fd7423f76653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9868969211012f95f7034cbf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:12 2016 +0100 wined3d: Get resource info from the texture in surface_depth_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9840683..b86cb72 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2757,7 +2757,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE static void surface_depth_blt(const struct wined3d_surface *surface, struct wined3d_context *context, GLuint texture, GLint x, GLint y, GLsizei w, GLsizei h, GLenum target) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_device *device = surface->container->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; GLint compare_mode = GL_NONE; struct blt_info info;

1 0

Paul Gofman : d3dx9: Add test for preshader in effect.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: ad7ec2ec14863c1b8fcf2db2bf7daf00a98035f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7ec2ec14863c1b8fcf2db2b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 21 16:55:52 2016 +0300 d3dx9: Add test for preshader in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 879 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 879 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad7ec2ec14863c1b8fcf2…

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_blt_to_drawable().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: c526188bb30619a3df80ad08109fa18b9d9e8f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c526188bb30619a3df80ad081… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:10 2016 +0100 wined3d: Get resource info from the texture in surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c11d248..4243de6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2512,6 +2512,8 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; @@ -2532,12 +2534,12 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - wined3d_texture_load(src_surface->container, context, FALSE); + wined3d_texture_load(src_texture, context, FALSE); /* Activate the destination context, set it up for blitting */ context_apply_blit_state(context, device); - if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) + if (!wined3d_resource_is_offscreen(&dst_texture->resource)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); @@ -2550,9 +2552,9 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* For P8 surfaces, the alpha component contains the palette index. * Which means that the colorkey is one of the palette entries. In * other cases pixels that should be masked away have alpha set to 0. */ - if (src_surface->resource.format->id == WINED3DFMT_P8_UINT) + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, - (float)src_surface->container->async.src_blt_color_key.color_space_low_value / 255.0f); + (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); else gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); checkGLcall("glAlphaFunc"); @@ -2575,8 +2577,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->unset_shader(context->gl_info); if (wined3d_settings.strict_draw_ordering - || (dst_surface->container->swapchain - && dst_surface->container->swapchain->front_buffer == dst_surface->container)) + || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ if (restore_rt)

1 0

Henri Verbeet : ddraw/tests: Get rid of the unused "d3d" variable in test_shademode().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 3c7ca3d5536e94078b6140d0ebeb44af2478b2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7ca3d5536e94078b6140d0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:09 2016 +0100 ddraw/tests: Get rid of the unused "d3d" variable in test_shademode(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ---- dlls/ddraw/tests/ddraw2.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8462873..02eb9c9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7939,7 +7939,6 @@ static void test_shademode(void) DWORD color0, color1; UINT i, inst_length; IDirectDraw *ddraw; - IDirect3D *d3d; ULONG refcount; HWND window; HRESULT hr; @@ -7986,8 +7985,6 @@ static void test_shademode(void) return; } - hr = IDirect3DDevice_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -8061,7 +8058,6 @@ static void test_shademode(void) destroy_viewport(device, viewport); destroy_material(background); IDirectDrawSurface_Release(rt); - IDirect3D_Release(d3d); refcount = IDirect3DDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index fe86149..ee3508f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9063,7 +9063,6 @@ static void test_shademode(void) DWORD color0, color1; IDirectDraw2 *ddraw; D3DLVERTEX *quad; - IDirect3D2 *d3d; ULONG refcount; UINT i, count; HWND window; @@ -9113,8 +9112,6 @@ static void test_shademode(void) return; } - hr = IDirect3DDevice2_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -9164,7 +9161,6 @@ static void test_shademode(void) destroy_viewport(device, viewport); destroy_material(background); IDirectDrawSurface_Release(rt); - IDirect3D2_Release(d3d); refcount = IDirect3DDevice2_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirectDraw_Release(ddraw);

1 0

Henri Verbeet : ddraw/tests: Rewrite blt_test().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: f0c7c7f6276b267755d88c93531ac3dfd2180bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c7c7f6276b267755d88c935… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:08 2016 +0100 ddraw/tests: Rewrite blt_test(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 81 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 81 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 84 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 84 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 108 ---------------------------------------------- 5 files changed, 330 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0c7c7f6276b267755d88…

1 0