February 2017 - Wine-Commits

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client EnumServiceProviders.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: bc85fee0f162aa468dc9946dc41b6cb074fc586c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc85fee0f162aa468dc9946dc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 06:45:53 2017 +0000 dpnet: Implement IDirectPlay8Client EnumServiceProviders. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 14 +++++++++++--- dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/peer.c | 2 +- dlls/dpnet/tests/client.c | 16 ++++++++-------- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 1fa825f..d1e6b3b 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -124,9 +124,17 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(IDirectPlay8Cl DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, PDWORD const pcbEnumData, PDWORD const pcReturned, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); } static HRESULT WINAPI IDirectPlay8ClientImpl_EnumHosts(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 89e0777..256e3f4 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -137,6 +137,8 @@ extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; extern void init_winsock(void) DECLSPEC_HIDDEN; +extern HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, + DWORD * const buf_size, DWORD * const returned) DECLSPEC_HIDDEN; /* used for generic dumping (copied from ddraw) */ typedef struct { diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 461d610..57f15ef 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, return DPN_OK; } -static HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, +HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, DWORD * const buf_size, DWORD * const returned) { static const WCHAR serviceproviders[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\', diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index bbd77fe..a1a1fa4 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -97,20 +97,20 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, NULL, 0); - todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, NULL, &items, 0); - todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, serv_prov_info, &size, &items, 0); ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + ok(items != 0, "Found unexpectedly no service providers\n"); trace("number of items found: %d\n", items); @@ -126,14 +126,14 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + ok(items != 0, "Found unexpectedly no adapter\n"); for (i=0;i<items;i++)

1 0

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Client EnumHost tests.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 15fe05ea768d419baf5ac21ca349ef15fea684fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fe05ea768d419baf5ac21ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 06:46:27 2017 +0000 dpnet/tests: Add IDirectPlay8Client EnumHost tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 165 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 149 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15fe05ea768d419baf5ac…

1 0

Henri Verbeet : d2d1: Properly invert join directions when needed.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: a525b6978146b24a4e75655578959e6107dd7345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a525b6978146b24a4e7565557… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 13:13:22 2017 +0100 d2d1: Properly invert join directions when needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 ++++++++++- dlls/d2d1/render_target.c | 42 ++++++++++++++++++------------------------ dlls/d2d1/tests/d2d1.c | 3 ++- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index b268b7d..5ef62cb 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1743,6 +1743,7 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, struct d2d_outline_vertex *v; struct d2d_face *f; size_t base_idx; + float ccw; if (!d2d_array_reserve((void **)&geometry->outline.vertices, &geometry->outline.vertices_size, geometry->outline.vertex_count + 4, sizeof(*geometry->outline.vertices))) @@ -1767,7 +1768,8 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, d2d_point_normalise(&q_prev); d2d_point_normalise(&q_next); - if (d2d_point_dot(&q_prev, &q_next) == -1.0f) + ccw = d2d_point_ccw(p0, prev, next); + if (ccw == 0.0f) { d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); @@ -1776,6 +1778,13 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, d2d_outline_vertex_set(&v[3], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); } + else if (ccw < 0.0f) + { + d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); + } else { d2d_outline_vertex_set(&v[0], p0->x, p0->y, 0.0f, 0.0f, 0.0f, 0.0f); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0f37264..c60d06e 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1917,12 +1917,10 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, float2 q_prev, q_next, v_p, q_i; float l; - q_prev.x = dot(prev, transform_geometry._11_21); - q_prev.y = dot(prev, transform_geometry._12_22); + q_prev = float2(dot(prev, transform_geometry._11_21), dot(prev, transform_geometry._12_22)); q_prev = normalize(q_prev); - q_next.x = dot(next, transform_geometry._11_21); - q_next.y = dot(next, transform_geometry._12_22); + q_next = float2(dot(next, transform_geometry._11_21), dot(next, transform_geometry._12_22)); q_next = normalize(q_next); /* tan(½θ) = sin(θ) / (1 + cos(θ)) @@ -1930,21 +1928,19 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, v_p = float2(-q_prev.y, q_prev.x); l = -dot(v_p, q_next) / (1.0f + dot(q_prev, q_next)); q_i = l * q_prev + v_p; - if (l < 0.0f) - q_i *= -1.0f; position = mul(float3(position, 1.0f), transform_geometry) + stroke_width * 0.5f * q_i; return float4(mul(float2x3(transform_rtx.xyz * transform_rtx.w, transform_rty.xyz * transform_rty.w), float3(position.xy, 1.0f)) + float2(-1.0f, 1.0f), 0.0f, 1.0f); } #endif - 0x43425844, 0xb58748c9, 0x99343e01, 0x92198e38, 0x667ab784, 0x00000001, 0x000004c0, 0x00000003, + 0x43425844, 0xe88f7af5, 0x480b101b, 0xfd80f66b, 0xd878e0b8, 0x00000001, 0x0000047c, 0x00000003, 0x0000002c, 0x00000098, 0x000000cc, 0x4e475349, 0x00000064, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000303, 0x00000059, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x0000005e, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000303, 0x49534f50, 0x4e4f4954, 0x45525000, 0x454e0056, 0xab005458, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, - 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000003ec, 0x00010040, 0x000000fb, 0x04000059, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x000003a8, 0x00010040, 0x000000ea, 0x04000059, 0x00208e46, 0x00000000, 0x00000004, 0x0300005f, 0x00101032, 0x00000000, 0x0300005f, 0x00101032, 0x00000001, 0x0300005f, 0x00101032, 0x00000002, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000003, 0x0800000f, 0x00100012, 0x00000000, 0x00101046, 0x00000002, 0x00208046, @@ -1960,22 +1956,20 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0x00000000, 0x00100a26, 0x00000001, 0x00100046, 0x00000000, 0x0700000f, 0x00100012, 0x00000000, 0x00100046, 0x00000001, 0x00100046, 0x00000000, 0x07000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0800000e, 0x00100012, 0x00000000, 0x8010002a, 0x00000041, - 0x00000000, 0x0010000a, 0x00000000, 0x09000032, 0x00100062, 0x00000000, 0x00100006, 0x00000000, - 0x00100106, 0x00000001, 0x00100cf6, 0x00000001, 0x07000031, 0x00100012, 0x00000000, 0x0010000a, - 0x00000000, 0x00004001, 0x00000000, 0x0a000037, 0x00100032, 0x00000000, 0x00100006, 0x00000000, - 0x80100596, 0x00000041, 0x00000000, 0x00100596, 0x00000000, 0x08000038, 0x00100042, 0x00000000, - 0x0020803a, 0x00000000, 0x00000001, 0x00004001, 0x3f000000, 0x05000036, 0x00100032, 0x00000001, - 0x00101046, 0x00000000, 0x05000036, 0x00100042, 0x00000001, 0x00004001, 0x3f800000, 0x08000010, - 0x00100012, 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000000, 0x08000010, - 0x00100022, 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000001, 0x09000032, - 0x00100032, 0x00000000, 0x00100aa6, 0x00000000, 0x00100046, 0x00000000, 0x00100046, 0x00000002, - 0x09000038, 0x00100072, 0x00000001, 0x00208ff6, 0x00000000, 0x00000002, 0x00208246, 0x00000000, - 0x00000002, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x07000010, 0x00100012, - 0x00000001, 0x00100246, 0x00000001, 0x00100246, 0x00000000, 0x09000038, 0x00100072, 0x00000002, - 0x00208ff6, 0x00000000, 0x00000003, 0x00208246, 0x00000000, 0x00000003, 0x07000010, 0x00100022, - 0x00000001, 0x00100246, 0x00000002, 0x00100246, 0x00000000, 0x0a000000, 0x00102032, 0x00000000, - 0x00100046, 0x00000001, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, - 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + 0x00000000, 0x0010000a, 0x00000000, 0x09000032, 0x00100032, 0x00000000, 0x00100006, 0x00000000, + 0x00100046, 0x00000001, 0x00100f36, 0x00000001, 0x08000038, 0x00100042, 0x00000000, 0x0020803a, + 0x00000000, 0x00000001, 0x00004001, 0x3f000000, 0x05000036, 0x00100032, 0x00000001, 0x00101046, + 0x00000000, 0x05000036, 0x00100042, 0x00000001, 0x00004001, 0x3f800000, 0x08000010, 0x00100012, + 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000000, 0x08000010, 0x00100022, + 0x00000002, 0x00100246, 0x00000001, 0x00208246, 0x00000000, 0x00000001, 0x09000032, 0x00100032, + 0x00000000, 0x00100aa6, 0x00000000, 0x00100046, 0x00000000, 0x00100046, 0x00000002, 0x09000038, + 0x00100072, 0x00000001, 0x00208ff6, 0x00000000, 0x00000002, 0x00208246, 0x00000000, 0x00000002, + 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x07000010, 0x00100012, 0x00000001, + 0x00100246, 0x00000001, 0x00100246, 0x00000000, 0x09000038, 0x00100072, 0x00000002, 0x00208ff6, + 0x00000000, 0x00000003, 0x00208246, 0x00000000, 0x00000003, 0x07000010, 0x00100022, 0x00000001, + 0x00100246, 0x00000002, 0x00100246, 0x00000000, 0x0a000000, 0x00102032, 0x00000000, 0x00100046, + 0x00000001, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, }; static const DWORD vs_code_triangle[] = { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7dccbd7..ec2c2d1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3680,6 +3680,7 @@ static void test_draw_geometry(void) ID2D1GeometrySink_SetFillMode(sink, D2D1_FILL_MODE_ALTERNATE); hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); ID2D1RenderTarget_BeginDraw(rt); @@ -3738,7 +3739,7 @@ static void test_draw_geometry(void) "CgIKiwEUjAEUjQESjgESjwEQkAEQkQEOkgEOkwEMlAEMlQEKlgEKlwEImAEImQEGmgEGmwEEnAEE" "nQECngECrycA"); ok(match, "Figure does not match.\n"); - match = compare_figure(surface, 320, 320, 160, 160, 0xff652e89, 2, + match = compare_figure(surface, 320, 320, 160, 160, 0xff652e89, 0, "rycCngECnQEEnAEEmwEGmgEGmQEImAEIlwEKlgEKlQEMlAEMkwEOkgEOkQEQkAEQjwESjgESjQEU" "jAEUiwEKAgqKAQoCCokBCgQKiAEKBAqHAQoGCoYBCgYKhQEKCAqEAQoICoMBCgoKggEKCgqBAQoM" "CoABCgwKfwoOCn4KDgp9ChAKfAoQCnsKEgp6ChIKeQoUCngKFAp3ChYKdgoWCnUKGAp0ChgKcwoa"

1 0

Józef Kucia : d3d10core/tests: Port test_resinfo_instruction() from d3d11.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 2d3e23c60ffdf8d9e1dd5b8461e0e997a778a7d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3e23c60ffdf8d9e1dd5b846… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:32 2017 +0100 d3d10core/tests: Port test_resinfo_instruction() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 315 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d3e23c60ffdf8d9e1dd5…

1 0

Peter Hater : comctl32/propsheet: Added PSM_INSERTPAGE implementation.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: a6661ba9ad70dcde95272b48c8dba9d30005056f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6661ba9ad70dcde95272b48c… Author: Peter Hater <7element(a)mail.bg> Date: Sun Feb 12 21:16:31 2017 +0300 comctl32/propsheet: Added PSM_INSERTPAGE implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 108 +++++++++++++++++++++++++--------------- dlls/comctl32/tests/propsheet.c | 18 +++---- 2 files changed, 77 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f575e16..caf7181 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -32,7 +32,6 @@ * - Wizard 97 header resizing * - Enforcing of minimal wizard size * - Messages: - * o PSM_INSERTPAGE * o PSM_RECALCPAGESIZES * o PSM_SETHEADERSUBTITLE * o PSM_SETHEADERTITLE @@ -2244,70 +2243,111 @@ static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg, return msgResult; } - /****************************************************************************** - * PROPSHEET_AddPage + * PROPSHEET_InsertPage */ -static BOOL PROPSHEET_AddPage(HWND hwndDlg, - HPROPSHEETPAGE hpage) +static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) { - PropPageInfo * ppi; - PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PropPageInfo *ppi, *prev_ppi = psInfo->proppage; HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); - TCITEMW item; LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)hpage; + TCITEMW item; + int index; - TRACE("hpage %p\n", hpage); - /* - * Allocate and fill in a new PropPageInfo entry. - */ - ppi = ReAlloc(psInfo->proppage, sizeof(PropPageInfo) * (psInfo->nPages + 1)); + TRACE("hwndDlg %p, hpageInsertAfter %p, hpage %p\n", hwndDlg, hpageInsertAfter, hpage); + + if (IS_INTRESOURCE(hpageInsertAfter)) + index = LOWORD(hpageInsertAfter); + else + { + index = PROPSHEET_GetPageIndex(hpageInsertAfter, psInfo, -1); + if (index < 0) + { + TRACE("Could not find page to insert after!\n"); + return FALSE; + } + index++; + } + + if (index > psInfo->nPages) + index = psInfo->nPages; + + ppi = Alloc(sizeof(PropPageInfo) * (psInfo->nPages + 1)); if (!ppi) return FALSE; + /* + * Fill in a new PropPageInfo entry. + */ + if (index > 0) + memcpy(ppi, prev_ppi, index * sizeof(PropPageInfo)); + memset(&ppi[index], 0, sizeof(PropPageInfo)); + if (index < psInfo->nPages) + memcpy(&ppi[index + 1], &prev_ppi[index], (psInfo->nPages - index) * sizeof(PropPageInfo)); psInfo->proppage = ppi; - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages, FALSE)) - return FALSE; - psInfo->proppage[psInfo->nPages].hpage = hpage; + if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, index, FALSE)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } + + psInfo->proppage[index].hpage = hpage; if (ppsp->dwFlags & PSP_PREMATURE) { /* Create the page but don't show it */ - if(!PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp)) - return FALSE; + if (!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppsp)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } } + Free(prev_ppi); + psInfo->nPages++; + if (index <= psInfo->active_page) + psInfo->active_page++; + /* * Add a new tab to the tab control. */ item.mask = TCIF_TEXT; - item.pszText = (LPWSTR) psInfo->proppage[psInfo->nPages].pszText; + item.pszText = (LPWSTR) psInfo->proppage[index].pszText; item.cchTextMax = MAX_TABTEXT_LENGTH; if (psInfo->hImageList) - { SendMessageW(hwndTabControl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList); - } - if ( psInfo->proppage[psInfo->nPages].hasIcon ) + if (psInfo->proppage[index].hasIcon) { item.mask |= TCIF_IMAGE; - item.iImage = psInfo->nPages; + item.iImage = index; } - SendMessageW(hwndTabControl, TCM_INSERTITEMW, psInfo->nPages + 1, - (LPARAM)&item); - - psInfo->nPages++; + SendMessageW(hwndTabControl, TCM_INSERTITEMW, index, (LPARAM)&item); /* If it is the only page - show it */ - if(psInfo->nPages == 1) + if (psInfo->nPages == 1) PROPSHEET_SetCurSel(hwndDlg, 0, 1, 0); + return TRUE; } /****************************************************************************** + * PROPSHEET_AddPage + */ +static BOOL PROPSHEET_AddPage(HWND hwndDlg, HPROPSHEETPAGE hpage) +{ + PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + TRACE("hwndDlg %p, hpage %p\n", hwndDlg, hpage); + return PROPSHEET_InsertPage(hwndDlg, UlongToPtr(psInfo->nPages), hpage); +} + +/****************************************************************************** * PROPSHEET_RemovePage */ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, @@ -2461,18 +2501,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) } /****************************************************************************** - * PROPSHEET_InsertPage - */ -static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) -{ - if (IS_INTRESOURCE(hpageInsertAfter)) - FIXME("(%p, %d, %p): stub\n", hwndDlg, LOWORD(hpageInsertAfter), hpage); - else - FIXME("(%p, %p, %p): stub\n", hwndDlg, hpageInsertAfter, hpage); - return FALSE; -} - -/****************************************************************************** * PROPSHEET_SetHeaderTitleW */ static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderTitle) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 1c284ff..7547e79 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -935,7 +935,7 @@ static void test_PSM_INSERTPAGE(void) /* add pages one by one */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 5, (LPARAM)hpsp[1]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); /* try with invalid values */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, 0); @@ -954,34 +954,34 @@ if (0) tab = (HWND)SendMessageA(hdlg, PSM_GETTABCONTROL, 0, 0); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 2, "got %d\n", r); + ok(r == 2, "got %d\n", r); ret = SendMessageA(hdlg, PSM_INSERTPAGE, (WPARAM)hpsp[1], (LPARAM)hpsp[2]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); /* add property sheet page that can't be created */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 1, (LPARAM)hpsp[3]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 4, "got %d\n", r); + ok(r == 4, "got %d\n", r); /* select page that can't be created */ ret = SendMessageA(hdlg, PSM_SETCURSEL, 1, 0); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); /* test PSP_PREMATURE flag with incorrect property sheet page */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, (LPARAM)hpsp[4]); ok(ret == FALSE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); DestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg);

