wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Nikolay Sivov : xmllite: Fix reported node type for attributes.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 201b1c2aba3832fe45c03f04378e6fe2c3db266d URL: http://source.winehq.org/git/wine.git/?a=commit;h=201b1c2aba3832fe45c03f043… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 6 16:18:28 2012 +0400 xmllite: Fix reported node type for attributes. --- dlls/xmllite/reader.c | 6 +++++- dlls/xmllite/tests/reader.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ec7fe37..8ec2eae 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -937,7 +937,11 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node { xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)->(%p)\n", This, node_type); - *node_type = This->nodetype; + + /* When we're on attribute always return attribute type, container node type is kept. + Note that container is not necessarily an element, and attribute doesn't mean it's + an attribute in XML spec terms. */ + *node_type = This->attr ? XmlNodeType_Attribute : This->nodetype; return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 099c8fb..852f3d4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -642,6 +642,12 @@ todo_wine /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + ok_pos(reader, 1, 7, -1, 55, TRUE); /* try to move from last attribute */ @@ -652,6 +658,11 @@ todo_wine hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "got %08x\n", hr); + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); @@ -672,6 +683,11 @@ todo_wine { hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type); + IStream_Release(stream); IXmlReader_Release(reader); }

1 0

Nikolay Sivov : xmllite: Implement attribute iteration methods.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: f6e6b835b60a9780f68a34eb71c25e2fe382691c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e6b835b60a9780f68a34eb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 6 16:05:19 2012 +0400 xmllite: Implement attribute iteration methods. --- dlls/xmllite/reader.c | 37 +++++++++++++++++++++++++++++++------ dlls/xmllite/tests/reader.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0d33296..ec7fe37 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -113,6 +113,7 @@ typedef struct _xmlreader DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ + struct attribute *attr; /* current attribute */ UINT attr_count; } xmlreader; @@ -942,14 +943,32 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); + return S_OK; } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + const struct list *next; + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + + if (!This->attr) + return IXmlReader_MoveToFirstAttribute(iface); + + next = list_next(&This->attrs, &This->attr->entry); + if (next) + This->attr = LIST_ENTRY(next, struct attribute, entry); + + return next ? S_OK : S_FALSE; } static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, @@ -962,8 +981,13 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = NULL; + return S_OK; } static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *qualifiedName, @@ -1202,6 +1226,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->nodetype = XmlNodeType_None; list_init(&reader->attrs); reader->attr_count = 0; + reader->attr = NULL; *obj = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c44816c..099c8fb 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -591,6 +591,7 @@ static void test_read_xmldeclaration(void) HRESULT hr; XmlNodeType type; UINT count = 0; + const WCHAR *val; hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -611,6 +612,16 @@ static void test_read_xmldeclaration(void) ok(hr == S_OK, "got %08x\n", hr); ok(count == 0, "got %d\n", count); + /* try to move without attributes */ + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + ok_pos(reader, 0, 0, -1, -1, FALSE); type = -1; @@ -622,13 +633,27 @@ static void test_read_xmldeclaration(void) ok_pos(reader, 1, 3, -1, 55, TRUE); test_read_state(reader, XmlReadState_Interactive, -1, 0); + hr = IXmlReader_GetValue(reader, &val, NULL); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); + /* try to move from last attribute */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + hr = IXmlReader_MoveToFirstAttribute(reader); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); hr = IXmlReader_GetAttributeCount(reader, NULL); @@ -644,6 +669,9 @@ todo_wine { ok(count == 1, "Expected 1, got %d\n", count); } + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); IXmlReader_Release(reader); }

1 0

Alexandre Julliard : wined3d: Call wglSwapBuffers through the GL driver function table.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 13f126498be00f4c34eb212dabc23f34d4864de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f126498be00f4c34eb212da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 14:10:04 2012 +0100 wined3d: Call wglSwapBuffers through the GL driver function table. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/swapchain.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8d75045..d9b86d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5460,6 +5460,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) #define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f); ALL_WGL_FUNCS #undef USE_GL_FUNC + gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); } #else /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */ @@ -5468,6 +5469,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); ReleaseDC( 0, hdc ); if (!wgl_driver || wgl_driver == (void *)-1) goto nogl_adapter; + gl_info->gl_ops.wgl = wgl_driver->wgl; gl_info->gl_ops.gl = wgl_driver->gl; } #endif diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 83d2ab5..bd36ce1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -560,7 +560,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain->num_contexts > 1) gl_info->gl_ops.gl.p_glFinish(); - SwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ + + /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */

