April 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] msvcr110: Add __crtCaptureCurrentContext implementation
by Piotr Caban April 5, 2018

April 5, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä April 5, 2018

April 5, 2018

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2962631137..6de3f878ec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9097,70 +9097,60 @@ msgstr "" "Tässä varmenteessa on ainakin yksi määrittelemätön turvallisuusongelma." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Palvelupyyntö aikakatkaistu.\n" +msgstr "Pyyntö on aikakatkaistu.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Tulostinvirhe." +msgstr "On tapahtunut sisäinen virhe.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Polku on viallinen.\n" +msgstr "URL on viallinen.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL-skeemaa ei tunnistettu, tai sitä ei tueta.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Käyttäjänimeä ei löytynyt.\n" +msgstr "Palvelimen nimeä ei voitu jäsentää.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Käyttäjäprofiili on viallinen.\n" +msgstr "Pyydetty toimenpide ei kelpaa.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Toimenpide keskeytettiin. Tämä johtuu yleensä siitä, että pyynnön " +"käsittelemä kahva suljettiin ennen toimenpiteen valmistumista.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Profiilia ei voitu lisätä.\n" +msgstr "Pyydettyä kohdetta ei löytynyt.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Ei voida yhdistää LDAP-palvelimeen" +msgstr "Yritys yhdistää palvelimeen epäonnistui.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Yhteys palvelimeen on katkaistu.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"Palvelimen lähettämän SSL-sertifikaatin päiväys ei kelpaa. Sertifikaatti on " +"vanhentunut.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikaatin yleinen nimi (CN, palvelimen nimi) ei kelpaa.\n" #: winmm.rc:32 msgid "The specified command was carried out." -- 2.16.3

1 0

[PATCH] msvcrtd: Allow new to allocated a _CRT_BLOCK block
by Alistair Leslie-Hughes April 5, 2018

April 5, 2018

Fixes: https://bugs.winehq.org/show_bug.cgi?id=44001 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msvcrtd/debug.c | 2 +- dlls/msvcrtd/tests/debug.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c index b8496526ae..6bfa730ece 100644 --- a/dlls/msvcrtd/debug.c +++ b/dlls/msvcrtd/debug.c @@ -52,6 +52,7 @@ void * CDECL MSVCRTD_operator_new_dbg(MSVCRT_size_t nSize, int nBlockUse, switch(_BLOCK_TYPE(nBlockUse)) { case _NORMAL_BLOCK: + case _CRT_BLOCK: break; case _CLIENT_BLOCK: FIXME("Unimplemented case for nBlockUse = _CLIENT_BLOCK\n"); @@ -59,7 +60,6 @@ void * CDECL MSVCRTD_operator_new_dbg(MSVCRT_size_t nSize, int nBlockUse, case _FREE_BLOCK: FIXME("Native code throws an exception here\n"); return NULL; - case _CRT_BLOCK: case _IGNORE_BLOCK: ERR("Not allowed nBlockUse value: %d\n", _BLOCK_TYPE(nBlockUse)); return NULL; diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index 9055db1382..d234f02f6d 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -65,6 +65,10 @@ static void test_new(void) mem = pMSVCRTD_operator_new_dbg(42, _NORMAL_BLOCK, __FILE__, __LINE__); ok(mem != NULL, "memory not allocated\n"); HeapFree(GetProcessHeap(), 0, mem); + + mem = pMSVCRTD_operator_new_dbg(42, _CRT_BLOCK, __FILE__, __LINE__); + ok(mem != NULL, "memory not allocated\n"); + HeapFree(GetProcessHeap(), 0, mem); } /**********************************************************************/ -- 2.16.3

2 1

[PATCH] msvcrt: Don't increment variables both in the loop header and body (clang)
by André Hentschel April 5, 2018

