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

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

Re: d3d11/tests: Add test for the SM4 instruction continuec.
by Henri Verbeet May 16, 2017

May 16, 2017

On 16 May 2017 at 17:47, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > To get fxc to output continuec_z/continuec_nz instead of an if-block > with a normal continue inside, the shaders have been compiled with > the /Gfa flag. > Could you add that as a comment in the code itself?

1 0

Re: [PATCH 4/4] server: Don't change clipboard sequnce number on delayed data rendering
by Marvin May 16, 2017

May 16, 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=30988 Your paranoid android. === w8 (32 bit clipboard) === clipboard.c:399: Test failed: GlobalGetAtomNameA should fail clipboard.c:400: Test failed: err -559038737

1 0

Re: [PATCH 1/3] ws2_32: Don't try to match host name in getaddrinfo if AI_NUMERICHOST hint is specified.
by Marvin May 16, 2017

May 16, 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=30982 Your paranoid android. === w7u (32 bit sock) === sock.c:6146: Test failed: Expected event sequence [FD_READ(0)], got []

1 0

Re: wined3d: Implement SM4 continuec opcode.
by Henri Verbeet May 16, 2017

May 16, 2017

On 14 May 2017 at 18:54, Sven Hesse <drmccoy(a)drmccoy.de> wrote: > Works just like breakc and retc. > > Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> > --- > dlls/wined3d/arb_program_shader.c | 1 + > dlls/wined3d/glsl_shader.c | 2 ++ > dlls/wined3d/shader.c | 1 + > dlls/wined3d/shader_sm4.c | 3 +++ > dlls/wined3d/wined3d_private.h | 1 + > 5 files changed, 8 insertions(+) > Thanks. I'll take this as it is, although a small test using the instruction would be nice.

2 1

Re: rpcrt4: Use standard Wine list to store connections in RpcServerProtseq.
by Alexandre Julliard May 16, 2017

May 16, 2017

Jacek Caban <jacek(a)codeweavers.com> writes: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/rpcrt4/rpc_binding.h | 2 +- > dlls/rpcrt4/rpc_server.c | 18 ++++---- > dlls/rpcrt4/rpc_server.h | 2 +- > dlls/rpcrt4/rpc_transport.c | 110 > +++++++++++++++----------------------------- > 4 files changed, 50 insertions(+), 82 deletions(-) This breaks the Windows build: i686-w64-mingw32-gcc -c -o rpc_transport.o ../../../wine/dlls/rpcrt4/rpc_transport.c -I. -I../../../wine/dlls/rpcrt4 \ -I../../include -I../../../wine/include -D__WINESRC__ -D_RPCRT4_ -DMSWMSG -D_REENTRANT -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla \ -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer \ -g -O2 -fno-diagnostics-show-caret -D_WIN32 In file included from ../../../wine/include/windef.h:266:0, from ../../../wine/include/windows.h:37, from ../../../wine/include/winsock.h:110, from ../../../wine/include/winsock2.h:47, from ../../../wine/include/ws2tcpip.h:22, from ../../../wine/dlls/rpcrt4/rpc_transport.c:40: ../../../wine/dlls/rpcrt4/rpc_transport.c: In function ‘rpcrt4_protseq_sock_get_wait_array’: ../../../wine/dlls/rpcrt4/rpc_transport.c:1767:37: error: ‘RpcServerProtseq {aka struct _RpcServerProtseq}’ has no member named ‘conn’ ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1772:46: error: ‘RpcConnection {aka struct _RpcConnection}’ has no member named ‘Next’; did you mean ‘exp’? ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1789:37: error: ‘RpcServerProtseq {aka struct _RpcServerProtseq}’ has no member named ‘conn’ ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1803:46: error: ‘RpcConnection {aka struct _RpcConnection}’ has no member named ‘Next’; did you mean ‘exp’? ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c: In function ‘rpcrt4_protseq_sock_wait_for_new_connection’: ../../../wine/dlls/rpcrt4/rpc_transport.c:1846:41: error: ‘RpcServerProtseq {aka struct _RpcServerProtseq}’ has no member named ‘conn’ ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ ../../../wine/dlls/rpcrt4/rpc_transport.c:1850:50: error: ‘RpcConnection {aka struct _RpcConnection}’ has no member named ‘Next’; did you mean ‘exp’? ../../../wine/include/winnt.h:760:21: note: in definition of macro ‘CONTAINING_RECORD’ Makefile:737: recipe for target 'rpc_transport.o' failed -- Alexandre Julliard julliard(a)winehq.org

