wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Nikolay Sivov : d3drm: Store animation options.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 1f38c0b165da739e791bea9ed8ade4259c201128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f38c0b165da739e791bea9ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 17:36:33 2017 +0300 d3drm: Store animation options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/frame.c | 55 +++++++++++++++++++++++++++++++++------------- dlls/d3drm/tests/d3drm.c | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 802a171..e4ffd2b 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -214,6 +214,7 @@ struct d3drm_animation LONG ref; IDirect3DRM *d3drm; IDirect3DRMFrame3 *frame; + D3DRMANIMATIONOPTIONS options; }; struct d3drm_wrap diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index c95c5df..79a3cb0 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3238,11 +3238,38 @@ static HRESULT WINAPI d3drm_animation1_GetClassName(IDirect3DRMAnimation *iface, return d3drm_animation2_GetClassName(&animation->IDirect3DRMAnimation2_iface, size, name); } +static HRESULT WINAPI d3drm_animation2_SetOptions(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONOPTIONS options) +{ + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); + static const DWORD supported_options = D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION + | D3DRMANIMATION_SPLINEPOSITION | D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION; + + TRACE("iface %p, options %#x.\n", iface, options); + + if (!(options & supported_options)) + return D3DRMERR_BADVALUE; + + if ((options & (D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED)) == (D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED) || + (options & (D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION)) == + (D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION) || + (options & (D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION)) == + (D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION)) + { + return D3DRMERR_BADVALUE; + } + + animation->options = options; + + return D3DRM_OK; +} + static HRESULT WINAPI d3drm_animation1_SetOptions(IDirect3DRMAnimation *iface, D3DRMANIMATIONOPTIONS options) { - FIXME("iface %p, %#x.\n", iface, options); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p, %#x.\n", iface, options); + + return d3drm_animation2_SetOptions(&animation->IDirect3DRMAnimation2_iface, options); } static HRESULT WINAPI d3drm_animation1_AddRotateKey(IDirect3DRMAnimation *iface, D3DVALUE time, D3DRMQUATERNION *q) @@ -3301,18 +3328,22 @@ static HRESULT WINAPI d3drm_animation1_SetTime(IDirect3DRMAnimation *iface, D3DV return E_NOTIMPL; } -static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnimation *iface) +static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnimation2 *iface) { - FIXME("iface %p.\n", iface); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return 0; + TRACE("iface %p.\n", iface); + + return animation->options; } -static HRESULT WINAPI d3drm_animation2_SetOptions(IDirect3DRMAnimation2 *iface, D3DRMANIMATIONOPTIONS options) +static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnimation *iface) { - FIXME("iface %p, options %#x.\n", iface, options); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + return d3drm_animation2_GetOptions(&animation->IDirect3DRMAnimation2_iface); } static HRESULT WINAPI d3drm_animation2_AddRotateKey(IDirect3DRMAnimation2 *iface, D3DVALUE time, D3DRMQUATERNION *q) @@ -3363,13 +3394,6 @@ static HRESULT WINAPI d3drm_animation2_SetTime(IDirect3DRMAnimation2 *iface, D3D return E_NOTIMPL; } -static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnimation2 *iface) -{ - FIXME("iface %p.\n", iface); - - return 0; -} - static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 **frame) { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); @@ -3481,6 +3505,7 @@ HRESULT d3drm_animation_create(struct d3drm_animation **animation, IDirect3DRM * object->IDirect3DRMAnimation2_iface.lpVtbl = &d3drm_animation2_vtbl; object->d3drm = d3drm; object->ref = 1; + object->options = D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION; d3drm_object_init(&object->obj, classname); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 051f8cb..9b166aa 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6706,6 +6706,7 @@ static void test_animation(void) { IDirect3DRMAnimation2 *animation2; IDirect3DRMAnimation *animation; + D3DRMANIMATIONOPTIONS options; IDirect3DRMObject *obj, *obj2; IDirect3DRMFrame3 *frame3; IDirect3DRMFrame *frame; @@ -6776,6 +6777,51 @@ static void test_animation(void) IDirect3DRMFrame3_Release(frame3); IDirect3DRMFrame_Release(frame); + /* Animation options. */ + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), + "Unexpected default options %#x.\n", options); + + /* Undefined mask value */ + hr = IDirect3DRMAnimation_SetOptions(animation, 0xf0000000); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), + "Unexpected default options %#x.\n", options); + + /* Ambiguous mask */ + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN | D3DRMANIMATION_CLOSED); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_LINEARPOSITION | D3DRMANIMATION_SPLINEPOSITION); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION | D3DRMANIMATION_POSITION); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == (D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION), + "Unexpected default options %#x.\n", options); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_SCALEANDROTATION); + ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == D3DRMANIMATION_SCALEANDROTATION, "Unexpected options %#x.\n", options); + + hr = IDirect3DRMAnimation_SetOptions(animation, D3DRMANIMATION_OPEN); + ok(SUCCEEDED(hr), "Failed to set animation options, hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options); + + hr = IDirect3DRMAnimation_SetOptions(animation, 0); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = IDirect3DRMAnimation_GetOptions(animation); + ok(options == D3DRMANIMATION_OPEN, "Unexpected options %#x.\n", options); + IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: wine Branch: master Commit: 9c84b06524b62012c775d3f0a5b2b42ff0c35547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c84b06524b62012c775d3f0a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 28 09:48:23 2017 +0300 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 | 284 +++++++++++++++++++++++---------------------------------------- 1 file changed, 102 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c84b06524b62012c775d…

1 0

Francois Gouget : testbot/WineRunTask: Always take a screenshot.
by Alexandre Julliard 28 Jun '17

28 Jun '17

Module: tools Branch: master Commit: 36e720d046620ec65da53adf8ee1593b7bb3906a URL: http://source.winehq.org/git/tools.git/?a=commit;h=36e720d046620ec65da53adf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 28 09:49:04 2017 +0200 testbot/WineRunTask: Always take a screenshot. Even if we were not able to send the test file. Maybe the screenshot will show a helpful Windows error message like "network connection lost". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 615d898..1663c10 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -64,7 +64,7 @@ sub TakeScreenshot($$) my ($VM, $FullScreenshotFileName) = @_; my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); - if (! defined($ErrMessage)) + if (!defined $ErrMessage) { my $OldUMask = umask(002); if (open(my $Screenshot, ">", $FullScreenshotFileName)) @@ -78,9 +78,9 @@ sub TakeScreenshot($$) } umask($OldUMask); } - else + elsif ($VM->IsPoweredOn()) { - Error "Can't capture screenshot: $ErrMessage\n"; + Error "Could not capture a screenshot: $ErrMessage\n"; } } @@ -222,6 +222,9 @@ sub WrapUpAndExit($;$$) my ($Status, $TestFailures, $Retry) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + Debug(Elapsed($Start), " Taking a screenshot\n"); + TakeScreenshot($VM, $FullScreenshotFileName); + my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -755,10 +758,6 @@ elsif (!defined $TAError) } $TA->Disconnect(); - -Debug(Elapsed($Start), " Taking a screenshot\n"); -TakeScreenshot($VM, $FullScreenshotFileName); - FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError);

1 0

Paul Gofman : d3dx9: Move transpose 'if' outside of the inner loop in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 08df007e802dfa2845a5b4f33bbf8a04202258bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08df007e802dfa2845a5b4f33… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:56 2017 +0300 d3dx9: Move transpose 'if' outside of the inner loop in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 25374a3..911ca79 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1141,7 +1141,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; unsigned int element, i, j, start_offset; - unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; enum pres_value_type param_type; @@ -1181,24 +1180,20 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. * All the supported types of parameters and table values have the same size. */ - for (i = 0; i < info.major_count; ++i) - { - for (j = 0; j < info.minor; ++j) - { - if (info.transpose) - param_offset = i + j * info.major; - else - param_offset = i * info.minor + j; - out[i * info.major_stride + j] = data[param_offset]; - } - } if (info.transpose) { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i + j * info.major]; + for (j = 0; j < info.minor_remainder; ++j) - { - param_offset = i + j * info.major; - out[i * info.major_stride + j] = data[param_offset]; - } + out[i * info.major_stride + j] = data[i + j * info.major]; + } + else + { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i * info.minor + j]; } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns;