1 0

Michael Müller : server: Give all access rights when opening an object with MAXIMUM_ALLOWED.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 0e49e0541fa4bfbf11224173a8ead006dcb41e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e49e0541fa4bfbf11224173a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 10 18:12:06 2017 +0100 server: Give all access rights when opening an object with MAXIMUM_ALLOWED. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 38 ++++++++++++++++++++++++++++++++++++++ server/handle.c | 1 + 2 files changed, 39 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3250544..c31dfbe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6414,6 +6414,43 @@ static void test_pseudo_tokens(void) "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); } +static void test_maximum_allowed(void) +{ + HANDLE (WINAPI *pCreateEventExA)(SECURITY_ATTRIBUTES *, LPCSTR, DWORD, DWORD); + char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH], buffer_acl[256]; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd; + SECURITY_ATTRIBUTES sa; + ACL *acl = (ACL *)&buffer_acl; + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + ACCESS_MASK mask; + HANDLE handle; + BOOL ret; + + pCreateEventExA = (void *)GetProcAddress(hkernel32, "CreateEventExA"); + if (!pCreateEventExA) + { + win_skip("CreateEventExA is not available\n"); + return; + } + + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with %u\n", GetLastError()); + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with %u\n", GetLastError()); + ret = SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with %u\n", GetLastError()); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + + handle = pCreateEventExA(&sa, NULL, 0, MAXIMUM_ALLOWED | 0x4); + ok(handle != NULL, "CreateEventExA failed with error %u\n", GetLastError()); + mask = get_obj_access(handle); + ok(mask == EVENT_ALL_ACCESS, "Expected %x, got %x\n", EVENT_ALL_ACCESS, mask); + CloseHandle(handle); +} + START_TEST(security) { init(); @@ -6461,4 +6498,5 @@ START_TEST(security) test_system_security_access(); test_GetSidIdentifierAuthority(); test_pseudo_tokens(); + test_maximum_allowed(); } diff --git a/server/handle.c b/server/handle.c index 37fba69..3f42352 100644 --- a/server/handle.c +++ b/server/handle.c @@ -272,6 +272,7 @@ static obj_handle_t alloc_handle_entry( struct process *process, void *ptr, obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) { struct object *obj = ptr; + if (access & MAXIMUM_ALLOWED) access = GENERIC_ALL; access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; return alloc_handle_entry( process, ptr, access, attr ); }

