January 2020 - Wine-Commits

Jacek Caban : vbscript: Fix VT_UNKNOWN handling in set statements.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 1c194f3b21967024b10de5b2f6b72947d687731b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c194f3b21967024b10de5b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 14:25:39 2020 +0100 vbscript: Fix VT_UNKNOWN handling in set statements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 12 ++++++------ dlls/vbscript/tests/lang.vbs | 6 ++++++ dlls/vbscript/tests/run.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9c07535517..333fe0f6bd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -458,22 +458,22 @@ static HRESULT stack_assume_disp(exec_ctx_t *ctx, unsigned n, IDispatch **disp) { VARIANT *v = stack_top(ctx, n), *ref; - if(V_VT(v) != VT_DISPATCH) { + if(V_VT(v) != VT_DISPATCH && (disp || V_VT(v) != VT_UNKNOWN)) { if(V_VT(v) != (VT_VARIANT|VT_BYREF)) { FIXME("not supported type: %s\n", debugstr_variant(v)); return E_FAIL; } ref = V_VARIANTREF(v); - if(V_VT(ref) != VT_DISPATCH) { + if(V_VT(ref) != VT_DISPATCH && (disp || V_VT(ref) != VT_UNKNOWN)) { FIXME("not disp %s\n", debugstr_variant(ref)); return E_FAIL; } - V_VT(v) = VT_DISPATCH; - V_DISPATCH(v) = V_DISPATCH(ref); - if(V_DISPATCH(v)) - IDispatch_AddRef(V_DISPATCH(v)); + V_VT(v) = V_VT(ref); + V_UNKNOWN(v) = V_UNKNOWN(ref); + if(V_UNKNOWN(v)) + IUnknown_AddRef(V_UNKNOWN(v)); } if(disp) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8007823394..f527b3411b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1197,6 +1197,12 @@ Call ok(obj.Test1 = 6, "obj.Test1 is not 6") obj.AddToTest1(5) Call ok(obj.Test1 = 11, "obj.Test1 is not 11") +set obj = unkObj +set x = obj +call ok(getVT(obj) = "VT_UNKNOWN*", "getVT(obj) = " & getVT(obj)) +call ok(getVT(x) = "VT_UNKNOWN*", "getVT(x) = " & getVT(x)) +call ok(getVT(unkObj) = "VT_UNKNOWN", "getVT(unkObj) = " & getVT(unkObj)) + ' Array tests Call ok(getVT(arr) = "VT_EMPTY*", "getVT(arr) = " & getVT(arr)) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 015f2b816a..8acf220f9f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -144,6 +144,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_TESTERROROBJECT 1023 #define DISPID_GLOBAL_THROWWITHDESC 1024 #define DISPID_GLOBAL_PROPARGSET 1025 +#define DISPID_GLOBAL_UNKOBJ 1026 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -214,6 +215,8 @@ static const char *vt2a(VARIANT *v) return "VT_BSTR"; case VT_DISPATCH: return "VT_DISPATCH"; + case VT_UNKNOWN: + return "VT_UNKNOWN"; case VT_BOOL: return "VT_BOOL"; case VT_ARRAY|VT_VARIANT: @@ -595,6 +598,35 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) static IDispatchEx enumDisp; +static HRESULT WINAPI unkObj_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI unkObj_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI unkObj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl unkObjVtbl = { + unkObj_QueryInterface, + unkObj_AddRef, + unkObj_Release +}; + +static IUnknown unkObj = { &unkObjVtbl }; + static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumVARIANT)) { @@ -1138,7 +1170,8 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"throwInt", DISPID_GLOBAL_THROWINT }, { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, - { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC } + { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC }, + { L"unkObj", DISPID_GLOBAL_UNKOBJ } }; test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -1657,6 +1690,10 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(hres == S_OK, "Invoke failed: %08x\n", hres); return S_OK; } + case DISPID_GLOBAL_UNKOBJ: + V_VT(pvarRes) = VT_UNKNOWN; + V_UNKNOWN(pvarRes) = &unkObj; + return S_OK; } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Fix VT_UNKNOWN handling in is expressions.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 47f3abb633d94835b1c93e57e77009cf357ce85e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f3abb633d94835b1c93e57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 14:25:45 2020 +0100 vbscript: Fix VT_UNKNOWN handling in is expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 96 ++++++++++++++++++-------------------------- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 40 insertions(+), 57 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 333fe0f6bd..906545cf4a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1928,75 +1928,57 @@ static HRESULT interp_case(exec_ctx_t *ctx) return S_OK; } -static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, VARIANT_BOOL *ret) +static HRESULT interp_is(exec_ctx_t *ctx) { - IObjectIdentity *identity; - IUnknown *unk1, *unk2; - HRESULT hres; + IUnknown *l = NULL, *r = NULL; + variant_val_t v; + HRESULT hres = S_OK; - if(disp1 == disp2) { - *ret = VARIANT_TRUE; - return S_OK; - } + TRACE("\n"); - if(!disp1 || !disp2) { - *ret = VARIANT_FALSE; - return S_OK; + stack_pop_deref(ctx, &v); + if(V_VT(v.v) != VT_DISPATCH && V_VT(v.v) != VT_UNKNOWN) { + FIXME("Unhandled type %s\n", debugstr_variant(v.v)); + hres = E_NOTIMPL; + }else if(V_UNKNOWN(v.v)) { + hres = IUnknown_QueryInterface(V_UNKNOWN(v.v), &IID_IUnknown, (void**)&r); } - - hres = IDispatch_QueryInterface(disp1, &IID_IUnknown, (void**)&unk1); + if(v.owned) VariantClear(v.v); if(FAILED(hres)) return hres; - hres = IDispatch_QueryInterface(disp2, &IID_IUnknown, (void**)&unk2); - if(FAILED(hres)) { - IUnknown_Release(unk1); - return hres; - } - - if(unk1 == unk2) { - *ret = VARIANT_TRUE; - }else { - hres = IUnknown_QueryInterface(unk1, &IID_IObjectIdentity, (void**)&identity); - if(SUCCEEDED(hres)) { - hres = IObjectIdentity_IsEqualObject(identity, unk2); - IObjectIdentity_Release(identity); - *ret = hres == S_OK ? VARIANT_TRUE : VARIANT_FALSE; - }else { - *ret = VARIANT_FALSE; - } + stack_pop_deref(ctx, &v); + if(V_VT(v.v) != VT_DISPATCH && V_VT(v.v) != VT_UNKNOWN) { + FIXME("Unhandled type %s\n", debugstr_variant(v.v)); + hres = E_NOTIMPL; + }else if(V_UNKNOWN(v.v)) { + hres = IUnknown_QueryInterface(V_UNKNOWN(v.v), &IID_IUnknown, (void**)&l); } + if(v.owned) VariantClear(v.v); - IUnknown_Release(unk1); - IUnknown_Release(unk2); - return S_OK; -} - -static HRESULT interp_is(exec_ctx_t *ctx) -{ - IDispatch *l, *r; - VARIANT v; - HRESULT hres; - - TRACE("\n"); - - hres = stack_pop_disp(ctx, &r); - if(FAILED(hres)) - return hres; - - hres = stack_pop_disp(ctx, &l); if(SUCCEEDED(hres)) { - V_VT(&v) = VT_BOOL; - hres = disp_cmp(l, r, &V_BOOL(&v)); - if(l) - IDispatch_Release(l); + VARIANT res; + V_VT(&res) = VT_BOOL; + if(r == l) + V_BOOL(&res) = VARIANT_TRUE; + else if(!r || !l) + V_BOOL(&res) = VARIANT_FALSE; + else { + IObjectIdentity *identity; + hres = IUnknown_QueryInterface(l, &IID_IObjectIdentity, (void**)&identity); + if(SUCCEEDED(hres)) { + hres = IObjectIdentity_IsEqualObject(identity, r); + IObjectIdentity_Release(identity); + } + V_BOOL(&res) = hres == S_OK ? VARIANT_TRUE : VARIANT_FALSE; + } + hres = stack_push(ctx, &res); } if(r) - IDispatch_Release(r); - if(FAILED(hres)) - return hres; - - return stack_push(ctx, &v); + IUnknown_Release(r); + if(l) + IUnknown_Release(l); + return hres; } static HRESULT interp_concat(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f527b3411b..12104a2a4a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1202,6 +1202,7 @@ set x = obj call ok(getVT(obj) = "VT_UNKNOWN*", "getVT(obj) = " & getVT(obj)) call ok(getVT(x) = "VT_UNKNOWN*", "getVT(x) = " & getVT(x)) call ok(getVT(unkObj) = "VT_UNKNOWN", "getVT(unkObj) = " & getVT(unkObj)) +call ok(obj is unkObj, "obj is not unkObj") ' Array tests

1 0

Henri Verbeet : d3d9/tests: Introduce adapter_is_amd().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 05a5e606d5da0c0b6a8adb28f9e3b6262ecc4b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a5e606d5da0c0b6a8adb28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 15:55:26 2020 +0330 d3d9/tests: Introduce adapter_is_amd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb0746f58b..366862a05a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -104,6 +104,16 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } +static BOOL adapter_is_vendor(const D3DADAPTER_IDENTIFIER9 *identifier, DWORD vendor) +{ + return identifier->VendorId == vendor; +} + +static BOOL adapter_is_amd(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return adapter_is_vendor(identifier, 0x1002); +} + /* Locks a given surface and returns the color at (x,y). It's the caller's * responsibility to only pass in lockable surfaces and valid x,y coordinates */ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y) @@ -26592,7 +26602,7 @@ static void test_alpha_to_coverage(void) nvidia_mode = FALSE; hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (identifier.VendorId != 0x1002 /* AMD */) + if (!adapter_is_amd(&identifier)) { skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device);

1 0

Paul Gofman : wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 941bd46597a8e8f2c40a80a8e429620c050a6fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=941bd46597a8e8f2c40a80a8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jan 27 15:55:28 2020 +0330 wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48302 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/wined3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5581c145ef..bd239d7659 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1490,15 +1490,15 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_RGB565, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0,

1 0

Nikolay Sivov : wineboot: Do not use SHGetMalloc() internally.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 664d57d0ebea341b38507739a01ece74e0ef55c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=664d57d0ebea341b38507739… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 11:33:51 2020 +0300 wineboot: Do not use SHGetMalloc() internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index dd9a5bd8f6..8e3e234397 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1267,7 +1267,6 @@ static BOOL ProcessStartupItems(void) { BOOL ret = FALSE; HRESULT hr; - IMalloc *ppM = NULL; IShellFolder *psfDesktop = NULL, *psfStartup = NULL; LPITEMIDLIST pidlStartup = NULL, pidlItem; ULONG NumPIDLs; @@ -1277,13 +1276,6 @@ static BOOL ProcessStartupItems(void) WINE_TRACE("Processing items in the StartUp folder.\n"); - hr = SHGetMalloc(&ppM); - if (FAILED(hr)) - { - WINE_ERR("Couldn't get IMalloc object.\n"); - goto done; - } - hr = SHGetDesktopFolder(&psfDesktop); if (FAILED(hr)) { @@ -1333,7 +1325,7 @@ static BOOL ProcessStartupItems(void) } } - IMalloc_Free(ppM, pidlItem); + ILFree(pidlItem); } /* Return success */ @@ -1342,7 +1334,7 @@ static BOOL ProcessStartupItems(void) done: if (iEnumList) IEnumIDList_Release(iEnumList); if (psfStartup) IShellFolder_Release(psfStartup); - if (pidlStartup) IMalloc_Free(ppM, pidlStartup); + if (pidlStartup) ILFree(pidlStartup); return ret; }

