November 2019 - Wine-commits

Jacek Caban : vbscript: Allow arbitrary number of arguments in builtin functions.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 2dceea6f35ae607c781a6452aa020244ac3a6cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dceea6f35ae607c781a6452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:57 2019 +0100 vbscript: Allow arbitrary number of arguments in builtin functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 16 +++++++++++++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4171df3915..e4ff572412 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -172,8 +172,9 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L { BuiltinDisp *This = impl_from_IDispatch(iface); const builtin_prop_t *prop; - VARIANT args[8]; + VARIANT args_buf[8], *args; unsigned argn, i; + HRESULT hres; TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, id, debugstr_guid(riid), lcid, flags, dp, res, ei, err); @@ -248,7 +249,13 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L return MAKE_VBSERROR(VBSE_FUNC_ARITY_MISMATCH); } - assert(argn < ARRAY_SIZE(args)); + if(argn <= ARRAY_SIZE(args_buf)) { + args = args_buf; + }else { + args = heap_alloc(argn * sizeof(*args)); + if(!args) + return E_OUTOFMEMORY; + } for(i=0; i < argn; i++) { if(V_VT(dp->rgvarg+dp->cArgs-i-1) == (VT_BYREF|VT_VARIANT)) @@ -257,7 +264,10 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L args[i] = dp->rgvarg[dp->cArgs-i-1]; } - return prop->proc(This, args, dp->cArgs, res); + hres = prop->proc(This, args, dp->cArgs, res); + if(args != args_buf) + heap_free(args); + return hres; } static const IDispatchVtbl BuiltinDispVtbl = { diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index afa0c2bb1f..d4f3eeaa47 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -243,6 +243,11 @@ Call ok(UBound(x) = 2, "UBound(x) = " & UBound(x)) Call ok(getVT(UBound(x, 1)) = "VT_I4", "getVT(UBound(x, 1)) = " & getVT(UBound(x, 1))) Call ok(UBound(x, 1) = 2, "UBound(x) = " & UBound(x, 1)) +x = Array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33) +ok x(1) = 2, "x(1) = " & x(1) +ok x(32) = 33, "x(32) = " & x(32) +ok ubound(x) = 32, "ubound(x) = " & ubound(x) + Dim arr2(2, 4) Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x))

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.4.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b06d272d635d30f570b440da2308b53fcc43c7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b06d272d635d30f570b440da… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 13:34:29 2019 -0600 mscoree: Update Wine Mono to 4.9.4. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e501054e16..350c25ef90 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.3" -#define MONO_SHA "7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d" +#define MONO_VERSION "4.9.4" +#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 250bd24ad1..5847126b3e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.3" +#define WINE_MONO_VERSION "4.9.4" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Vincent Povirk : Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.".
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 1fddf230ffff2b0946f6b9ae13648b454785e23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fddf230ffff2b0946f6b9ae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 13:34:30 2019 -0600 Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.". This reverts commit d10f2c0723585da66a7b1e822e852ce54d56c5f1. The bug we were working around has been fixed in upstream Mono and in Wine Mono 4.9.4. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 -- dlls/mscoree/metahost.c | 2 -- dlls/mscoree/mscoree_private.h | 1 - 3 files changed, 5 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b72af709c0..e932a7f58b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1544,8 +1544,6 @@ __int32 WINAPI _CorExeMain(void) if (domain) { - int dummy; - mono_threads_enter_gc_unsafe_region(&dummy); mono_thread_manage(); mono_runtime_quit(); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 575d6ce1d3..18232a4568 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -124,7 +124,6 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -225,7 +224,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); - LOAD_MONO_FUNCTION(mono_threads_enter_gc_unsafe_region); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5847126b3e..d5f78b61f0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -177,7 +177,6 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; -extern void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mfreadwrite/tests: Add some tests for "any"-stream requests.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 9d14077e29eb12546dd70c078b03d6f9c386fe51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d14077e29eb12546dd70c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 23:02:45 2019 +0300 mfreadwrite/tests: Add some tests for "any"-stream requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 511 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 511 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d14077e29eb12546dd7…

1 0

Zebediah Figura : d3d9/tests: Reorder two occlusion query tests to work around a timeout with llvmpipe.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b2165875771a3a2f9173ccddc8f36d17829f3519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2165875771a3a2f9173ccdd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:44:07 2019 -0600 d3d9/tests: Reorder two occlusion query tests to work around a timeout with llvmpipe. llvmpipe is extraordinarily slow to execute glBeginQuery() [as much as 10ms per call] when the regression test for bug 45932 is run after the previous test drawing a 33-bit number of samples. Swap the two tests to work around this. 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/tests/device.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 40ca639001..75cddbb6db 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6007,6 +6007,26 @@ static void test_occlusion_query(void) if (broken_occlusion) goto done; + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Failed to begin scene, hr %#x.\n", hr); + for (i = 0; i < 50000; ++i) + { + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Failed to end scene, hr %#x.\n", hr); + + wait_query(query); + + memset(&data, 0xff, sizeof(data)); + hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0 && data.dword[1] == 0, + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); @@ -6062,26 +6082,6 @@ static void test_occlusion_query(void) || broken(data.dword[0] < 0xffffffff && !data.dword[1]), "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - for (i = 0; i < 50000; ++i) - { - hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - wait_query(query); - - memset(&data, 0xff, sizeof(data)); - hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(data.dword[0] == 0 && data.dword[1] == 0, - "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - IDirect3DSurface9_Release(rt); done:

