October 2015 - Wine-Commits

Józef Kucia : d3d11/tests: Add test for geometry shader to test_create_shader().
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 9ea0083477a2f179508c4aff2b19acfb8824c064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea0083477a2f179508c4aff2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:31 2015 +0200 d3d11/tests: Add test for geometry shader to test_create_shader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cecac07..c58539e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1399,8 +1399,53 @@ static void test_create_shader(void) 0x00000000, 0x00000000, }; +#if 0 + struct gs_out + { + float4 pos : SV_POSITION; + }; + + [maxvertexcount(4)] + void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout) + { + float offset = 0.1 * vin[0].w; + gs_out v; + + v.pos = float4(vin[0].x - offset, vin[0].y - offset, vin[0].z, vin[0].w); + vout.Append(v); + v.pos = float4(vin[0].x - offset, vin[0].y + offset, vin[0].z, vin[0].w); + vout.Append(v); + v.pos = float4(vin[0].x + offset, vin[0].y - offset, vin[0].z, vin[0].w); + vout.Append(v); + v.pos = float4(vin[0].x + offset, vin[0].y + offset, vin[0].z, vin[0].w); + vout.Append(v); + } +#endif + static const DWORD gs_4_0[] = + { + 0x43425844, 0x000ee786, 0xc624c269, 0x885a5cbe, 0x444b3b1f, 0x00000001, 0x0000023c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000001a0, 0x00020040, + 0x00000068, 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x02000068, 0x00000001, 0x0100085d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, + 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, + 0x3dcccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, + 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, + 0x00000000, 0x01000013, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0e000032, + 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, 0x00000000, + 0x3dcccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, 0x05000036, 0x00102022, 0x00000000, + 0x0010002a, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, + 0x01000013, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, + 0x00000000, 0x0010001a, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, + 0x00000000, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, 0x06000036, + 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, 0x01000013, 0x0100003e, + }; + ULONG refcount, expected_refcount; ID3D11Device *device, *tmp; + ID3D11GeometryShader *gs; ID3D11VertexShader *vs; ID3D11PixelShader *ps; unsigned int i; @@ -1415,6 +1460,7 @@ static void test_create_shader(void) continue; } + /* vertex shader */ hr = ID3D11Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), NULL, &vs); ok(hr == E_INVALIDARG, "Created a SM2 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); @@ -1448,6 +1494,7 @@ static void test_create_shader(void) ID3D11Device_Release(tmp); ID3D11VertexShader_Release(vs); + /* pixel shader */ expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D11Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), NULL, &ps); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); @@ -1464,6 +1511,24 @@ static void test_create_shader(void) ID3D11Device_Release(tmp); ID3D11PixelShader_Release(ps); + /* geometry shader */ + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateGeometryShader(device, gs_4_0, sizeof(gs_4_0), NULL, &gs); + ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", + refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11GeometryShader_GetDevice(gs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + refcount = ID3D11GeometryShader_Release(gs); + ok(!refcount, "Geometry shader has %u references left.\n", refcount); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Józef Kucia : d3d10core/tests: Add test for geometry shader to test_create_shaders().
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: b27efb4bdf326bf9be6fc86c1c556326107958f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27efb4bdf326bf9be6fc86c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:30 2015 +0200 d3d10core/tests: Add test for geometry shader to test_create_shaders(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 74 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 99890a2..ee12b40 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1081,10 +1081,55 @@ float4 main(const float4 color : COLOR) : SV_TARGET 0x00000000, 0x00000000, }; +#if 0 +struct gs_out +{ + float4 pos : SV_POSITION; +}; + +[maxvertexcount(4)] +void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout) +{ + float offset = 0.1 * vin[0].w; + gs_out v; + + v.pos = float4(vin[0].x - offset, vin[0].y - offset, vin[0].z, vin[0].w); + vout.Append(v); + v.pos = float4(vin[0].x - offset, vin[0].y + offset, vin[0].z, vin[0].w); + vout.Append(v); + v.pos = float4(vin[0].x + offset, vin[0].y - offset, vin[0].z, vin[0].w); + vout.Append(v); + v.pos = float4(vin[0].x + offset, vin[0].y + offset, vin[0].z, vin[0].w); + vout.Append(v); +} +#endif + static const DWORD gs_4_0[] = + { + 0x43425844, 0x000ee786, 0xc624c269, 0x885a5cbe, 0x444b3b1f, 0x00000001, 0x0000023c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000001a0, 0x00020040, + 0x00000068, 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x02000068, 0x00000001, 0x0100085d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, + 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, + 0x3dcccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, + 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, + 0x00000000, 0x01000013, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0e000032, + 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, 0x00004002, 0x3dcccccd, 0x00000000, + 0x3dcccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, 0x05000036, 0x00102022, 0x00000000, + 0x0010002a, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, + 0x01000013, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, + 0x00000000, 0x0010001a, 0x00000000, 0x06000036, 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, + 0x00000000, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, 0x06000036, + 0x001020c2, 0x00000000, 0x00201ea6, 0x00000000, 0x00000000, 0x01000013, 0x0100003e, + }; + ULONG refcount, expected_refcount; - ID3D10VertexShader *vs = NULL; - ID3D10PixelShader *ps = NULL; ID3D10Device *device, *tmp; + ID3D10GeometryShader *gs; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; IUnknown *iface; HRESULT hr; @@ -1094,6 +1139,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET return; } + /* vertex shader */ expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); @@ -1125,6 +1171,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreateVertexShader(device, ps_4_0, sizeof(ps_4_0), &vs); ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x\n", hr); + /* pixel shader */ expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); @@ -1147,6 +1194,29 @@ float4 main(const float4 color : COLOR) : SV_TARGET refcount = ID3D10PixelShader_Release(ps); ok(!refcount, "Pixel shader has %u references left.\n", refcount); + /* geometry shader */ + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D10Device_CreateGeometryShader(device, gs_4_0, sizeof(gs_4_0), &gs); + ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x.\n", hr); + + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10GeometryShader_GetDevice(gs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); + + hr = ID3D10GeometryShader_QueryInterface(gs, &IID_ID3D11GeometryShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Geometry shader should implement ID3D11GeometryShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10GeometryShader_Release(gs); + ok(!refcount, "Geometry shader has %u references left.\n", refcount); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Józef Kucia : d3d11/tests: Port test_device_removed_reason() from d3d10core.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 894ef070bc3b33781973c0baab3e6aeb5f7f4ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894ef070bc3b33781973c0baa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:25 2015 +0200 d3d11/tests: Port test_device_removed_reason() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bc44dbd..a079acf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1612,6 +1612,27 @@ static void test_create_rasterizer_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_device_removed_reason(void) +{ + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_GetDeviceRemovedReason(device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1628,4 +1649,5 @@ START_TEST(d3d11) test_create_shader(); test_create_depthstencil_state(); test_create_rasterizer_state(); + test_device_removed_reason(); }