1 0

Nikolay Sivov : hlink: Properly return interface pointers.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: f6b1e1235caa04a1e78cef9cb9f0951d41f5b71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b1e1235caa04a1e78cef9cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:03 2017 +0300 hlink: Properly return interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 2 +- dlls/hlink/link.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index e54a392..b0a20b1 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -528,7 +528,7 @@ static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { - *ppvObj = This; + *ppvObj = &This->IClassFactory_iface; return S_OK; } diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 6f4ac12..f5da0b4 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -129,7 +129,7 @@ static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid, *ppvObj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) - *ppvObj = This; + *ppvObj = &This->IHlink_iface; else if (IsEqualIID(riid, &IID_IPersistStream)) *ppvObj = &This->IPersistStream_iface; else if (IsEqualIID(riid, &IID_IDataObject))

1 0

Nikolay Sivov : mapi32: Properly return interface pointer.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: d618c0fa0049697ec6075c3ab71143bb09f82b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d618c0fa0049697ec6075c3ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:06 2017 +0300 mapi32: Properly return interface pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 530c41e..ce8ed80 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1513,7 +1513,7 @@ static WINAPI HRESULT IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, IsEqualIID(riid, &IID_IMAPIProp) || IsEqualIID(riid, &IID_IMAPIPropData)) { - *ppvObj = This; + *ppvObj = &This->IPropData_iface; IPropData_AddRef(iface); TRACE("returning %p\n", *ppvObj); return S_OK;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 9135c03f4f892f292ecb284a13f80efd92ae06f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9135c03f4f892f292ecb284a1… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Feb 11 08:55:15 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7e399ed..f8e5688 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-10 21:23+0300\n" +"PO-Revision-Date: 2017-02-11 08:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9353,10 +9353,8 @@ msgid "Confidentiality Required" msgstr "Reikalingas slaptumas" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Vyksta sistemos stabdymas.\n" +msgstr "Vyksta SASL saistymas" #: wldap32.rc:48 msgid "No Such Attribute"

1 0

Francois Gouget : iccvid: Add a __WINE_ALLOC_SIZE attribute to heap_alloc( ).
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 4dcdbf359e6d5e767db2a70ab34282a281c6fd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcdbf359e6d5e767db2a70ab… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:18:30 2017 +0100 iccvid: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its formatting, parameter name, etc. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 1ef2db6..e5d5147 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -81,14 +81,14 @@ typedef struct _ICCVID_Info cinepak_info *cvinfo; } ICCVID_Info; -static inline LPVOID heap_alloc( size_t size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free( LPVOID ptr ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, ptr ); + return HeapFree(GetProcessHeap(), 0, mem); }

1 0