1 0

Paul Gofman : d3dx9: Get rid of constant' s length checking for matrix in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 0029128464922a6d714fd33709b0a2e4a8c5eb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029128464922a6d714fd3370… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:55 2017 +0300 d3dx9: Get rid of constant's length checking for matrix in set_constants(). When count in const_upload_info is calculated precisely (considering actual constant set length), boolean matrix setting fall in direct copy path, unless transpose is required. The case of incomplete last row for matrix should be handled in set_constants() for transposed boolean constant only. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3b06f66..25374a3 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -269,6 +269,7 @@ struct const_upload_info unsigned int major_stride; unsigned int major_count; unsigned int count; + unsigned int minor_remainder; }; static enum pres_value_type table_type_from_param_type(D3DXPARAMETER_TYPE type) @@ -1038,10 +1039,22 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->major = param->rows; info->minor = param->columns; } - info->major_stride = max(info->minor, get_reg_components(table)); - info->major_count = min(info->major * info->major_stride, - get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; - info->count = info->major_count * info->minor; + + if (get_reg_components(table) == 1) + { + unsigned int const_length = get_offset_reg(table, const_set->register_count); + + info->major_stride = info->minor; + info->major_count = const_length / info->major_stride; + info->minor_remainder = const_length % info->major_stride; + } + else + { + info->major_stride = get_reg_components(table); + info->major_count = const_set->register_count; + info->minor_remainder = 0; + } + info->count = info->major_count * info->minor + info->minor_remainder; } static void pres_int_from_float(void *out, const void *in, unsigned int count) @@ -1172,16 +1185,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const { for (j = 0; j < info.minor; ++j) { - unsigned int offset; - - offset = i * info.major_stride + j; - if (get_reg_offset(table, offset) >= const_set->register_count) - break; if (info.transpose) param_offset = i + j * info.major; else param_offset = i * info.minor + j; - out[offset] = data[param_offset]; + out[i * info.major_stride + j] = data[param_offset]; + } + } + if (info.transpose) + { + for (j = 0; j < info.minor_remainder; ++j) + { + param_offset = i + j * info.major; + out[i * info.major_stride + j] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); @@ -1417,6 +1433,16 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC && !info.transpose && info.minor == info.major_stride && info.count == get_offset_reg(const_set.table, const_set.register_count) && info.count * sizeof(unsigned int) <= param->bytes; + if (info.minor_remainder && !const_set.direct_copy && !info.transpose) + FIXME("Incomplete last row for not transposed matrix which cannot be directly copied, parameter %s.\n", + debugstr_a(param->name)); + + if (info.major_count > info.major + || (info.major_count == info.major && info.minor_remainder)) + { + WARN("Constant dimensions exceed parameter size.\n"); + return D3DERR_INVALIDCALL; + } if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0

Paul Gofman : d3dx9: Remove redundant parameter size check in set_constants().
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ed7e27ad8db2c08afbf222d80ec0d6d093ad4498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7e27ad8db2c08afbf222d80… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:54 2017 +0300 d3dx9: Remove redundant parameter size check in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 7ca0c8f..3b06f66 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1181,11 +1181,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const param_offset = i + j * info.major; else param_offset = i * info.minor + j; - if (param_offset * sizeof(unsigned int) >= param->bytes) - { - WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); - break; - } out[offset] = data[param_offset]; } }

