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

Henri Verbeet : d2d1: Use segment indices in d2d_geometry_resolve_beziers( ).
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 3895f07c4b45dae038d4d8424abc31c1030ebaf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3895f07c4b45dae038d4d8424… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:25 2017 +0200 d2d1: Use segment indices in d2d_geometry_resolve_beziers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 105 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 34 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 537f57f..8796323 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2603,9 +2603,54 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry) geometry->u.path.figures_size = 0; } +static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx, BOOL next) +{ + if (next) + { + ++idx->vertex_idx; + ++idx->control_idx; + } + + for (; idx->figure_idx < geometry->u.path.figure_count; ++idx->figure_idx, idx->vertex_idx = idx->control_idx = 0) + { + struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; + + if (!figure->bezier_control_count) + continue; + + for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) + { + if (figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_BEZIER + || figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + return TRUE; + } + } + + return FALSE; +} + +static BOOL d2d_geometry_get_first_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx) +{ + memset(idx, 0, sizeof(*idx)); + + return d2d_geometry_get_bezier_segment_idx(geometry, idx, FALSE); +} + +static BOOL d2d_geometry_get_next_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx) +{ + return d2d_geometry_get_bezier_segment_idx(geometry, idx, TRUE); +} + static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { - size_t bezier_idx, control_idx, i, j; + struct d2d_segment_idx idx_p; + struct d2d_bezier_vertex *b; + const D2D1_POINT_2F *p[3]; + struct d2d_figure *figure; + size_t bezier_idx, i; + + if (!d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p)) + return S_OK; for (i = 0; i < geometry->u.path.figure_count; ++i) { @@ -2620,45 +2665,37 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) return E_OUTOFMEMORY; } - for (i = 0, bezier_idx = 0; i < geometry->u.path.figure_count; ++i) + bezier_idx = 0; + for (;;) { - struct d2d_figure *figure = &geometry->u.path.figures[i]; - if (figure->bezier_control_count) - { - for (j = 0, control_idx = 0; j < figure->vertex_count; ++j) - { - const D2D1_POINT_2F *p0, *p1, *p2; - struct d2d_bezier_vertex *b; - float sign = -1.0f; + float sign = -1.0f; - if (figure->vertex_types[j] != D2D_VERTEX_TYPE_BEZIER - && figure->vertex_types[j] != D2D_VERTEX_TYPE_SPLIT_BEZIER) - continue; + figure = &geometry->u.path.figures[idx_p.figure_idx]; + p[0] = &figure->vertices[idx_p.vertex_idx]; + p[1] = &figure->bezier_controls[idx_p.control_idx]; - b = &geometry->fill.bezier_vertices[bezier_idx * 3]; - p0 = &figure->vertices[j]; - p1 = &figure->bezier_controls[control_idx++]; + i = idx_p.vertex_idx + 1; + if (d2d_path_geometry_point_inside(geometry, p[1], FALSE)) + { + sign = 1.0f; + d2d_figure_insert_vertex(figure, i, *p[1]); + /* Inserting a vertex potentially invalidates p[0]. */ + p[0] = &figure->vertices[idx_p.vertex_idx]; + ++i; + } - if (d2d_path_geometry_point_inside(geometry, p1, FALSE)) - { - sign = 1.0f; - d2d_figure_insert_vertex(figure, j + 1, *p1); - /* Inserting a vertex potentially invalidates p0. */ - p0 = &figure->vertices[j]; - ++j; - } + if (i == figure->vertex_count) + i = 0; + p[2] = &figure->vertices[i]; - if (j == figure->vertex_count - 1) - p2 = &figure->vertices[0]; - else - p2 = &figure->vertices[j + 1]; + b = &geometry->fill.bezier_vertices[bezier_idx * 3]; + d2d_bezier_vertex_set(&b[0], p[0], 0.0f, 0.0f, sign); + d2d_bezier_vertex_set(&b[1], p[1], 0.5f, 0.0f, sign); + d2d_bezier_vertex_set(&b[2], p[2], 1.0f, 1.0f, sign); - d2d_bezier_vertex_set(&b[0], p0, 0.0f, 0.0f, sign); - d2d_bezier_vertex_set(&b[1], p1, 0.5f, 0.0f, sign); - d2d_bezier_vertex_set(&b[2], p2, 1.0f, 1.0f, sign); - ++bezier_idx; - } - } + if (!d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_p)) + break; + ++bezier_idx; } return S_OK;

1 0