1 0

Hans Leidekker : msi: Add support for custom action type 7.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 54ef6e5e3932a5ce747fca717c697b67f2bd3e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ef6e5e3932a5ce747fca71… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 27 14:07:31 2020 +0100 msi: Add support for custom action type 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44618 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 230 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 159 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54ef6e5e3932a5ce747f…

1 0

Nikolay Sivov : shell32: Do not use SHGetMalloc() internally.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 84e06f228973e5dc7b79803d8f3b2a251006bda9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e06f228973e5dc7b79803d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 11:37:17 2020 +0300 shell32: Do not use SHGetMalloc() internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 4 +--- dlls/shell32/shellord.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 0dfb81c6e7..5b044d4be1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -405,7 +405,6 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - IMalloc *pMalloc; TRACE("(%p)->(%p)\n", This, filename); @@ -415,8 +414,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *f return S_FALSE; } - SHGetMalloc(&pMalloc); - *filename = IMalloc_Alloc(pMalloc, (strlenW(This->filepath)+1)*sizeof(WCHAR)); + *filename = CoTaskMemAlloc((strlenW(This->filepath) + 1) * sizeof(WCHAR)); if (!*filename) return E_OUTOFMEMORY; strcpyW(*filename, This->filepath); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index b04a56e783..e1262accdd 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -760,7 +760,6 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) CHAR link_dir[MAX_PATH]; CHAR new_lnk_filepath[MAX_PATH]; CHAR new_lnk_name[MAX_PATH]; - IMalloc *ppM; LPITEMIDLIST pidl; HWND hwnd = 0; /* FIXME: get real window handle */ INT ret; @@ -815,24 +814,18 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) /* Get path to user's "Recent" directory */ - if(SUCCEEDED(SHGetMalloc(&ppM))) { - if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, - &pidl))) { - SHGetPathFromIDListA(pidl, link_dir); - IMalloc_Free(ppM, pidl); - } - else { - /* serious issues */ - link_dir[0] = 0; - ERR("serious issues 1\n"); - } - IMalloc_Release(ppM); + if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, &pidl))) + { + SHGetPathFromIDListA(pidl, link_dir); + ILFree(pidl); } - else { - /* serious issues */ - link_dir[0] = 0; - ERR("serious issues 2\n"); + else + { + /* serious issues */ + link_dir[0] = 0; + ERR("serious issues 1\n"); } + TRACE("Users Recent dir %s\n", link_dir); /* If no input, then go clear the lists */

1 0

Nikolay Sivov : ole32: Fix string buffer size.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: a697aa21f39f693482290ca810d07f7166665294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a697aa21f39f693482290ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 09:24:20 2020 +0300 ole32: Fix string buffer size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 0f0f824a77..c5d2a42e1c 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -554,7 +554,7 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, UINT srcCP, LPSTR *dst, UI len = (lstrlenW((LPCWSTR)src) + 1) * sizeof(WCHAR); else len = strlen(src) + 1; - *dst = CoTaskMemAlloc(len * sizeof(WCHAR)); + *dst = CoTaskMemAlloc(len); if (!*dst) hr = STG_E_INSUFFICIENTMEMORY; else

1 0

Nikolay Sivov : ole32: Add support for writing VT_BSTR properties.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 433c17c0104a124178f1012f14987f528ac4cf9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=433c17c0104a124178f1012f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 09:24:16 2020 +0300 ole32: Add support for writing VT_BSTR properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 65 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8421353155..54904a581b 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -623,15 +623,24 @@ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, const PROPVARI assert(prop); assert(propvar); - if (propvar->vt == VT_LPSTR) + + switch (propvar->vt) { - hr = PropertyStorage_StringCopy(propvar->u.pszVal, srcCP, - &prop->u.pszVal, targetCP); + case VT_LPSTR: + hr = PropertyStorage_StringCopy(propvar->u.pszVal, srcCP, &prop->u.pszVal, targetCP); if (SUCCEEDED(hr)) prop->vt = VT_LPSTR; + break; + case VT_BSTR: + if ((prop->u.bstrVal = SysAllocStringLen(propvar->u.bstrVal, SysStringLen(propvar->u.bstrVal)))) + prop->vt = VT_BSTR; + else + hr = E_OUTOFMEMORY; + break; + default: + hr = PropVariantCopy(prop, propvar); } - else - PropVariantCopy(prop, propvar); + return hr; } @@ -1881,11 +1890,11 @@ end: static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, DWORD propNum, DWORD propid, const PROPVARIANT *var, DWORD *sectionOffset) { + DWORD len, dwType, dwTemp, bytesWritten; HRESULT hr; LARGE_INTEGER seek; PROPERTYIDOFFSET propIdOffset; ULONG count; - DWORD dwType, bytesWritten; assert(var); assert(sectionOffset); @@ -1938,8 +1947,6 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, case VT_I4: case VT_UI4: { - DWORD dwTemp; - StorageUtl_WriteDWord(&dwTemp, 0, var->u.lVal); hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); bytesWritten = count; @@ -1947,8 +1954,6 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, } case VT_LPSTR: { - DWORD len, dwTemp; - if (This->codePage == CP_UNICODE) len = (lstrlenW(var->u.pwszVal) + 1) * sizeof(WCHAR); else @@ -1961,9 +1966,45 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count + sizeof(DWORD); break; } + case VT_BSTR: + { + if (This->codePage == CP_UNICODE) + { + len = SysStringByteLen(var->u.bstrVal) + sizeof(WCHAR); + StorageUtl_WriteDWord(&dwTemp, 0, len); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (SUCCEEDED(hr)) + hr = IStream_Write(This->stm, var->u.bstrVal, len, &count); + } + else + { + char *str; + + len = WideCharToMultiByte(This->codePage, 0, var->u.bstrVal, SysStringLen(var->u.bstrVal) + 1, + NULL, 0, NULL, NULL); + + str = heap_alloc(len); + if (!str) + { + hr = E_OUTOFMEMORY; + goto end; + } + + WideCharToMultiByte(This->codePage, 0, var->u.bstrVal, SysStringLen(var->u.bstrVal), + str, len, NULL, NULL); + StorageUtl_WriteDWord(&dwTemp, 0, len); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (SUCCEEDED(hr)) + hr = IStream_Write(This->stm, str, len, &count); + heap_free(str); + } + + bytesWritten = count + sizeof(DWORD); + break; + } case VT_LPWSTR: { - DWORD len = lstrlenW(var->u.pwszVal) + 1, dwTemp; + len = lstrlenW(var->u.pwszVal) + 1; StorageUtl_WriteDWord(&dwTemp, 0, len); hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); @@ -1985,7 +2026,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, } case VT_CF: { - DWORD cf_hdr[2], len; + DWORD cf_hdr[2]; len = var->u.pclipdata->cbSize; StorageUtl_WriteDWord(&cf_hdr[0], 0, len + 8);

1 0

Nikolay Sivov : ole32: Validate offsets when reading storage dictionary.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: cab617bbab386f7fb5679089ea96f0c6c37e3a75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cab617bbab386f7fb5679089… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 27 09:24:19 2020 +0300 ole32: Validate offsets when reading storage dictionary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 119 ++++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8bab995eb6..0f0f824a77 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -81,6 +81,8 @@ static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *i #define CFTAG_FMTID (-3L) #define CFTAG_NODATA 0L +#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align))&~(_Align)) + typedef struct tagPROPERTYSETHEADER { WORD wByteOrder; /* always 0xfffe */ @@ -1175,55 +1177,6 @@ static void PropertyStorage_ByteSwapString(LPWSTR str, size_t len) #define PropertyStorage_ByteSwapString(s, l) #endif -/* Reads the dictionary from the memory buffer beginning at ptr. Interprets - * the entries according to the values of This->codePage and This->locale. - * FIXME: there isn't any checking whether the read property extends past the - * end of the buffer. - */ -static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, - BYTE *ptr) -{ - DWORD numEntries, i; - HRESULT hr = S_OK; - - assert(This->name_to_propid); - assert(This->propid_to_name); - - StorageUtl_ReadDWord(ptr, 0, &numEntries); - TRACE("Reading %d entries:\n", numEntries); - ptr += sizeof(DWORD); - for (i = 0; SUCCEEDED(hr) && i < numEntries; i++) - { - PROPID propid; - DWORD cbEntry; - - StorageUtl_ReadDWord(ptr, 0, &propid); - ptr += sizeof(PROPID); - StorageUtl_ReadDWord(ptr, 0, &cbEntry); - ptr += sizeof(DWORD); - /* Make sure the source string is NULL-terminated */ - if (This->codePage != CP_UNICODE) - ptr[cbEntry - 1] = '\0'; - else - ((WCHAR *)ptr)[cbEntry - 1] = '\0'; - - TRACE("Reading entry with ID %#x, %d chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? - debugstr_wn((WCHAR *)ptr, cbEntry) : debugstr_an((char *)ptr, cbEntry)); - - hr = PropertyStorage_StoreNameWithId(This, (char*)ptr, This->codePage, propid); - if (This->codePage == CP_UNICODE) - { - cbEntry *= sizeof(WCHAR); - - /* Unicode entries are padded to DWORD boundaries */ - if (cbEntry % sizeof(DWORD)) - ptr += sizeof(DWORD) - (cbEntry % sizeof(DWORD)); - } - ptr += cbEntry; - } - return hr; -} - static void* WINAPI Allocate_CoTaskMemAlloc(void *this, ULONG size) { return CoTaskMemAlloc(size); @@ -1701,6 +1654,71 @@ static HRESULT PropertyStorage_ReadSectionHeaderFromStream(IStream *stm, return hr; } +/* Reads the dictionary from the memory buffer beginning at ptr. Interprets + * the entries according to the values of This->codePage and This->locale. + */ +static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, const struct read_buffer *buffer, + size_t offset) +{ + DWORD numEntries, i; + HRESULT hr; + + assert(This->name_to_propid); + assert(This->propid_to_name); + + if (FAILED(hr = buffer_read_dword(buffer, offset, &numEntries))) + return hr; + + TRACE("Reading %d entries:\n", numEntries); + + offset += sizeof(DWORD); + + for (i = 0; SUCCEEDED(hr) && i < numEntries; i++) + { + PROPID propid; + DWORD cbEntry; + WCHAR ch = 0; + + if (SUCCEEDED(hr = buffer_read_dword(buffer, offset, &propid))) + hr = buffer_read_dword(buffer, offset + sizeof(PROPID), &cbEntry); + if (FAILED(hr)) + break; + + offset += sizeof(PROPID) + sizeof(DWORD); + + if (FAILED(hr = buffer_test_offset(buffer, offset, This->codePage == CP_UNICODE ? + ALIGNED_LENGTH(cbEntry * sizeof(WCHAR), 3) : cbEntry))) + { + WARN("Broken name length for entry %d.\n", i); + return hr; + } + + /* Make sure the source string is NULL-terminated */ + if (This->codePage != CP_UNICODE) + buffer_read_byte(buffer, offset + cbEntry - 1, (BYTE *)&ch); + else + buffer_read_word(buffer, offset + (cbEntry - 1) * sizeof(WCHAR), &ch); + + if (ch) + { + WARN("Dictionary entry name %d is not null-terminated.\n", i); + return E_FAIL; + } + + TRACE("Reading entry with ID %#x, %d chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? + debugstr_wn((WCHAR *)buffer->data, cbEntry) : debugstr_an((char *)buffer->data, cbEntry)); + + hr = PropertyStorage_StoreNameWithId(This, (char *)buffer->data + offset, This->codePage, propid); + /* Unicode entries are padded to DWORD boundaries */ + if (This->codePage == CP_UNICODE) + cbEntry = ALIGNED_LENGTH(cbEntry * sizeof(WCHAR), 3); + + offset += cbEntry; + } + + return hr; +} + static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) { struct read_buffer read_buffer; @@ -1877,8 +1895,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) This->locale = LOCALE_SYSTEM_DEFAULT; TRACE("Code page is %d, locale is %d\n", This->codePage, This->locale); if (dictOffset) - hr = PropertyStorage_ReadDictionary(This, - buf + dictOffset - sizeof(PROPERTYSECTIONHEADER)); + hr = PropertyStorage_ReadDictionary(This, &read_buffer, dictOffset - sizeof(PROPERTYSECTIONHEADER)); end: HeapFree(GetProcessHeap(), 0, buf);

1 0