August 2015 - Wine-commits - list.winehq.org

Stefan Dösinger : dxgi/tests: Test presentation parameter combinations.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: f805fb11f67c73cb7a3a9e71680acf0bafec4126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f805fb11f67c73cb7a3a9e716… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 27 23:05:03 2015 +0200 dxgi/tests: Test presentation parameter combinations. --- dlls/dxgi/factory.c | 30 +++++++- dlls/dxgi/tests/device.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ include/dxgi.idl | 2 + 3 files changed, 215 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f805fb11f67c73cb7a3a9…

1 0

Stefan Dösinger : ddraw/tests: Properly clean up in test_texcoordindex.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: 9427d1d553059b0a7b88295095979fa64b87e574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9427d1d553059b0a7b8829509… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 28 00:22:36 2015 +0200 ddraw/tests: Properly clean up in test_texcoordindex. --- dlls/ddraw/tests/ddraw4.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index eed5f334..6ac725d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9415,7 +9415,7 @@ static void test_texcoordindex(void) } hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); IDirect3D3_Release(d3d); @@ -9545,10 +9545,14 @@ static void test_texcoordindex(void) color = get_surface_color(rt, 480, 360); ok(compare_color(color, 0x00ffff00, 2), "Got unexpected color 0x%08x.\n", color); - IDirectDrawSurface7_Release(texture1); - IDirectDrawSurface7_Release(texture2); + IDirect3DTexture2_Release(texture2); + IDirect3DTexture2_Release(texture1); + IDirectDrawSurface4_Release(surface2); + IDirectDrawSurface4_Release(surface1); + + destroy_viewport(device, viewport); - IDirectDrawSurface7_Release(rt); + IDirectDrawSurface4_Release(rt); IDirectDraw_Release(ddraw); refcount = IDirect3DDevice3_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d11: Implement d3d11_texture2d_GetDesc().
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: acec54e707ddc8f8cbca6e6acb4a7e7d70d27047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acec54e707ddc8f8cbca6e6ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 28 00:39:15 2015 +0200 d3d11: Implement d3d11_texture2d_GetDesc(). --- dlls/d3d11/d3d11_private.h | 15 ++++- dlls/d3d11/device.c | 14 +++- dlls/d3d11/texture.c | 50 +++++++++----- dlls/d3d11/utils.c | 161 ++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 211 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acec54e707ddc8f8cbca6…

1 0

Józef Kucia : d3d11: Move d3d11 device implementation to top of file.
by Alexandre Julliard 28 Aug '15

28 Aug '15

Module: wine Branch: master Commit: c9ce47c6a993b048b2adef8174b21729e5d0204a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ce47c6a993b048b2adef817… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 28 00:39:16 2015 +0200 d3d11: Move d3d11 device implementation to top of file. Just to use d311 device static methods in d3d10 device freely. --- dlls/d3d11/device.c | 3714 +++++++++++++++++++++++++-------------------------- 1 file changed, 1857 insertions(+), 1857 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9ce47c6a993b048b2ade…

1 0

