October 2016 - Wine-Devel - list.winehq.org

Re: [PATCH] xinput1_3: Prefer builtin DLL

by Bruno Jesus

On Sun, Oct 30, 2016 at 12:37 PM, Filip Frackiewicz <fjfrackiewicz(a)gmail.com> wrote: > Hi Bruno, Hello, thanks for the email. > I hope I am not intruding or stating something already known,,, > >>- case DLL_WINE_PREATTACH: >>- return FALSE; /* prefer native version */ > case DLL_PROCESS_ATTACH: > DisableThreadLibraryCalls(inst); > break; > > This code looks different than the patch > https://bugs.winehq.org/attachment.cgi?id=55851 attached to > https://bugs.winehq.org/show_bug.cgi?id=41428 If you take a look at the whole function [1] you will see that it returns TRUE in the end, so there is no need for the "case DLL_WINE_PREATTACH" any longer. [1] http://source.winehq.org/source/dlls/xinput1_3/xinput1_3_main.c#0042

Oct. 30, 2016

RE: [PATCH] xinput1_3: Prefer builtin DLL

by Filip Frackiewicz

Hi Bruno, I hope I am not intruding or stating something already known,,, >- case DLL_WINE_PREATTACH: >- return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break; This code looks different than the patch https://bugs.winehq.org/attachment.cgi?id=55851 attached to https://bugs.winehq.org/show_bug.cgi?id=41428 The patch attached to the bug did fix the issue in another game for me. Just thought I'd mention this just in case :) Cheers, Filip

Oct. 30, 2016

Re: [PATCH 6/7] ddraw: Implement executebuffer point and line draws.

by Stefan Dösinger

Am 2016-10-30 um 07:02 schrieb Stefan Dösinger: > + case D3DOP_LINE: > + primitive_size = 2; > + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_LINELIST); I should probably mention the purpose of this patch: It fixes the minimap and bike performance display in Moto Racer 2.

Oct. 30, 2016

Re: [PATCH] ws2_32: Fix the default behavior of IPV6_V6ONLY

by Bruno Jesus

On Sat, Oct 29, 2016 at 10:37 PM, Marvin <testbot(a)winehq.org> wrote: > === w2008s64 (64 bit sock) === > sock: unhandled exception c0000005 at 000007FEFF126F94 Unfortunately a well-known issue. Clean run https://testbot.winehq.org/JobDetails.pl?Key=26344 I just started wondering if there is a difference between testing the patches manually and letting Marvin test them, because it is quite common for people to send a reference to a "clean run" whenever Marvin sends such emails.

Oct. 30, 2016

Re: [PATCH] ws2_32: Fix the default behavior of IPV6_V6ONLY

by Marvin

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=26345 Your paranoid android. === w2008s64 (64 bit sock) === sock: unhandled exception c0000005 at 000007FEFF126F94

Oct. 30, 2016

Re: d3dx9: d3dx9_base_effect_get_pass_desc

by Henri Verbeet

