May 2017 - Wine-Devel - list.winehq.org

Re: [PATCH 6/9] combase: sort specfile
by Alexandre Julliard May 18, 2017

May 18, 2017

Austin English <austinenglish(a)gmail.com> writes: > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/combase/combase.spec | 128 +++++++++++++++++++++++----------------------- > 1 file changed, 64 insertions(+), 64 deletions(-) Please always confirm that they are sorted on Windows, many of these look like they might be ordinal exports. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] msvcp: Implement the wchar version of _Open_dir.
by Piotr Caban May 18, 2017

May 18, 2017

On 05/18/17 13:33, Stefan Dösinger wrote: > + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, wcslen(target_w) + 1, NULL, NULL); You can use MAX_PATH here instead of wcslen(target_w)+1. Thanks, Piotr

1 0

Re: Avoid using isspace()/isdigit() for WCHARs.
by Hugh McMaster May 18, 2017

May 18, 2017

On Thursday, 18 May 2017 6:16 PM, Hans Leidekker wrote: > +/* > +** WCHAR safe version of isdigit() > +*/ > +static inline int isDigit(WCHAR c) > +{ > + return c >= '0' && c <= '9'; > +} > + > +/* > +** WCHAR safe version of isspace(), except '\r' > +*/ > +static inline int isSpace(WCHAR c) > +{ > + return c == ' ' || c == '\t' || c == '\n' || c == '\f'; > +} Why not just use Wine's inbuilt inline functions? isdigitW() and isspaceW() are in wine/unicode.h, which is already included in msi/tokenize.c.

2 1

Re: [PATCH] kernel32: add AddDllDirectory stub
by Hugh McMaster May 18, 2017

May 18, 2017

On Thursday, 18 May 2017 9:00 AM, Austin English wrote: > > +/************************************************************************* > + * AddDllDirectory (KERNEL32.@) > + */ > +BOOL WINAPI AddDllDirectory(WCHAR *directory) > +{ > + FIXME("(%s): stub\n", wine_dbgstr_w(directory)); > + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > + return FALSE; > +} This function actually returns DLL_DIRECTORY_COOKIE, which is a typedef'd void *. The actual definition is in libloaderapi.h, which Wine doesn't have. And, according to MSDN, directory should be const WCHAR *. -- Hugh McMaster

1 0

Re: [PATCH v2] comctl32/tests: Add tests for mouse right-click in a treeview control
by Nikolay Sivov May 17, 2017

May 17, 2017