April 5, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/msvcrt/mbcs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 7ca1906..430c2a6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2011,13 +2011,12 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se { if (_ismbblead(*p)) { - for (q = set; *q; q++) + for (q = set; *q; q += 2) { if (!q[1]) break; if ((*p == *q) && (p[1] == q[1])) break; - q++; } if (!q[0] || !q[1]) break; } @@ -2043,13 +2042,12 @@ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* { if (_ismbblead(*p)) { - for (q = set; *q; q++) + for (q = set; *q; q += 2) { if (!q[1]) break; if ((*p == *q) && (p[1] == q[1])) break; - q++; } if (!q[0] || !q[1]) break; } -- 2.7.4

2 1

[PATCH 4/4] [v2] winmm: Fix MEVT_LONGMSG handling in MIDI stream.
by Akihiro Sagawa April 5, 2018

April 5, 2018

In v2, just rebased. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)

2 1

[PATCH 3/4] [v2] winmm/tests: Add more MIDI System Exclusive message tests.
by Akihiro Sagawa April 5, 2018

April 5, 2018

In v2, introduce time division settings and reduce the duration. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)

2 1

[PATCH 2/4] [v2] midimap: Open lower devices when opening MIDI Mapper.
by Akihiro Sagawa April 5, 2018

April 5, 2018

Without this change, the lower device can't get a long message at the beginning. The mapper didn't open it before receiving a short message in modData function. In v2, rebased it. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 27 ++++++++++++++------------- dlls/winmm/tests/midi.c | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 1/4] [v2] winmm/tests: Add MIDI System Exclusive message tests.
by Akihiro Sagawa April 5, 2018

April 5, 2018

In v2, reduce duration time to 200ms from 400ms. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)

2 1

[PATCH 1/2] ddraw: Fix D3DEXECUTEDATA.dwSize handling.
by Stefan Dösinger April 5, 2018

April 5, 2018

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ddraw/executebuffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 497287e32f..89d9ed3a26 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -610,6 +610,12 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * TRACE("iface %p, data %p.\n", iface, data); + if (data->dwSize != sizeof(*data)) + { + WARN("data->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", data->dwSize); + return DDERR_INVALIDPARAMS; + } + /* Skip past previous vertex data. */ buffer->src_vertex_pos += buffer->data.dwVertexCount; @@ -693,12 +699,11 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * static HRESULT WINAPI d3d_execute_buffer_GetExecuteData(IDirect3DExecuteBuffer *iface, D3DEXECUTEDATA *data) { struct d3d_execute_buffer *buffer = impl_from_IDirect3DExecuteBuffer(iface); - DWORD dwSize; TRACE("iface %p, data %p.\n", iface, data); - dwSize = data->dwSize; - memcpy(data, &buffer->data, dwSize); + /* Tests show that dwSize is ignored. */ + memcpy(data, &buffer->data, sizeof(*data)); if (TRACE_ON(ddraw)) { -- 2.16.1

2 3

[PATCH] d2d1: Fix outline join drawing.
by Giovanni Mascellani April 5, 2018

April 5, 2018

Calling d2d_outline_vertex_set(x, y, 0, 0, 0, 0) causes a normalize() to be invoked with a zero vector in the vertex shader vs_code_bezier_outline. This gives rise to an undefinite result, that in some cases causes the join triangles to be dropped. Tested on Debian unstable. Signed-off-by: Giovanni Mascellani <g.mascellani(a)gmail.com> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 5b5a75b9ed..d716fb128d 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2136,14 +2136,14 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, } 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[0], p0->x, p0->y, q_next.x, q_next.y, q_prev.x, q_prev.y); 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); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_next.x, -q_next.y); d2d_outline_vertex_set(&v[1], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); d2d_outline_vertex_set(&v[2], p0->x, p0->y, q_prev.x, q_prev.y, q_next.x, q_next.y); d2d_outline_vertex_set(&v[3], p0->x, p0->y, q_next.x, q_next.y, q_next.x, q_next.y); -- 2.16.3

2 1