July 2013 - Wine-devel - list.winehq.org

Re: [PATCH] winemac.drv: Also return the number of pixel formats if the caller didn't supply a PIXELFORMATDESCRIPTOR.
by Ken Thomases 24 Jul '13

24 Jul '13

On Jul 23, 2013, at 10:26 PM, Charles Davis wrote: > This is akin to what glxdrv already does, and apparently what Windows > does. It allows the GLView sample from the OpenGL SuperBible to > correctly enumerate pixel formats with the Mac driver. > --- > dlls/winemac.drv/opengl.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c > index 0922371..fb294d1 100644 > --- a/dlls/winemac.drv/opengl.c > +++ b/dlls/winemac.drv/opengl.c > @@ -3281,7 +3281,7 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI > > TRACE("hdc %p fmt %d size %u descr %p\n", hdc, fmt, size, descr); > > - if (fmt <= 0 || fmt > ret) return ret; > + if (fmt <= 0 || fmt > ret || !descr) return ret; > if (size < sizeof(*descr)) return 0; > > pf = &pixel_formats[fmt - 1]; > -- > 1.7.5.4 Looks good to me. Thanks! -Ken

1 0

Re: [PATCH] winemac.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string.
by Ken Thomases 24 Jul '13

24 Jul '13

Hi, On Jul 23, 2013, at 10:26 PM, Charles Davis wrote: > @@ -1226,8 +1227,10 @@ static BOOL init_gl_info(void) > gl_info.glVersion = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); > strcpy(gl_info.glVersion, str); > str = (const char*)opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); > - gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); > + gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str) + > + sizeof(" WGL_EXT_extensions_string WGL_EXT_swap_control")); > strcpy(gl_info.glExtensions, str); > + strcat(gl_info.glExtensions, " WGL_EXT_extensions_string WGL_EXT_swap_control"); As a minor nitpick, I would prefer to avoid that duplicated string literal. Otherwise, looks good to me. Cheers, Ken

1 0

Re: [PATCH 4/5] scrrun: Add IFileSystem3::GetTempName implementation
by Alexandre Julliard 24 Jul '13

24 Jul '13

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -174,6 +174,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) > case DLL_PROCESS_ATTACH: > DisableThreadLibraryCalls( hinst ); > scrrun_instance = hinst; > + srand(GetTickCount()); You don't want to do that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: po: Update English (US) resource
by Francois Gouget 24 Jul '13

24 Jul '13

On Mon, 22 Jul 2013, Ken Sharp wrote: > Logon/Log on as with the British/neutral patch. > > msgid "Can't logon with inter-domain trust account.\n" > -msgstr "Can't logon with inter-domain trust account.\n" > +msgstr "Can't log on with inter-domain trust account.\n" [...] I think these fixes should really be applied to the source winerror.mc file instead. If I remember correctly en_US.po is just a dummy translation where msgid and msgstr strings should be identical (there might (with maybe one or two exceptions for things like um -> µm). -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Be careful of reading health books, you might die of a misprint. -- Mark Twain

2 1

Re: [PATCH 1/3] msvcrt: Fix _mktemp implementation
by Marvin 24 Jul '13

24 Jul '13

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 http://testbot.winehq.org/JobDetails.pl?Key=26413 Your paranoid android. === W2KPROSP4 (32 bit file) === file: unhandled exception c0000005 at 7801B5A7 === WXPPROSP2 (32 bit file) === file: unhandled exception c0000005 at 77C2F1C3 === W2K3R2SESP2 (32 bit file) === file: unhandled exception c0000005 at 77BC00A3 === WXPX64 (64 bit file) === Timeout

1 0

Re: [PATCH 1/3] d3dx9: Fix initialization of D3DXPC_OBJECTs.
by Rico Schüller 23 Jul '13

23 Jul '13

On 23.07.2013 11:46, Rico Schüller wrote: > --- > dlls/d3dx9_36/effect.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > > > > These may not apply correctly. Sorry for the noise. I'll resend a new version. Cheers Rico

1 0

Re: [docs] "sgml" is not a valid output format
by Francois Gouget 23 Jul '13

23 Jul '13

On Tue, 23 Jul 2013, Frédéric Delanoy wrote: [...] > -ALLFORMATS = html pdf sgml ps txt > +ALLFORMATS = html pdf ps txt 'make sgml' can be used to generate the translated SGML source files for our many documentation translations. So I don't think this patch should be applied. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The last time religion ruled, it was called the dark ages.

1 0

Re: [docs] "sgml" is not a valid output format
by Frédéric Delanoy 23 Jul '13

23 Jul '13

On Tue, Jul 23, 2013 at 5:26 PM, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > --- > Make.rules.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Make.rules.in b/Make.rules.in > index fda8e81..d326247 100644 > --- a/Make.rules.in > +++ b/Make.rules.in > @@ -100,7 +100,7 @@ dummy: > > # Manual Dependencies > > -ALLFORMATS = html pdf sgml ps txt > +ALLFORMATS = html pdf ps txt Please discard this patch ; it seems to be used in the translated guides to generate sgml from english version+po file

1 0

Re: [1/5] oledb32: Stub for IRowPosition
by Marvin 23 Jul '13

23 Jul '13

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 http://testbot.winehq.org/JobDetails.pl?Key=26406 Your paranoid android. === WINEBUILD (build) === Make failed

2 1

Re: [PATCH 1/2] wined3d: Implement special fog behavior for orthogonal projection matrices.
by Henri Verbeet 23 Jul '13

23 Jul '13

On 22 July 2013 20:24, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -3614,10 +3614,19 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct > & WINED3D_FFP_LIGHT_TYPE_MASK) << WINED3D_FFP_LIGHT_TYPE_SHIFT(i); > } > > + settings->ortho_fog = 0; > if (!state->render_states[WINED3D_RS_FOGENABLE]) > settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; > else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) > + { > settings->fog_mode = WINED3D_FFP_VS_FOG_DEPTH; > + > + if (state->transforms[WINED3D_TS_PROJECTION].u.m[0][3] == 0.0f > + && state->transforms[WINED3D_TS_PROJECTION].u.m[1][3] == 0.0f > + && state->transforms[WINED3D_TS_PROJECTION].u.m[2][3] == 0.0f > + && state->transforms[WINED3D_TS_PROJECTION].u.m[3][3] == 1.0f) > + settings->ortho_fog = 1; > + } I'm going to guess "No, because the projection matrix is ignored.", but does this "feature" apply to transformed vertices as well?

1 0