4 6

Re: [PATCH 3/6] d3dx9: Match native out of bounds array selector index handling.
by Matteo Bruni May 16, 2017

May 16, 2017

2017-05-12 14:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 9c07f9c..21aa5d7 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -1051,7 +1051,9 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta > FIXME("Preshader structure is null.\n"); > return D3DERR_INVALIDCALL; > } > - if (update_all || is_param_eval_input_dirty(param->param_eval)) > + /* According to the tests, native d3dx handles the case of array index evaluated to -1 > + * in a specific way. */ > + if (state->index == 0xffffffffu || is_param_eval_input_dirty(param->param_eval, pass->update_version)) Hmm, so that's the index value set at initialization, thus getting a -1 in the first evaluation ends up breaking the "selector changed" check in native? You might want to spell that out in some form in the comment. AFAIU there is no other way a -1 is stored in state->index, correct?

2 3

Re: [PATCH 2/6] d3dx9: Use versioned parameter updates instead of 'dirty' flags.
by Matteo Bruni May 16, 2017

May 16, 2017

2017-05-12 14:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Looping through shared parameters in set_dirty() which is removed by this patch > has a major performance impact on parameter update for applications creating a > lot of effects and sharing parameters between them, which is a common case. > Using versioned scheme also allows for some further optimization. > > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> I don't have serious issues with this patch but I also have a number of questions so I don't feel like signing it off either. Sorry :/ > @@ -163,6 +163,7 @@ struct d3dx_const_tab > unsigned int const_set_size; > struct d3dx_const_param_eval_output *const_set; > const enum pres_reg_tables *regset2table; > + ULONG64 update_version; > }; Is it necessary? Could you do without it, using the pass version instead? > struct d3dx_shared_data; > > @@ -213,6 +214,8 @@ struct d3dx_parameter > UINT bytes; > DWORD runtime_flags; > DWORD object_id; > + ULONG64 update_version; > + ULONG64 *update_version_counter; I don't like the "update_version_counter" name that much but I don't have particularly good suggestions. pass_update_version? current_update_version? parent_update_version? new_update_version? > +static inline ULONG64 get_update_version_counter(ULONG64 *update_version_counter) > +{ > + return ++*update_version_counter; > +} Maybe it's just me but it's a bit surprising to see this get_x() function having side effects. Not sure how to call it. next_update_version()? inc_update_version_counter()? > +static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_version) > +{ > + struct d3dx_shared_data *shared_data; > + > + if ((shared_data = param->top_level_param->u.shared_data)) > + return update_version < shared_data->update_version; > + else > + return update_version < param->top_level_param->update_version; > +} Did you try if a unified update_version pointer looks any nicer? Especially considering that you have a more or less matching *update_version_counter at the moment. > HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, > - const struct d3dx_parameter *param, void *param_value, BOOL update_all) DECLSPEC_HIDDEN; > + const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; I guess this has to do with the update_version in struct d3dx_const_tab. I might be missing something, in that case please clue me. > +static ULONG64 get_effect_update_version_counter(struct d3dx9_base_effect *base) > +{ > + return get_update_version_counter(get_update_version_counter_ptr(base)); > } Same naming caveat here. > -static void clear_dirty_params(struct d3dx9_base_effect *base) > +static void set_dirty(struct d3dx_parameter *param) > { > - unsigned int i; > + struct d3dx_shared_data *shared_data; > + struct d3dx_parameter *top_param = param->top_level_param; > + ULONG64 new_update_version = get_update_version_counter(top_param->update_version_counter); > > - for (i = 0; i < base->parameter_count; ++i) > - base->parameters[i].runtime_flags &= ~PARAMETER_FLAG_DIRTY; > + if ((shared_data = top_param->u.shared_data)) > + shared_data->update_version = new_update_version; > + else > + top_param->update_version = new_update_version; > } Another option would be NOT to increment the effect / pool counter on each set_dirty() but instead only increment it in BeginPass() and CommitChanges(), after you're done with the update (or well, it's fine at almost any point given that we don't have to care about races). It seems a bit better to me, unless I'm overlooking something and it won't work. > static HRESULT set_string(char **param_data, const char *string) > @@ -3078,6 +3074,7 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 > unsigned int i; > HRESULT ret; > HRESULT hr; > + ULONG64 new_update_version = get_effect_update_version_counter(&effect->base_effect); > > TRACE("effect %p, pass %p, state_count %u.\n", effect, pass, pass->state_count); > > @@ -3109,7 +3106,7 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 > } > effect->material_updated = FALSE; > > - clear_dirty_params(&effect->base_effect); > + pass->update_version = new_update_version; > return ret; > } Right, here is where I'd update the counter.