On 16.05.2017 12:05, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/comctl32/tests/treeview.c | 79 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 79 insertions(+) > > diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c > index 43de61c..ca3366d 100644 > --- a/dlls/comctl32/tests/treeview.c > +++ b/dlls/comctl32/tests/treeview.c > @@ -54,6 +54,21 @@ static BOOL g_v6; > static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; > static struct msg_sequence *item_sequence[1]; > > +static void flush_events(void) > +{ > + MSG msg; > + int diff = 200; > + int min_timeout = 100; > + DWORD time = GetTickCount() + diff; > + > + while (diff > 0) > + { > + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; > + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); > + diff = time - GetTickCount(); > + } > +} > + > static const struct message FillRootSeq[] = { > { TVM_INSERTITEMA, sent }, > { TVM_INSERTITEMA, sent }, > @@ -201,6 +216,13 @@ static const struct message test_get_set_unicodeformat_seq[] = { > { 0 } > }; > > +static const struct message test_right_click_seq[] = { > + { WM_RBUTTONDOWN, sent|wparam, MK_RBUTTON }, > + { WM_CAPTURECHANGED, sent|defwinproc }, > + { TVM_GETNEXTITEM, sent|wparam|lparam|defwinproc, TVGN_CARET, 0 }, > + { 0 } > +}; > + > static const struct message parent_expand_seq[] = { > { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, > { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, > @@ -342,6 +364,12 @@ static const struct message parent_vk_return_seq[] = { > { 0 } > }; > > +static const struct message parent_right_click_seq[] = { > + { WM_NOTIFY, sent|id, 0, 0, NM_RCLICK }, > + { WM_CONTEXTMENU, sent }, > + { 0 } > +}; > + > static HWND hMainWnd; > > static HTREEITEM hRoot, hChild; > @@ -1296,6 +1324,13 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, > } > break; > } > + case NM_RCLICK: > + { > + HTREEITEM selected = (HTREEITEM)SendMessageA(((NMHDR *)lParam)->hwndFrom, > + TVM_GETNEXTITEM, TVGN_CARET, 0); > + ok(selected == hChild, "child item should still be selected\n"); > + break; > + } > } > } > break; > @@ -2583,6 +2618,49 @@ todo_wine > DestroyWindow(hwnd); > } > > +static void test_right_click(void) > +{ > + HWND hTree; > + HTREEITEM selected; > + RECT rc; > + LRESULT result; > + POINT pt; > + > + hTree = create_treeview_control(0); > + fill_tree(hTree); > + > + SendMessageA(hTree, TVM_ENSUREVISIBLE, 0, (LPARAM)hChild); > + SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hChild); > + selected = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); > + ok(selected == hChild, "child item not selected\n"); > + > + *(HTREEITEM *)&rc = hRoot; > + result = SendMessageA(hTree, TVM_GETITEMRECT, TRUE, (LPARAM)&rc); > + ok(result, "TVM_GETITEMRECT failed\n"); > + > + flush_events(); > + > + pt.x = rc.left + (rc.right - rc.left) / 2; > + pt.y = rc.top + (rc.bottom - rc.top) / 2; Could you please simplify this to "(a + b) / 2"? Other than that, it looks good.

1 0

Re: [PATCH] appwiz.cpl: Use sha256 checksums to validate Mono/Gecko downloads.
by Alexandre Julliard May 17, 2017

May 17, 2017

Alex Henrie <alexhenrie24(a)gmail.com> writes: > + if(BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0)) > + goto end; > + if(BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0)) > + goto end; > + if(BCryptHashData(hash, (UCHAR *)file_map, size, 0)) > + goto end; > + if(BCryptFinishHash(hash, sha, sizeof(sha), 0)) > + goto end; > > UnmapViewOfFile(file_map); You are leaking file_map on error. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: add GetPhysicalCursorPos/SetPhysicalCursorPos stubs (try 3)
by Ken Thomases May 17, 2017

May 17, 2017

On May 16, 2017, at 12:38 PM, Austin English <austinenglish(a)gmail.com> wrote: > --- > dlls/user32/input.c | 19 +++++++++++++++++++ > dlls/user32/user32.spec | 2 ++ > 2 files changed, 21 insertions(+) Looks good to me. -Ken

1 0

Re: [PATCH 4/6 v2] reg/tests: Add tests for importing REG_NONE data
by Marvin May 17, 2017

May 17, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=31013 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [v8 PATCH] oleaut32: Improve support for IDispatch in VarCat
by Jacek Caban May 17, 2017

May 17, 2017

