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

Re: [PATCH 1/5] wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location.

by Matteo Bruni

2016-06-02 0:59 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > On Wed, Jun 1, 2016 at 11:16 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> >> --- >> dlls/wined3d/glsl_shader.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c >> index e5a0e69..4e773b6 100644 >> --- a/dlls/wined3d/glsl_shader.c >> +++ b/dlls/wined3d/glsl_shader.c >> @@ -6363,10 +6363,15 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr >> >> shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); >> >> + if (shader_glsl_use_explicit_attrib_location(gl_info)) >> + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); >> + >> for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) >> { >> const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4"; >> >> + if (shader_glsl_use_explicit_attrib_location(gl_info)) >> + shader_addline(buffer, "layout(location = %u) ", i); >> shader_addline(buffer, "%s %s vs_in%u;\n", get_attribute_keyword(gl_info), type, i); >> } >> shader_addline(buffer, "\n"); >> -- >> 2.7.3 >> >> >> > > I am not sure how I missed this... Thanks! No problem. I guess some OpenGL implementations by default assign attribute locations in the order they are declared. That's apparently not the case with Mesa and the tests were pretty loud in telling me that :)

June 1, 2016

Re: [PATCH 1/5] wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location.

by Józef Kucia

On Wed, Jun 1, 2016 at 11:16 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/wined3d/glsl_shader.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index e5a0e69..4e773b6 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -6363,10 +6363,15 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr > > shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); > > + if (shader_glsl_use_explicit_attrib_location(gl_info)) > + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); > + > for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) > { > const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4"; > > + if (shader_glsl_use_explicit_attrib_location(gl_info)) > + shader_addline(buffer, "layout(location = %u) ", i); > shader_addline(buffer, "%s %s vs_in%u;\n", get_attribute_keyword(gl_info), type, i); > } > shader_addline(buffer, "\n"); > -- > 2.7.3 > > > I am not sure how I missed this... Thanks!

June 1, 2016

Re: [v2] setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status

by André Hentschel

Hi Bob, Am 01.06.2016 um 22:22 schrieb Bob Wya: > Hi André, > > I've resubmitted the patch as you suggested (v2). Sorry after re-submitting it I realised I should have cc'd you in. Hopefully I've read the MSDN docs right this time!! Prototype looks good now, thx! > Just taking some baby steps - to get my feet wet so to speak... I'm working on fixing up an existing / long-standing, "unglamorous" wine bug - that is taking some "real work" now. :-) That's great to hear! Just some remarks for v3 (which should then be good to go): Am 30.05.2016 um 11:40 schrieb Rob Walker: > +CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, > + ULONG ulFlags) > +{ > + FIXME("%p %p 0x%08x 0x%08x: stub\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags); > + return CR_FAILURE; > +} > + > +/*********************************************************************** > + * CM_Get_DevNode_Status_Ex (SETUPAPI.@) > + */ > +CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, > + ULONG ulFlags, HMACHINE hMachine) > +{ > + FIXME("%p %p 0x%08x 0x%08x %p: stub\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags, hMachine); > + return CR_FAILURE; > +} Please avoid "PULONG" style variables, instead use e.g. "ULONG *status" Further we normally don't copy the variable names, because they often are camelcase and/or hungarian notation, which we avoid both for new code. I'd suggest something like: status, number, dev, flags, machine

June 1, 2016

Re: [PATCH] d3dx9_36: Stop crash when displaying effect errors

by Matteo Bruni

2016-06-01 12:18 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx9_36/effect.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 7772406..a72aa3a 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -5969,7 +5969,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, > if (bytecode) > ID3D10Blob_Release(bytecode); > if (temp_errors) > - TRACE("%s\n", (char *)ID3D10Blob_GetBufferPointer(temp_errors)); > + TRACE("%s\n", debugstr_a((char *)ID3D10Blob_GetBufferPointer(temp_errors))); > if (errors) > *errors = temp_errors; > else if (temp_errors) > -- > 2.8.1 What effect / application is crashing because of this and what are the errors?

