May 2018 - Wine-commits - list.winehq.org

Nikolay Sivov : gdiplus: Convert actually used points for anchored round caps.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 5436cfc9b67c51d88a1525c661db24a88ec68d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5436cfc9b67c51d88a1525c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:46 2018 +0300 gdiplus: Convert actually used points for anchored round caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6635dea..478039e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1634,9 +1634,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[1].X = x2 + dx; ptf[1].Y = y2 + dy; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 2); - round_points(pt, ptf, 3); + round_points(pt, ptf, 2); Ellipse(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);

1 0

Nikolay Sivov : gdiplus: Fix the number of transformed points for round caps.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: cd228c281556c1fca2031cac99b40f971832354b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd228c281556c1fca2031cac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:47 2018 +0300 gdiplus: Fix the number of transformed points for round caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 478039e..a7e5c80 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1680,9 +1680,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[3].X = x2 + dx; ptf[3].Y = y2 + dy; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 4); - round_points(pt, ptf, 3); + round_points(pt, ptf, 4); Pie(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y, pt[2].x, pt[2].y, pt[3].x, pt[3].y);

1 0

Nikolay Sivov : gdiplus: Draw using actual point data for custom caps.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 3d8bd665116e2a804c9ea2f25250c1827049ba8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8bd665116e2a804c9ea2f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:48 2018 +0300 gdiplus: Draw using actual point data for custom caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a7e5c80..5fdbaf1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1709,9 +1709,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s GdipTranslateMatrix(&matrix, x2, y2, MatrixOrderAppend); GdipTransformMatrixPoints(&matrix, custptf, count); - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, custptf, count); - round_points(pt, ptf, 3); + round_points(custpt, custptf, count); for(i = 0; i < count; i++) tp[i] = convert_path_point_type(custom->pathdata.Types[i]);

1 0

Nikolay Sivov : dsound: Use correct pointer type.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 339d9e3a6aff7cedceeb8b11337a6a1ce9734643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339d9e3a6aff7cedceeb8b11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 10:55:11 2018 +0300 dsound: Use correct pointer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 1180594..9b3e730 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -699,7 +699,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (!pad_frames) WARN("Probable buffer underrun\n"); - hr = IAudioRenderClient_GetBuffer(device->render, frames, (void*)&buffer); + hr = IAudioRenderClient_GetBuffer(device->render, frames, (BYTE **)&buffer); if(FAILED(hr)){ WARN("GetBuffer failed: %08x\n", hr); LeaveCriticalSection(&device->mixlock);

1 0

Akihiro Sagawa : winmm: Fix default time division value in MIDI stream.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 1d499396189e7353dfda31a84dd89bb13f2747f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d499396189e7353dfda31a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue May 8 22:02:10 2018 +0900 winmm: Fix default time division value in MIDI stream. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 97cef2d..b0efe16 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -565,7 +565,7 @@ static void test_midiStream(UINT udev, HWND hwnd) midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_GET|MIDIPROP_TIMEDIV); ok(!rc, "midiStreamProperty TIMEDIV rc=%s\n", mmsys_error(rc)); - todo_wine ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv); + ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv); memset(&mhdr, 0, sizeof(mhdr)); mhdr.dwUser = 0x56FA552C; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index faeb474..58a7672 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1277,8 +1277,8 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (!lpMidiStrm) return MMSYSERR_NOMEM; - lpMidiStrm->dwTempo = 500000; - lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quarter notes per minute *//* FIXME ??*/ + lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */ + lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->dwPositionMS = 0; mosm.dwStreamID = (DWORD)lpMidiStrm;

1 0

Akihiro Sagawa : winmm: Avoid casting unsigned char to plain char.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 107dba39a3d50f8511a2e4031066bfecfc1105b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107dba39a3d50f8511a2e403… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue May 8 22:02:12 2018 +0900 winmm: Avoid casting unsigned char to plain char. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 58a7672..b97580e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -956,7 +956,7 @@ static DWORD MMSYSTEM_MidiStream_Convert(WINE_MIDIStream* lpMidiStrm, DWORD puls if (lpMidiStrm->dwTimeDiv == 0) { FIXME("Shouldn't happen. lpMidiStrm->dwTimeDiv = 0\n"); } else if (lpMidiStrm->dwTimeDiv > 0x8000) { /* SMPTE, unchecked FIXME? */ - int nf = -(char)HIBYTE(lpMidiStrm->dwTimeDiv); /* number of frames */ + int nf = 256 - HIBYTE(lpMidiStrm->dwTimeDiv); /* number of frames */ int nsf = LOBYTE(lpMidiStrm->dwTimeDiv); /* number of sub-frames */ ret = (pulse * 1000) / (nf * nsf); } else {

1 0

Alexandre Julliard : Release 3.8.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 7280f7fb744e951281e7f051c347fb8fef5ab36b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7280f7fb744e951281e7f051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:20:21 2018 +0200 Release 3.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 643 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 304 insertions(+), 361 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7280f7fb744e951281e7…

1 0

Tag wine-3.8 : Alexandre Julliard : Release 3.8
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: refs/tags/wine-3.8 Tag: 07fd2bf834d616959afb3f5d998a0f9fa15443df URL: https://source.winehq.org/git/wine.git/?a=tag;h=07fd2bf834d616959afb3f5d998… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:20:21 2018 +0200 Release 3.8

1 0

Jacek Caban : jscript: Add Object.defineProperty implementation.
by Alexandre Julliard 11 May '18

11 May '18

1 0

Jacek Caban : jscript: Use jsdisp_define_property instead of jsdisp_propput_const.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 4555828c57c918d99cd91fcb469b8ebda243f5b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4555828c57c918d99cd91fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 11 14:43:28 2018 +0200 jscript: Use jsdisp_define_property instead of jsdisp_propput_const. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 6 ++++++ dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.h | 2 +- dlls/jscript/math.c | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 7a2879a..714f3a4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1701,3 +1701,9 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t prop->flags = (prop->flags & ~desc->mask) | (desc->flags & desc->mask); return S_OK; } + +HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned flags, jsval_t value) +{ + property_desc_t prop_desc = { flags, flags, TRUE, value }; + return jsdisp_define_property(obj, name, &prop_desc); +} diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index af0b9a4..040bcc5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -655,7 +655,8 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, return hres; if(builtin_info) - hres = jsdisp_propput_const(&function->dispex, lengthW, jsval_number(function->length)); + hres = jsdisp_define_data_property(&function->dispex, lengthW, 0, + jsval_number(function->length)); if(SUCCEEDED(hres)) hres = set_prototype(ctx, &function->dispex, prototype); if(FAILED(hres)) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2beee26..40e99f3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -284,7 +284,6 @@ HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; @@ -295,6 +294,7 @@ HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDE HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; +HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index ef906f5..109df9d 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -559,7 +559,8 @@ HRESULT create_math(script_ctx_t *ctx, jsdisp_t **ret) } for(i=0; i < sizeof(constants)/sizeof(*constants); i++) { - hres = jsdisp_propput_const(math, constants[i].name, jsval_number(constants[i].val)); + hres = jsdisp_define_data_property(math, constants[i].name, 0, + jsval_number(constants[i].val)); if(FAILED(hres)) { jsdisp_release(math); return hres;

1 0