Hi Alistair, On 12.05.2017 05:56, Alistair Leslie-Hughes wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=27106 > > v6 - Simplify the code when the Variant cannot be coerced. > v7 - Fix copy/paste bug in return value. > v8 - Fixed failed test. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oleaut32/tests/vartest.c | 217 ++++++++++++++++++++++++++++++++++++++++++ > dlls/oleaut32/variant.c | 52 +++------- > 2 files changed, 229 insertions(+), 40 deletions(-) > > diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c > index 0e86ffb..f4224dc 100644 > --- a/dlls/oleaut32/tests/vartest.c > +++ b/dlls/oleaut32/tests/vartest.c > @@ -97,6 +97,150 @@ static BOOL has_i8; > #define R8_MAX DBL_MAX > #define R8_MIN DBL_MIN > > +#define DEFINE_EXPECT(func) \ > + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE > + > +#define SET_EXPECT(func) \ > + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) > + > +#define CHECK_EXPECT2(func) \ > + do { \ > + ok(expect_ ##func, "unexpected call " #func "\n"); \ > + called_ ## func = TRUE; \ > + }while(0) > + > +#define CHECK_EXPECT(func) \ > + do { \ > + CHECK_EXPECT2(func); \ > + expect_ ## func = FALSE; \ > + }while(0) > + > +#define CHECK_CALLED(func) \ > + do { \ > + ok(called_ ## func, "expected " #func "\n"); \ > + expect_ ## func = called_ ## func = FALSE; \ > + }while(0) > + > +DEFINE_EXPECT(dispatch_invoke); > + > +typedef struct > +{ > + IDispatch IDispatch_iface; > + VARTYPE vt; > + HRESULT result; > +} DummyDispatch; > + > +static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) > +{ > + return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); > +} > + > +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) > +{ > + return 2; > +} > + > +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) > +{ > + return 1; > +} > + > +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, > + REFIID riid, > + void** ppvObject) > +{ > + *ppvObject = NULL; > + > + if (IsEqualIID(riid, &IID_IDispatch) || > + IsEqualIID(riid, &IID_IUnknown)) > + { > + *ppvObject = iface; > + IDispatch_AddRef(iface); > + } > + > + return *ppvObject ? S_OK : E_NOINTERFACE; > +} > + > +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) > +{ > + ok(0, "Unexpected call\n"); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) > +{ > + ok(0, "Unexpected call\n"); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, > + UINT cnames, LCID lcid, DISPID *dispid) > +{ > + ok(0, "Unexpected call\n"); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, > + DISPID dispid, REFIID riid, > + LCID lcid, WORD wFlags, > + DISPPARAMS *params, > + VARIANT *res, > + EXCEPINFO *ei, > + UINT *arg_err) > +{ > + DummyDispatch *This = impl_from_IDispatch(iface); > + > + CHECK_EXPECT(dispatch_invoke); > + > + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); > + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); > + ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); > + > + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); > + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); > + ok(params->cArgs == 0, "got %d\n", params->cArgs); > + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); > + > + ok(res != NULL, "got %p\n", res); > + ok(V_VT(res) == VT_EMPTY, "got %d\n", V_VT(res)); > + ok(ei == NULL, "got %p\n", ei); > + ok(arg_err == NULL, "got %p\n", arg_err); > + > + if (FAILED(This->result)) > + return This->result; > + > + V_VT(res) = This->vt; > + if (This->vt == VT_UI1) > + V_UI1(res) = 34; > + else if (This->vt == VT_NULL) > + { > + V_VT(res) = VT_NULL; > + V_BSTR(res) = NULL; > + } > + else > + memset(res, 0, sizeof(*res)); > + > + return S_OK; > +} > + > +static const IDispatchVtbl DummyDispatch_VTable = > +{ > + DummyDispatch_QueryInterface, > + DummyDispatch_AddRef, > + DummyDispatch_Release, > + DummyDispatch_GetTypeInfoCount, > + DummyDispatch_GetTypeInfo, > + DummyDispatch_GetIDsOfNames, > + DummyDispatch_Invoke > +}; > + > +static void init_test_dispatch(VARTYPE vt, DummyDispatch *dispatch) > +{ > + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; > + dispatch->vt = vt; > + dispatch->result = S_OK; > +} > + > typedef struct IRecordInfoImpl > { > IRecordInfo IRecordInfo_iface; > @@ -5607,6 +5751,7 @@ static void test_VarCat(void) > HRESULT hres; > HRESULT expected_error_num; > int cmp; > + DummyDispatch dispatch; > > CHECKPTR(VarCat); > > @@ -5941,6 +6086,78 @@ static void test_VarCat(void) > VariantClear(&result); > VariantClear(&expected); > > + /* Dispatch conversion */ > + init_test_dispatch(VT_NULL, &dispatch); > + V_VT(&left) = VT_DISPATCH; > + V_DISPATCH(&left) = &dispatch.IDispatch_iface; > + > + V_VT(&expected) = VT_BSTR; > + V_BSTR(&expected)= SysAllocString(sz_empty); > + > + SET_EXPECT(dispatch_invoke); > + hres = VarCat(&left, &right, &result); > + ok(hres == S_OK, "got 0x%08x\n", hres); > + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); > + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); > + CHECK_CALLED(dispatch_invoke); > + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, "VarCat: DISPATCH concat with EMPTY did not return empty VT_BSTR\n"); This VarCmp doesn't test any more than you tested a few lines earlier. I'd remove it. > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > + init_test_dispatch(VT_NULL, &dispatch); > + V_VT(&right) = VT_DISPATCH; > + V_DISPATCH(&right) = &dispatch.IDispatch_iface; > + > + SET_EXPECT(dispatch_invoke); > + hres = VarCat(&left, &right, &result); > + ok(hres == S_OK, "got 0x%08x\n", hres); > + ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); > + ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); > + CHECK_CALLED(dispatch_invoke); > + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, "VarCat: DISPATCH concat with EMPTY did not return empty VT_BSTR\n"); Same here. > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > + init_test_dispatch(VT_UI1, &dispatch); > + V_VT(&right) = VT_DISPATCH; > + V_DISPATCH(&right) = &dispatch.IDispatch_iface; > + > + V_VT(&expected) = VT_BSTR; > + V_VT(&left) = VT_BSTR; > + V_BSTR(&left) = SysAllocString(sz12); > + V_BSTR(&expected) = SysAllocString(sz1234); > + SET_EXPECT(dispatch_invoke); > + hres = pVarCat(&left,&right,&result); > + ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); > + CHECK_CALLED(dispatch_invoke); > + ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, "VarCat: VT_DISPATCH concat with VT_BSTR failed to return correct result\n"); I'd replace that with explicit result tests, using strcmp_wa(). > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > + init_test_dispatch(VT_NULL, &dispatch); > + dispatch.result = E_OUTOFMEMORY; > + V_VT(&right) = VT_DISPATCH; > + V_DISPATCH(&right) = &dispatch.IDispatch_iface; > + > + SET_EXPECT(dispatch_invoke); > + hres = VarCat(&left, &right, &result); > + todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); > + CHECK_CALLED(dispatch_invoke); This test shows that there is still something wrong with error handling with your patch. > + > + VariantClear(&left); > + VariantClear(&right); > + VariantClear(&result); > + VariantClear(&expected); > + > /* Test boolean conversion */ > V_VT(&left) = VT_BOOL; > V_BOOL(&left) = VARIANT_TRUE; > diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c > index 17f753a..aa86be0 100644 > --- a/dlls/oleaut32/variant.c > +++ b/dlls/oleaut32/variant.c > @@ -2605,30 +2605,16 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > else > V_BSTR(&bstrvar_left) = SysAllocString(str_false); > } Note that V_BOOL case could also be handled by VariantChangeTypeEx if you used VARIANT_ALPHABOOL flag. > - /* Fill with empty string for later concat with right side */ > - else if (leftvt == VT_NULL) > - { > - V_VT(&bstrvar_left) = VT_BSTR; > - V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); > - } > else > { > + /* The value may not be able to be coerced, ie. VT_NULL */ > hres = VariantChangeTypeEx(&bstrvar_left,left,0,0,VT_BSTR); > - if (hres != S_OK) { > - VariantClear(&bstrvar_left); > - VariantClear(&bstrvar_right); > - if (leftvt == VT_NULL && (rightvt == VT_EMPTY || > - rightvt == VT_NULL || rightvt == VT_I2 || > - rightvt == VT_I4 || rightvt == VT_R4 || > - rightvt == VT_R8 || rightvt == VT_CY || > - rightvt == VT_DATE || rightvt == VT_BSTR || > - rightvt == VT_BOOL || rightvt == VT_DECIMAL || > - rightvt == VT_I1 || rightvt == VT_UI1 || > - rightvt == VT_UI2 || rightvt == VT_UI4 || > - rightvt == VT_I8 || rightvt == VT_UI8 || > - rightvt == VT_INT || rightvt == VT_UINT)) > - return DISP_E_BADVARTYPE; Removing dead code should be a separated patch. > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > return hres; > + else if(FAILED(hres)) > + { > + V_VT(&bstrvar_left) = VT_BSTR; > + V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); > } Something like: if (hres == DISP_E_TYPEMISMATCH) { // set empty string }else if(hres != S_OK) return hres; would be cleaner. However, more importantly, this needs more tests. There are more cases than IDispatch when your patch changes behaviour, so we need to make sure what behaviour is desired first. > } > } > @@ -2645,30 +2631,16 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) > else > V_BSTR(&bstrvar_right) = SysAllocString(str_false); > } > - /* Fill with empty string for later concat with right side */ > - else if (rightvt == VT_NULL) > - { > - V_VT(&bstrvar_right) = VT_BSTR; > - V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); > - } > else > { > + /* The value may not be able to be coerced, ie. VT_NULL */ > hres = VariantChangeTypeEx(&bstrvar_right,right,0,0,VT_BSTR); > - if (hres != S_OK) { > - VariantClear(&bstrvar_left); > - VariantClear(&bstrvar_right); > - if (rightvt == VT_NULL && (leftvt == VT_EMPTY || > - leftvt == VT_NULL || leftvt == VT_I2 || > - leftvt == VT_I4 || leftvt == VT_R4 || > - leftvt == VT_R8 || leftvt == VT_CY || > - leftvt == VT_DATE || leftvt == VT_BSTR || > - leftvt == VT_BOOL || leftvt == VT_DECIMAL || > - leftvt == VT_I1 || leftvt == VT_UI1 || > - leftvt == VT_UI2 || leftvt == VT_UI4 || > - leftvt == VT_I8 || leftvt == VT_UI8 || > - leftvt == VT_INT || leftvt == VT_UINT)) > - return DISP_E_BADVARTYPE; > + if (hres != S_OK && hres != DISP_E_TYPEMISMATCH) > return hres; > + else if(FAILED(hres)) > + { > + V_VT(&bstrvar_right) = VT_BSTR; > + V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); > } > } > } > -- 1.9.1 Same for those changes: remove dead code in separated patch, add tests and consider using VARIANT_ALPHABOOL. Thanks, Jacek

1 0

Re: Transferring D3D textures to OpenGL or Vulkan contexts in Winelib
by Józef Kucia May 16, 2017

May 16, 2017

On Tue, May 16, 2017 at 12:55 AM, Ben "Root" Anderson <roothorick(a)gmail.com> wrote: > On Sun, May 14, 2017 at 2:53 AM, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >> In theory Wine could implement WGL_NV_DX_interop [1] and WGL_NV_DX_interop2 [2]. >> >> [1] - https://www.khronos.org/registry/OpenGL/extensions/NV/WGL_NV_DX_interop.txt >> [2] - https://www.khronos.org/registry/OpenGL/extensions/NV/WGL_NV_DX_interop2.txt > > In theory? I'm just a bit skeptical about usefulness of this extension in Wine besides your use-case. > > The main question I can't find the answer to is, are there any > potential copyright/IP problems (or just Wine policy issues) with > implementing these extensions "paint by numbers" off the published > specs? I'm not aware of such problems. Other WGL extensions are already implemented in Wine, see dlls/winex11.drv/opengl.c. In this case it may be a little harder though, the extension has to understand D3D9, D3D10 and D3D11 interfaces, and it has to talk to wined3d, and it has to presumably map GL objects to internal wined3d GL objects.

3 2