1 0

Piotr Caban : include: Added MS_ENH_RSA_AES_PROV_XP definition.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 15632df2c9d1f8375d3a4cde3428c2e499a4a04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15632df2c9d1f8375d3a4cde3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 11:43:15 2012 +0100 include: Added MS_ENH_RSA_AES_PROV_XP definition. --- include/wincrypt.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index a14edab..617a9b9 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1817,6 +1817,22 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #endif #define MS_ENH_RSA_AES_PROV WINELIB_NAME_AW(MS_ENH_RSA_AES_PROV_) +#define MS_ENH_RSA_AES_PROV_XP_A "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" +#if defined(__GNUC__) +# define MS_ENH_RSA_AES_PROV_XP_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \ + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ',\ + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',' ',\ + '(','P','r','o','t','o','t','y','p','e',')',0 } +#elif defined(_MSC_VER) +# define MS_ENH_RSA_AES_PROV_XP_W L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" +#else +static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f','t',' ', + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',' ', + '(','P','r','o','t','o','t','y','p','e',')',0 }; +#endif +#define MS_ENH_RSA_AES_PROV_XP WINELIB_NAME_AW(MS_ENH_RSA_AES_PROV_XP_) + /* Key Specs*/ #define AT_KEYEXCHANGE 1 #define AT_SIGNATURE 2

1 0

Piotr Caban : msvcr90: Fixed non-blocking file access tests.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: f25d91f6e7241a3b8cbe4876ba84a495a93aaa00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25d91f6e7241a3b8cbe4876b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 10:59:01 2012 +0100 msvcr90: Fixed non-blocking file access tests. --- dlls/msvcr90/tests/msvcr90.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ce8fe69..f1ac539 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1116,7 +1116,8 @@ struct block_file_arg { FILE *read; FILE *write; - HANDLE blocked; + HANDLE init; + HANDLE finish; }; static DWORD WINAPI block_file(void *arg) @@ -1125,8 +1126,8 @@ static DWORD WINAPI block_file(void *arg) p_lock_file(files->read); p_lock_file(files->write); - SetEvent(files->blocked); - WaitForSingleObject(files->blocked, INFINITE); + SetEvent(files->init); + WaitForSingleObject(files->finish, INFINITE); p_unlock_file(files->read); p_unlock_file(files->write); return 0; @@ -1158,24 +1159,13 @@ static void test_nonblocking_file_access(void) arg.read = filer; arg.write = filew; - arg.blocked = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(arg.blocked != NULL, "CreateEvent failed\n"); - if(!arg.blocked) { - p_fclose(filer); - p_fclose(filew); - p_unlink("test_file"); - return; - } + arg.init = CreateEvent(NULL, FALSE, FALSE, NULL); + arg.finish = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(arg.init != NULL, "CreateEvent failed\n"); + ok(arg.finish != NULL, "CreateEvent failed\n"); thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); - if(!thread) { - CloseHandle(arg.blocked); - p_fclose(filer); - p_fclose(filew); - p_unlink("test_file"); - return; - } - WaitForSingleObject(arg.blocked, INFINITE); + WaitForSingleObject(arg.init, INFINITE); ret = p_fileno(filer); ok(ret, "_fileno(filer) returned %d\n", ret); @@ -1197,9 +1187,10 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); - SetEvent(arg.blocked); + SetEvent(arg.finish); WaitForSingleObject(thread, INFINITE); - CloseHandle(arg.blocked); + CloseHandle(arg.init); + CloseHandle(arg.finish); CloseHandle(thread); p_fclose(filer); p_fclose(filew);

1 0

Stefan Dösinger : d3d9/tests: Move the clipplane + shader test inside the capability check.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: aeee527ebd4a23201c0c40bd64969ea1953408fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeee527ebd4a23201c0c40bd6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 08:23:08 2012 +0100 d3d9/tests: Move the clipplane + shader test inside the capability check. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c468697..a9c5c44 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14132,6 +14132,7 @@ START_TEST(visual) loop_index_test(device_ptr); sincos_test(device_ptr); sgn_test(device_ptr); + clip_planes_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { test_vshader_input(device_ptr); test_vshader_float16(device_ptr); @@ -14188,7 +14189,6 @@ START_TEST(visual) fp_special_test(device_ptr); depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); - clip_planes_test(device_ptr); update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); zenable_test(device_ptr);