Stefan Dösinger : d3d8/tests: Test presentation parameter combinations.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 93ed5d3ba3ef93d1ff70454ca0bbb87ac83dd495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ed5d3ba3ef93d1ff70454ca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 26 21:50:58 2015 +0200 d3d8/tests: Test presentation parameter combinations. --- dlls/d3d8/tests/device.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d7400e7..660e202 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7249,6 +7249,153 @@ static void test_resource_priority(void) DestroyWindow(window); } +static void test_swapchain_parameters(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + IDirect3DSurface8 *backbuffer; + HWND window; + HRESULT hr; + unsigned int i, j; + D3DPRESENT_PARAMETERS present_parameters, present_parameters_windowed = {0}; + static const struct + { + BOOL windowed; + UINT backbuffer_count; + D3DSWAPEFFECT swap_effect; + HRESULT hr; + } + tests[] = + { + /* Swap effect 0 is not allowed. */ + {TRUE, 1, 0, D3DERR_INVALIDCALL}, + {FALSE, 1, 0, D3DERR_INVALIDCALL}, + + /* All (non-ex) swap effects are allowed in + * windowed and fullscreen mode. */ + {TRUE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + + /* Only one backbuffer in copy mode. Reset allows it for + * some reason. */ + {TRUE, 0, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {FALSE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + + /* Ok with the others, in fullscreen and windowed mode. */ + {TRUE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + + /* 3 is the highest allowed backbuffer count. */ + {TRUE, 3, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {TRUE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + IDirect3DDevice8_Release(device); + + present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters_windowed.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters_windowed.hDeviceWindow = window; + present_parameters_windowed.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters_windowed.SwapEffect = D3DSWAPEFFECT_COPY; + present_parameters_windowed.Windowed = TRUE; + present_parameters_windowed.BackBufferCount = 1; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + UINT bb_count = tests[i].backbuffer_count ? tests[i].backbuffer_count : 1; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + + present_parameters.SwapEffect = tests[i].swap_effect; + present_parameters.Windowed = tests[i].windowed; + present_parameters.BackBufferCount = tests[i].backbuffer_count; + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == tests[i].hr, "Expected hr %x, got %x, test %u.\n", tests[i].hr, hr, i); + if (SUCCEEDED(hr)) + { + for (j = 0; j < bb_count; ++j) + { + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); + IDirect3DSurface8_Release(backbuffer); + } + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %x, test %u.\n", hr, i); + + IDirect3DDevice8_Release(device); + } + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters_windowed, &device); + ok(SUCCEEDED(hr), "Failed to create device, hr %#x, test %u.\n", hr, i); + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + + present_parameters.SwapEffect = tests[i].swap_effect; + present_parameters.Windowed = tests[i].windowed; + present_parameters.BackBufferCount = tests[i].backbuffer_count; + + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(hr == tests[i].hr, "Expected hr %x, got %x, test %u.\n", tests[i].hr, hr, i); + + if (FAILED(hr)) + { + hr = IDirect3DDevice8_Reset(device, &present_parameters_windowed); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x, test %u.\n", hr, i); + } + else + { + for (j = 0; j < bb_count; ++j) + { + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + if (j) + todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); + else + ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); + if (SUCCEEDED(hr)) + IDirect3DSurface8_Release(backbuffer); + } + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %x, test %u.\n", hr, i); + } + IDirect3DDevice8_Release(device); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -7347,6 +7494,7 @@ START_TEST(device) test_writeonly_resource(); test_lost_device(); test_resource_priority(); + test_swapchain_parameters(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Piotr Caban : d2d1: Avoid possible infinite loop in d2d_geometry_intersect_self caused by rounding errors.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: f5b64c0d35640b574db057486708debd431745c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b64c0d35640b574db057486… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 27 12:43:13 2015 +0200 d2d1: Avoid possible infinite loop in d2d_geometry_intersect_self caused by rounding errors. --- dlls/d2d1/geometry.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 41af05a..a705723 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -843,23 +843,25 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) { D2D1_POINT_2F p0, p1, q0, q1, v_p, v_q, v_qp, intersection; struct d2d_figure *figure_p, *figure_q; - size_t i, j, k, l, limit; + size_t i, j, k, l, min_j, min_l, max_l; float s, t, det; for (i = 0; i < geometry->u.path.figure_count; ++i) { figure_p = &geometry->u.path.figures[i]; p0 = figure_p->vertices[figure_p->vertex_count - 1]; + min_j = 0; + min_l = 0; for (k = 0; k < figure_p->vertex_count; p0 = p1, ++k) { p1 = figure_p->vertices[k]; d2d_point_subtract(&v_p, &p1, &p0); - for (j = 0; j < i || (j == i && k); ++j) + for (j = min_j, min_j = 0, l = min_l, min_l = 0; j < i || (j == i && k); ++j, l = 0) { figure_q = &geometry->u.path.figures[j]; - limit = j == i ? k - 1 : figure_q->vertex_count; - q0 = figure_q->vertices[figure_q->vertex_count - 1]; - for (l = 0; l < limit; q0 = q1, ++l) + max_l = j == i ? k - 1 : figure_q->vertex_count; + q0 = figure_q->vertices[l == 0 ? figure_q->vertex_count - 1 : l - 1]; + for (; l < max_l; q0 = q1, ++l) { q1 = figure_q->vertices[l]; d2d_point_subtract(&v_q, &q1, &q0); @@ -884,7 +886,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) return FALSE; if (j == i) ++k; - ++limit; + ++max_l; ++l; } @@ -892,6 +894,8 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) { if (!d2d_figure_insert_vertex(figure_p, k, intersection)) return FALSE; + min_j = j; + min_l = l+1; p1 = intersection; d2d_point_subtract(&v_p, &p1, &p0); }

1 0

Gerald Pfeifer : include: Base D3DVSD_TOKENTYPEMASK on an unsigned constant to avoid avoid shift overflows.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 46365d4873b89e266cfd36709885feed7a1c3a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46365d4873b89e266cfd36709… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 27 00:10:39 2015 +0200 include: Base D3DVSD_TOKENTYPEMASK on an unsigned constant to avoid avoid shift overflows. --- include/d3d8types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 0ffa2db..9592544 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -263,7 +263,7 @@ typedef enum _D3DVSDT_TYPE { #define D3DVSD_CONSTCOUNTMASK (0xF << D3DVSD_CONSTCOUNTSHIFT) #define D3DVSD_DATALOADTYPEMASK (0x1 << D3DVSD_DATALOADTYPESHIFT) #define D3DVSD_STREAMTESSMASK (0x1 << D3DVSD_STREAMTESSSHIFT) -#define D3DVSD_TOKENTYPEMASK (0x7 << D3DVSD_TOKENTYPESHIFT) +#define D3DVSD_TOKENTYPEMASK (0x7u << D3DVSD_TOKENTYPESHIFT) #define D3DVSD_MAKETOKENTYPE(TokenType) \

1 0

Hans Leidekker : include: Add missing Network List Manager declarations.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 8e90ff68c7bbd26d73241d0719d64f0b8edb1299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e90ff68c7bbd26d73241d071… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:03:19 2015 +0200 include: Add missing Network List Manager declarations. --- include/netlistmgr.idl | 193 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index e6328f4..e098f72 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -44,6 +44,13 @@ typedef [v1_enum] enum NLM_CONNECTIVITY NLM_CONNECTIVITY_IPV6_INTERNET = 0x0400 } NLM_CONNECTIVITY; +typedef [v1_enum] enum NLM_DOMAIN_TYPE +{ + NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK = 0x00, + NLM_DOMAIN_TYPE_DOMAIN_NETWORK = 0x01, + NLM_DOMAIN_TYPE_DOMAIN_AUTHENTICATED = 0x02 +} NLM_DOMAIN_TYPE; + typedef [v1_enum] enum NLM_ENUM_NETWORK { NLM_ENUM_NETWORK_CONNECTED = 0x01, @@ -112,6 +119,20 @@ interface INetworkCostManager : IUnknown [ object, pointer_default(unique), + uuid(dcb0000a-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkConnectionCost : IUnknown +{ + HRESULT GetCost( + [out] DWORD *pCost); + + HRESULT GetDataPlanStatus( + [out] NLM_DATAPLAN_STATUS *pDataPlanStatus); +} + +[ + object, + pointer_default(unique), uuid(dcb00009-570f-4a9b-8d69-199fdba5723b) ] interface INetworkCostManagerEvents : IUnknown @@ -125,6 +146,68 @@ interface INetworkCostManagerEvents : IUnknown } [ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00003-570f-4a9b-8d69-199fdba5723b) +] +interface IEnumNetworks : IDispatch +{ + [id(DISPID_NEWENUM), propget, hidden, restricted] + HRESULT _NewEnum( + [out, retval] IEnumVARIANT **ppEnumVar); + + [id(1)] + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] INetwork **rgelt, + [in, out] ULONG *pceltFetched); + + [id(2)] + HRESULT Skip( + [in] ULONG celt); + + [id(3)] + HRESULT Reset(); + + [id(4)] + HRESULT Clone( + [out, retval] IEnumNetworks **ppEnumNetwork); +} + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00006-570f-4a9b-8d69-199fdba5723b) +] +interface IEnumNetworkConnections : IDispatch +{ + [id(DISPID_NEWENUM), propget, hidden, restricted] + HRESULT _NewEnum( + [out, retval] IEnumVARIANT **ppEnumVar); + + [id(1)] + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] INetworkConnection **rgelt, + [in, out] ULONG *pceltFetched); + + [id(2)] + HRESULT Skip( + [in] ULONG celt); + + [id(3)] + HRESULT Reset(); + + [id(4)] + HRESULT Clone( + [out, retval] IEnumNetworkConnections **ppEnumNetwork); +} + +[ dual, object, oleautomation, @@ -197,3 +280,113 @@ interface INetworkConnectionEvents : IUnknown [in] GUID connectionId, [in] NLM_CONNECTION_PROPERTY_CHANGE flags); } + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00005-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkConnection : IDispatch +{ + [id(1)] + HRESULT GetNetwork( + [out, retval] INetwork **ppNetwork); + + [propget, id(2)] + HRESULT IsConnectedToInternet( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [propget, id(3)] + HRESULT IsConnected( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [id(4)] + HRESULT GetConnectivity( + [out, retval] NLM_CONNECTIVITY *pConnectivity); + + [id(5)] + HRESULT GetConnectionId( + [out, retval] GUID *pgdConnectionId); + + [id(6)] + HRESULT GetAdapterId( + [out, retval] GUID *pgdAdapterId); + + [id(7)] + HRESULT GetDomainType( + [out, retval] NLM_DOMAIN_TYPE *pDomainType); +} + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00002-570f-4a9b-8d69-199fdba5723b) +] +interface INetwork : IDispatch +{ + typedef enum NLM_NETWORK_CATEGORY + { + NLM_NETWORK_CATEGORY_PUBLIC = 0x00, + NLM_NETWORK_CATEGORY_PRIVATE = 0x01, + NLM_NETWORK_CATEGORY_DOMAIN_AUTHENTICATED = 0x02 + } NLM_NETWORK_CATEGORY; + + [id(1)] + HRESULT GetName( + [out, string, retval] BSTR *pszNetworkName); + + [id(2)] + HRESULT SetName( + [in, string] BSTR szNetworkNewName); + + [id(3)] + HRESULT GetDescription( + [out, string, retval] BSTR *pszDescription); + + [id(4)] + HRESULT SetDescription( + [in, string] BSTR szDescription); + + [id(5)] + HRESULT GetNetworkId( + [out, retval] GUID *pgdGuidNetworkId); + + [id(6)] + HRESULT GetDomainType( + [out, retval] NLM_DOMAIN_TYPE *pNetworkType); + + [id(7)] + HRESULT GetNetworkConnections( + [out, retval] IEnumNetworkConnections **ppEnumNetworkConnection); + + [id(8)] + HRESULT GetTimeCreatedAndConnected( + [out] DWORD *pdwLowDateTimeCreated, + [out] DWORD *pdwHighDateTimeCreated, + [out] DWORD *pdwLowDateTimeConnected, + [out] DWORD *pdwHighDateTimeConnected); + + [propget, id(9)] + HRESULT IsConnectedToInternet( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [propget, id(10)] + HRESULT IsConnected( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [id(11)] + HRESULT GetConnectivity( + [out, retval] NLM_CONNECTIVITY *pConnectivity); + + [id(12)] + HRESULT GetCategory( + [out, retval] NLM_NETWORK_CATEGORY *pCategory); + + [id(13)] + HRESULT SetCategory( + [in] NLM_NETWORK_CATEGORY NewCategory); +}

1 0

Hans Leidekker : netprofm: Introduce heap allocation macros.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 346dd728fb1b2331a2f250d11e35ba6ecf802661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346dd728fb1b2331a2f250d11… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:03:48 2015 +0200 netprofm: Introduce heap allocation macros. --- dlls/netprofm/list.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 245f7f4..cd51d37 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -40,6 +40,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + struct list_manager { INetworkListManager INetworkListManager_iface; @@ -111,7 +121,7 @@ static ULONG WINAPI connection_point_Release( { TRACE( "destroying %p\n", cp ); IConnectionPointContainer_Release( cp->container ); - HeapFree( GetProcessHeap(), 0, cp ); + heap_free( cp ); } return refs; } @@ -199,7 +209,7 @@ static HRESULT connection_point_create( struct connection_point *cp; TRACE( "%p, %s, %p\n", obj, debugstr_guid(riid), container ); - if (!(cp = HeapAlloc( GetProcessHeap(), 0, sizeof(*cp) ))) return E_OUTOFMEMORY; + if (!(cp = heap_alloc( sizeof(*cp) ))) return E_OUTOFMEMORY; cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; cp->container = container; cp->refs = 1; @@ -348,7 +358,7 @@ static ULONG WINAPI list_manager_Release( if (!refs) { TRACE( "destroying %p\n", mgr ); - HeapFree( GetProcessHeap(), 0, mgr ); + heap_free( mgr ); } return refs; } @@ -576,7 +586,7 @@ HRESULT list_manager_create( void **obj ) TRACE( "%p\n", obj ); - if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; + if (!(mgr = heap_alloc( sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl;

1 0

Hans Leidekker : netprofm: Clear the object pointer on failure in QueryInterface.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 981460e84a5c82982a82971f3954f27393cdb126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981460e84a5c82982a82971f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:07 2015 +0200 netprofm: Clear the object pointer on failure in QueryInterface. --- dlls/netprofm/list.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index cd51d37..ee0f7b7 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -99,6 +99,7 @@ static HRESULT WINAPI connection_point_QueryInterface( else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *obj = NULL; return E_NOINTERFACE; } IConnectionPoint_AddRef( iface ); @@ -388,6 +389,7 @@ static HRESULT WINAPI list_manager_QueryInterface( else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *obj = NULL; return E_NOINTERFACE; } INetworkListManager_AddRef( iface );

1 0