1 0

Nikolay Sivov : d3drm: Store animated frame pointer in animation object.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 9b35d5c6d47d1956ff687c5f4440876e03266b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b35d5c6d47d1956ff687c5f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 11:17:11 2017 +0300 d3drm: Store animated frame pointer in animation object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/frame.c | 37 +++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index f2a6131..802a171 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -213,6 +213,7 @@ struct d3drm_animation IDirect3DRMAnimation IDirect3DRMAnimation_iface; LONG ref; IDirect3DRM *d3drm; + IDirect3DRMFrame3 *frame; }; struct d3drm_wrap diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 5969b50..c95c5df 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3277,9 +3277,21 @@ static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3 static HRESULT WINAPI d3drm_animation1_SetFrame(IDirect3DRMAnimation *iface, IDirect3DRMFrame *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); + HRESULT hr = D3DRM_OK; - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (frame) + { + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&animation->frame); + if (SUCCEEDED(hr)) + IDirect3DRMFrame3_Release(animation->frame); + } + else + animation->frame = NULL; + + return hr; } static HRESULT WINAPI d3drm_animation1_SetTime(IDirect3DRMAnimation *iface, D3DVALUE time) @@ -3335,9 +3347,13 @@ static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D static HRESULT WINAPI d3drm_animation2_SetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + animation->frame = frame; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_SetTime(IDirect3DRMAnimation2 *iface, D3DVALUE time) @@ -3356,9 +3372,18 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnima static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 **frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (!frame) + return D3DRMERR_BADVALUE; + + *frame = animation->frame; + if (*frame) + IDirect3DRMFrame3_AddRef(*frame); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *iface, DWORD id) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ff1aadd..051f8cb 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6707,6 +6707,8 @@ static void test_animation(void) IDirect3DRMAnimation2 *animation2; IDirect3DRMAnimation *animation; IDirect3DRMObject *obj, *obj2; + IDirect3DRMFrame3 *frame3; + IDirect3DRMFrame *frame; IDirect3DRM *d3drm1; HRESULT hr; @@ -6738,6 +6740,42 @@ static void test_animation(void) IDirect3DRMObject_Release(obj); IDirect3DRMObject_Release(obj2); + /* Set animated frame, get it back. */ + hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame); + ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame, 1); + hr = IDirect3DRMAnimation_SetFrame(animation, frame); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame, 1); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3); + ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr); + ok(frame3 != (void *)frame, "Unexpected interface pointer.\n"); + CHECK_REFCOUNT(frame, 2); + + IDirect3DRMFrame3_Release(frame3); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame3, 2); + hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame3, 2); + + IDirect3DRMFrame3_Release(frame3); + IDirect3DRMFrame_Release(frame); + IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Alistair Leslie-Hughes : dsound: Free MMDevice on Release.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: a731eaa705dc844f484f4e8153e73ddb9dcade52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a731eaa705dc844f484f4e815… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 25 10:42:46 2017 +0000 dsound: Free MMDevice on Release. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e8c10a7..a8b20b1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -232,7 +232,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioRenderClient_Release(device->render); if(device->volume) IAudioStreamVolume_Release(device->volume); - + if(device->mmdevice) + IMMDevice_Release(device->mmdevice); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer);

1 0

Hugh McMaster : regedit/tests: Test whether EOF invalidates a hex data line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: ec0043f0839d6a9b617858ce8512194805d5754f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0043f0839d6a9b617858ce8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:37:12 2017 +0000 regedit/tests: Test whether EOF invalidates a hex data line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79213c6..fec6e3e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -486,6 +486,15 @@ static void test_basic_import(void) " 25,48,4f,4d,45,25,00\n\n"); verify_reg(hkey, "Wine16", REG_EXPAND_SZ, "%HOME%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\"); + lr = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", lr); + if (lr == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1021,6 +1030,11 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine30a"); verify_reg_nonexist(hkey, "Wine30b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,69,6e,65,20\\"); + verify_reg_nonexist(hkey, "Wine62b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test whether a forward slash can be used as a concatenation marker.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 82d3be80948390c84d8528078eb3d6eadc349bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d3be80948390c84d8528078… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:33:11 2017 +0000 regedit/tests: Test whether a forward slash can be used as a concatenation marker. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f7334e4..79213c6 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1012,6 +1012,15 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Wine29a"); todo_wine verify_reg_nonexist(hkey, "Wine29b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine30a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine30b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine30a"); + verify_reg_nonexist(hkey, "Wine30b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017