September 2019 - Wine-Commits

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_vs_consts_i().
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 83416bc25b9e901bcd80b11bfc7e335576e92265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83416bc25b9e901bcd80b11b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 18:32:52 2019 -0500 wined3d: Introduce wined3d_stateblock_set_vs_consts_i(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 97ef422f5a..e056ace213 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1288,6 +1288,26 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stat return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + + memcpy(&stateblock->stateblock_state.vs_consts_i[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.vertexShaderConstantsI |= (1u << i); + return WINED3D_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a0d9864018..abfbaa7e40 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) +@ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4543b882ac..2ad28a3345 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2662,6 +2662,8 @@ ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); +HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain);

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetVertexShaderConstantI().
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: ceef84084e214b0febf10fec681528404a840a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceef84084e214b0febf10fec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 18:32:53 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetVertexShaderConstantI(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8436967ddd..8228d07ab3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3515,8 +3515,11 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_i(device->wined3d_device, + hr = wined3d_stateblock_set_vs_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_vs_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr;

1 0

Paul Gofman : wined3d: Support zero row pitch in wined3d_texture_gl_upload_data().
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 85c0c49af73cfee0dc46b1920b4f11acd650cea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c0c49af73cfee0dc46b192… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Sep 27 00:17:20 2019 +0300 wined3d: Support zero row pitch in wined3d_texture_gl_upload_data(). Fixes Wine test failure in d3d11 test_copy_subresource_region(). The test failure could be unstable as there was read after data end in glTexSubImage2D() called from wined3d_texture_gl_upload_data(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 5 ++++- dlls/wined3d/texture.c | 35 +++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d58319df58..456d34470c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12719,10 +12719,13 @@ static void test_copy_subresource_region(void) check_texture_color(test_context.backbuffer, 0x800000ff, 2); memset(float_colors, 0, sizeof(float_colors)); + for (i = 0; i < texture_desc.Width; ++i) + ((unsigned int *)float_colors)[i] = 0x45454545; + ID3D11DeviceContext1_UpdateSubresource1(context1, (ID3D11Resource *)dst_texture, 0, NULL, float_colors, 0, 0, 0); draw_quad(&test_context); - check_texture_color(test_context.backbuffer, 0x00000000, 1); + check_texture_color(test_context.backbuffer, 0x45454545, 1); ID3D11DeviceContext1_CopySubresourceRegion1(context1, (ID3D11Resource *)dst_texture, 0, 0, 0, 0, (ID3D11Resource *)src_texture, 0, NULL, 0); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ff25f64043..c4ef184484 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2052,26 +2052,41 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, } else { + unsigned int y, y_count; + TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", target, level, dst_x, dst_y, dst_z, update_w, update_h, update_d, format_gl->format, format_gl->type, bo.addr); - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + if (src_row_pitch) { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, dst_z, - update_w, update_h, update_d, format_gl->format, format_gl->type, bo.addr)); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); + y_count = 1; } - else if (target == GL_TEXTURE_1D) + else { - gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, - update_w, format_gl->format, format_gl->type, bo.addr); + y_count = update_h; + update_h = 1; } - else + + for (y = 0; y < y_count; ++y) { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, format_gl->format, format_gl->type, bo.addr); + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z, + update_w, update_h, update_d, format_gl->format, format_gl->type, bo.addr)); + } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, + update_w, format_gl->format, format_gl->type, bo.addr); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, + update_w, update_h, format_gl->format, format_gl->type, bo.addr); + } } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); checkGLcall("Upload texture data");

1 0

Piotr Caban : msvcrt: Fix _putws implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 3577f06f719e854513d1015f33aa78c506ad3f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3577f06f719e854513d1015f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 30 15:22:15 2019 +0200 msvcrt: Fix _putws implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47615 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 18d69b7205..9075b432ff 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4840,19 +4840,14 @@ int CDECL MSVCRT_puts(const char *s) */ int CDECL MSVCRT__putws(const MSVCRT_wchar_t *s) { - static const MSVCRT_wchar_t nl = '\n'; - MSVCRT_size_t len = strlenW(s); int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { - MSVCRT__unlock_file(MSVCRT_stdout); - return MSVCRT_EOF; - } - - ret = MSVCRT__fwrite_nolock(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT_fputws(s, MSVCRT_stdout); + if(ret >= 0) + ret = MSVCRT__fputwc_nolock('\n', MSVCRT_stdout); MSVCRT__unlock_file(MSVCRT_stdout); - return ret; + return ret >= 0 ? 0 : MSVCRT_WEOF; } /*********************************************************************

1 0

Hans Leidekker : bcrypt: Implement BCryptEnumAlgorithms.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 04631f9c6efe480def24051fae3e49a804cb8124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04631f9c6efe480def24051f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 30 17:12:57 2019 +0200 bcrypt: Implement BCryptEnumAlgorithms. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 24 +++++-- dlls/bcrypt/bcrypt_main.c | 151 ++++++++++++++++++++++++++---------------- dlls/bcrypt/gnutls.c | 7 +- dlls/bcrypt/tests/bcrypt.c | 30 +++++++++ include/bcrypt.h | 23 ++++++- 5 files changed, 171 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04631f9c6efe480def24…

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptControl::Run.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 5a67b266c0837b80e02b3dd42e990907ca671c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a67b266c0837b80e02b3dd4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 30 15:43:26 2019 +0300 msscript.ocx: Implement IScriptControl::Run. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 100 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 11 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 9cb8282aa2..c4c6485980 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -20,12 +20,14 @@ #include "windows.h" #include "initguid.h" +#include "dispex.h" #include "ole2.h" #include "olectl.h" #include "objsafe.h" #include "activscp.h" #include "rpcproxy.h" #include "msscript.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "wine/debug.h" #include "wine/heap.h" @@ -71,6 +73,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + IDispatch *script_dispatch; SCRIPTSTATE script_state; CLSID clsid; @@ -200,6 +203,17 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam return NULL; } +static HRESULT get_script_dispatch(struct ScriptControl *control, IDispatch **disp) +{ + if (!control->host->script_dispatch) + { + HRESULT hr = IActiveScript_GetScriptDispatch(control->host->script, NULL, &control->host->script_dispatch); + if (FAILED(hr)) return hr; + } + *disp = control->host->script_dispatch; + return S_OK; +} + static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) { HRESULT hr; @@ -210,6 +224,19 @@ static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) return hr; } +static HRESULT start_script(struct ScriptControl *control) +{ + HRESULT hr = S_OK; + + if (!control->host || control->state != Initialized) + return E_FAIL; + + if (control->host->script_state != SCRIPTSTATE_STARTED) + hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -316,7 +343,10 @@ static void release_script_engine(ScriptHost *host) if (host->parse) IActiveScriptParse_Release(host->parse); + if (host->script_dispatch) + IDispatch_Release(host->script_dispatch); + host->script_dispatch = NULL; host->parse = NULL; host->script = NULL; @@ -539,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) host->ref = 1; host->script = NULL; host->parse = NULL; + host->script_dispatch = NULL; host->clsid = *clsid; list_init(&host->named_items); @@ -982,15 +1013,8 @@ static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD EXCEPINFO excepinfo; HRESULT hr; - if (!control->host || control->state != Initialized) - return E_FAIL; - - if (control->host->script_state != SCRIPTSTATE_STARTED) - { - hr = set_script_state(control->host, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; - } + hr = start_script(control); + if (FAILED(hr)) return hr; hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, NULL, NULL, 0, 1, flag, res, &excepinfo); @@ -1032,8 +1056,62 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); - return E_NOTIMPL; + IDispatchEx *dispex; + IDispatch *disp; + SAFEARRAY *sa; + DISPPARAMS dp; + DISPID dispid; + HRESULT hr; + UINT i; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); + + if (!parameters || !res) return E_POINTER; + if (!(sa = *parameters)) return E_POINTER; + + V_VT(res) = VT_EMPTY; + if (sa->cDims == 0) return DISP_E_BADINDEX; + if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE; + + hr = start_script(This); + if (FAILED(hr)) return hr; + + hr = get_script_dispatch(This, &disp); + if (FAILED(hr)) return hr; + + hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &procedure_name, 1, LOCALE_USER_DEFAULT, &dispid); + if (FAILED(hr)) return hr; + + dp.cArgs = sa->rgsabound[0].cElements; + dp.rgdispidNamedArgs = NULL; + dp.cNamedArgs = 0; + dp.rgvarg = heap_alloc(dp.cArgs * sizeof(*dp.rgvarg)); + if (!dp.rgvarg) return E_OUTOFMEMORY; + + hr = SafeArrayLock(sa); + if (SUCCEEDED(hr)) + { + /* The DISPPARAMS are stored in reverse order */ + for (i = 0; i < dp.cArgs; i++) + dp.rgvarg[i] = *(VARIANT*)((char*)(sa->pvData) + (dp.cArgs - i - 1) * sa->cbElements); + SafeArrayUnlock(sa); + + hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if (FAILED(hr)) + { + hr = IDispatch_Invoke(disp, dispid, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + } + else + { + hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + IDispatchEx_Release(dispex); + } + } + heap_free(dp.rgvarg); + + return hr; } static const IScriptControlVtbl ScriptControlVtbl = {

1 0

Sven Baars : msi/tests: Fix a test failure on Windows XP.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: eec7f105124a58565fa35ca61c1bc8289321fedc URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec7f105124a58565fa35ca6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Sep 28 12:59:18 2019 +0200 msi/tests: Fix a test failure on Windows XP. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f994ad4c18..504f32cf96 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1131,7 +1131,9 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); - todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); + todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || + r == ERROR_INSTALL_PACKAGE_INVALID /* winxp */, + "got %u\n", r); GetCurrentDirectoryA(sizeof(path), path); r = MsiDatabaseExportA(db, "Test", path, "bogus.idt");

1 0

Francois Gouget : msg711.acm: Fix the spelling of the copyright notice.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 34acb56074dd727ca8ecf17249f06d5cef4cfcb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34acb56074dd727ca8ecf172… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 30 01:38:28 2019 +0200 msg711.acm: Fix the spelling of the copyright notice. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 9c44c65b29..6909494e29 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -161,7 +161,7 @@ static inline void W16(unsigned char* dst, short s) * charge. * * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING - * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * * Sun source code is provided with no support and without any obligation on

1 0

Zebediah Figura : quartz/tests: Add some tests for video renderer filter states.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 0fc36698fa9a21946e0ca30428cfc5ebc6f6ca05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc36698fa9a21946e0ca304… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:27 2019 -0500 quartz/tests: Add some tests for video renderer filter states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 283 ++++++++++++++++++++++++++++++-------- 1 file changed, 227 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0fc36698fa9a21946e0c…

1 0

Francois Gouget : mfplat/tests: Fix the spelling of a comment.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 5d95fe767bf8d34097aafe2a79994426eb9a7d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d95fe767bf8d34097aafe2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 30 01:39:30 2019 +0200 mfplat/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 721ec120ef..832b52713c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1499,7 +1499,7 @@ static void test_system_memory_buffer(void) ok(length == 10, "got %u\n", length); ok(max == 1024, "got %u\n", max); - /* Attempt to lock the bufer twice */ + /* Attempt to lock the buffer twice */ hr = IMFMediaBuffer_Lock(buffer, &data2, &max, &length); ok(hr == S_OK, "got 0x%08x\n", hr); ok(data == data2, "got 0x%08x\n", hr);

1 0