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

Jacek Caban : wininet/tests: Fixed tests for the new winehq.org cert.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: fd3563b2b9b0a8aeac31d00674adef49d24220da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3563b2b9b0a8aeac31d0067… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 15:08:39 2014 +0100 wininet/tests: Fixed tests for the new winehq.org cert. --- dlls/wininet/tests/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2f9c36c..e40cdb6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4029,9 +4029,9 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" + "6JcR7G3G8tgjkeoMcitK-bTbzcpumDSy\r\n" "GT98380011\r\n" - "See www.rapidssl.com/resources/cps (c)13\r\n" + "See www.rapidssl.com/resources/cps (c)14\r\n" "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org",

1 0

Gediminas Jakutis : d3dx9: Implement D3DXCreateBox().
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: cc3ec2da1a96b9f6874aed8f3140dd984261fc73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3ec2da1a96b9f6874aed8f3… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Feb 27 21:02:19 2014 +0200 d3dx9: Implement D3DXCreateBox(). --- dlls/d3dx9_36/mesh.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/mesh.c | 14 +++--- 2 files changed, 105 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 118baf7..cc3576c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4525,20 +4525,110 @@ cleanup: return hr; } -HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float height, - float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency) -{ - FIXME("(%p, %f, %f, %f, %p, %p): stub\n", device, width, height, depth, mesh, adjacency); - - return E_NOTIMPL; -} - struct vertex { D3DXVECTOR3 position; D3DXVECTOR3 normal; }; +HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float height, + float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency) +{ + HRESULT hr; + ID3DXMesh *box; + struct vertex *vertices; + WORD (*faces)[3]; + DWORD *adjacency_buf; + unsigned int i, face; + static const D3DXVECTOR3 unit_box[] = + { + {-1.0f, -1.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, -1.0f}, + {-1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, + { 1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, -1.0f}, + {-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, 1.0f}, + {-1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, + {-1.0f, -1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f} + }; + static const D3DXVECTOR3 normals[] = + { + {-1.0f, 0.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, + { 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, -1.0f} + }; + static const DWORD adjacency_table[] = + { + 6, 9, 1, 2, 10, 0, 1, 9, 3, 4, 10, 2, + 3, 8, 5, 7, 11, 4, 0, 11, 7, 5, 8, 6, + 7, 4, 9, 2, 0, 8, 1, 3, 11, 5, 6, 10 + }; + + TRACE("device %p, width %f, height %f, depth %f, mesh %p, adjacency %p\n", + device, width, height, depth, mesh, adjacency); + + if (!device || width < 0.0f || height < 0.0f || depth < 0.0f || !mesh) + { + return D3DERR_INVALIDCALL; + } + + if (FAILED(hr = D3DXCreateMeshFVF(12, 24, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &box))) + { + return hr; + } + + if (FAILED(hr = box->lpVtbl->LockVertexBuffer(box, 0, (void **)&vertices))) + { + box->lpVtbl->Release(box); + return hr; + } + + if (FAILED(hr = box->lpVtbl->LockIndexBuffer(box, 0, (void **)&faces))) + { + box->lpVtbl->UnlockVertexBuffer(box); + box->lpVtbl->Release(box); + return hr; + } + + width /= 2.0f; + height /= 2.0f; + depth /= 2.0f; + + for (i = 0; i < 24; i++) + { + vertices[i].position.x = width * unit_box[i].x; + vertices[i].position.y = height * unit_box[i].y; + vertices[i].position.z = depth * unit_box[i].z; + vertices[i].normal.x = normals[i / 4].x; + vertices[i].normal.y = normals[i / 4].y; + vertices[i].normal.z = normals[i / 4].z; + } + + face = 0; + for (i = 0; i < 12; i++) + { + faces[i][0] = face++; + faces[i][1] = face++; + faces[i][2] = (i % 2) ? face - 4 : face; + } + + box->lpVtbl->UnlockIndexBuffer(box); + box->lpVtbl->UnlockVertexBuffer(box); + + if (adjacency) + { + if (FAILED(hr = D3DXCreateBuffer(sizeof(adjacency_table), adjacency))) + { + box->lpVtbl->Release(box); + return hr; + } + + adjacency_buf = ID3DXBuffer_GetBufferPointer(*adjacency); + memcpy(adjacency_buf, adjacency_table, sizeof(adjacency_table)); + } + + *mesh = box; + + return D3D_OK; +} + typedef WORD face[3]; struct sincos_table diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1c3748f..d32f159 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2482,23 +2482,23 @@ static void D3DXCreateBoxTest(void) } hr = D3DXCreateBox(device,2.0f,20.0f,4.9f,NULL, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(NULL,22.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,-2.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,-20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); ppBuffer = NULL; hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); + ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) { @@ -2508,7 +2508,7 @@ static void D3DXCreateBoxTest(void) buffer = ID3DXBuffer_GetBufferPointer(ppBuffer); for(i=0; i<36; i++) - todo_wine ok(adjacency[i]==buffer[i], "expected adjacency %d: %#x, received %#x\n",i,adjacency[i], buffer[i]); + ok(adjacency[i]==buffer[i], "expected adjacency %d: %#x, received %#x\n",i,adjacency[i], buffer[i]); box->lpVtbl->Release(box);

1 0

Hans Leidekker : msi: Remove the product reference when a shared component is unregistered.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: f5250381427c0b8ac00864940574461d8d29bc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5250381427c0b8ac00864940… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 3 10:50:34 2014 +0100 msi: Remove the product reference when a shared component is unregistered. --- dlls/msi/action.c | 24 ++++++- dlls/msi/tests/install.c | 159 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 173 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5250381427c0b8ac0086…

1 0

Aric Stewart : user32: Correct buffer calculation for GetMenuStringA.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: beab7da6cd7af154ec27608d8d943ae5990a342a URL: http://source.winehq.org/git/wine.git/?a=commit;h=beab7da6cd7af154ec27608d8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 3 14:10:05 2014 +0900 user32: Correct buffer calculation for GetMenuStringA. --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bbaa5f3..915b1c5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3687,7 +3687,7 @@ INT WINAPI GetMenuStringA( return 0; } if (!item->text) return 0; - if (!str || !nMaxSiz) return strlenW(item->text); + if (!str || !nMaxSiz) return WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) str[nMaxSiz-1] = 0; TRACE("returning %s\n", debugstr_a(str));

1 0

Nikolay Sivov : msxml3: Added IVBSAXLexicalHandler interface for MXWriter.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: d6de1be777bfbcc390db48489e7f1b78cb3a9ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6de1be777bfbcc390db48489… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:56:20 2014 +0400 msxml3: Added IVBSAXLexicalHandler interface for MXWriter. --- dlls/msxml3/mxwriter.c | 141 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 25 +++++++- 2 files changed, 164 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6de1be777bfbcc390db4…

1 0

Nikolay Sivov : msxml3: Added IVBSAXDeclHandler interface for MXWriter.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 94dcff1dda7a3ce45c0b60617dd73a7c661b1557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dcff1dda7a3ce45c0b60617… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:55:59 2014 +0400 msxml3: Added IVBSAXDeclHandler interface for MXWriter. --- dlls/msxml3/mxwriter.c | 125 ++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 30 +++++++++- 2 files changed, 153 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94dcff1dda7a3ce45c0b6…

1 0

Nikolay Sivov : msxml3: Support more variant types in putProperty().
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: a28ace9ae7f6bdae8ad8e1d6580741325f3d2f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28ace9ae7f6bdae8ad8e1d65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:55:37 2014 +0400 msxml3: Support more variant types in putProperty(). --- dlls/msxml3/saxreader.c | 122 ++++++++++++++++++----------------------- dlls/msxml3/tests/saxreader.c | 32 +++++++++++ 2 files changed, 86 insertions(+), 68 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 530ca02..df92997 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2602,99 +2602,85 @@ static HRESULT internal_parseURL( return detach_bsc(bsc); } -static HRESULT internal_putProperty( - saxreader* This, - const WCHAR *prop, - VARIANT value, - BOOL vbInterface) +static HRESULT saxreader_put_handler_from_variant(saxreader *This, enum saxhandler_type type, const VARIANT *v, BOOL vb) { - TRACE("(%p)->(%s %s)\n", This, debugstr_w(prop), debugstr_variant(&value)); - - if(!memcmp(prop, PropertyDeclHandlerW, sizeof(PropertyDeclHandlerW))) - { - if(This->isParsing) return E_FAIL; + const IID *riid; - switch (V_VT(&value)) - { - case VT_EMPTY: - saxreader_put_handler(This, SAXDeclHandler, NULL, vbInterface); - break; - case VT_UNKNOWN: - { - IUnknown *handler = NULL; + if (V_VT(v) == VT_EMPTY) + return saxreader_put_handler(This, type, NULL, vb); - if (V_UNKNOWN(&value)) - { - HRESULT hr; + switch (type) + { + case SAXDeclHandler: + riid = vb ? &IID_IVBSAXDeclHandler : &IID_ISAXDeclHandler; + break; + case SAXLexicalHandler: + riid = vb ? &IID_IVBSAXLexicalHandler : &IID_ISAXLexicalHandler; + break; + default: + ERR("wrong handler type %d\n", type); + return E_FAIL; + } - if (vbInterface) - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_IVBSAXDeclHandler, (void**)&handler); - else - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_ISAXDeclHandler, (void**)&handler); - if (FAILED(hr)) return hr; - } + switch (V_VT(v)) + { + case VT_DISPATCH: + case VT_UNKNOWN: + { + IUnknown *handler = NULL; - saxreader_put_handler(This, SAXDeclHandler, handler, vbInterface); - if (handler) IUnknown_Release(handler); - break; - } - default: - return E_INVALIDARG; + if (V_UNKNOWN(v)) + { + HRESULT hr = IUnknown_QueryInterface(V_UNKNOWN(v), riid, (void**)&handler); + if (FAILED(hr)) return hr; } - return S_OK; + saxreader_put_handler(This, type, handler, vb); + if (handler) IUnknown_Release(handler); + break; + } + default: + ERR("value type %d not supported\n", V_VT(v)); + return E_INVALIDARG; } - if(!memcmp(prop, PropertyLexicalHandlerW, sizeof(PropertyLexicalHandlerW))) - { - if(This->isParsing) return E_FAIL; + return S_OK; +} - switch (V_VT(&value)) - { - case VT_EMPTY: - saxreader_put_handler(This, SAXLexicalHandler, NULL, vbInterface); - break; - case VT_UNKNOWN: - { - IUnknown *handler = NULL; +static HRESULT internal_putProperty( + saxreader* This, + const WCHAR *prop, + VARIANT value, + BOOL vbInterface) +{ + VARIANT *v; - if (V_UNKNOWN(&value)) - { - HRESULT hr; + TRACE("(%p)->(%s %s)\n", This, debugstr_w(prop), debugstr_variant(&value)); - if (vbInterface) - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_IVBSAXLexicalHandler, (void**)&handler); - else - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_ISAXLexicalHandler, (void**)&handler); - if (FAILED(hr)) return hr; - } + if (This->isParsing) return E_FAIL; - saxreader_put_handler(This, SAXLexicalHandler, handler, vbInterface); - if (handler) IUnknown_Release(handler); - break; - } - default: - return E_INVALIDARG; - } + v = V_VT(&value) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(&value) : &value; + if(!memcmp(prop, PropertyDeclHandlerW, sizeof(PropertyDeclHandlerW))) + return saxreader_put_handler_from_variant(This, SAXDeclHandler, v, vbInterface); - return S_OK; - } + if(!memcmp(prop, PropertyLexicalHandlerW, sizeof(PropertyLexicalHandlerW))) + return saxreader_put_handler_from_variant(This, SAXLexicalHandler, v, vbInterface); if(!memcmp(prop, PropertyMaxXMLSizeW, sizeof(PropertyMaxXMLSizeW))) { - if (V_VT(&value) == VT_I4 && V_I4(&value) == 0) return S_OK; - FIXME("(%p)->(%s): max-xml-size unsupported\n", This, debugstr_variant(&value)); + if (V_VT(v) == VT_I4 && V_I4(v) == 0) return S_OK; + FIXME("(%p)->(%s): max-xml-size unsupported\n", This, debugstr_variant(v)); return E_NOTIMPL; } if(!memcmp(prop, PropertyMaxElementDepthW, sizeof(PropertyMaxElementDepthW))) { - if (V_VT(&value) == VT_I4 && V_I4(&value) == 0) return S_OK; - FIXME("(%p)->(%s): max-element-depth unsupported\n", This, debugstr_variant(&value)); + if (V_VT(v) == VT_I4 && V_I4(v) == 0) return S_OK; + FIXME("(%p)->(%s): max-element-depth unsupported\n", This, debugstr_variant(v)); return E_NOTIMPL; } - FIXME("(%p)->(%s:%s): unsupported property\n", This, debugstr_w(prop), debugstr_variant(&value)); + FIXME("(%p)->(%s:%s): unsupported property\n", This, debugstr_w(prop), debugstr_variant(v)); if(!memcmp(prop, PropertyCharsetW, sizeof(PropertyCharsetW))) return E_NOTIMPL; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index bb3ea2a..f581fd3 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2523,6 +2523,7 @@ static void test_saxreader_properties(void) while (ptr->prop_name) { + VARIANT varref; LONG ref; init_saxlexicalhandler(&lexicalhandler, S_OK); @@ -2535,6 +2536,7 @@ static void test_saxreader_properties(void) ok(V_VT(&v) == VT_UNKNOWN, "got %d\n", V_VT(&v)); ok(V_UNKNOWN(&v) == NULL, "got %p\n", V_UNKNOWN(&v)); + /* VT_UNKNOWN */ V_VT(&v) = VT_UNKNOWN; V_UNKNOWN(&v) = ptr->iface; ref = get_refcount(ptr->iface); @@ -2542,6 +2544,36 @@ static void test_saxreader_properties(void) EXPECT_HR(hr, S_OK); ok(ref < get_refcount(ptr->iface), "expected inreased refcount\n"); + /* VT_DISPATCH */ + V_VT(&v) = VT_DISPATCH; + V_UNKNOWN(&v) = ptr->iface; + ref = get_refcount(ptr->iface); + hr = ISAXXMLReader_putProperty(reader, _bstr_(ptr->prop_name), v); + EXPECT_HR(hr, S_OK); + ok(ref == get_refcount(ptr->iface), "got wrong refcount %d, expected %d\n", get_refcount(ptr->iface), ref); + + /* VT_VARIANT|VT_BYREF with VT_UNKNOWN in referenced variant */ + V_VT(&varref) = VT_UNKNOWN; + V_UNKNOWN(&varref) = ptr->iface; + + V_VT(&v) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(&v) = &varref; + ref = get_refcount(ptr->iface); + hr = ISAXXMLReader_putProperty(reader, _bstr_(ptr->prop_name), v); + EXPECT_HR(hr, S_OK); + ok(ref == get_refcount(ptr->iface), "got wrong refcount %d, expected %d\n", get_refcount(ptr->iface), ref); + + /* VT_VARIANT|VT_BYREF with VT_DISPATCH in referenced variant */ + V_VT(&varref) = VT_DISPATCH; + V_UNKNOWN(&varref) = ptr->iface; + + V_VT(&v) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(&v) = &varref; + ref = get_refcount(ptr->iface); + hr = ISAXXMLReader_putProperty(reader, _bstr_(ptr->prop_name), v); + EXPECT_HR(hr, S_OK); + ok(ref == get_refcount(ptr->iface), "got wrong refcount %d, expected %d\n", get_refcount(ptr->iface), ref); + V_VT(&v) = VT_EMPTY; V_UNKNOWN(&v) = (IUnknown*)0xdeadbeef;

1 0

Nikolay Sivov : fontsub: Added dll stub.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: fbd446519c66045ea7efff761754683d88836b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd446519c66045ea7efff761… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:54:04 2014 +0400 fontsub: Added dll stub. --- configure | 2 ++ configure.ac | 1 + dlls/fontsub/Makefile.in | 4 ++++ dlls/fontsub/fontsub.spec | 2 ++ dlls/fontsub/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index c6f4b39..dcd8581 100755 --- a/configure +++ b/configure @@ -1029,6 +1029,7 @@ enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep enable_fltlib enable_fntcache +enable_fontsub enable_fusion enable_fwpuclnt enable_gameux @@ -16852,6 +16853,7 @@ wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fntcache enable_fntcache +wine_fn_config_dll fontsub enable_fontsub wine_fn_config_dll fusion enable_fusion wine_fn_config_test dlls/fusion/tests fusion_test wine_fn_config_dll fwpuclnt enable_fwpuclnt diff --git a/configure.ac b/configure.ac index 098a5bd..ee8cd1a 100644 --- a/configure.ac +++ b/configure.ac @@ -2858,6 +2858,7 @@ WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fntcache) +WINE_CONFIG_DLL(fontsub) WINE_CONFIG_DLL(fusion) WINE_CONFIG_TEST(dlls/fusion/tests) WINE_CONFIG_DLL(fwpuclnt) diff --git a/dlls/fontsub/Makefile.in b/dlls/fontsub/Makefile.in new file mode 100644 index 0000000..ac323b5 --- /dev/null +++ b/dlls/fontsub/Makefile.in @@ -0,0 +1,4 @@ +MODULE = fontsub.dll + +C_SRCS = \ + main.c diff --git a/dlls/fontsub/fontsub.spec b/dlls/fontsub/fontsub.spec new file mode 100644 index 0000000..dfb47fb --- /dev/null +++ b/dlls/fontsub/fontsub.spec @@ -0,0 +1,2 @@ +@ stub CreateFontPackage +@ stub MergeFontPackage diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c new file mode 100644 index 0000000..515c2d3 --- /dev/null +++ b/dlls/fontsub/main.c @@ -0,0 +1,40 @@ +/* + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fontsub); + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +}

1 0

Grazvydas Ignotas : include: Remove unneeded semicolons and fix a typo.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 7e4fa636215ab4930c0110b2e47bfa692f9ab33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4fa636215ab4930c0110b2e… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Mar 2 04:12:27 2014 +0200 include: Remove unneeded semicolons and fix a typo. --- include/ddk/imm.h | 2 +- include/loadperf.h | 2 +- include/msi.h | 6 +++--- include/shlobj.h | 4 ++-- include/shlwapi.h | 2 +- include/tapi.h | 6 +++--- include/winreg.h | 4 ++-- include/winsock2.h | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/ddk/imm.h b/include/ddk/imm.h index 51685d5..bbbd70a 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -143,7 +143,7 @@ DWORD WINAPI ImmGetIMCCSize(HIMCC); BOOL WINAPI ImmGenerateMessage(HIMC); LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); -#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); +#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage) BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM); HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); BOOL WINAPI ImmDestroySoftKeyboard(HWND); diff --git a/include/loadperf.h b/include/loadperf.h index d11186a..40de444 100644 --- a/include/loadperf.h +++ b/include/loadperf.h @@ -25,7 +25,7 @@ extern "C" { DWORD WINAPI InstallPerfDllA(LPCSTR, LPCSTR, ULONG_PTR); DWORD WINAPI InstallPerfDllW(LPCWSTR, LPCWSTR, ULONG_PTR); -#define InstallPerfDll WINELIB_NAME_AW(InstallPerfDll); +#define InstallPerfDll WINELIB_NAME_AW(InstallPerfDll) DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR, BOOL); DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR, BOOL); diff --git a/include/msi.h b/include/msi.h index 9a7d562..8d0dff2 100644 --- a/include/msi.h +++ b/include/msi.h @@ -493,15 +493,15 @@ INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR); UINT WINAPI MsiConfigureProductA(LPCSTR, int, INSTALLSTATE); UINT WINAPI MsiConfigureProductW(LPCWSTR, int, INSTALLSTATE); -#define MsiConfigureProduct WINELIB_NAME_AW(MsiConfigureProduct); +#define MsiConfigureProduct WINELIB_NAME_AW(MsiConfigureProduct) UINT WINAPI MsiConfigureProductExA(LPCSTR, int, INSTALLSTATE, LPCSTR); UINT WINAPI MsiConfigureProductExW(LPCWSTR, int, INSTALLSTATE, LPCWSTR); -#define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx); +#define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx) UINT WINAPI MsiConfigureFeatureA(LPCSTR, LPCSTR, INSTALLSTATE); UINT WINAPI MsiConfigureFeatureW(LPCWSTR, LPCWSTR, INSTALLSTATE); -#define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature); +#define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature) UINT WINAPI MsiGetProductCodeA(LPCSTR, LPSTR); UINT WINAPI MsiGetProductCodeW(LPCWSTR, LPWSTR); diff --git a/include/shlobj.h b/include/shlobj.h index 95369ad..9025a73 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -61,7 +61,7 @@ BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,DWORD,LPCWSTR,LPCWSTR,LPCW HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); -#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir) HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); @@ -72,7 +72,7 @@ HRESULT WINAPI SHLoadOLE(LPARAM); HRESULT WINAPI SHParseDisplayName(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); -#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite); +#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite) UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM); LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR); BOOL WINAPI SHRunControlPanel(LPCWSTR, HWND); diff --git a/include/shlwapi.h b/include/shlwapi.h index f3d6ca0..205d5e6 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -424,7 +424,7 @@ BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR); BOOL WINAPI PathIsFileSpecA(LPCSTR); BOOL WINAPI PathIsFileSpecW(LPCWSTR); -#define PathIsFileSpec WINELIB_NAME_AW(PathIsFileSpec); +#define PathIsFileSpec WINELIB_NAME_AW(PathIsFileSpec) BOOL WINAPI PathIsPrefixA(LPCSTR,LPCSTR); BOOL WINAPI PathIsPrefixW(LPCWSTR,LPCWSTR); diff --git a/include/tapi.h b/include/tapi.h index 98d995a..45ab122 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -918,11 +918,11 @@ DWORD WINAPI lineGetConfRelatedCalls(HCALL,LPLINECALLLIST); DWORD WINAPI lineGetCountry(DWORD,DWORD,LPLINECOUNTRYLIST); DWORD WINAPI lineGetDevCapsA(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); DWORD WINAPI lineGetDevCapsW(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); -#define lineGetDevCaps WINELIB_NAME_AW(lineGetDevCaps); +#define lineGetDevCaps WINELIB_NAME_AW(lineGetDevCaps) DWORD WINAPI lineGetDevConfig(DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIDA(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIDW(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCWSTR); -#define lineGetID WINELIB_NAME_AW(lineGetID); +#define lineGetID WINELIB_NAME_AW(lineGetID) DWORD WINAPI lineGetIcon(DWORD,LPCSTR,HICON *); DWORD WINAPI lineGetLineDevStatus(HLINE,LPLINEDEVSTATUS); DWORD WINAPI lineGetNewCalls(HLINE,DWORD,DWORD,LPLINECALLLIST); @@ -941,7 +941,7 @@ LONG WINAPI lineInitializeExW(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCWSTR,LPDWORD #define lineInitializeEx WINELIB_NAME_AW(lineInitializeEx) DWORD WINAPI lineMakeCallA(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); DWORD WINAPI lineMakeCallW(HLINE,LPHCALL,LPCWSTR,DWORD,LPLINECALLPARAMS); -#define lineMakeCall WINELIB_NAMEAW(lineMakeCall); +#define lineMakeCall WINELIB_NAME_AW(lineMakeCall) DWORD WINAPI lineMonitorDigits(HCALL,DWORD); DWORD WINAPI lineMonitorMedia(HCALL,DWORD); DWORD WINAPI lineMonitorTones(HCALL,LPLINEMONITORTONE,DWORD); diff --git a/include/winreg.h b/include/winreg.h index fb0b752..56d9650 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -87,10 +87,10 @@ WINADVAPI BOOL WINAPI AbortSystemShutdownW(LPWSTR); #define AbortSystemShutdown WINELIB_NAME_AW(AbortSystemShutdown) WINADVAPI BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL); WINADVAPI BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL); -#define InitiateSystemShutdown WINELIB_NAME_AW(InitiateSystemShutdown); +#define InitiateSystemShutdown WINELIB_NAME_AW(InitiateSystemShutdown) WINADVAPI BOOL WINAPI InitiateSystemShutdownExA(LPSTR,LPSTR,DWORD,BOOL,BOOL,DWORD); WINADVAPI BOOL WINAPI InitiateSystemShutdownExW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL,DWORD); -#define InitiateSystemShutdownEx WINELIB_NAME_AW(InitiateSystemShutdownEx); +#define InitiateSystemShutdownEx WINELIB_NAME_AW(InitiateSystemShutdownEx) WINADVAPI LSTATUS WINAPI RegCloseKey(HKEY); WINADVAPI LSTATUS WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY); WINADVAPI LSTATUS WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY); diff --git a/include/winsock2.h b/include/winsock2.h index f189f79..04f3aea 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -724,7 +724,7 @@ typedef int (WINAPI *LPFN_WSAIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWO typedef int (WINAPI *LPFN_WSAJOINLEAF)(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINA)(LPWSAQUERYSETA,DWORD,LPHANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINW)(LPWSAQUERYSETW,DWORD,LPHANDLE); -#define LPFN_WSALOOKUPSERVICEBEGIN WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICEBEGIN); +#define LPFN_WSALOOKUPSERVICEBEGIN WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICEBEGIN) typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND)(HANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTA)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETA); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW);

1 0

Piotr Caban : ole32: Add more DoDragDrop tests.
by Alexandre Julliard March 3, 2014

March 3, 2014

Module: wine Branch: master Commit: 6d1ab7fa16b3bb2ec93578d93bdbf2ddc71e4baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1ab7fa16b3bb2ec93578d93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 1 14:47:07 2014 +0100 ole32: Add more DoDragDrop tests. --- dlls/ole32/tests/dragdrop.c | 177 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 170 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index d6eaf7a..36328df 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -31,6 +31,40 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(DataObject_EnumFormatEtc); +DEFINE_EXPECT(EnumFORMATETC_Next); +DEFINE_EXPECT(EnumFORMATETC_Reset); +DEFINE_EXPECT(DataObject_QueryGetData); +DEFINE_EXPECT(DropSource_QueryContinueDrag); +DEFINE_EXPECT(DropTarget_DragEnter); +DEFINE_EXPECT(DropSource_GiveFeedback); +DEFINE_EXPECT(DropTarget_Drop); +DEFINE_EXPECT(DropTarget_DragLeave); + static int droptarget_refs; /* helper macros to make tests a bit leaner */ @@ -68,7 +102,9 @@ static HRESULT WINAPI DropTarget_DragEnter(IDropTarget* iface, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - return E_NOTIMPL; + CHECK_EXPECT(DropTarget_DragEnter); + *pdwEffect = DROPEFFECT_COPY; + return S_OK; } static HRESULT WINAPI DropTarget_DragOver(IDropTarget* iface, @@ -76,11 +112,14 @@ static HRESULT WINAPI DropTarget_DragOver(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - return E_NOTIMPL; + ok(0, "unexpected call\n"); + *pdwEffect = DROPEFFECT_COPY; + return S_OK; } static HRESULT WINAPI DropTarget_DragLeave(IDropTarget* iface) { + CHECK_EXPECT(DropTarget_DragLeave); return E_NOTIMPL; } @@ -88,7 +127,8 @@ static HRESULT WINAPI DropTarget_Drop(IDropTarget* iface, IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - return E_NOTIMPL; + CHECK_EXPECT(DropTarget_Drop); + return 0xbeefbeef; } static const IDropTargetVtbl DropTarget_VTbl = @@ -104,7 +144,6 @@ static const IDropTargetVtbl DropTarget_VTbl = static IDropTarget DropTarget = { &DropTarget_VTbl }; -/** stub IDropSource **/ static HRESULT WINAPI DropSource_QueryInterface(IDropSource *iface, REFIID riid, void **ppObj) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -132,7 +171,7 @@ static HRESULT WINAPI DropSource_QueryContinueDrag( BOOL fEscapePressed, DWORD grfKeyState) { - /* always drop */ + CHECK_EXPECT(DropSource_QueryContinueDrag); return DRAGDROP_S_DROP; } @@ -140,6 +179,7 @@ static HRESULT WINAPI DropSource_GiveFeedback( IDropSource *iface, DWORD dwEffect) { + CHECK_EXPECT(DropSource_GiveFeedback); return DRAGDROP_S_USEDEFAULTCURSORS; } @@ -153,7 +193,75 @@ static const IDropSourceVtbl dropsource_vtbl = { static IDropSource DropSource = { &dropsource_vtbl }; -/** IDataObject stub **/ +static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, + REFIID riid, void **ppvObj) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) +{ + return 2; +} + +static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) +{ + return 1; +} + +static BOOL formats_enumerated; +static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, + ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) +{ + static FORMATETC format = { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + + CHECK_EXPECT2(EnumFORMATETC_Next); + + ok(celt == 1, "celt = %d\n", celt); + ok(rgelt != NULL, "rgelt == NULL\n"); + ok(pceltFetched == NULL, "pceltFetched != NULL\n"); + + if(formats_enumerated) + return S_FALSE; + + *rgelt = format; + formats_enumerated = TRUE; + return S_OK; +} + +static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) +{ + CHECK_EXPECT(EnumFORMATETC_Reset); + formats_enumerated = FALSE; + return S_OK; +} + +static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, + IEnumFORMATETC **ppenum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IEnumFORMATETCVtbl enumformatetc_vtbl = { + EnumFORMATETC_QueryInterface, + EnumFORMATETC_AddRef, + EnumFORMATETC_Release, + EnumFORMATETC_Next, + EnumFORMATETC_Skip, + EnumFORMATETC_Reset, + EnumFORMATETC_Clone +}; + +static IEnumFORMATETC EnumFORMATETC = { &enumformatetc_vtbl }; + static HRESULT WINAPI DataObject_QueryInterface( IDataObject *iface, REFIID riid, @@ -166,6 +274,8 @@ static HRESULT WINAPI DataObject_QueryInterface( IDataObject_AddRef(iface); return S_OK; } + + trace("DataObject_QueryInterface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -184,6 +294,7 @@ static HRESULT WINAPI DataObject_GetData( FORMATETC *pformatetcIn, STGMEDIUM *pmedium) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -192,6 +303,7 @@ static HRESULT WINAPI DataObject_GetDataHere( FORMATETC *pformatetc, STGMEDIUM *pmedium) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -199,6 +311,7 @@ static HRESULT WINAPI DataObject_QueryGetData( IDataObject *iface, FORMATETC *pformatetc) { + CHECK_EXPECT(DataObject_QueryGetData); return S_OK; } @@ -207,6 +320,7 @@ static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( FORMATETC *pformatectIn, FORMATETC *pformatetcOut) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -216,6 +330,7 @@ static HRESULT WINAPI DataObject_SetData( STGMEDIUM *pmedium, BOOL fRelease) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -224,6 +339,9 @@ static HRESULT WINAPI DataObject_EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) { + CHECK_EXPECT(DataObject_EnumFormatEtc); + *ppenumFormatEtc = &EnumFORMATETC; + formats_enumerated = FALSE; return S_OK; } @@ -234,6 +352,7 @@ static HRESULT WINAPI DataObject_DAdvise( IAdviseSink *pAdvSink, DWORD *pdwConnection) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -241,6 +360,7 @@ static HRESULT WINAPI DataObject_DUnadvise( IDataObject *iface, DWORD dwConnection) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -248,6 +368,7 @@ static HRESULT WINAPI DataObject_EnumDAdvise( IDataObject *iface, IEnumSTATDATA **ppenumAdvise) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -362,9 +483,10 @@ static void test_DoDragDrop(void) DWORD effect; HRESULT hr; HWND hwnd; + RECT rect; hwnd = CreateWindowA("WineOleTestClass", "Test", 0, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, NULL, NULL); ok(IsWindow(hwnd), "failed to create window\n"); @@ -396,6 +518,47 @@ static void test_DoDragDrop(void) hr = DoDragDrop(&DataObject, NULL, 0, &effect); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ShowWindow(hwnd, SW_SHOW); + GetWindowRect(hwnd, &rect); + ok(SetCursorPos(rect.left+50, rect.top+50), "SetCursorPos failed\n"); + SET_EXPECT(DataObject_EnumFormatEtc); + SET_EXPECT(EnumFORMATETC_Next); + SET_EXPECT(EnumFORMATETC_Reset); + SET_EXPECT(DataObject_QueryGetData); + SET_EXPECT(DropSource_QueryContinueDrag); + SET_EXPECT(DropTarget_DragEnter); + SET_EXPECT(DropSource_GiveFeedback); + SET_EXPECT(DropTarget_Drop); + hr = DoDragDrop(&DataObject, &DropSource, DROPEFFECT_COPY, &effect); + ok(hr == 0xbeefbeef, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(DataObject_EnumFormatEtc); + todo_wine CHECK_CALLED(EnumFORMATETC_Next); + todo_wine CHECK_CALLED(EnumFORMATETC_Reset); + todo_wine CHECK_CALLED(DataObject_QueryGetData); + CHECK_CALLED(DropSource_QueryContinueDrag); + CHECK_CALLED(DropTarget_DragEnter); + CHECK_CALLED(DropSource_GiveFeedback); + CHECK_CALLED(DropTarget_Drop); + + SET_EXPECT(DataObject_EnumFormatEtc); + SET_EXPECT(EnumFORMATETC_Next); + SET_EXPECT(EnumFORMATETC_Reset); + SET_EXPECT(DataObject_QueryGetData); + SET_EXPECT(DropSource_QueryContinueDrag); + SET_EXPECT(DropTarget_DragEnter); + SET_EXPECT(DropSource_GiveFeedback); + SET_EXPECT(DropTarget_DragLeave); + hr = DoDragDrop(&DataObject, &DropSource, 0, &effect); + ok(hr == DRAGDROP_S_DROP, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(DataObject_EnumFormatEtc); + todo_wine CHECK_CALLED(EnumFORMATETC_Next); + todo_wine CHECK_CALLED(EnumFORMATETC_Reset); + todo_wine CHECK_CALLED(DataObject_QueryGetData); + CHECK_CALLED(DropSource_QueryContinueDrag); + CHECK_CALLED(DropTarget_DragEnter); + CHECK_CALLED(DropSource_GiveFeedback); + CHECK_CALLED(DropTarget_DragLeave); + OleUninitialize(); DestroyWindow(hwnd);

1 0