1 0

Andrew Eikum : xapofx: Implement CreateFX.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: ad4ba76eb044a75b2a86a7738502a266caef2292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4ba76eb044a75b2a86a7738… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:13 2015 -0500 xapofx: Implement CreateFX. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xapofx1_1/xapofx1_1.spec | 2 +- dlls/xapofx1_3/xapofx1_3.spec | 2 +- dlls/xapofx1_4/xapofx1_4.spec | 2 +- dlls/xapofx1_5/Makefile.in | 1 + dlls/xapofx1_5/main.c | 11 +++++++++++ dlls/xapofx1_5/xapofx1_5.spec | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/xapofx1_1/xapofx1_1.spec b/dlls/xapofx1_1/xapofx1_1.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_1/xapofx1_1.spec +++ b/dlls/xapofx1_1/xapofx1_1.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_3/xapofx1_3.spec b/dlls/xapofx1_3/xapofx1_3.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_3/xapofx1_3.spec +++ b/dlls/xapofx1_3/xapofx1_3.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_4/xapofx1_4.spec b/dlls/xapofx1_4/xapofx1_4.spec index 33269e3..bc17511 100644 --- a/dlls/xapofx1_4/xapofx1_4.spec +++ b/dlls/xapofx1_4/xapofx1_4.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr) xapofx1_5.CreateFX diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in index e0c6e9a..d243802 100644 --- a/dlls/xapofx1_5/Makefile.in +++ b/dlls/xapofx1_5/Makefile.in @@ -1,4 +1,5 @@ MODULE = xapofx1_5.dll +IMPORTS = ole32 C_SRCS = \ main.c diff --git a/dlls/xapofx1_5/main.c b/dlls/xapofx1_5/main.c index 1b223ad..4865d31 100644 --- a/dlls/xapofx1_5/main.c +++ b/dlls/xapofx1_5/main.c @@ -19,8 +19,13 @@ #include <stdarg.h> +#include "initguid.h" #include "windef.h" #include "winbase.h" +#include "compobj.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -35,3 +40,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) +{ + TRACE("%s %p\n", debugstr_guid(clsid), out); + return CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)out); +} diff --git a/dlls/xapofx1_5/xapofx1_5.spec b/dlls/xapofx1_5/xapofx1_5.spec index 33269e3..9b768cb 100644 --- a/dlls/xapofx1_5/xapofx1_5.spec +++ b/dlls/xapofx1_5/xapofx1_5.spec @@ -1 +1 @@ -@ stub CreateFX +@ cdecl CreateFX(ptr ptr)