2 3

Re: wrc: Allow quotes in resource nameID.
by Alexandre Julliard May 16, 2017

May 16, 2017

Artur Świgoń <artur.swigon(a)gmail.com> writes: > @@ -138,6 +142,14 @@ static int wbufalloc = 0; > > static int current_codepage = -1; /* use language default */ > > +/* Used for differentiating between single- and double-quoted nameID's */ > +static int id_dblquote = 0; > + > +/* Used for catching first (quoted) nameID before wanted_id is set. > + * This variable is reset to 0 once the first ID (quoted or not), string or > + * data has been encountered */ > +static int id_initial = 1; That's a bit hackish. Couldn't you simply set the initial state appropriately instead of introducing a separate variable? > @@ -402,8 +414,30 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) > 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); > return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } > > +<tkid_dbl>[A-Za-z_0-9./\\\']+\" | > +<tkid_sgl>[A-Za-z_0-9./\\\"]+\' { There are more characters that should be allowed. Nested quotes are also supposed to work. -- Alexandre Julliard julliard(a)winehq.org

2 2

winetricks alldlls=builtin update based on wine-2.7
by wylda＠volny.cz May 16, 2017

May 16, 2017

______________________________________________________________ > Od: Austin English <austinenglish(a)gmail.com> > Komu: wylda(a)volny.cz > Datum: 20.02.2017 07:07 > Předmět: Re: winetricks alldlls=builtin update based on wine-2.2 > > CC: <wine-devel(a)winehq.org> On Sun, Feb 19, 2017 at 7:51 AM, <wylda(a)volny.cz> wrote: > Hi, > in case you find it useful... > > W. Hi Wylda, Please send a pull request to https://github.com/Winetricks/winetricks/ -- -Austin GPG: 14FB D7EA A041 937B ______________________________________________________________ Hi Austin, i updated alldlls=builtin function for wine-2.7 and also fixed few things: - generates properly indentioned library list - removed nonsensical library names like "./dlls" - script generates override list matching 1:1 to wine-2.7 available list Unfortunately i not able to create pull request in github even though i have created github account right now. It's still grey out and i don't know different way to upload a patch. Anyway is there a different way to get it in, so i don't need to maintain locally? (spent whole day on this and i have no plans to learn git "details" in near futures). Best regards, W.

2 1

Re: [PATCH] user32: add GetPhysicalCursorPos/SetPhysicalCursorPos stubs (try 2)
by Dmitry Timoshkov May 16, 2017

May 16, 2017

Austin English <austinenglish(a)gmail.com> wrote: > +BOOL WINAPI GetPhysicalCursorPos(POINT *point) > +{ > + FIXME("(%p) semi-stub: forwarding to GetCursorPos\n", point); > + return GetPhysicalCursorPos(point); > +} A copy/paste bug. -- Dmitry.

1 0

Re: [PATCH] user32: add GetPhysicalCursorPos/SetPhysicalCursorPos stubs
by Ken Thomases May 15, 2017

May 15, 2017

On May 15, 2017, at 9:11 PM, Austin English <austinenglish(a)gmail.com> wrote: > > https://bugs.winehq.org/show_bug.cgi?id=42985 > > -- > -Austin > GPG: 14FB D7EA A041 937B > --- > dlls/user32/input.c | 14 ++++++++++++++ > dlls/user32/user32.spec | 2 ++ > 2 files changed, 16 insertions(+) Shouldn't these just pass through to GetCursorPos() and SetCursorPos(), respectively? Their docs refer to the docs for PhysicalToLogicalPoint()[1], which says that a) the distinction is only meaningful for Vista-style DPI scaling, which Wine doesn't support; and b) since Windows 8.1, even that distinction has been eliminated by DPI virtualization. [1] https://msdn.microsoft.com/en-us/library/windows/desktop/ms633536(v=vs.85).… -Ken

1 0

Transferring D3D textures to OpenGL or Vulkan contexts in Winelib
by Ben "Root" Anderson May 15, 2017

May 15, 2017

I'd like to start a discussion here and see where it goes. First, my usecase. I want to write a wrapper that connects Windows SteamVR applications running under Wine to the native Linux SteamVR runtime. Because it's the same API on both sides, this is very straightforward, except for one crucial element. In their API, the application does not (necessarily) output the rendered frame to a window, instead submitting the frame to their VR compositor as either an ID3D11Texture, a struct describing a D3D12 texture, an OpenGL texture or render buffer name, or a struct describing a Vulkan texture. For obvious reasons, the latter two are the options available on Linux, making them very straightforward for a Winelib DLL. The former two... not so much. The vast majority of SteamVR applications are currently using Direct3D 11, which means for any of this to work with them, I need some way to convert an ID3D11Texture to the appropriate OpenGL or (preferably) Vulkan equivalent that SteamVR is expecting. I've looked high and low and see no way to do this, neither through Windows APIs nor Winelib. Just to get things working for now, I'll likely figure out a way to invoke wined3d_texture_get_gl_buffer() or similar from outside Wine itself, but that's a dirty hack at best and likely to break frequently (eventually, maybe permanently) as Wine evolves. Thoughts?

2 2

Re: [PATCH 5/6] d3dx9: Avoid redundant constant tables updates.
by Matteo Bruni May 15, 2017

May 15, 2017

2017-05-12 14:24 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > +static void set_preshader_modified(struct d3dx_preshader *pres) > +{ > + unsigned int i; > + > + for (i = 0; i < pres->ins_count; ++i) > + { > + const struct d3dx_pres_ins *ins = &pres->ins[i]; > + const struct d3dx_pres_reg *reg = &ins->output.reg; > + > + regstore_set_modified(&pres->regs, reg->table, reg->offset, > + pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); > + } > +} This looks a bit ugly but I imagine it's actually okay in practice. Not that I can think of anything better either. E.g. I'm not sure that storing an array of register ranges to dirtify (i.e. precomputing this preshader scan) is really an improvement.

1 0

[v6 PATCH 00/21] x86: Enable User-Mode Instruction Prevention
by Ricardo Neri May 15, 2017

May 15, 2017

This is v6 of this series. The five previous submissions can be found here [1], here [2], here[3], here[4], and here[5]. This version addresses the comments received in v4 plus improvements of the handling of emulation in 64-bit builds. Please see details in the change log. === What is UMIP? User-Mode Instruction Prevention (UMIP) is a security feature present in new Intel Processors. If enabled, it prevents the execution of certain instructions if the Current Privilege Level (CPL) is greater than 0. If these instructions were executed while in CPL > 0, user space applications could have access to system-wide settings such as the global and local descriptor tables, the segment selectors to the current task state and the local descriptor table. These are the instructions covered by UMIP: * SGDT - Store Global Descriptor Table * SIDT - Store Interrupt Descriptor Table * SLDT - Store Local Descriptor Table * SMSW - Store Machine Status Word * STR - Store Task Register If any of these instructions is executed with CPL > 0, a general protection exception is issued when UMIP is enabled. === How does it impact applications? There is a caveat, however. Certain applications rely on some of these instructions to function. An example of this are applications that use WineHQ[6]. For instance, these applications rely on sidt returning a non- accessible memory location[8]. During the discussions, it was proposed that the fault could be relied to the user-space and perform the emulation in user-mode. However, this would break existing applications until, for instance, they update to a new WineHQ version. However, this approach would require UMIP to be disabled by default. The consensus in this forum is to always enable it. This patchset initially treated tasks running in virtual-8086 mode as a special case. However, I received clarification that DOSEMU[8] does not support applications that use these instructions. It relies on WineHQ for this [9]. Furthermore, the applications for which the concern was raised run in protected mode [8]. Please note that UMIP is always enabled for both 64-bit and 32-bit Linux builds. However, emulation of the UMIP-protected instructions is not done for 64-bit processes. 64-bit user space applications will receive the SIGSEGV signal when UMIP instructions causes a general protection fault. === How are UMIP-protected instructions emulated? This version keeps UMIP enabled at all times and by default. If a general protection fault caused by the instructions protected by UMIP is detected, such fault will be fixed-up by returning dummy values as follows: * SGDT and SIDT return hard-coded dummy values as the base of the global descriptor and interrupt descriptor tables. These hard-coded values correspond to memory addresses that are near the end of the kernel memory map. This is also the case for virtual-8086 mode tasks. In all my experiments in x86_32, the base of GDT and IDT was always a 4-byte address, even for 16-bit operands. Thus, my emulation code does the same. In all cases, the limit of the table is set to 0. * STR and SLDT return 0 as the segment selector. This looks appropriate since we are providing a dummy value as the base address of the global descriptor table. * SMSW returns the value with which the CR0 register is programmed in head_32/64.S at boot time. This is, the following bits are enabled: CR0.0 for Protection Enable, CR.1 for Monitor Coprocessor, CR.4 for Extension Type, which will always be 1 in recent processors with UMIP; CR.5 for Numeric Error, CR0.16 for Write Protect, CR0.18 for Alignment Mask. As per the Intel 64 and IA-32 Architectures Software Developer's Manual, SMSW returns a 16-bit results for memory operands. However, when the operand is a register, the results can be up to CR0[63:0]. Since the emulation code only kicks-in in x86_32, we return up to CR[31:0]. * The proposed emulation code is handles faults that happens in both protected and virtual-8086 mode. === How is this series laid out? ++ Fix bugs in MPX address evaluator I found very useful the code for Intel MPX (Memory Protection Extensions) used to parse opcodes and the memory locations contained in the general purpose registers when used as operands. I put some of this code in a separate library file that both MPX and UMIP can access and avoid code duplication. Before creating the new library, I fixed a couple of bugs that I found in how MPX determines the address contained in the instruction and operands. ++ Provide a new x86 instruction evaluating library With bugs fixed, the MPX evaluating code is relocated in a new insn-eval.c library. The basic functionality of this library is extended to obtain the segment descriptor selected by either segment override prefixes or the default segment by the involved registers in the calculation of the effective address. It was also extended to obtain the default address and operand sizes as well as the segment base address. Also, support to process 16-bit address encodings. Armed with this arsenal, it is now possible to determine the linear address onto which the emulated results shall be copied. This code supports Normal 32-bit and 64-bit (i.e., __USER32_CS and/or __USER_CS) protected mode, virtual-8086 mode, 16-bit protected mode with 32-bit base address. ++ Emulate UMIP instructions A new fixup_umip_exception functions inspect the instruction at the instruction pointer. If it is an UMIP-protected instruction, it executes the emulation code. This uses all the address-computing code of the previous section. ++ Add self-tests Lastly, self-tests are added to entry_from_v86.c to exercise the most typical use cases of UMIP-protected instructions in a virtual-8086 mode. ++ Extensive tests Extensive tests were performed to test all the combinations of ModRM, SiB and displacements for 16-bit and 32-bit encodings for the ss, ds, es, fs and gs segments. Tests also include a 64-bit program that uses segmentation via fs and gs. For this purpose, I temporarily, and not as part of this patchset, enabled UMIP support for 64-bit process with the intention to test the computations of linear addresses in 64-bit mode, including the extra R8-R15 registers. Extensive test is also implemented for virtual-8086 tasks. Code of these tests can be found here [10] and here [11]. [1]. https://lwn.net/Articles/705877/ [2]. https://lkml.org/lkml/2016/12/23/265 [3]. https://lkml.org/lkml/2017/1/25/622 [4]. https://lkml.org/lkml/2017/2/23/40 [5]. https://lkml.org/lkml/2017/3/3/678 [7]. https://www.winehq.org/ [8]. https://www.winehq.org/pipermail/wine-devel/2016-November/115320.html [9]. http://www.dosemu.org/ [9]. http://marc.info/?l=linux-kernel&m=147876798717927&w=2 [10]. https://github.com/01org/luv-yocto/tree/rneri/umip/meta-luv/recipes-core/um… [11]. https://github.com/01org/luv-yocto/commit/a72a7fe7d68693c0f4100ad86de6ecabd… Thanks and BR, Ricardo Changes since V5: * Relocate the page fault error code enumerations to traps.h Changes since V4: * Audited patches to use braces in all the branches of conditional. statements, except those in which the conditional action only takes one line. * Implemented support in 64-builds for both 32-bit and 64-bit tasks in the instruction evaluating library. * Split segment selector function in the instruction evaluating library into two functions to resolve the segment type by instruction override or default and a separate function to actually read the segment selector. * Fixed a bug when evaluating 32-bit effective addresses with 64-bit kernels. * Split patches further for for easier review. * Use signed variables for computation of effective address. * Fixed issue with a spurious static modifier in function insn_get_addr_ref found by kbuild test bot. * Removed comparison between true and fixup_umip_exception. * Reworked check logic when identifying erroneous vs invalid values of the SiB base and index. Changes since V3: * Limited emulation to 32-bit and 16-bit modes. For 64-bit mode, a general protection fault is still issued when UMIP-protected instructions are executed with CPL > 0. * Expanded instruction-evaluating code to obtain segment descriptor along with their attributes such as base address and default address and operand sizes. Also, support for 16-bit encodings in protected mode was implemented. * When getting a segment descriptor, this include support to obtain those of a local descriptor table. * Now the instruction-evaluating code returns -EDOM when the value of registers should not be used in calculating the effective address. The value -EINVAL is left for errors. * Incorporate the value of the segment base address in the computation of linear addresses. * Renamed new instruction evaluation library from insn-kernel.c to insn-eval.c * Exported functions insn_get_reg_offset_* to obtain the register offset by ModRM r/m, SiB base and SiB index. * Improved documentation of functions. * Split patches further for easier review. Changes since V2: * Added new utility functions to decode the memory addresses contained in registers when the 16-bit addressing encodings are used. This includes code to obtain and compute memory addresses using segment selectors for real-mode address translation. * Added support to emulate UMIP-protected instructions for virtual-8086 tasks. * Added self-tests for virtual-8086 mode that contains representative use cases: address represented as a displacement, address in registers and registers as operands. * Instead of maintaining a static variable for the dummy base addresses of the IDT and GDT, a hard-coded value is used. * The emulated SMSW instructions now return the value with which the CR0 register is programmed in head_32/64.S This is: PE | MP | ET | NE | WP | AM. For x86_64, PG is also enabled. * The new file arch/x86/lib/insn-utils.c is now renamed as arch/x86/lib/ insn-kernel.c. It also has its own header. This helps keep in sync the the kernel and objtool instruction decoders. Also, the new insn-kernel.c contains utility functions that are only relevant in a kernel context. * Removed printed warnings for errors that occur when decoding instructions with invalid operands. * Added more comments on fixes in the instruction-decoding MPX functions. * Now user_64bit_mode(regs) is used instead of test_thread_flag(TIF_IA32) to determine if the task is 32-bit or 64-bit. * Found and fixed a bug in insn-decoder in which X86_MODRM_RM was incorrectly used to obtain the mod part of the ModRM byte. * Added more explanatory code in emulation and instruction decoding code. This includes a comment regarding that copy_from_user could fail if there exists a memory protection key in place. * Tested code with CONFIG_X86_DECODER_SELFTEST=y and everything passes now. * Prefixed get_reg_offset_rm with insn_ as this function is exposed via a header file. For clarity, this function was added in a separate patch. Changes since V1: * Virtual-8086 mode tasks are not treated in a special manner. All code for this purpose was removed. * Instead of attempting to disable UMIP during a context switch or when entering virtual-8086 mode, UMIP remains enabled all the time. General protection faults that occur are fixed-up by returning dummy values as detailed above. * Removed umip= kernel parameter in favor of using clearcpuid=514 to disable UMIP. * Removed selftests designed to detect the absence of SIGSEGV signals when running in virtual-8086 mode. * Reused code from MPX to decode instructions operands. For this purpose code was put in a common location. * Fixed two bugs in MPX code that decodes operands. Ricardo Neri (21): x86/mpx: Use signed variables to compute effective addresses x86/mpx: Do not use SIB index if index points to R/ESP x86/mpx: Do not use R/EBP as base in the SIB byte with Mod = 0 x86/mpx, x86/insn: Relocate insn util functions to a new insn-kernel x86/insn-eval: Add utility functions to get register offsets x86/insn-eval: Add utility functions to get segment selector x86/insn-eval: Add utility function to get segment descriptor x86/insn-eval: Add utility function to get segment descriptor base address x86/insn-eval: Add functions to get default operand and address sizes x86/insn-eval: Do not use R/EBP as base if mod in ModRM is zero insn/eval: Incorporate segment base in address computation x86/insn: Support both signed 32-bit and 64-bit effective addresses x86/insn-eval: Add support to resolve 16-bit addressing encodings x86/insn-eval: Add wrapper function for 16-bit and 32-bit address encodings x86/mm: Relocate page fault error codes to traps.h x86/cpufeature: Add User-Mode Instruction Prevention definitions x86: Add emulation code for UMIP instructions x86/umip: Force a page fault when unable to copy emulated result to user x86/traps: Fixup general protection faults caused by UMIP x86: Enable User-Mode Instruction Prevention selftests/x86: Add tests for User-Mode Instruction Prevention arch/x86/Kconfig | 10 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/insn-eval.h | 23 + arch/x86/include/asm/traps.h | 18 + arch/x86/include/asm/umip.h | 15 + arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/common.c | 16 +- arch/x86/kernel/traps.c | 4 + arch/x86/kernel/umip.c | 298 +++++++++ arch/x86/lib/Makefile | 2 +- arch/x86/lib/insn-eval.c | 832 ++++++++++++++++++++++++++ arch/x86/mm/fault.c | 88 ++- arch/x86/mm/mpx.c | 120 +--- tools/testing/selftests/x86/entry_from_vm86.c | 39 +- 16 files changed, 1301 insertions(+), 176 deletions(-) create mode 100644 arch/x86/include/asm/insn-eval.h create mode 100644 arch/x86/include/asm/umip.h create mode 100644 arch/x86/kernel/umip.c create mode 100644 arch/x86/lib/insn-eval.c -- 2.9.3

7 109

Wine 2.8 source code
by Игорь Чебаненко May 15, 2017

May 15, 2017

Wine 2.8 scanned with Cppcheck 1.72 There is A LOT of "noise" but I hope it will be helpfull for you.

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz May 15, 2017

May 15, 2017

>>> When I run winecfg, I got: >>> >>> wine: glibc >= 2.3 without NPTL or TLS is not a supported combination. >>> Please upgrade to a glibc with NPTL support. >>> >>> >>> Should I interpret that message, that: >>> 1. NPTL is required >>> 2. I should use glibc-2.2 or lower >>> >>> If 1) that's probably end of game per https://lwn.net/Articles/10465/ >>> * "- The 2.5.36 kernel or above must be installed and used." >>> * "The current snapshot for glibc 2.3 (or glibc 2.3 when released) is >>> necessary." >>> * "The general compiler requirement for glibc is at least gcc 3.2." >>> >>> So for further steps 1) or 2) ? >> >>A glibc using TLS might still work without NPTL, though that may require >>glibc 2.3 anyway. > >Yes, TLS was added to 2.5.29: >https://www.kernel.org/pub/linux/kernel/v2.5/ChangeLog-2.5.29 > >...and further improved in 2.5.32: >https://lwn.net/Articles/7591/ > >> Note that the above requirements are for building >>glibc, not running it. > >Short version: hint for 2.3 is probably not correct > >Longer version based on Glibc's release notes: > >glibc-2.3: Even though TLS support is mentioned as one new feature for this release >the default is not to build glibc with TLS support enabled. This has >several reasons, most of which are out of control of the glibc >developers. Therefore it is necessry to *not* use the --with-tls option >for configure. > >=no support for TLS & NPTL in glibc-2.3. > >glibc-2.3.2: ELF thread-local storage support (TLS) now works on x86-64. >glibc-2.3.2: The sources were also prepared to be used with the NPTL > thread library which is not yet included. > >=no support for NPTL in glibc-2.3.2 itself > >glibc-2.3.3: The main glibc-2.3.3 release >package contains the Native POSIX Threads Library (NPTL) contributed >by Ulrich Drepper, which supports Linux 2.6 kernels only. > > > > The NPTL support was backported to older kernels IIRC. > >It seems, that RedHat did that... >http://rpm.pbone.net/index.php3/stat/4/idpl/18727833/dir/fedora_1/com/kerne… > >I'm not fan of Fedora, so i could try your initially suggested >"A glibc using TLS might still work without NPTL...", i.e. >kernel-2.5.32 + rebuild of glibc-2.3.2, but i find that >glibc recipe pretty painful. But if you are expecting rather >2.4.xx results, that would be for some Fedora/RedHat fans. > >Anyway, i don't see chances for anything like subject mentioned >linux v2.3.31. > One more note: Debian Sarge includes glibc-2.3.2 and shows: "Thread-local storage support included" and does not mention NPTL. But kernel is 2.4.27 (without kernel side TLS), so winecfg complains. So i could also easily try Sarge's alternative kernel 2.6.8 instead of 2.4.27. Then TLS is supported in this glibc without NPTL and see if, winecfg is happy. That is the easiest step.

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz May 15, 2017