1 0

Stefan Dösinger : d3d9/tests: Give the texture transform test a defined colorop.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: b11e499c0b7ab6fef70fb53bddabdc596df08555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11e499c0b7ab6fef70fb53bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 08:23:07 2012 +0100 d3d9/tests: Give the texture transform test a defined colorop. --- dlls/d3d9/tests/visual.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1c43e17..c468697 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4063,6 +4063,10 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState(D3DSAMP_ADDRESSV) returned %08x\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSW, D3DTADDRESS_CLAMP); ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState(D3DSAMP_ADDRESSW) returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState(D3DTSS_COLOROP) returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState(D3DTSS_COLORARG1) returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState(D3DRS_LIGHTING) returned %08x\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0);

1 0

Stefan Dösinger : d3d9/tests: Skip some texture transform tests if shaders are unsupported.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 320b33e57b65d3f6d8159ecbc06d0e679b87e5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=320b33e57b65d3f6d8159ecbc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 08:23:06 2012 +0100 d3d9/tests: Skip some texture transform tests if shaders are unsupported. --- dlls/d3d9/tests/visual.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5bb50f7..1c43e17 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3878,12 +3878,25 @@ static void projected_textures_test(IDirect3DDevice9 *device, }; IDirect3DVertexShader9 *vs = NULL; IDirect3DPixelShader9 *ps = NULL; + IDirect3D9 *d3d; + D3DCAPS9 caps; HRESULT hr; - hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader, &vs); - ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader, &ps); - ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); + IDirect3DDevice9_GetDirect3D(device, &d3d); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed (%08x)\n", hr); + IDirect3D9_Release(d3d); + + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader, &vs); + ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); + } + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 3)) + { + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader, &ps); + ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff203040, 0.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); @@ -3920,12 +3933,26 @@ static void projected_textures_test(IDirect3DDevice9 *device, }; if (tests[i].vs) + { + if (!vs) + { + skip("Vertex shaders not supported, skipping\n"); + continue; + } hr = IDirect3DDevice9_SetVertexShader(device, vs); + } else hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); if (tests[i].ps) + { + if (!ps) + { + skip("Pixel shaders not supported, skipping\n"); + continue; + } hr = IDirect3DDevice9_SetPixelShader(device, ps); + } else hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); @@ -3949,11 +3976,14 @@ static void projected_textures_test(IDirect3DDevice9 *device, hr = IDirect3DDevice9_SetVertexShader(device, NULL); hr = IDirect3DDevice9_SetPixelShader(device, NULL); - IDirect3DVertexShader9_Release(vs); - IDirect3DPixelShader9_Release(ps); + if (vs) IDirect3DVertexShader9_Release(vs); + if (ps) IDirect3DPixelShader9_Release(ps); for (i = 0; i < 4; ++i) - check_rect(device, tests[i].rect, tests[i].message); + { + if ((!tests[i].vs || vs) && (!tests[i].ps || ps)) + check_rect(device, tests[i].rect, tests[i].message); + } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr);

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IEnumBackgroundCopyFiles iface.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 49e6d411b07c922a0324026c05bc03e4ad6c80f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e6d411b07c922a0324026c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 23:53:15 2012 +0100 qmgr: COM cleanup for the IEnumBackgroundCopyFiles iface. --- dlls/qmgr/enum_files.c | 84 +++++++++++++++++++++++++----------------------- dlls/qmgr/qmgr.h | 10 ------ 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index d7f36cd..05659cf 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +typedef struct +{ + IEnumBackgroundCopyFiles IEnumBackgroundCopyFiles_iface; + LONG ref; + IBackgroundCopyFile **files; + ULONG numFiles; + ULONG indexFiles; +} EnumBackgroundCopyFilesImpl; + static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) { ULONG i; @@ -34,37 +43,39 @@ static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) HeapFree(GetProcessHeap(), 0, This); } -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef( - IEnumBackgroundCopyFiles* iface) +static inline EnumBackgroundCopyFilesImpl *impl_from_IEnumBackgroundCopyFiles(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - return InterlockedIncrement(&This->ref); + return CONTAINING_RECORD(iface, EnumBackgroundCopyFilesImpl, IEnumBackgroundCopyFiles_iface); } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface( - IEnumBackgroundCopyFiles* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_QueryInterface(IEnumBackgroundCopyFiles *iface, + REFIID riid, void **ppv) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; - TRACE("IID: %s\n", debugstr_guid(riid)); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumBackgroundCopyFiles)) { - *ppvObject = &This->lpVtbl; - BITS_IEnumBackgroundCopyFiles_AddRef(iface); + *ppv = iface; + IEnumBackgroundCopyFiles_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *ppv = NULL; return E_NOINTERFACE; } -static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( - IEnumBackgroundCopyFiles* iface) +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_AddRef(IEnumBackgroundCopyFiles *iface) +{ + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -74,13 +85,10 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release( } /* Return reference to one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( - IEnumBackgroundCopyFiles* iface, - ULONG celt, - IBackgroundCopyFile **rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next(IEnumBackgroundCopyFiles *iface, + ULONG celt, IBackgroundCopyFile **rgelt, ULONG *pceltFetched) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG fetched; ULONG i; IBackgroundCopyFile *file; @@ -115,11 +123,10 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Next( } /* Skip over one or more files in the file enumerator */ -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( - IEnumBackgroundCopyFiles* iface, - ULONG celt) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip(IEnumBackgroundCopyFiles *iface, + ULONG celt) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); if (celt > This->numFiles - This->indexFiles) { @@ -131,27 +138,24 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Skip( return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset( - IEnumBackgroundCopyFiles* iface) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Reset(IEnumBackgroundCopyFiles *iface) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); This->indexFiles = 0; return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone( - IEnumBackgroundCopyFiles* iface, - IEnumBackgroundCopyFiles **ppenum) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_Clone(IEnumBackgroundCopyFiles *iface, + IEnumBackgroundCopyFiles **ppenum) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount( - IEnumBackgroundCopyFiles* iface, - ULONG *puCount) +static HRESULT WINAPI BITS_IEnumBackgroundCopyFiles_GetCount(IEnumBackgroundCopyFiles *iface, + ULONG *puCount) { - EnumBackgroundCopyFilesImpl *This = (EnumBackgroundCopyFilesImpl *) iface; + EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); *puCount = This->numFiles; return S_OK; } @@ -181,7 +185,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob2 *i if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; + This->IEnumBackgroundCopyFiles_iface.lpVtbl = &BITS_IEnumBackgroundCopyFiles_Vtbl; This->ref = 1; /* Create array of files */ @@ -210,6 +214,6 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob2 *i } LeaveCriticalSection(&job->cs); - *ppObj = &This->lpVtbl; + *ppObj = &This->IEnumBackgroundCopyFiles_iface; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 4bd1e34..93fcd0e 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -46,16 +46,6 @@ typedef struct struct list entryFromQmgr; } BackgroundCopyJobImpl; -/* Enum background copy files vtbl and related data */ -typedef struct -{ - const IEnumBackgroundCopyFilesVtbl *lpVtbl; - LONG ref; - IBackgroundCopyFile **files; - ULONG numFiles; - ULONG indexFiles; -} EnumBackgroundCopyFilesImpl; - /* Background copy file vtbl and related data */ typedef struct {

1 0

Michael Stefaniuc : qmgr: Merge a helper function.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 7183c6953107291e276cd9ee027d87385ed83d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7183c6953107291e276cd9ee0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 23:57:52 2012 +0100 qmgr: Merge a helper function. --- dlls/qmgr/enum_files.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 05659cf..aeb9d64 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -32,17 +32,6 @@ typedef struct ULONG indexFiles; } EnumBackgroundCopyFilesImpl; -static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) -{ - ULONG i; - - for(i = 0; i < This->numFiles; i++) - IBackgroundCopyFile_Release(This->files[i]); - - HeapFree(GetProcessHeap(), 0, This->files); - HeapFree(GetProcessHeap(), 0, This); -} - static inline EnumBackgroundCopyFilesImpl *impl_from_IEnumBackgroundCopyFiles(IEnumBackgroundCopyFiles *iface) { return CONTAINING_RECORD(iface, EnumBackgroundCopyFilesImpl, IEnumBackgroundCopyFiles_iface); @@ -77,9 +66,15 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFil { EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; if (ref == 0) - EnumBackgroundCopyFilesDestructor(This); + { + for(i = 0; i < This->numFiles; i++) + IBackgroundCopyFile_Release(This->files[i]); + HeapFree(GetProcessHeap(), 0, This->files); + HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
55
Older →

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 December 2012