April 2022 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : jscript: Handle NULL return pointers in all constructors.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: c464c1bd4781ca650a5397ff6a2cfd574c1877f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c464c1bd4781ca650a5397ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:38 2022 +0300 jscript: Handle NULL return pointers in all constructors. Instead of crashing. 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/jscript/activex.c | 3 ++- dlls/jscript/array.c | 4 ++++ dlls/jscript/bool.c | 3 +++ dlls/jscript/date.c | 6 ++++-- dlls/jscript/enumerator.c | 3 ++- dlls/jscript/function.c | 3 ++- dlls/jscript/number.c | 11 ++++++----- dlls/jscript/set.c | 4 ++++ dlls/jscript/string.c | 9 ++++++--- dlls/jscript/tests/api.js | 15 +++++++++++++++ dlls/jscript/vbarray.c | 4 +++- 11 files changed, 51 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 5d79d2b0b82..a74f6acb529 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -181,7 +181,8 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, return E_NOTIMPL; } - *r = jsval_disp(disp); + if(r) *r = jsval_disp(disp); + else IDispatch_Release(disp); return S_OK; } diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index dcabc0dfb71..ee725792830 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1374,6 +1374,8 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, u if(n < 0 || !is_int32(n)) return JS_E_INVALID_LENGTH; + if(!r) + return S_OK; hres = create_array(ctx, n, &obj); if(FAILED(hres)) @@ -1383,6 +1385,8 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, u return S_OK; } + if(!r) + return S_OK; hres = create_array(ctx, argc, &obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index a230855d452..3a4aa9c9199 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -151,6 +151,9 @@ static HRESULT BoolConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un case DISPATCH_CONSTRUCT: { jsdisp_t *bool; + if(!r) + return S_OK; + hres = create_bool(ctx, value, &bool); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index e482c4a4a02..bc09f05d4b9 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2248,7 +2248,8 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, un if(FAILED(hres)) return hres; - *r = jsval_number(n); + if(r) + *r = jsval_number(n); return S_OK; } @@ -2403,7 +2404,8 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un } } - *r = jsval_obj(&date->dispex); + if(r) *r = jsval_obj(&date->dispex); + else jsdisp_release(&date->dispex); return S_OK; case INVOKE_FUNC: { diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 94eb9f209bc..f82263eaf26 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -300,7 +300,8 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD fla if(FAILED(hres)) return hres; - *r = jsval_obj(obj); + if(r) *r = jsval_obj(obj); + else jsdisp_release(obj); break; } default: diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 03c541c5d2a..12511bbaaa6 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -1008,7 +1008,8 @@ static HRESULT FunctionConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags if(FAILED(hres)) return hres; - *r = jsval_disp(ret); + if(r) *r = jsval_disp(ret); + else IDispatch_Release(ret); break; } default: diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 472acd0d4b2..be733fb5af5 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -554,11 +554,12 @@ static HRESULT NumberConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, n = 0; } - hres = create_number(ctx, n, &obj); - if(FAILED(hres)) - return hres; - - *r = jsval_obj(obj); + if(r) { + hres = create_number(ctx, n, &obj); + if(FAILED(hres)) + return hres; + *r = jsval_obj(obj); + } break; } default: diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 7973d4216df..8098d76cb2f 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -114,6 +114,8 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns case DISPATCH_CONSTRUCT: TRACE("\n"); + if(!r) + return S_OK; if(!(set = heap_alloc_zero(sizeof(*set)))) return E_OUTOFMEMORY; @@ -461,6 +463,8 @@ static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns case DISPATCH_CONSTRUCT: TRACE("\n"); + if(!r) + return S_OK; if(!(map = heap_alloc_zero(sizeof(*map)))) return E_OUTOFMEMORY; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0b2e69538f0..e73b9e8b52f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1644,7 +1644,8 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, str = jsstr_empty(); } - *r = jsval_string(str); + if(r) *r = jsval_string(str); + else jsstr_release(str); break; } case DISPATCH_CONSTRUCT: { @@ -1659,8 +1660,10 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, str = jsstr_empty(); } - hres = create_string(ctx, str, &ret); - if (SUCCEEDED(hres)) *r = jsval_obj(ret); + if(r) { + hres = create_string(ctx, str, &ret); + if(SUCCEEDED(hres)) *r = jsval_obj(ret); + } jsstr_release(str); return hres; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fe336d46ba9..1efc0239cc3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -287,6 +287,8 @@ ok(Object.prototype.hasOwnProperty('toString'), "Object.prototype.hasOwnProperty ok(Object.prototype.hasOwnProperty('isPrototypeOf'), "Object.prototype.hasOwnProperty('isPrototypeOf') is false"); ok(Function.prototype.hasOwnProperty('call'), "Function.prototype.hasOwnProperty('call') is false"); +Object(); +new Object(); obj = new Object(); ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); @@ -296,28 +298,37 @@ ok(!Object.hasOwnProperty('isPrototypeOf'), "Object.hasOwnProperty('isPrototypeO ok(!parseFloat.hasOwnProperty('call'), "parseFloat.hasOwnProperty('call') is true"); ok(!Function.hasOwnProperty('call'), "Function.hasOwnProperty('call') is true"); +Array(); +new Array(); obj = new Array(); ok(Array.prototype.hasOwnProperty('sort'), "Array.prototype.hasOwnProperty('sort') is false"); ok(Array.prototype.hasOwnProperty('length'), "Array.prototype.hasOwnProperty('length') is false"); ok(!obj.hasOwnProperty('sort'), "obj.hasOwnProperty('sort') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is true"); +Boolean(); +new Boolean(); obj = new Boolean(false); ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); ok(!Boolean.hasOwnProperty('toString'), "Boolean.hasOwnProperty('toString') is true"); ok(Boolean.prototype.hasOwnProperty('toString'), "Boolean.prototype.hasOwnProperty('toString') is false"); +Date(); +new Date(); obj = new Date(); ok(!obj.hasOwnProperty('getTime'), "obj.hasOwnProperty('getTime') is true"); ok(!Date.hasOwnProperty('getTime'), "Date.hasOwnProperty('getTime') is true"); ok(Date.prototype.hasOwnProperty('getTime'), "Date.prototype.hasOwnProperty('getTime') is false"); ok(!("now" in Date), "now found in Date"); +Number(); +new Number(); obj = new Number(); ok(!obj.hasOwnProperty('toFixed'), "obj.hasOwnProperty('toFixed') is true"); ok(!Number.hasOwnProperty('toFixed'), "Number.hasOwnProperty('toFixed') is true"); ok(Number.prototype.hasOwnProperty('toFixed'), "Number.prototype.hasOwnProperty('toFixed') is false"); +/x/; obj = /x/; ok(!obj.hasOwnProperty('exec'), "obj.hasOwnProperty('exec') is true"); ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); @@ -325,6 +336,8 @@ ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +String(); +new String(); obj = new String(); ok(!obj.hasOwnProperty('charAt'), "obj.hasOwnProperty('charAt') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is false"); @@ -3127,6 +3140,8 @@ ok(String.length == 1, "String.length = " + String.length); var tmp = createArray(); ok(getVT(tmp) == "VT_ARRAY|VT_VARIANT", "getVT(createArray()) = " + getVT(tmp)); ok(getVT(VBArray(tmp)) == "VT_ARRAY|VT_VARIANT", "getVT(VBArray(tmp)) = " + getVT(VBArray(tmp))); +VBArray(tmp); +new VBArray(tmp); tmp = new VBArray(tmp); tmp = new VBArray(VBArray(createArray())); ok(tmp.dimensions() == 2, "tmp.dimensions() = " + tmp.dimensions()); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 987d71444ee..d55e90d0bbf 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -291,11 +291,13 @@ static HRESULT VBArrayConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, if(argc<1 || !is_variant(argv[0]) || V_VT(get_variant(argv[0])) != (VT_ARRAY|VT_VARIANT)) return JS_E_VBARRAY_EXPECTED; - return jsval_copy(argv[0], r); + return r ? jsval_copy(argv[0], r) : S_OK; case DISPATCH_CONSTRUCT: if(argc<1 || !is_variant(argv[0]) || V_VT(get_variant(argv[0])) != (VT_ARRAY|VT_VARIANT)) return JS_E_VBARRAY_EXPECTED; + if(!r) + return S_OK; hres = alloc_vbarray(ctx, NULL, &vbarray); if(FAILED(hres))

1 0

Zhiyi Zhang : ieframe: Enable visual styles.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: dca8e2561d1495e09cfb582bf49ad814a6f32967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca8e2561d1495e09cfb582b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 14 15:26:11 2022 +0800 ieframe: Enable visual styles. ieframe.dll uses manifest at ID 123. However, IEWinMain() is not called from rundll32.exe or Control_RunDLL() so the manifest needs to be activated in IEWinMain(). This allows iexplore.exe to enable theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.manifest | 16 ++++++++++++++++ dlls/ieframe/ieframe.rc | 3 +++ dlls/ieframe/iexplore.c | 33 ++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/ieframe.manifest b/dlls/ieframe/ieframe.manifest new file mode 100644 index 00000000000..c8fd3eb4dce --- /dev/null +++ b/dlls/ieframe/ieframe.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Ieframe" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index aed8483e4ce..eb05a98dbc4 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -108,6 +108,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: ieframe.manifest */ +123 RT_MANIFEST ieframe.manifest + /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 27b72a64fa7..1616d4d7f84 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -1125,10 +1125,13 @@ static void release_dde(void) */ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { + BOOL embedding = FALSE, nohome = FALSE, manager = FALSE, activated = FALSE; MSG msg; HRESULT hres; - BOOL embedding = FALSE, nohome = FALSE, manager = FALSE; - DWORD reg_cookie; + HANDLE context = INVALID_HANDLE_VALUE; + DWORD reg_cookie, ret = 1; + ULONG_PTR context_cookie; + ACTCTXW actctx; static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; @@ -1138,6 +1141,15 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) CoInitialize(NULL); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.hModule = ieframe_instance; + actctx.lpResourceName = MAKEINTRESOURCEW(123); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + context = CreateActCtxW(&actctx); + if (context != INVALID_HANDLE_VALUE) + activated = ActivateActCtx(context, &context_cookie); + init_dde(); while (*cmdline) @@ -1173,17 +1185,13 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) if (FAILED(hres)) { ERR("failed to register CLSID_InternetExplorer%s: %08lx\n", manager ? "Manager" : "", hres); - CoUninitialize(); - ExitProcess(1); + goto done; } if (!embedding) { if(!create_ie_window(nohome, cmdline)) - { - CoUninitialize(); - ExitProcess(1); - } + goto done; } /* run the message loop for this thread */ @@ -1196,8 +1204,11 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) CoRevokeClassObject(reg_cookie); release_dde(); + ret = 0; +done: CoUninitialize(); - - ExitProcess(0); - return 0; + if (activated) + DeactivateActCtx(0, context_cookie); + ReleaseActCtx(context); + ExitProcess(ret); }

1 0

Gabriel Ivăncescu : jscript: Set a map entry using a helper function.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 477026a55bab993ccd17056d096fd924f9c88c1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=477026a55bab993ccd17056d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:41 2022 +0300 jscript: Set a map entry using a helper function. So it can be re-used by Set objects. 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/jscript/set.c | 67 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 8946dbbd966..640bf44b5f4 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -127,6 +127,42 @@ static void delete_map_entry(MapInstance *map, struct jsval_map_entry *entry) release_map_entry(entry); } +static HRESULT set_map_entry(MapInstance *map, jsval_t key, jsval_t value, jsval_t *r) +{ + struct jsval_map_entry *entry; + HRESULT hres; + + if((entry = get_map_entry(map, key))) { + jsval_t val; + hres = jsval_copy(value, &val); + if(FAILED(hres)) + return hres; + + jsval_release(entry->value); + entry->value = val; + }else { + if(!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY; + + hres = jsval_copy(key, &entry->key); + if(SUCCEEDED(hres)) { + hres = jsval_copy(value, &entry->value); + if(FAILED(hres)) + jsval_release(entry->key); + } + if(FAILED(hres)) { + heap_free(entry); + return hres; + } + grab_map_entry(entry); + wine_rb_put(&map->map, &entry->key, &entry->entry); + list_add_tail(&map->entries, &entry->list_entry); + map->size++; + } + + if(r) *r = jsval_undefined(); + return S_OK; +} + static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, jsval_t *argv, jsval_t *r) { struct jsval_map_entry *entry; @@ -243,7 +279,6 @@ static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar { jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); jsval_t value = argc >= 2 ? argv[1] : jsval_undefined(); - struct jsval_map_entry *entry; MapInstance *map; HRESULT hres; @@ -253,35 +288,7 @@ static HRESULT Map_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar TRACE("%p (%s %s)\n", map, debugstr_jsval(key), debugstr_jsval(value)); - if((entry = get_map_entry(map, key))) { - jsval_t val; - hres = jsval_copy(value, &val); - if(FAILED(hres)) - return hres; - - jsval_release(entry->value); - entry->value = val; - }else { - if(!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY; - - hres = jsval_copy(key, &entry->key); - if(SUCCEEDED(hres)) { - hres = jsval_copy(value, &entry->value); - if(FAILED(hres)) - jsval_release(entry->key); - } - if(FAILED(hres)) { - heap_free(entry); - return hres; - } - grab_map_entry(entry); - wine_rb_put(&map->map, &entry->key, &entry->entry); - list_add_tail(&map->entries, &entry->list_entry); - map->size++; - } - - if(r) *r = jsval_undefined(); - return S_OK; + return set_map_entry(map, key, value, r); } static HRESULT Map_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : win32u: Move NtUserChildWindowFromPointEx implementation from user32.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 4104b19ade7532aba5645cb7410b4c6aebe45b8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4104b19ade7532aba5645cb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:10:33 2022 +0200 win32u: Move NtUserChildWindowFromPointEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 42 +++++++----------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 58 insertions(+), 36 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a00686ee111..c38e0fabb1c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -216,54 +216,26 @@ HWND WINAPI WindowFromPoint( POINT pt ) /******************************************************************* * ChildWindowFromPoint (USER32.@) */ -HWND WINAPI ChildWindowFromPoint( HWND hwndParent, POINT pt ) +HWND WINAPI ChildWindowFromPoint( HWND parent, POINT pt ) { - return ChildWindowFromPointEx( hwndParent, pt, CWP_ALL ); + return NtUserChildWindowFromPointEx( parent, pt.x, pt.y, CWP_ALL ); } /******************************************************************* * RealChildWindowFromPoint (USER32.@) */ -HWND WINAPI RealChildWindowFromPoint( HWND hwndParent, POINT pt ) +HWND WINAPI RealChildWindowFromPoint( HWND parent, POINT pt ) { - return ChildWindowFromPointEx( hwndParent, pt, CWP_SKIPTRANSPARENT | CWP_SKIPINVISIBLE ); + return NtUserChildWindowFromPointEx( parent, pt.x, pt.y, + CWP_SKIPTRANSPARENT | CWP_SKIPINVISIBLE ); } /******************************************************************* * ChildWindowFromPointEx (USER32.@) */ -HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags) +HWND WINAPI ChildWindowFromPointEx( HWND parent, POINT pt, UINT flags ) { - /* pt is in the client coordinates */ - HWND *list; - int i; - RECT rect; - HWND retvalue; - - GetClientRect( hwndParent, &rect ); - if (!PtInRect( &rect, pt )) return 0; - if (!(list = WIN_ListChildren( hwndParent ))) return hwndParent; - - for (i = 0; list[i]; i++) - { - if (!WIN_GetRectangles( list[i], COORDS_PARENT, &rect, NULL )) continue; - if (!PtInRect( &rect, pt )) continue; - if (uFlags & (CWP_SKIPINVISIBLE|CWP_SKIPDISABLED)) - { - LONG style = GetWindowLongW( list[i], GWL_STYLE ); - if ((uFlags & CWP_SKIPINVISIBLE) && !(style & WS_VISIBLE)) continue; - if ((uFlags & CWP_SKIPDISABLED) && (style & WS_DISABLED)) continue; - } - if (uFlags & CWP_SKIPTRANSPARENT) - { - if (GetWindowLongW( list[i], GWL_EXSTYLE ) & WS_EX_TRANSPARENT) continue; - } - break; - } - retvalue = list[i]; - HeapFree( GetProcessHeap(), 0, list ); - if (!retvalue) retvalue = hwndParent; - return retvalue; + return NtUserChildWindowFromPointEx( parent, pt.x, pt.y, flags ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d19ab54fa90..4c316486099 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -106,6 +106,7 @@ static void * const syscalls[] = NtUserAddClipboardFormatListener, NtUserAttachThreadInput, NtUserBuildHwndList, + NtUserChildWindowFromPointEx, NtUserCloseDesktop, NtUserCloseWindowStation, NtUserCopyAcceleratorTable, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 0bc95daafc8..cf419668789 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -790,7 +790,7 @@ @ stub NtUserCheckProcessForClipboardAccess @ stub NtUserCheckProcessSession @ stub NtUserCheckWindowThreadDesktop -@ stub NtUserChildWindowFromPointEx +@ stdcall -syscall NtUserChildWindowFromPointEx(long long long long) @ stub NtUserClearForeground @ stdcall NtUserClipCursor(ptr) @ stdcall NtUserCloseClipboard() diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 93c9f15afff..6eb272ec227 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2255,6 +2255,43 @@ HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ) return window_from_point( 0, pt, &hittest ); } +/******************************************************************* + * NtUserChildWindowFromPointEx (win32u.@) + */ +HWND WINAPI NtUserChildWindowFromPointEx( HWND parent, LONG x, LONG y, UINT flags ) +{ + POINT pt = { .x = x, .y = y }; /* in the client coordinates */ + HWND *list; + int i; + RECT rect; + HWND ret; + + get_client_rect( parent, &rect ); + if (!PtInRect( &rect, pt )) return 0; + if (!(list = list_window_children( 0, parent, NULL, 0 ))) return parent; + + for (i = 0; list[i]; i++) + { + if (!get_window_rects( list[i], COORDS_PARENT, &rect, NULL, get_thread_dpi() )) continue; + if (!PtInRect( &rect, pt )) continue; + if (flags & (CWP_SKIPINVISIBLE|CWP_SKIPDISABLED)) + { + LONG style = get_window_long( list[i], GWL_STYLE ); + if ((flags & CWP_SKIPINVISIBLE) && !(style & WS_VISIBLE)) continue; + if ((flags & CWP_SKIPDISABLED) && (style & WS_DISABLED)) continue; + } + if (flags & CWP_SKIPTRANSPARENT) + { + if (get_window_long( list[i], GWL_EXSTYLE ) & WS_EX_TRANSPARENT) continue; + } + break; + } + ret = list[i]; + free( list ); + if (!ret) ret = parent; + return ret; +} + /******************************************************************* * get_work_rect * diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index ba921e7e543..509d5272038 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -93,6 +93,7 @@ SYSCALL_ENTRY( NtUserAddClipboardFormatListener ) \ SYSCALL_ENTRY( NtUserAttachThreadInput ) \ SYSCALL_ENTRY( NtUserBuildHwndList ) \ + SYSCALL_ENTRY( NtUserChildWindowFromPointEx ) \ SYSCALL_ENTRY( NtUserCloseDesktop ) \ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserCopyAcceleratorTable ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 9d957673ceb..db4ba246866 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -416,6 +416,16 @@ NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args ) return NtUserGetMouseMovePointsEx( size, ptin, ptout, count, resolution ); } +NTSTATUS WINAPI wow64_NtUserChildWindowFromPointEx( UINT *args ) +{ + HWND parent = get_handle( &args ); + LONG x = get_ulong( &args ); + LONG y = get_ulong( &args ); + UINT flags = get_ulong( &args ); + + return HandleToUlong( NtUserChildWindowFromPointEx( parent, x, y, flags )); +} + NTSTATUS WINAPI wow64_NtUserSetProcessDpiAwarenessContext( UINT *args ) { ULONG awareness = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index efabbe64ad7..52bc6c12c32 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -403,6 +403,7 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ); ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); +HWND WINAPI NtUserChildWindowFromPointEx( HWND parent, LONG x, LONG y, UINT flags ); BOOL WINAPI NtUserClipCursor( const RECT *rect ); BOOL WINAPI NtUserCloseClipboard(void); BOOL WINAPI NtUserCloseDesktop( HDESK handle );

1 0

Alexandre Julliard : user32/tests: Fix some tests that break in UTF-8 codepage.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 86b063c1a912beea24aeafdd94c5d4a8d2c68271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86b063c1a912beea24aeafdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 11:34:21 2022 +0200 user32/tests: Fix some tests that break in UTF-8 codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/resource.c | 8 ++++---- dlls/user32/tests/wsprintf.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 97c274c7817..fff962b955c 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -172,11 +172,11 @@ static void test_accel1(void) ac[n++].fVirt = (SHORT) 0xffff; ac[n].cmd = 0xfff0; - ac[n].key = 0xffff; + ac[n].key = 'B'; ac[n++].fVirt = (SHORT) 0xfff0; ac[n].cmd = 0xfff0; - ac[n].key = 0xffff; + ac[n].key = 'C'; ac[n++].fVirt = 0x0000; ac[n].cmd = 0xfff0; @@ -204,12 +204,12 @@ static void test_accel1(void) if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 2 not preserved got %x\n", ac[n].cmd); - ok( (ac[n].key & 0xff) == 0xff, "key 2 not preserved got %x\n", ac[n].key); + ok( ac[n].key == 'B', "key 2 not preserved got %x\n", ac[n].key); ok( ac[n].fVirt == 0x0070, "fVirt 2 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; ok( ac[n].cmd == 0xfff0, "cmd 3 not preserved got %x\n", ac[n].cmd); - ok( (ac[n].key & 0xff) == 0xff, "key 3 not preserved got %x\n", ac[n].key); + ok( ac[n].key == 'C', "key 3 not preserved got %x\n", ac[n].key); ok( ac[n].fVirt == 0x0000, "fVirt 3 wrong got %x\n", ac[n].fVirt); if (++n == r) goto done; diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index f46cfa5aea3..d35138f4087 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -95,7 +95,7 @@ static void wsprintfATest(void) ok(!strcmp(buf, i64_formats[i].res), "%u: wrong result [%s]\n", i, buf); } - if (!GetCPInfo(CP_ACP, &cpinfo) || cpinfo.MaxCharSize <= 1) + if (!GetCPInfo(CP_ACP, &cpinfo) || cpinfo.MaxCharSize != 2) { skip("Multi-byte wsprintfA test isn't available for the current codepage\n"); return; @@ -199,7 +199,7 @@ static void wsprintfWTest(void) ok(buf[0] == L' ', "expected \\x0020, got \\x%04x\n", buf[0]); ok(buf[1] == wc99, "expected \\x%04x, got \\x%04x\n", wc99, buf[1]); - if (!GetCPInfoExW(CP_ACP, 0, &cpinfoex) || cpinfoex.MaxCharSize <= 1) + if (!GetCPInfoExW(CP_ACP, 0, &cpinfoex) || cpinfoex.MaxCharSize != 2) { skip("Multi-byte wsprintfW test isn't available for the current codepage\n"); return;

1 0

Zebediah Figura : quartz/vmr9: Stub IAMVideoAccelerator.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: d0b400c945b41abcb311be9b8eefc52c085f2e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0b400c945b41abcb311be9b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:03 2022 -0500 quartz/vmr9: Stub IAMVideoAccelerator. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 142 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 5e8866de5a2..88c82bec0d3 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -257,7 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); + check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 4fd8f35d4f8..405f7ee89ba 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -264,7 +264,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); + check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4b213d57426..2330f8fc0c9 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -33,6 +33,7 @@ #include "ddraw.h" #include "dvdmedia.h" #include "d3d9.h" +#include "videoacc.h" #include "vmr9.h" #include "wine/debug.h" @@ -78,6 +79,7 @@ struct quartz_vmr * Native uses a separate reference count for IVMRSurfaceAllocatorNotify9. */ LONG IVMRSurfaceAllocatorNotify9_refcount; + IAMVideoAccelerator IAMVideoAccelerator_iface; IOverlay IOverlay_iface; IVMRSurfaceAllocator9 *allocator; @@ -610,7 +612,9 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - if (IsEqualGUID(iid, &IID_IOverlay)) + if (IsEqualGUID(iid, &IID_IAMVideoAccelerator)) + *out = &filter->IAMVideoAccelerator_iface; + else if (IsEqualGUID(iid, &IID_IOverlay)) *out = &filter->IOverlay_iface; else return E_NOINTERFACE; @@ -2430,6 +2434,139 @@ static const IVMRAspectRatioControl9Vtbl aspect_ratio_control9_vtbl = aspect_ratio_control9_SetAspectRatioMode, }; +static struct quartz_vmr *impl_from_IAMVideoAccelerator(IAMVideoAccelerator *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IAMVideoAccelerator_iface); +} + +static HRESULT WINAPI video_accelerator_QueryInterface(IAMVideoAccelerator *iface, REFIID iid, void **out) +{ + struct quartz_vmr *filter = impl_from_IAMVideoAccelerator(iface); + return IPin_QueryInterface(&filter->renderer.sink.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI video_accelerator_AddRef(IAMVideoAccelerator *iface) +{ + struct quartz_vmr *filter = impl_from_IAMVideoAccelerator(iface); + return IPin_AddRef(&filter->renderer.sink.pin.IPin_iface); +} + +static ULONG WINAPI video_accelerator_Release(IAMVideoAccelerator *iface) +{ + struct quartz_vmr *filter = impl_from_IAMVideoAccelerator(iface); + return IPin_Release(&filter->renderer.sink.pin.IPin_iface); +} + +static HRESULT WINAPI video_accelerator_GetVideoAcceleratorGUIDs( + IAMVideoAccelerator *iface, DWORD *count, GUID *accelerators) +{ + FIXME("iface %p, count %p, accelerators %p, stub!\n", iface, count, accelerators); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetUncompFormatsSupported(IAMVideoAccelerator *iface, + const GUID *accelerator, DWORD *count, DDPIXELFORMAT *formats) +{ + FIXME("iface %p, accelerator %s, count %p, formats %p, stub!\n", + iface, debugstr_guid(accelerator), count, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetInternalMemInfo(IAMVideoAccelerator *iface, + const GUID *accelerator, const AMVAUncompDataInfo *format_info, AMVAInternalMemInfo *mem_info) +{ + FIXME("iface %p, accelerator %s, format_info %p, mem_info %p, stub!\n", + iface, debugstr_guid(accelerator), format_info, mem_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetCompBufferInfo(IAMVideoAccelerator *iface, + const GUID *accelerator, const AMVAUncompDataInfo *uncompressed_info, + DWORD *compressed_info_count, AMVACompBufferInfo *compressed_infos) +{ + FIXME("iface %p, accelerator %s, uncompressed_info %p, compressed_info_count %p, compressed_infos %p, stub!\n", + iface, debugstr_guid(accelerator), uncompressed_info, compressed_info_count, compressed_infos); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetInternalCompBufferInfo( + IAMVideoAccelerator *iface, DWORD *count, AMVACompBufferInfo *infos) +{ + FIXME("iface %p, count %p, infos %p, stub!\n", iface, count, infos); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_BeginFrame(IAMVideoAccelerator *iface, const AMVABeginFrameInfo *info) +{ + FIXME("iface %p, info %p, stub!\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_EndFrame(IAMVideoAccelerator *iface, const AMVAEndFrameInfo *info) +{ + FIXME("iface %p, info %p, stub!\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_GetBuffer(IAMVideoAccelerator *iface, + DWORD type_index, DWORD buffer_index, BOOL read_only, void **buffer, LONG *stride) +{ + FIXME("iface %p, type_index %lu, buffer_index %lu, read_only %d, buffer %p, stride %p, stub!\n", + iface, type_index, buffer_index, read_only, buffer, stride); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_ReleaseBuffer( + IAMVideoAccelerator *iface, DWORD type_index, DWORD buffer_index) +{ + FIXME("iface %p, type_index %lu, buffer_index %lu, stub!\n", iface, type_index, buffer_index); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_Execute(IAMVideoAccelerator *iface, + DWORD function, void *in_data, DWORD in_size, void *out_data, + DWORD out_size, DWORD buffer_count, const AMVABUFFERINFO *buffers) +{ + FIXME("iface %p, function %#lx, in_data %p, in_size %lu," + " out_data %p, out_size %lu, buffer_count %lu, buffers %p, stub!\n", + iface, function, in_data, in_size, out_data, out_size, buffer_count, buffers); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_QueryRenderStatus(IAMVideoAccelerator *iface, + DWORD type_index, DWORD buffer_index, DWORD flags) +{ + FIXME("iface %p, type_index %lu, buffer_index %lu, flags %#lx, stub!\n", + iface, type_index, buffer_index, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI video_accelerator_DisplayFrame( + IAMVideoAccelerator *iface, DWORD index, IMediaSample *sample) +{ + FIXME("iface %p, index %lu, sample %p, stub!\n", iface, index, sample); + return E_NOTIMPL; +} + +static const IAMVideoAcceleratorVtbl video_accelerator_vtbl = +{ + video_accelerator_QueryInterface, + video_accelerator_AddRef, + video_accelerator_Release, + video_accelerator_GetVideoAcceleratorGUIDs, + video_accelerator_GetUncompFormatsSupported, + video_accelerator_GetInternalMemInfo, + video_accelerator_GetCompBufferInfo, + video_accelerator_GetInternalCompBufferInfo, + video_accelerator_BeginFrame, + video_accelerator_EndFrame, + video_accelerator_GetBuffer, + video_accelerator_ReleaseBuffer, + video_accelerator_Execute, + video_accelerator_QueryRenderStatus, + video_accelerator_DisplayFrame, +}; + static inline struct quartz_vmr *impl_from_IOverlay(IOverlay *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IOverlay_iface); @@ -2567,6 +2704,8 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl; object->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl; object->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; + + object->IAMVideoAccelerator_iface.lpVtbl = &video_accelerator_vtbl; object->IOverlay_iface.lpVtbl = &overlay_vtbl; video_window_init(&object->window, &IVideoWindow_VTable,

1 0

Zebediah Figura : quartz/tests: Test more VMR7 interfaces in all modes.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: d3e74a7270b8b918d5ddffd1ef411f2aa6e7836b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e74a7270b8b918d5ddffd1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:01 2022 -0500 quartz/tests: Test more VMR7 interfaces in all modes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 71 ++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 2cff39a867c..9049f8d726b 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -219,17 +219,13 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } -static void test_interfaces(void) +static void test_common_interfaces(IBaseFilter *filter) { - IBaseFilter *filter = create_vmr7(0); - ULONG ref; IPin *pin; check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); - check_interface(filter, &IID_IBasicVideo, TRUE); - todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE); @@ -238,12 +234,10 @@ static void test_interfaces(void) check_interface(filter, &IID_IQualityControl, TRUE); todo_wine check_interface(filter, &IID_IQualProp, TRUE); check_interface(filter, &IID_IUnknown, TRUE); - check_interface(filter, &IID_IVideoWindow, TRUE); todo_wine check_interface(filter, &IID_IVMRAspectRatioControl, TRUE); todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl, TRUE); check_interface(filter, &IID_IVMRFilterConfig, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -254,12 +248,9 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE); check_interface(filter, &IID_IVMRFilterConfig9, FALSE); check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); - check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -275,8 +266,27 @@ static void test_interfaces(void) check_interface(pin, &IID_IMediaSeeking, FALSE); IPin_Release(pin); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_vmr7(0); + ULONG ref; + + test_common_interfaces(filter); + + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + check_interface(filter, &IID_IVMRMonitorConfig, TRUE); + + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - IBaseFilter_Release(filter); filter = create_vmr7(VMRMode_Windowless); check_interface(filter, &IID_IVMRMonitorConfig, TRUE); @@ -285,28 +295,12 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IBasicVideo2, FALSE); todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); - check_interface(filter, &IID_IVMRMixerControl9, FALSE); - check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); - - IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - - check_interface(pin, &IID_IMemInputPin, TRUE); - check_interface(pin, &IID_IOverlay, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - check_interface(pin, &IID_IUnknown, TRUE); - - check_interface(pin, &IID_IKsPropertySet, FALSE); - check_interface(pin, &IID_IMediaPosition, FALSE); - check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); - IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - IBaseFilter_Release(filter); filter = create_vmr7(VMRMode_Renderless); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, TRUE); @@ -316,24 +310,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); - check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); - check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); - check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); - - IBaseFilter_FindPin(filter, L"VMR Input0", &pin); - - check_interface(pin, &IID_IMemInputPin, TRUE); - check_interface(pin, &IID_IOverlay, TRUE); - check_interface(pin, &IID_IPin, TRUE); - todo_wine check_interface(pin, &IID_IQualityControl, TRUE); - check_interface(pin, &IID_IUnknown, TRUE); - - check_interface(pin, &IID_IKsPropertySet, FALSE); - check_interface(pin, &IID_IMediaPosition, FALSE); - check_interface(pin, &IID_IMediaSeeking, FALSE); - - IPin_Release(pin); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Zebediah Figura : include: Add videoacc.idl.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 5f9f182e8a58d0f658e6baf135b5327cbcaf3169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9f182e8a58d0f658e6baf1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:00 2022 -0500 include: Add videoacc.idl. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/videoacc.idl | 126 +++++++++++++++++++++++++++++++++++++++++++++++ libs/strmiids/strmiids.c | 1 + 3 files changed, 128 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c76e2ec7d0d..dff2f341568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -747,6 +747,7 @@ SOURCES = \ verrsrc.h \ vfw.h \ vfwmsgs.h \ + videoacc.idl \ virtdisk.h \ vmr9.idl \ vmrender.idl \ diff --git a/include/videoacc.idl b/include/videoacc.idl new file mode 100644 index 00000000000..af380e4b3c8 --- /dev/null +++ b/include/videoacc.idl @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2022 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; + +interface IMediaSample; + +cpp_quote("#if 0") + +typedef struct _DDSCAPS2 +{ + DWORD dwCaps; + DWORD dwCaps2; + DWORD dwCaps3; + union + { + DWORD dwCaps4; + DWORD dwVolumeDepth; + } DUMMYUNIONNAME1; +} DDSCAPS2; + +typedef struct _DDPIXELFORMAT +{ + DWORD dwSize; + DWORD dwFlags; + DWORD dwFourCC; + union + { + DWORD dwRGBBitCount; + DWORD dwYUVBitCount; + DWORD dwZBufferBitDepth; + DWORD dwAlphaBitDepth; + DWORD dwLuminanceBitCount; + DWORD dwBumpBitCount; + DWORD dwPrivateFormatBitCount; + } DUMMYUNIONNAME1; + union + { + DWORD dwRBitMask; + DWORD dwYBitMask; + DWORD dwStencilBitDepth; + DWORD dwLuminanceBitMask; + DWORD dwBumpDuBitMask; + DWORD dwOperations; + } DUMMYUNIONNAME2; + union + { + DWORD dwGBitMask; + DWORD dwUBitMask; + DWORD dwZBitMask; + DWORD dwBumpDvBitMask; + struct + { + WORD wFlipMSTypes; + WORD wBltMSTypes; + } MultiSampleCaps; + } DUMMYUNIONNAME3; + union + { + DWORD dwBBitMask; + DWORD dwVBitMask; + DWORD dwStencilBitMask; + DWORD dwBumpLuminanceBitMask; + } DUMMYUNIONNAME4; + union + { + DWORD dwRGBAlphaBitMask; + DWORD dwYUVAlphaBitMask; + DWORD dwLuminanceAlphaBitMask; + DWORD dwRGBZBitMask; + DWORD dwYUVZBitMask; + } DUMMYUNIONNAME5; +} DDPIXELFORMAT; + +import "amva.h"; + +cpp_quote("#endif") + +[ + local, + uuid(256a6a22-fbad-11d1-82bf-00a0c9696c8f), +] +interface IAMVideoAccelerator : IUnknown +{ + HRESULT GetVideoAcceleratorGUIDs(DWORD *count, GUID *accelerators); + HRESULT GetUncompFormatsSupported(const GUID *accelerator, DWORD *count, DDPIXELFORMAT *formats); + HRESULT GetInternalMemInfo(const GUID *accelerator, + const AMVAUncompDataInfo *format_info, AMVAInternalMemInfo *mem_info); + HRESULT GetCompBufferInfo(const GUID *accelerator, const AMVAUncompDataInfo *uncompressed_info, + DWORD *compressed_info_count, AMVACompBufferInfo *compressed_infos); + HRESULT GetInternalCompBufferInfo(DWORD *count, AMVACompBufferInfo *infos); + HRESULT BeginFrame(const AMVABeginFrameInfo *info); + HRESULT EndFrame(const AMVAEndFrameInfo *info); + HRESULT GetBuffer(DWORD type_index, DWORD buffer_index, BOOL read_only, void **buffer, LONG *stride); + HRESULT ReleaseBuffer(DWORD type_index, DWORD buffer_index); + HRESULT Execute(DWORD function, void *in_data, DWORD in_size, void *out_data, + DWORD out_size, DWORD buffer_count, const AMVABUFFERINFO *buffers); + HRESULT QueryRenderStatus(DWORD type_index, DWORD buffer_index, DWORD flags); + HRESULT DisplayFrame(DWORD index, IMediaSample *sample); +} + +[ + local, + uuid(256a6a21-fbad-11d1-82bf-00a0c9696c8f), +] +interface IAMVideoAcceleratorNotify : IUnknown +{ + HRESULT GetUncompSurfacesInfo(const GUID *accelerator, AMVAUncompBufferInfo *info); + HRESULT SetUncompSurfacesInfo(DWORD allocated_count); + HRESULT GetCreateVideoAcceleratorData(const GUID *accelerator, DWORD *size, void **data); +} diff --git a/libs/strmiids/strmiids.c b/libs/strmiids/strmiids.c index a257a23e9a4..1a7005bde3c 100644 --- a/libs/strmiids/strmiids.c +++ b/libs/strmiids/strmiids.c @@ -39,3 +39,4 @@ #include "amstream.h" #include "qedit.h" #include "vmr9.h" +#include "videoacc.h"

1 0

Connor McAdams : webservices/tests: Add some tests for session dictionary size.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 7b6a38b072e0f93d768ba9c3db99e7a732350b7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b6a38b072e0f93d768ba9c3… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 13 10:40:30 2022 -0400 webservices/tests: Add some tests for session dictionary size. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 363 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 356 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b6a38b072e0f93d768b…

1 0

Paul Gofman : crypt32: Support CERT_QUERY_OBJECT_BLOB in CRYPT_QueryEmbeddedMessageObject().
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: a6ea269a96f1a6b8f31d130e3f64036018974bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ea269a96f1a6b8f31d130e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 13 17:00:35 2022 +0300 crypt32: Support CERT_QUERY_OBJECT_BLOB in CRYPT_QueryEmbeddedMessageObject(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/object.c | 40 +++++++++++-- dlls/crypt32/tests/object.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6ea269a96f1a6b8f31d…

1 0