January 2015 - Wine-Devel - list.winehq.org

Re: windowscodecs: DibDecoder_CreateInstance() is unused so remove it.

by Vincent Povirk

The original intent was that this could be used by d3dx9 to implement reading of the DIB format, but I didn't have the knowledge of d3dx9 to test that this really does what is needed.

Jan. 5, 2015

Re: fonts: Added glyphs handptleft, handptright and handptdwn for wingdings, fixed handptup.

by Qian Hong

On Wed, Dec 31, 2014 at 5:28 PM, Qian Hong <qhong(a)codeweavers.com> wrote: > However, I would like to bring a related discussion: > - Could we copy glyphs from GPL font like WenQuanYi Micro Hei and reuse in > Wine fonts? > - Could we copy glyphs from Apache license font like Adobe Source Han Sans > and reuse in Wine fonts? Anyone has comment on the above questions please? And one more: Could we copy glyphs from symbola font and reuse in Wine fonts? Symbola font is "offered free for any use", according to its official page: http://users.teilar.gr/~g1951d/ It also pass fedora's license review: https://bugzilla.redhat.com/show_bug.cgi?id=532819 FWIW, Yida Wang is working on an experiment program, using smart computer vision algorithm like PCANet ( http://arxiv.org/abs/1404.3606 ), to discover similar wingdings glyphs from symbola fonts automatically. So far the result is not bad, see the two attachments, windings.png is wingdings glyphs, and symbola.png is similar glyphs from symbola which map to wingdings glyphs. The result is not complete, it is just an experiment. Once the program is trained and optimized we could use it to discover more glyphs for wingdings/wingdings2/wingdings3/webdings/mtextra and even more, which are useful for not only Wine, but also Libreoffice, WPS and other Linux application. That might also bring a new question: would we want to redistribute Wingdings and similar fonts outsite of Wine, so that they could be installed to system directories like /usr/share/fonts/truetype and reused by application like WPS and Libreoffice? Any comment is still great appreciated! -- Regards, Qian Hong - http://www.codeweavers.com

Jan. 5, 2015

Re: [PATCH 3/5] opengl32: Fix extension checks on OpenGL core profile contexts.

by Henri Verbeet

On 5 January 2015 at 17:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > static BOOL has_extension( const char *list, const char *ext, size_t len ) > { > + if (!list) > + { > + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; > + const char *gl_ext; > + unsigned int i; > + GLint extensions_count; > + > + glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); > + for (i = 0; i < extensions_count; ++i) > + { > + gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); > + if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) > + return TRUE; > + } > + return FALSE; > + } > + If I'm reading this correctly, this effectively ignores DisabledExtensions for anything newer than GL 3.0. (And at least as far as wglGetProcAddress() is concerned it affects both compatibility and core contexts.) > + gl_version = (const char *)glGetString(GL_VERSION); > + sscanf(gl_version, "%u", &major); > + if (major >= 3) > + { It seems tempting to just flag the context in wglCreateContextAttribsARB() under the appropriate conditions, perhaps in a similar way to wgl_handle_type. Not sure if it would really make it better though. As an aside, note that winex11.drv also uses "glGetString(GL_EXTENSIONS);" in X11DRV_WineGL_InitOpenglInfo().

Jan. 5, 2015

Re: [PATCH 5/5] wined3d: Prefer the core glActiveTexture function.

by Henri Verbeet

On 5 January 2015 at 17:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +#define MAP_GL_FUNCTION(core_func, ext_func) \ > + { \ > + if (!gl_info->gl_ops.ext.p_##core_func) \ > + gl_info->gl_ops.ext.p_##core_func = gl_info->gl_ops.ext.p_##ext_func; \ > + } > + > + MAP_GL_FUNCTION(glActiveTexture, glActiveTextureARB); > +#undef MAP_GL_FUNCTION > + This kind of thing doesn't exactly fill me with joy, but I guess the alternatives wouldn't be much better. Any reason this can't be part of load_gl_funcs()? (And while we're touching load_gl_funcs(), I don't see much of a reason we couldn't just inline GL_EXT_FUNCS_GEN these days.) > + /* Newer core functions */ \ > + USE_GL_FUNC(glActiveTexture) \ It would probably be nice to note the exact GL version where the function entered core GL.

Jan. 5, 2015

Re: [PATCH 5/5] wined3d: Prefer the core glActiveTexture function.

by Matteo Bruni