June 1, 2016

Re: Regression in wined3d

by Bruno Jesus

On Wed, Jun 1, 2016 at 3:16 PM, Fabian Maurer <dark.shadow4(a)web.de> wrote: > Hello, > > I found a regression in the implementation of wined3d that causes a lot of > rendering artifacts in certain games, for example the NekoPara series on > steam. > I uploaded a sample screenshot: http://imgur.com/cIfQDft > > The offending commit is > 1ddf2e47e252fd30976237bd190a98b310909301 wined3d: Use immutable storage for 2D > textures. > > After reverting that commit and it's child > (4f9642d0e90b941e0316137523dbf12588c4bccc), it displays fine again. > Since I don't know too much about the 3d implementation, I'd be glad to have > someone help me with that issue. Hi, please open a bug report so we don't lose track of this issue: https://bugs.winehq.org/ There you can add the same text you added here and copy Józef as well.

June 1, 2016

Regression in wined3d

by Fabian Maurer

Hello, I found a regression in the implementation of wined3d that causes a lot of rendering artifacts in certain games, for example the NekoPara series on steam. I uploaded a sample screenshot: http://imgur.com/cIfQDft The offending commit is 1ddf2e47e252fd30976237bd190a98b310909301 wined3d: Use immutable storage for 2D textures. After reverting that commit and it's child (4f9642d0e90b941e0316137523dbf12588c4bccc), it displays fine again. Since I don't know too much about the 3d implementation, I'd be glad to have someone help me with that issue. Fabian

June 1, 2016

Re: Broken AppDB Test Results Pages

by Jimi Huotari

On 01/06/16 14:47, Rosanne DiMesio wrote: > I deleted the reports that were breaking those pages. FYI, the way to > do that is to go to the page for one of the older test reports Ah, should have thought of that. Thanks. > https://bugs.winehq.org/show_bug.cgi?id=34647 Likewise, should have guessed this is a known bug already... Apologies for the ruckus. Thank you.

June 1, 2016

Re: Broken AppDB Test Results Pages

by Rosanne DiMesio

On Tue, 31 May 2016 12:04:22 +0300 Jimi Huotari <chiitoo(a)gentoo.org> wrote: > So I broke a couple of pages: > > //appdb.winehq.org/objectManager.php?sClass=version&iId=24670 > > //appdb.winehq.org/objectManager.php?sClass=version&iId=24695 > I deleted the reports that were breaking those pages. FYI, the way to do that is to go to the page for one of the older test reports (use Google to find one). That allows the page to render, and you can use the links in the Test Results table to delete or edit the offending test report. > > I already reported the issue upstream of QupZilla, and a fix was quickly > put in place there, but the editor itself remains vulnerable (no idea > how big of an annoyance /really/ exploiting it could become). > https://bugs.winehq.org/show_bug.cgi?id=34647 -- Rosanne DiMesio dimesio(a)earthlink.net

June 1, 2016

Re: [PATCH 2/2] msi/tests: Add test for special InstallService-ErrorControl-flag

by Hans Leidekker

On Tue, 2016-05-31 at 22:44 +0200, Andreas Maier wrote: > diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c > index 243e61b..3213737 100644 > --- a/dlls/msi/tests/action.c > +++ b/dlls/msi/tests/action.c > @@ -234,7 +234,7 @@ static const char service_install2_dat[] = > "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" > "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" > "ServiceInstall\tServiceInstall\n" > - "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\n" > + "TestService\tTestService\tTestService\t2\t3\t0x8000\t\t\tTestService\t\t\tservice_comp\t\n" > "TestService4\tTestService4\tTestService4\t2\t3\t0\t\t\tTestService4\t\t\tservice_comp3\t\n"; This test fails here on Windows. You should label the fix 1/2 to correctly express the dependency.

June 1, 2016