1 0

Andrew Eikum : xaudio2_1: Forward to xaudio2_7.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 24a371c9d6917e87e8f6781a233286a3c04469f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a371c9d6917e87e8f6781a2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:09 2015 -0500 xaudio2_1: Forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_1/Makefile.in | 7 ++++++ dlls/xaudio2_1/xaudio2_1.spec | 4 +++ dlls/xaudio2_1/xaudio_classes.idl | 28 +++++++++++++++++++++ dlls/xaudio2_1/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++ include/xaudio2.idl | 7 ++++++ 7 files changed, 101 insertions(+) diff --git a/configure b/configure index 5b5000d..34edcce 100755 --- a/configure +++ b/configure @@ -1374,6 +1374,7 @@ enable_xapofx1_1 enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 +enable_xaudio2_1 enable_xaudio2_2 enable_xaudio2_3 enable_xaudio2_4 @@ -17916,6 +17917,7 @@ wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 +wine_fn_config_dll xaudio2_1 enable_xaudio2_1 clean wine_fn_config_dll xaudio2_2 enable_xaudio2_2 clean wine_fn_config_dll xaudio2_3 enable_xaudio2_3 clean wine_fn_config_dll xaudio2_4 enable_xaudio2_4 clean diff --git a/configure.ac b/configure.ac index 51574db..d350ea6 100644 --- a/configure.ac +++ b/configure.ac @@ -3460,6 +3460,7 @@ WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) +WINE_CONFIG_DLL(xaudio2_1,,[clean]) WINE_CONFIG_DLL(xaudio2_2,,[clean]) WINE_CONFIG_DLL(xaudio2_3,,[clean]) WINE_CONFIG_DLL(xaudio2_4,,[clean]) diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in new file mode 100644 index 0000000..282513b --- /dev/null +++ b/dlls/xaudio2_1/Makefile.in @@ -0,0 +1,7 @@ +MODULE = xaudio2_1.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c + +IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_1/xaudio2_1.spec b/dlls/xaudio2_1/xaudio2_1.spec new file mode 100644 index 0000000..cb263d4 --- /dev/null +++ b/dlls/xaudio2_1/xaudio2_1.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_1/xaudio_classes.idl b/dlls/xaudio2_1/xaudio_classes.idl new file mode 100644 index 0000000..de85c0b --- /dev/null +++ b/dlls/xaudio2_1/xaudio_classes.idl @@ -0,0 +1,28 @@ +/* + * COM Classes for xaudio + * + * Copyright 2015 Andrew Eikum 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 + */ + +#pragma makedep register + +[ + helpstring("XAudio2.1 Class"), + threading(both), + uuid(e21a7345-eb21-468e-be50-804db97cf708) +] +coclass XAudio21 { interface IXAudio22; } diff --git a/dlls/xaudio2_1/xaudio_dll.c b/dlls/xaudio2_1/xaudio_dll.c new file mode 100644 index 0000000..7c95c28 --- /dev/null +++ b/dlls/xaudio2_1/xaudio_dll.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Andrew Eikum 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 "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance); +} diff --git a/include/xaudio2.idl b/include/xaudio2.idl index bd79718..5d4726a 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -31,6 +31,13 @@ coclass XAudio2 { } [ + uuid(e21a7345-eb21-468e-be50-804db97cf708) +] +coclass XAudio21 { + interface IUnknown; +} + +[ uuid(b802058a-464a-42db-bc10-b650d6f2586a) ] coclass XAudio22 {