Henri Verbeet : d2d1: Split overlapping bezier control triangles.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 2187a1edb394dac7cfbb0f23b6b7d58d59c49333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2187a1edb394dac7cfbb0f23b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:26 2017 +0200 d2d1: Split overlapping bezier control triangles. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 2 +- 2 files changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8796323..8c66881 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2641,9 +2641,138 @@ static BOOL d2d_geometry_get_next_bezier_segment_idx(struct d2d_geometry *geomet return d2d_geometry_get_bezier_segment_idx(geometry, idx, TRUE); } +static BOOL d2d_geometry_check_bezier_overlap(struct d2d_geometry *geometry, + const struct d2d_segment_idx *idx_p, const struct d2d_segment_idx *idx_q) +{ + const D2D1_POINT_2F *a[3], *b[3], *p[2], *q; + const struct d2d_figure *figure; + D2D1_POINT_2F v_q[3], v_p, v_qp; + unsigned int i, j, score; + float det, t; + + figure = &geometry->u.path.figures[idx_p->figure_idx]; + a[0] = &figure->vertices[idx_p->vertex_idx]; + a[1] = &figure->bezier_controls[idx_p->control_idx]; + if (idx_p->vertex_idx == figure->vertex_count - 1) + a[2] = &figure->vertices[0]; + else + a[2] = &figure->vertices[idx_p->vertex_idx + 1]; + + figure = &geometry->u.path.figures[idx_q->figure_idx]; + b[0] = &figure->vertices[idx_q->vertex_idx]; + b[1] = &figure->bezier_controls[idx_q->control_idx]; + if (idx_q->vertex_idx == figure->vertex_count - 1) + b[2] = &figure->vertices[0]; + else + b[2] = &figure->vertices[idx_q->vertex_idx + 1]; + + if (d2d_point_ccw(a[0], a[1], a[2]) == 0.0f || d2d_point_ccw(b[0], b[1], b[2]) == 0.0f) + return FALSE; + + d2d_point_subtract(&v_q[0], b[1], b[0]); + d2d_point_subtract(&v_q[1], b[2], b[0]); + d2d_point_subtract(&v_q[2], b[1], b[2]); + + /* Check for intersections between the edges. Strictly speaking we'd only + * need to check 8 of the 9 possible intersections, since if there's any + * intersection there has to be a second intersection as well. */ + for (i = 0; i < 3; ++i) + { + d2d_point_subtract(&v_p, a[(i & 1) + 1], a[i & 2]); + for (j = 0; j < 3; ++j) + { + det = v_p.x * v_q[j].y - v_p.y * v_q[j].x; + if (det == 0.0f) + continue; + + d2d_point_subtract(&v_qp, a[i & 2], b[j & 2]); + t = (v_q[j].x * v_qp.y - v_q[j].y * v_qp.x) / det; + if (t <= 0.0f || t >= 1.0f) + continue; + + t = (v_p.x * v_qp.y - v_p.y * v_qp.x) / det; + if (t <= 0.0f || t >= 1.0f) + continue; + + return TRUE; + } + } + + /* Check if one triangle is contained within the other. */ + for (j = 0, score = 0, q = a[1], p[0] = b[2]; j < 3; ++j) + { + p[1] = b[j]; + d2d_point_subtract(&v_p, p[1], p[0]); + d2d_point_subtract(&v_qp, q, p[0]); + + if ((q->y < p[0]->y) != (q->y < p[1]->y) && v_qp.x < v_p.x * (v_qp.y / v_p.y)) + ++score; + + p[0] = p[1]; + } + + if (score & 1) + return TRUE; + + for (j = 0, score = 0, q = b[1], p[0] = a[2]; j < 3; ++j) + { + p[1] = a[j]; + d2d_point_subtract(&v_p, p[1], p[0]); + d2d_point_subtract(&v_qp, q, p[0]); + + if ((q->y < p[0]->y) != (q->y < p[1]->y) && v_qp.x < v_p.x * (v_qp.y / v_p.y)) + ++score; + + p[0] = p[1]; + } + + return score & 1; +} + +static float d2d_geometry_bezier_ccw(struct d2d_geometry *geometry, const struct d2d_segment_idx *idx) +{ + const struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; + size_t next = idx->vertex_idx + 1; + + if (next == figure->vertex_count) + next = 0; + + return d2d_point_ccw(&figure->vertices[idx->vertex_idx], + &figure->bezier_controls[idx->control_idx], &figure->vertices[next]); +} + +static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struct d2d_segment_idx *idx) +{ + const D2D1_POINT_2F *p[3]; + struct d2d_figure *figure; + D2D1_POINT_2F q[3]; + size_t next; + + figure = &geometry->u.path.figures[idx->figure_idx]; + p[0] = &figure->vertices[idx->vertex_idx]; + p[1] = &figure->bezier_controls[idx->control_idx]; + next = idx->vertex_idx + 1; + if (next == figure->vertex_count) + next = 0; + p[2] = &figure->vertices[next]; + + d2d_point_lerp(&q[0], p[0], p[1], 0.5f); + d2d_point_lerp(&q[1], p[1], p[2], 0.5f); + d2d_point_lerp(&q[2], &q[0], &q[1], 0.5f); + + figure->bezier_controls[idx->control_idx] = q[0]; + if (!(d2d_figure_insert_bezier_control(figure, idx->control_idx + 1, &q[1]))) + return FALSE; + if (!(d2d_figure_insert_vertex(figure, idx->vertex_idx + 1, q[2]))) + return FALSE; + figure->vertex_types[idx->vertex_idx + 1] = D2D_VERTEX_TYPE_SPLIT_BEZIER; + + return TRUE; +} + static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { - struct d2d_segment_idx idx_p; + struct d2d_segment_idx idx_p, idx_q; struct d2d_bezier_vertex *b; const D2D1_POINT_2F *p[3]; struct d2d_figure *figure; @@ -2652,6 +2781,34 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) if (!d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p)) return S_OK; + /* Split overlapping bezier control triangles. */ + while (d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_p)) + { + d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_q); + while (idx_q.figure_idx < idx_p.figure_idx || idx_q.vertex_idx < idx_p.vertex_idx) + { + while (d2d_geometry_check_bezier_overlap(geometry, &idx_p, &idx_q)) + { + if (fabsf(d2d_geometry_bezier_ccw(geometry, &idx_q)) > fabsf(d2d_geometry_bezier_ccw(geometry, &idx_p))) + { + if (!d2d_geometry_split_bezier(geometry, &idx_q)) + return E_OUTOFMEMORY; + if (idx_p.figure_idx == idx_q.figure_idx) + { + ++idx_p.vertex_idx; + ++idx_p.control_idx; + } + } + else + { + if (!d2d_geometry_split_bezier(geometry, &idx_p)) + return E_OUTOFMEMORY; + } + } + d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_q); + } + } + for (i = 0; i < geometry->u.path.figure_count; ++i) { geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; @@ -2666,6 +2823,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) } bezier_idx = 0; + d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p); for (;;) { float sign = -1.0f; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ade5743..c1ca98d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5696,7 +5696,7 @@ static void test_bezier_intersect(void) "sQGRAbEBkAGyAZABsgGPAbMBjwG0AY4BtAGNAbUBjQG2AYwBtgGLAbgBigG4AYoBuQGJAboBhwG7" "AYcBvAGGAb0BhQG+AYQBvwGDAcABggHBAYIBwgGAAcMBf8QBfsYBfMgBe8gBesoBeMwBd80BddAB" "c9EBcdQBb9YBbNkBatsBaN0BZeEBYuQBX+gBW+0BVvEBUvUBTvwBR4QCQIoCOZgCK6oCGQIA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt);

1 0

Henri Verbeet : wined3d: Explicitly check for "Radeon" and "FirePro" in wined3d_guess_card_vendor().
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 57c0d98d11a31f85bb3265c630220508eb82af2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c0d98d11a31f85bb3265c63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:27 2017 +0200 wined3d: Explicitly check for "Radeon" and "FirePro" in wined3d_guess_card_vendor(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 919b997..e30430a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1813,6 +1813,8 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "X.Org R300 Project") || strstr(gl_renderer, "AMD") + || strstr(gl_renderer, "FirePro") + || strstr(gl_renderer, "Radeon") || strstr(gl_renderer, "R100") || strstr(gl_renderer, "R200") || strstr(gl_renderer, "R300")

1 0

Rosanne DiMesio : Add missing background colors for ratings hints
by Jeremy Newman 16 Aug '17

16 Aug '17

Module: appdb Branch: master Commit: dfd849512a5be238f67c0178488da1396f3a6575 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dfd849512a5be238f67c0178… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 14:28:05 2017 -0500 Add missing background colors for ratings hints Adds background colors for platinum, bronze, and garbage ratings. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/styles.css b/css/styles.css index adfd3b4..aa4157c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -483,8 +483,11 @@ hr .committed { font-style: italic; color: gray; } /* App Support status */ +.platinum { background-color: whitesmoke; } .gold { background-color: wheat; } .silver { background-color: silver; } +.bronze { background-color: goldenrod; } +.garbage { background-color: darkkhaki; } /* Rating Number */ .rating { font-family: Helvetica, Arial; font-size: 6pt; color: #333333; }

1 0

Rosanne DiMesio : Revise ratings hints
by Jeremy Newman 16 Aug '17

16 Aug '17

Module: appdb Branch: master Commit: 64f4aef4e810c581be9235af94697256b1c33c32 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=64f4aef4e810c581be9235af… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 14:29:03 2017 -0500 Revise ratings hints Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- js/utils.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/utils.js b/js/utils.js index 26128a9..0fdcb92 100644 --- a/js/utils.js +++ b/js/utils.js @@ -119,11 +119,11 @@ $(document).ready(function() { var ratingdesc=[ "", - " Works flawlessly out of the box - no problems ", - " Works flawlessly with DLL overrides, third party software or other settings ", - " Works excellently for normal use;works fine in singleplayer but not multi ", - " Works but has issues for normal use ", - " Does not run or cannot be installed with Wine " + " Works as well as (or better than) on Windows out of the box ", + " Works as well as (or better than) on Windows with workarounds ", + " Works excellently for normal use, but has some problems ", + " Works, but has problems for normal use ", + " Problems are severe enough that the application cannot be used for the purpose it was designed for " ]; var ratingstyle =[ "",

1 0

Rosanne DiMesio : Add two columns to testResults table
by Jeremy Newman 16 Aug '17

16 Aug '17

Module: appdb Branch: master Commit: c0f7b6f62b4b72159d00e4ed852581cd6abefacf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c0f7b6f62b4b72159d00e4ed… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 11:26:03 2017 -0500 Add two columns to testResults table Adds usedWorkarounds and workarounds columns. First step toward fixing bug 16169. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/alter.sql | 2 ++ tables/testResults.sql | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..f61f3fb 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +1,4 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ + +ALTER TABLE testResults ADD COLUMN usedWorkaround ENUM("Yes", "No") DEFAULT NULL AFTER runs, ADD COLUMN workarounds TEXT DEFAULT NULL AFTER usedWorkaround; diff --git a/tables/testResults.sql b/tables/testResults.sql index 44a52ae..5d35a00 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -17,6 +17,8 @@ create table testResults ( staging tinyint(1) not null default '0', installs enum('Yes','No','No, but has workaround','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', + usedWorkaround enum('Yes','No') default NULL, + workarounds text default NULL, testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL, comments text, submitTime datetime NOT NULL,

1 0

Rosanne DiMesio : Add Workarounds section to test report
by Jeremy Newman 16 Aug '17

16 Aug '17

Module: appdb Branch: master Commit: 4a1506322966340d3ad42151ffa31f551e7e9f4c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4a1506322966340d3ad42151… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 11:26:57 2017 -0500 Add Workarounds section to test report Adds a yes/no question about whether workarounds were used and a textarea to enter details if yes. Prohibits Platinum ratings when workarounds are reported used. Fixes bug 16169. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 103 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 91 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=4a1506322966340d3ad4…

1 0

Jeremy Newman : taking changes live
by Jeremy Newman 16 Aug '17

16 Aug '17

Module: appdb Branch: master Commit: 425fb629980bd1da47ac56d87c1d518d7341770e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=425fb629980bd1da47ac56d8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Aug 16 11:32:09 2017 -0500 taking changes live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index f61f3fb..0e977b2 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,4 +1,3 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ -ALTER TABLE testResults ADD COLUMN usedWorkaround ENUM("Yes", "No") DEFAULT NULL AFTER runs, ADD COLUMN workarounds TEXT DEFAULT NULL AFTER usedWorkaround;

1 0

Alex Henrie : include: Add CryptProtectMemory and CryptUnprotectMemory.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: 26a47d32a3a93c1072d4ead7ade7bf669a082292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a47d32a3a93c1072d4ead7a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 15 09:19:59 2017 -0600 include: Add CryptProtectMemory and CryptUnprotectMemory. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index abbe99f..83db673 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4428,6 +4428,9 @@ BOOL WINAPI CryptUnprotectData( DATA_BLOB* pDataIn, LPWSTR* ppszDataDescr, DATA_BLOB* pOptionalEntropy, PVOID pvReserved, CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags, DATA_BLOB* pDataOut ); +BOOL WINAPI CryptProtectMemory(void *pData, DWORD cbData, DWORD dwFlags); +BOOL WINAPI CryptUnprotectMemory(void *pData, DWORD cbData, DWORD dwFlags); + DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString); DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType,

1 0

Alex Henrie : include: Add GetNamedPipeClientProcessId.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Module: wine Branch: master Commit: ae2d6e836b98440cdc938718226dc89592a64eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2d6e836b98440cdc9387182… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 15 09:00:37 2017 -0600 include: Add GetNamedPipeClientProcessId. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 4c1d86e..9d59e4d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2113,6 +2113,7 @@ WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateA(HANDLE,LPDWORD,LPDWORD,LP WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); #define GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState) WINBASEAPI BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); +WINBASEAPI BOOL WINAPI GetNamedPipeClientProcessId(HANDLE,PULONG); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD);

1 0