2015-01-05 17:49 GMT+01:00 Matteo Bruni <matteo.mystral(a)gmail.com>: > 2015-01-05 17:39 GMT+01:00 Wojciech Arabczyk <arabek(a)gmail.com>: >> On 5 January 2015 at 17:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> >>> diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c >>> index 4da8c7d..023bcbf 100644 >>> --- a/dlls/wined3d/context.c >>> +++ b/dlls/wined3d/context.c >>> @@ -1328,8 +1328,8 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc >>> >>> for (i = 0; i < count; ++i) >>> { >>> - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); >>> - checkGLcall("glActiveTextureARB"); >>> + GL_EXTCALL(glActiveTexture(GL_TEXTURE0_ARB + i)); >>> + checkGLcall("glActiveTexture"); >> >> Per analogy, shouldn't this be GL_TEXTURE0 instead? > > Yes, good point. To add some more context: the point of this patch (and more in the same vein coming down the road) is to replace calls to functions which potentially aren't exported in the GL core profile with their "core" version. So replacing the constant with the non-_ARB version here isn't strictly needed but it's certainly a good idea since I'm touching those lines anyway. I'm going to resend this one later today with that fixed, unless I get some other feedback in the meantime. >> >>> { >>> - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0 + unit)); >>> - checkGLcall("glActiveTextureARB"); >>> + GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); >>> + checkGLcall("glActiveTexture"); >>> context->active_texture = unit; >>> } >>> >> >> -- >> With kind regards >> Wojciech Arabczyk

Jan. 5, 2015

Re: [PATCH 5/5] wined3d: Prefer the core glActiveTexture function.

by Matteo Bruni

2015-01-05 17:39 GMT+01:00 Wojciech Arabczyk <arabek(a)gmail.com>: > On 5 January 2015 at 17:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > >> diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c >> index 4da8c7d..023bcbf 100644 >> --- a/dlls/wined3d/context.c >> +++ b/dlls/wined3d/context.c >> @@ -1328,8 +1328,8 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc >> >> for (i = 0; i < count; ++i) >> { >> - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); >> - checkGLcall("glActiveTextureARB"); >> + GL_EXTCALL(glActiveTexture(GL_TEXTURE0_ARB + i)); >> + checkGLcall("glActiveTexture"); > > Per analogy, shouldn't this be GL_TEXTURE0 instead? Yes, good point. > >> { >> - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0 + unit)); >> - checkGLcall("glActiveTextureARB"); >> + GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); >> + checkGLcall("glActiveTexture"); >> context->active_texture = unit; >> } >> > > -- > With kind regards > Wojciech Arabczyk

Jan. 5, 2015

Re: [PATCH 4/5] d3d9/tests: Remove a couple duplicate lines.

by Matteo Bruni

2015-01-05 17:37 GMT+01:00 Bruno Jesus <00cpxxx(a)gmail.com>: > On Mon, Jan 5, 2015 at 2:17 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > > Ciao, Matteo. > >> --- >> dlls/d3d9/tests/visual.c | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c >> index d1aa3d4..acc3a44 100644 >> --- a/dlls/d3d9/tests/visual.c >> +++ b/dlls/d3d9/tests/visual.c >> @@ -6775,8 +6775,6 @@ static void pretransformed_varying_test(void) >> hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); >> ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); >> >> - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); >> - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); > > Isn't this done on purpose to check if double setting works? The idea might have been that but I don't think this is interesting to test. Actually it looks more like the side effect of multiple separate changes done over the course of the years over that piece of code. > Distinti Saluti, > Bruno Cheers ;)

Jan. 5, 2015

Re: [PATCH 5/5] wined3d: Prefer the core glActiveTexture function.

by Wojciech Arabczyk

On 5 January 2015 at 17:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c > index 4da8c7d..023bcbf 100644 > --- a/dlls/wined3d/context.c > +++ b/dlls/wined3d/context.c > @@ -1328,8 +1328,8 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc > > for (i = 0; i < count; ++i) > { > - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); > - checkGLcall("glActiveTextureARB"); > + GL_EXTCALL(glActiveTexture(GL_TEXTURE0_ARB + i)); > + checkGLcall("glActiveTexture"); Per analogy, shouldn't this be GL_TEXTURE0 instead? > { > - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0 + unit)); > - checkGLcall("glActiveTextureARB"); > + GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); > + checkGLcall("glActiveTexture"); > context->active_texture = unit; > } > -- With kind regards Wojciech Arabczyk

Jan. 5, 2015

Re: [PATCH 4/5] d3d9/tests: Remove a couple duplicate lines.

by Bruno Jesus

On Mon, Jan 5, 2015 at 2:17 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: Ciao, Matteo. > --- > dlls/d3d9/tests/visual.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c > index d1aa3d4..acc3a44 100644 > --- a/dlls/d3d9/tests/visual.c > +++ b/dlls/d3d9/tests/visual.c > @@ -6775,8 +6775,6 @@ static void pretransformed_varying_test(void) > hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); > ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); > > - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); > - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); Isn't this done on purpose to check if double setting works? Distinti Saluti, Bruno

Jan. 5, 2015

Re: loader: More generic pre_exec for Linux (try 2)

by André Hentschel

Am 29.12.2014 um 23:03 schrieb André Hentschel: > --- > loader/main.c | 26 ++++++++++++++++++-------- > 1 file changed, 18 insertions(+), 8 deletions(-) [After a small IRC discussion] My main goal is to also get the 2G/2G vmsplit warning on ARM, too. (and potential other platforms) There are still many ARM kernels out there with a 2G split. The problem is that Wine can't start on 2G/2G, it seems there are too much assumptions in the code for a 3G split. e.g. for shared user data. We can't allocate 0x7ffe0000-0x7fff0000 on 2G split, most likely something else is already there, idk

Jan. 5, 2015