On 29 October 2016 at 21:11, Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> wrote: > Could anyone help improving this patch so that it makes it to the wine > tree? At first sight: >> @@ -5955,6 +5995,8 @@ static HRESULT d3dx9_base_effect_init(struct >> d3dx9_base_effect *base, >> >> base->effect = effect; >> >> + base->clonable = TRUE; >> + Did you perhaps intend to store "eflags" instead here? >> + if (base->clonable) >> + { And then check "base->flags" against D3DXFX_NOT_CLONEABLE here. >> + if (vshader) >> + { >> + IDirect3DVertexShader9_GetFunction(vshader, >> NULL, >> &size); >> + if (desc->pVertexShaderFunction) >> + free((void *)desc->pVertexShaderFunction); >> + desc->pVertexShaderFunction = malloc(size); >> + IDirect3DVertexShader9_GetFunction(vshader, >> (void >> *)(desc->pVertexShaderFunction), &size); >> + } Why not move this out of the loop? >> + if (pshader) >> + { >> + IDirect3DPixelShader9_GetFunction(pshader, NULL, >> &size); >> + if (desc->pPixelShaderFunction) >> + free((void *)desc->pPixelShaderFunction); >> + desc->pPixelShaderFunction = malloc(size); >> + IDirect3DPixelShader9_GetFunction(pshader, (void >> *)(desc->pPixelShaderFunction), &size); >> + } Likewise.

Oct. 29, 2016

Re: d3dx9: d3dx9_base_effect_get_pass_desc

by Luis C. Busquets Pérez

Could anyone help improving this patch so that it makes it to the wine tree? > --- > dlls/d3dx9_36/effect.c | 46 > ++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 44 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 42f5aea..c69b73c 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -150,6 +150,7 @@ struct d3dx9_base_effect > UINT parameter_count; > UINT technique_count; > UINT object_count; > + BOOL clonable; > > struct d3dx_parameter *parameters; > struct d3dx_technique *techniques; > @@ -999,6 +1000,11 @@ static HRESULT > d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, > D3DXHANDLE pass, D3DXPASS_DESC *desc) > { > struct d3dx_pass *p = get_valid_pass(base, pass); > + struct d3dx_state *s; > + struct d3dx_parameter *param; > + IDirect3DVertexShader9 *vshader; > + IDirect3DPixelShader9 *pshader; > + UINT i, size; > > if (!desc || !p) > { > @@ -1008,11 +1014,45 @@ static HRESULT > d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, > > desc->Name = p->name; > desc->Annotations = p->annotation_count; > - > - FIXME("Pixel shader and vertex shader are not supported, > yet.\n"); > desc->pVertexShaderFunction = NULL; > desc->pPixelShaderFunction = NULL; > > + if (base->clonable) > + { > + for (i=0; i < p->state_count; i++) > + { > + s = p->states + i; > + if (state_table[s->operation].class == SC_VERTEXSHADER) > + { > + param = &(s->parameter); > + vshader = *(struct IDirect3DVertexShader9 **)param- > > > > data; > + if (vshader) > + { > + IDirect3DVertexShader9_GetFunction(vshader, > NULL, > &size); > + if (desc->pVertexShaderFunction) > + free((void *)desc->pVertexShaderFunction); > + desc->pVertexShaderFunction = malloc(size); > + IDirect3DVertexShader9_GetFunction(vshader, > (void > *)(desc->pVertexShaderFunction), &size); > + } > + } > + if (state_table[s->operation].class == SC_PIXELSHADER) > + { > + param = &(s->parameter); > + pshader = *(struct IDirect3DPixelShader9 **)param- > > > > data; > + if (pshader) > + { > + IDirect3DPixelShader9_GetFunction(pshader, NULL, > &size); > + if (desc->pPixelShaderFunction) > + free((void *)desc->pPixelShaderFunction); > + desc->pPixelShaderFunction = malloc(size); > + IDirect3DPixelShader9_GetFunction(pshader, (void > *)(desc->pPixelShaderFunction), &size); > + } > + } > + } > + } > + > + TRACE("Pass '%s': %i annots. Vertexshader %p and Pixelshader > %p\n", desc->Name, desc->Annotations, desc->pVertexShaderFunction, > desc->pPixelShaderFunction); > + > return D3D_OK; > } > > @@ -5955,6 +5995,8 @@ static HRESULT d3dx9_base_effect_init(struct > d3dx9_base_effect *base, > > base->effect = effect; > > + base->clonable = TRUE; > + > read_dword(&ptr, &tag); > TRACE("Tag: %x\n", tag); > > -- > 2.7.4

Oct. 29, 2016

Re: Imort system certificates in crypt32@Wine

by Donat Enikeev

Hi Jacek, I've applied your recommendations and submitted new version to @wine-patches > Also, it seems that we don't really have tests using root store. It > would be nice to have some. Generic test for this and other common stores are submitted as well, it took slightly more time, as appeared that certs for HKCU\MY are not saved in the registry, but in %AppData%, even though it is explicitly declared to use registry physical store. However, this test doesn't cover expressing of system certs into registry, as I hasn't figured out yet, how to do that in a portable way, so that tests are reliably working in a) the read-only context, b) across distributions and c) in the future, considering certificates revocation and expiration (ftr I have 173 certificates in /etc/ssl/certs/ca-certificates.crt shipped with distribution, not counting another hundreds of Mozilla) Re-implementing certs import from scratch for the reference, so tests are well-independent, would have taken notable amount of time, while putting hacks into the code for the test-purposes only - looks redundantly (and such patches will not be accepted, I suppose :). I am still thinking on this, but probably you would have (or already have) ideas how to do that in more elegant way Looking forward Best, Donnie On Чт, окт 27, 2016 at 2:15 , Jacek Caban <jacek(a)codeweavers.com> wrote: > Hi Donnie, > > On 26.10.2016 21:29, Donat Enikeev wrote: >> Hi Jacek, >> >> Following your proposal over the previous patch, that it should be >> a step forward to the implementation closer to the original >> behaviour, >> >> I've prepared different version of patch: >> >> 1. sligthly changed existing functions saving certs to the registry >> (to be able to pass the REG_OPTION_VOLATILE flag) >> 2. replaced the RootStore entity and everything related with new >> CRYPT_ImportSystemRootCertsToReg() that does actual import (once) >> into REG_OPTION_VOLATILE keys >> 3. start calling this import whenever an application is reaching >> necessity to work with HKLM\Root certs store as previously, however >> the latter call could be moved to the DllMain >> >> Does it look better? > > Yes, it looks better. I have a few comments from a quick review. > >> static const char * const CRYPT_knownLocations[] = { >> "/etc/ssl/certs/ca-certificates.crt", >> "/etc/ssl/certs", >> @@ -492,6 +445,7 @@ static const char * const >> CRYPT_knownLocations[] = { >> "/etc/security/cacerts", /* Android */ >> }; >> >> +/* This cert had been expired on 31.12.1999, shoult we delete it ? >> */ >> static const BYTE authenticode[] = { >> >> 0x30,0x82,0x03,0xd6,0x30,0x82,0x02,0xbe,0xa0,0x03,0x02,0x01,0x02,0x02,0x01,0x01, >> >> 0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x04,0x05,0x00,0x30, >> @@ -555,6 +509,10 @@ static const BYTE authenticode[] = { >> >> 0x60,0xdc,0x82,0x1f,0xfb,0xce,0x74,0x06,0x7e,0xd6,0xf1,0xac,0x19,0x6a,0x4f,0x74, >> >> 0x5c,0xc5,0x15,0x66,0x31,0x6c,0xc1,0x62,0x71,0x91,0x0f,0x59,0x5b,0x7d,0x2a,0x82, >> 0x1a,0xdf,0xb1,0xb4,0xd8,0x1d,0x37,0xde,0x0d,0x0f }; >> + >> +/* Microsoft Root Authority >> + * Valid to 31.12.2020, please consider update after this date >> + */ >> static const BYTE rootauthority[] = { >> >> 0x30,0x82,0x04,0x12,0x30,0x82,0x02,0xfa,0xa0,0x03,0x02,0x01,0x02,0x02,0x0f,0x00, >> >> 0xc1,0x00,0x8b,0x3c,0x3c,0x88,0x11,0xd1,0x3e,0xf6,0x63,0xec,0xdf,0x40,0x30,0x0d, >> @@ -622,6 +580,10 @@ static const BYTE rootauthority[] = { >> >> 0x04,0xe4,0xa8,0x45,0x04,0xc8,0x5a,0x33,0x38,0x6e,0x4d,0x1c,0x0d,0x62,0xb7,0x0a, >> >> 0xa2,0x8c,0xd3,0xd5,0x54,0x3f,0x46,0xcd,0x1c,0x55,0xa6,0x70,0xdb,0x12,0x3a,0x87, >> 0x93,0x75,0x9f,0xa7,0xd2,0xa0 }; >> + >> +/* Microsoft Root Authority Certificate >> + * Valid to 09.05.2021, please consider update after this date >> + */ > > Please avoid unrelated changes in part of code that you don't touch. > The > patch changes enough places already. > >> static const BYTE rootcertauthority[] = { >> >> 0x30,0x82,0x05,0x99,0x30,0x82,0x03,0x81,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x79, >> >> 0xad,0x16,0xa1,0x4a,0xa0,0xa5,0xad,0x4c,0x73,0x58,0xf4,0x07,0x13,0x2e,0x65,0x30, >> @@ -790,55 +752,48 @@ static void >> read_trusted_roots_from_known_locations(HCERTSTORE store) >> >> static HCERTSTORE create_root_store(void) >> { >> - HCERTSTORE root = NULL; >> HCERTSTORE memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, >> X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); >> >> if (memStore) >> { >> - CERT_STORE_PROV_INFO provInfo = { >> - sizeof(CERT_STORE_PROV_INFO), >> - sizeof(rootProvFuncs) / sizeof(rootProvFuncs[0]), >> - rootProvFuncs, >> - NULL, >> - 0, >> - NULL >> - }; >> - >> read_trusted_roots_from_known_locations(memStore); >> add_ms_root_certs(memStore); >> - root = CRYPT_ProvCreateStore(0, memStore, &provInfo); >> } >> - TRACE("returning %p\n", root); >> - return root; >> + TRACE("returning %p\n", memStore); >> + return memStore; >> } >> >> -static WINECRYPT_CERTSTORE *CRYPT_rootStore; >> +static LONG root_certs_imported = 0; >> >> -WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, >> DWORD dwFlags) >> +static const WCHAR certs_root_path[] = >> + >> {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', >> + >> 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s','\\', >> + 'R','o','o','t','\\', >> 'C','e','r','t','i','f','i','c','a','t','e','s', 0}; >> + >> +BOOL CRYPT_ImportSystemRootCertsToReg(void) >> { >> - TRACE("(%ld, %08x)\n", hCryptProv, dwFlags); >> + HCERTSTORE store = NULL; >> + HKEY key; >> + BOOL ret = FALSE; >> + LONG rc; >> >> - if (dwFlags & CERT_STORE_DELETE_FLAG) >> - { >> - WARN("root store can't be deleted\n"); >> - SetLastError(ERROR_ACCESS_DENIED); >> - return NULL; >> - } >> - if (!CRYPT_rootStore) >> - { >> - HCERTSTORE root = create_root_store(); >> + TRACE("\n"); >> + >> + if (root_certs_imported) return FALSE; > > To guarantee that it's called only once per process, INIT_ONCE would > be > nicer. However, in this case, we'd like to have it done only once per > wineserver session. For that CreateMutex seems like a good choice. > > Also, there is no need to return BOOL if since return value is not > used > anyway. > > Also, it seems that we don't really have tests using root store. It > would be nice to have some. > > Thanks, > Jacek

Oct. 28, 2016

Re: [PATCH] d2d1: Use transformed geometry to translate glyph run outline

by Nikolay Sivov

On 28.10.2016 16:55, Henri Verbeet wrote: > On 28 October 2016 at 13:23, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> >> --- >> dlls/d2d1/render_target.c | 27 +++++++++++++++++++-------- >> 1 file changed, 19 insertions(+), 8 deletions(-) >> > This is probably fine, but why would you want to do that? > > Only to make it work as a single geometry filling command, instead of three - adjusting target transform/filling/reverting transform. But as you pointed out until major issue with resources is resolved this is premature.

Oct. 28, 2016

Re: [PATCH] wined3d: Invalidate INDEXBUFFER device state when contents of bound index buffer is changed.

by Henri Verbeet

On 28 October 2016 at 12:20, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (buffer->resource.bind_count) > + { > + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER) > + device_invalidate_state(buffer->resource.device, STATE_INDEXBUFFER); > + } You can merge those if-conditions. What happens exactly that makes this required?

Oct. 28, 2016