1 0

Dmitry Timoshkov : oleaut32/tests: Update the typelib test generator to match existing data.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 016985f67deddfa844235546d0246300c91010d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=016985f67deddfa844235546d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:13 2015 +0800 oleaut32/tests: Update the typelib test generator to match existing data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 152 ++++++++++++++++++++++++++++++++---------- 1 file changed, 118 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=016985f67deddfa844235…

1 0

Dmitry Timoshkov : oleaut32/tests: Add a check for referenced type of VT_USERDEFINED parameters.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 5081ce3e37e305246f462c4deaa0807818b09372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5081ce3e37e305246f462c4de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:25 2015 +0800 oleaut32/tests: Add a check for referenced type of VT_USERDEFINED parameters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 121 ++++++++++++++++++++++++++++-------------- 1 file changed, 81 insertions(+), 40 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index dfc7bee..a9ef5fb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3929,6 +3929,30 @@ static const char *dump_func_flags(DWORD flags) return buf; } +static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) +{ + int href_type = -1; + + if (tdesc->vt == VT_USERDEFINED) + { + HRESULT hr; + ITypeInfo *param; + TYPEATTR *attr; + + hr = ITypeInfo_GetRefTypeInfo(info, U(*tdesc).hreftype, &param); + ok(hr == S_OK, "GetRefTypeInfo error %#x\n", hr); + hr = ITypeInfo_GetTypeAttr(param, &attr); + ok(hr == S_OK, "GetTypeAttr error %#x\n", hr); + + href_type = attr->typekind; + + ITypeInfo_ReleaseTypeAttr(param, attr); + ITypeInfo_Release(param); + } + + return href_type; +} + static void test_dump_typelib(const char *name) { WCHAR wszString[260]; @@ -3982,14 +4006,16 @@ static void test_dump_typelib(const char *name) map_value(desc->callconv, callconv_map)); printf(" /*#param*/ %d, /*#opt*/ %d, /*vtbl*/ %d, /*#scodes*/ %d, /*flags*/ %s,\n", desc->cParams, desc->cParamsOpt, desc->oVft/sizeof(void*), desc->cScodes, dump_func_flags(desc->wFuncFlags)); - printf(" {%s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); + printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), + map_value(get_href_type(info, &desc->elemdescFunc.tdesc), tkind_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); printf(" { /* params */\n"); for (p = 0; p < desc->cParams; p++) { ELEMDESC e = desc->lprgelemdescParam[p]; - printf(" {%s, %s},\n", map_value(e.tdesc.vt, vt_map), dump_param_flags(U(e).paramdesc.wParamFlags)); + printf(" {%s, %s, %s},\n", map_value(e.tdesc.vt, vt_map), + map_value(get_href_type(info, &e.tdesc), tkind_map), dump_param_flags(U(e).paramdesc.wParamFlags)); } - printf(" {-1, -1}\n"); + printf(" {-1, 0, 0}\n"); printf(" },\n"); printf(" { /* names */\n"); OLE_CHECK(ITypeInfo_GetNames(info, desc->memid, tab, 256, &cNames)); @@ -4018,6 +4044,7 @@ static void test_dump_typelib(const char *name) typedef struct _element_info { VARTYPE vt; + TYPEKIND type; USHORT wParamFlags; } element_info; @@ -4061,11 +4088,11 @@ static const type_info info[] = { { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "QueryInterface", @@ -4077,9 +4104,9 @@ static const type_info info[] = { { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_UI4, PARAMFLAG_NONE}, /* ret */ + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "AddRef", @@ -4089,9 +4116,9 @@ static const type_info info[] = { { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_UI4, PARAMFLAG_NONE}, /* ret */ + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Release", @@ -4101,10 +4128,10 @@ static const type_info info[] = { { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetTypeInfoCount", @@ -4115,12 +4142,12 @@ static const type_info info[] = { { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_UINT, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetTypeInfo", @@ -4133,14 +4160,14 @@ static const type_info info[] = { { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_UINT, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetIDsOfNames", @@ -4155,17 +4182,17 @@ static const type_info info[] = { { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_I4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_UI2, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {VT_PTR, PARAMFLAG_FOUT}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_I4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_UI2, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "Invoke", @@ -4183,9 +4210,9 @@ static const type_info info[] = { { /*id*/ 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Test", @@ -4203,9 +4230,9 @@ static const type_info info[] = { { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, - {VT_HRESULT, PARAMFLAG_NONE}, /* ret */ + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Test", @@ -4316,6 +4343,20 @@ static void test_dump_typelib(const char *name) for (i = 0 ; i < desc->cParams; i++) { check_type(&desc->lprgelemdescParam[i], &fn_info->params[i]); + + if (desc->lprgelemdescParam[i].tdesc.vt == VT_USERDEFINED) + { + ITypeInfo *param; + TYPEATTR *var_attr; + + ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, U(desc->lprgelemdescParam[i].tdesc).hreftype, &param)); + ole_check(ITypeInfo_GetTypeAttr(param, &var_attr)); + + ok(var_attr->typekind == fn_info->params[i].type, "expected %#x, got %#x\n", fn_info->params[i].type, var_attr->typekind); + + ITypeInfo_ReleaseTypeAttr(param, var_attr); + ITypeInfo_Release(param); + } } expect_int(fn_info->params[desc->cParams].vt, (VARTYPE)-1);

1 0

Dmitry Timoshkov : oleaut32/tests: Add more tests for typelib data.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: e1760f84229abf107afa5414bb20251e01127951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1760f84229abf107afa5414b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 6 15:55:03 2015 +0800 oleaut32/tests: Add more tests for typelib data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/test_tlb.idl | 15 ++++++ dlls/oleaut32/tests/typelib.c | 111 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index fa084ec..8275c37 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -58,4 +58,19 @@ library Test IDispatch *disp; BSTR bstr; }; + + typedef [public] enum _a { a1, a2 } a; + typedef [public] enum aa { aa1, aa2 } aa; + typedef enum _b { b1, b2 } b; + typedef enum bb { bb1, bb2 } bb; + typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396b)] enum _c { c1, c2 } c; + typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396c)] enum cc { cc1, cc2 } cc; + + [uuid(ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a)] + interface ITestIface : IDispatch + { + HRESULT test1(a value); + HRESULT test2(b value); + HRESULT test3(c value); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a9ef5fb..1d13b89 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4252,6 +4252,104 @@ static const type_info info[] = { "{4029f190-ca4a-4611-aeb9-673983cb96de}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2), /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "a", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_a", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "aa", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_b", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "bb", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "c", + "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_c", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "cc", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "ITestIface", + "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*), + /*#vtbl*/ 10, /*#func*/ 3, + { + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test1", + "value", + NULL, + }, + }, + { + /*id*/ 0x60020001, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ENUM, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test2", + "value", + NULL, + }, + }, + { + /*id*/ 0x60020002, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test3", + "value", + NULL, + }, + }, + } } }; @@ -4286,8 +4384,21 @@ static void test_dump_typelib(const char *name) ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); expect_int(typeattr->typekind, ti->type); expect_hex(typeattr->wTypeFlags, ti->wTypeFlags); + /* FIXME: remove once widl is fixed */ + if (typeattr->typekind == TKIND_ALIAS) + { +todo_wine /* widl generates broken typelib and typeattr just reflects that */ + ok(typeattr->cbAlignment == ti->cbAlignment || broken(typeattr->cbAlignment == 1), + "expected %d, got %d\n", ti->cbAlignment, typeattr->cbAlignment); +todo_wine /* widl generates broken typelib and typeattr just reflects that */ + ok(typeattr->cbSizeInstance == ti->cbSizeInstance || broken(typeattr->cbSizeInstance == 0), + "expected %d, got %d\n", ti->cbSizeInstance, typeattr->cbSizeInstance); + } + else + { expect_int(typeattr->cbAlignment, ti->cbAlignment); expect_int(typeattr->cbSizeInstance, ti->cbSizeInstance); + } expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); expect_int(typeattr->cFuncs, ti->cFuncs);

1 0

Dmitry Timoshkov : oleaut32/tests: Replace magic values by symbolic names in the typelib data.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 2ce0efd3b19a3e972874c21592908594939804b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0efd3b19a3e972874c2159… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:20 2015 +0800 oleaut32/tests: Replace magic values by symbolic names in the typelib data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 213 +++++++++++++++++++++++++++++++++--------- 1 file changed, 170 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ce0efd3b19a3e972874c…

1 0

Jacek Caban : mshtml: Updated nsIDocShellLoadInfo declaration to recent Wine Gecko version.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: d25737b38176edf918c6b89d384647b38b67d179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25737b38176edf918c6b89d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 5 17:45:48 2015 +0200 mshtml: Updated nsIDocShellLoadInfo declaration to recent Wine Gecko version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsiface.idl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 13c610f..c0b120c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3735,12 +3735,13 @@ interface nsIContentViewer : nsISupports [ object, - uuid(c8d3b1e1-565a-427e-9d68-b109910ce9b7), + uuid(c63e9d64-490d-48bf-8013-b5d8ee4dbc25), local ] interface nsIDocShellLoadInfo : nsISupports { - typedef int nsDocShellInfoLoadType; + typedef int32_t nsDocShellInfoLoadType; + typedef uint32_t nsDocShellInfoReferrerPolicy; nsresult GetReferrer(nsIURI **aReferrer); nsresult SetReferrer(nsIURI *aReferrer); @@ -3762,6 +3763,8 @@ interface nsIDocShellLoadInfo : nsISupports nsresult SetHeadersStream(nsIInputStream *aHeadersStream); nsresult GetSendReferrer(bool *aSendReferrer); nsresult SetSendReferrer(bool aSendReferrer); + nsresult GetReferrerPolicy(nsDocShellInfoReferrerPolicy *aReferrerPolicy); + nsresult SetReferrerPolicy(nsDocShellInfoReferrerPolicy aReferrerPolicy); nsresult GetIsSrcdocLoad(bool *aIsSrcdocLoad); nsresult GetSrcdocData(nsAString *aSrcdocData); nsresult SetSrcdocData(const nsAString *aSrcdocData);

1 0