1 0

Zebediah Figura : d3d8/tests: Flush events after sending SC_MAXIMIZE.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 2b29d02aa5ba65465b4adc017cdca9a8932b0dbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b29d02aa5ba65465b4adc01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 1 10:52:03 2019 -0500 d3d8/tests: Flush events after sending SC_MAXIMIZE. For some reason, on fvwm2 sometimes focus_window will be restored and activated between the subsequent call to SetForegroundWindow() and the next call to ShowWindow(SW_RESTORE), causing the next test to fail. Flushing first seems to reliably work around this. 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/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 819c1cd944..9fc06c3c9d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3151,6 +3151,7 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; + flush_events(); SetForegroundWindow(GetDesktopWindow()); flush_events();

1 0

Nikolay Sivov : comsvcs: Implement Hash() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ee9447162518be0a91f1e580f8f246f1785eeee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9447162518be0a91f1e580… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:58 2019 +0300 comsvcs: Implement Hash() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 10 ++++++++-- dlls/comsvcs/tests/comsvcs.c | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 101af6f071..7addd1ee80 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -55,6 +55,7 @@ struct new_moniker { IMoniker IMoniker_iface; LONG refcount; + CLSID clsid; }; static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); @@ -556,9 +557,13 @@ static HRESULT WINAPI new_moniker_IsEqual(IMoniker *iface, IMoniker *other_monik static HRESULT WINAPI new_moniker_Hash(IMoniker *iface, DWORD *hash) { - FIXME("%p, %p.\n", iface, hash); + struct new_moniker *moniker = impl_from_IMoniker(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hash); + + *hash = moniker->clsid.Data1; + + return S_OK; } static HRESULT WINAPI new_moniker_IsRunning(IMoniker* iface, IBindCtx *pbc, IMoniker *pmkToLeft, @@ -748,6 +753,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; moniker->refcount = 1; + moniker->clsid = guid; *ret = &moniker->IMoniker_iface; diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index b377a9a515..cbe338872a 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -327,10 +327,9 @@ static void test_new_moniker(void) /* Hashing */ hash = 0; hr = IMoniker_Hash(moniker, &hash); -todo_wine { ok(hr == S_OK, "Failed to get a hash, hr %#x.\n", hr); ok(hash == 0x20d04fe0, "Unexpected hash value %#x.\n", hash); -} + moniker_type = MKSYS_CLASSMONIKER; hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); todo_wine {

1 0

Nikolay Sivov : comsvcs: Implement IsSystemMoniker() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 96b5670ac74df6a470018f56b527ffca923b70c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b5670ac74df6a470018f56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:59 2019 +0300 comsvcs: Implement IsSystemMoniker() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 6 ++++-- dlls/comsvcs/tests/comsvcs.c | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 7addd1ee80..d772365dda 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -621,9 +621,11 @@ static HRESULT WINAPI new_moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pb static HRESULT WINAPI new_moniker_IsSystemMoniker(IMoniker *iface, DWORD *moniker_type) { - FIXME("%p, %p.\n", iface, moniker_type); + TRACE("%p, %p.\n", iface, moniker_type); - return E_NOTIMPL; + *moniker_type = MKSYS_NONE; + + return S_FALSE; } static const IMonikerVtbl new_moniker_vtbl = diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index cbe338872a..5fb73d29ca 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -332,10 +332,9 @@ static void test_new_moniker(void) moniker_type = MKSYS_CLASSMONIKER; hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); -todo_wine { ok(hr == S_FALSE || broken(hr == S_OK) /* XP */, "Unexpected hr %#x.\n", hr); ok(moniker_type == MKSYS_NONE, "Unexpected moniker type %d.\n", moniker_type); -} + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : comsvcs: Implement Inverse() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ab6274180b0823f2babdc4737b4b510ec15bea8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6274180b0823f2babdc473… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:31:00 2019 +0300 comsvcs: Implement Inverse() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 4 ++-- dlls/comsvcs/tests/comsvcs.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index d772365dda..6b292844d9 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -584,9 +584,9 @@ static HRESULT WINAPI new_moniker_GetTimeOfLastChange(IMoniker *iface, IBindCtx static HRESULT WINAPI new_moniker_Inverse(IMoniker *iface, IMoniker **inverse) { - FIXME("%p, %p.\n", iface, inverse); + TRACE("%p, %p.\n", iface, inverse); - return E_NOTIMPL; + return CreateAntiMoniker(inverse); } static HRESULT WINAPI new_moniker_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **ret) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 5fb73d29ca..37fce3dab4 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -358,16 +358,13 @@ todo_wine ok(hr == MK_E_NOSTORAGE, "Unexpected hr %#x.\n", hr); hr = IMoniker_Inverse(moniker, &inverse); -todo_wine ok(hr == S_OK, "Failed to create inverse moniker, hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ moniker_type = MKSYS_NONE; hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); -} + IMoniker_Release(moniker); IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : ole32: Support BIND_OPTS3 in bind context.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 89ef98ab8ad17f72fc2d4fd473fa5cf19b6305f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ef98ab8ad17f72fc2d4fd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 23:58:58 2019 +0300 ole32: Support BIND_OPTS3 in bind context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/bindctx.c | 38 +++++++++++++++----------------------- dlls/ole32/tests/moniker.c | 13 ++++++++----- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 1951100b0b..24229568f1 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -57,7 +57,7 @@ typedef struct BindCtxImpl{ DWORD bindCtxTableLastIndex; /* first free index in the table */ DWORD bindCtxTableSize; /* size table */ - BIND_OPTS2 bindOption2; /* a structure which contains the bind options*/ + BIND_OPTS3 options; } BindCtxImpl; @@ -246,17 +246,17 @@ BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - TRACE("(%p,%p)\n",This,pbindopts); + TRACE("(%p,%p)\n",This, pbindopts); if (pbindopts==NULL) return E_POINTER; - if (pbindopts->cbStruct > sizeof(BIND_OPTS2)) + if (pbindopts->cbStruct > sizeof(This->options)) { - WARN("invalid size\n"); - return E_INVALIDARG; /* FIXME : not verified */ + WARN("invalid size %u.\n", pbindopts->cbStruct); + return E_INVALIDARG; } - memcpy(&This->bindOption2, pbindopts, pbindopts->cbStruct); + memcpy(&This->options, pbindopts, pbindopts->cbStruct); return S_OK; } @@ -267,19 +267,16 @@ static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - ULONG cbStruct; + DWORD size; TRACE("(%p,%p)\n",This,pbindopts); if (pbindopts==NULL) return E_POINTER; - cbStruct = pbindopts->cbStruct; - if (cbStruct > sizeof(BIND_OPTS2)) - cbStruct = sizeof(BIND_OPTS2); - - memcpy(pbindopts, &This->bindOption2, cbStruct); - pbindopts->cbStruct = cbStruct; + size = min(pbindopts->cbStruct, sizeof(This->options)); + memcpy(pbindopts, &This->options, size); + pbindopts->cbStruct = size; return S_OK; } @@ -520,16 +517,11 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) This->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; This->ref = 0; - /* Initialize the BIND_OPTS2 structure */ - This->bindOption2.cbStruct = sizeof(BIND_OPTS2); - This->bindOption2.grfFlags = 0; - This->bindOption2.grfMode = STGM_READWRITE; - This->bindOption2.dwTickCountDeadline = 0; - - This->bindOption2.dwTrackFlags = 0; - This->bindOption2.dwClassContext = CLSCTX_SERVER; - This->bindOption2.locale = GetThreadLocale(); - This->bindOption2.pServerInfo = 0; + memset(&This->options, 0, sizeof(This->options)); + This->options.cbStruct = sizeof(This->options); + This->options.grfMode = STGM_READWRITE; + This->options.dwClassContext = CLSCTX_SERVER; + This->options.locale = GetThreadLocale(); /* Initialize the bindctx table */ This->bindCtxTableSize=0; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5bcc136a36..18ea4d465b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1888,7 +1888,7 @@ static void test_bind_context(void) HRESULT hr; IBindCtx *pBindCtx; IEnumString *pEnumString; - BIND_OPTS2 bind_opts; + BIND_OPTS3 bind_opts; HeapUnknown *unknown; HeapUnknown *unknown2; IUnknown *param_obj; @@ -1908,19 +1908,20 @@ static void test_bind_context(void) bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts) || - bind_opts.cbStruct == sizeof(bind_opts) + sizeof(void*), /* Vista */ - "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(BIND_OPTS3) || broken(bind_opts.cbStruct == sizeof(BIND_OPTS2)) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(BIND_OPTS); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(BIND_OPTS), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + memset(&bind_opts, 0xfe, sizeof(bind_opts)); bind_opts.cbStruct = sizeof(bind_opts); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(bind_opts) || bind_opts.cbStruct == sizeof(BIND_OPTS2) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); ok(bind_opts.grfFlags == 0, "bind_opts.grfFlags was 0x%x instead of 0\n", bind_opts.grfFlags); ok(bind_opts.grfMode == STGM_READWRITE, "bind_opts.grfMode was 0x%x instead of STGM_READWRITE\n", bind_opts.grfMode); ok(bind_opts.dwTickCountDeadline == 0, "bind_opts.dwTickCountDeadline was %d instead of 0\n", bind_opts.dwTickCountDeadline); @@ -1929,6 +1930,8 @@ static void test_bind_context(void) "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo); + if (bind_opts.cbStruct >= sizeof(BIND_OPTS3)) + ok(bind_opts.hwnd == NULL, "Unexpected bind_opts.hwnd %p.\n", bind_opts.hwnd); bind_opts.cbStruct = -1; hr = IBindCtx_SetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts);

1 0