May 15, 2017

>> When I run winecfg, I got: >> >> wine: glibc >= 2.3 without NPTL or TLS is not a supported combination. >> Please upgrade to a glibc with NPTL support. >> >> >> Should I interpret that message, that: >> 1. NPTL is required >> 2. I should use glibc-2.2 or lower >> >> If 1) that's probably end of game per https://lwn.net/Articles/10465/ >> * "- The 2.5.36 kernel or above must be installed and used." >> * "The current snapshot for glibc 2.3 (or glibc 2.3 when released) is >> necessary." >> * "The general compiler requirement for glibc is at least gcc 3.2." >> >> So for further steps 1) or 2) ? > >A glibc using TLS might still work without NPTL, though that may require >glibc 2.3 anyway. Yes, TLS was added to 2.5.29: https://www.kernel.org/pub/linux/kernel/v2.5/ChangeLog-2.5.29 ...and further improved in 2.5.32: https://lwn.net/Articles/7591/ > Note that the above requirements are for building >glibc, not running it. Short version: hint for 2.3 is probably not correct Longer version based on Glibc's release notes: glibc-2.3: Even though TLS support is mentioned as one new feature for this release the default is not to build glibc with TLS support enabled. This has several reasons, most of which are out of control of the glibc developers. Therefore it is necessry to *not* use the --with-tls option for configure. =no support for TLS & NPTL in glibc-2.3. glibc-2.3.2: ELF thread-local storage support (TLS) now works on x86-64. glibc-2.3.2: The sources were also prepared to be used with the NPTL thread library which is not yet included. =no support for NPTL in glibc-2.3.2 itself glibc-2.3.3: The main glibc-2.3.3 release package contains the Native POSIX Threads Library (NPTL) contributed by Ulrich Drepper, which supports Linux 2.6 kernels only. > The NPTL support was backported to older kernels IIRC. It seems, that RedHat did that... http://rpm.pbone.net/index.php3/stat/4/idpl/18727833/dir/fedora_1/com/kerne… I'm not fan of Fedora, so i could try your initially suggested "A glibc using TLS might still work without NPTL...", i.e. kernel-2.5.32 + rebuild of glibc-2.3.2, but i find that glibc recipe pretty painful. But if you are expecting rather 2.4.xx results, that would be for some Fedora/RedHat fans. Anyway, i don't see chances for anything like subject mentioned linux v2.3.31.

1 0

Re: [RFC] README: Update Linux version requirement to 2.3.31.
by wylda＠volny.cz May 15, 2017

May 15, 2017

>>>If winecfg runs, that should be good enough. Optional packages can be >>>backported if necessary. >>> >> >>OK, then I will concentrate on min kernel version :) >> Currently I build wine-2.8 on machine with: * Linux-v2.4.27-3-386 * gcc-v3.3.5 * libc6-v2.3.2 There were few failures which I overcome by not building these components: * dwrite * winealsa.drv * wmvcore * ws2_32 * programs/winhlp32 When I run winecfg, I got: wine: glibc >= 2.3 without NPTL or TLS is not a supported combination. Please upgrade to a glibc with NPTL support. Should I interpret that message, that: 1. NPTL is required 2. I should use glibc-2.2 or lower If 1) that's probably end of game per https://lwn.net/Articles/10465/ * "- The 2.5.36 kernel or above must be installed and used." * "The current snapshot for glibc 2.3 (or glibc 2.3 when released) is necessary." * "The general compiler requirement for glibc is at least gcc 3.2." So for further steps 1) or 2) ? wmvcore and winhlp32 look like a real bugs. Others failures can be probably be solved by using newer components. I can open bugreports, if anyone is interested. Regards, W.

2 1

Re: [PATCH 2/2] uninstaller: Allocate enough memory to null-terminate the command string
by Alexandre Julliard May 15, 2017

May 15, 2017

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -245,7 +245,7 @@ static int FetchFromRootKey(HKEY root) > type == REG_DWORD && value == 1) > { > static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; > - command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR)); > + command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + sizeOfSubKeyName + 1) * sizeof(WCHAR)); The %s in the format gets replaced, so the existing code is fine. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] dwrite: Fix locale data buffer length passed to GetLocaleInfoEx()
by Alexandre Julliard May 15, 2017

May 15, 2017

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -1106,8 +1109,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, > struct scriptshaping_context context; > struct scriptshaping_cache *cache = NULL; > BOOL update_cluster, need_vertical; > + WCHAR digits[native_digits_length]; It would have to be a #define if you want to do this. -- Alexandre Julliard julliard(a)winehq.org

1 0