September 2013 - Wine-commits

Bruno Jesus : ws2_32: Remove a FIXME message.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 4981b5b4466bfba3364bb4af1bf054a5df8be2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4981b5b4466bfba3364bb4af1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 09:14:06 2013 -0300 ws2_32: Remove a FIXME message. --- dlls/ws2_32/socket.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d1256c1..ed55b64 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1649,11 +1649,7 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) break; default: - if ((protocol == ISOPROTO_TP4) || (protocol == NSPROTO_SPX)) - FIXME("Protocol <%s> not implemented\n", - (protocol == ISOPROTO_TP4) ? "ISOPROTO_TP4" : "NSPROTO_SPX"); - else - FIXME("unknown Protocol <0x%08x>\n", protocol); + FIXME("unknown Protocol <0x%08x>\n", protocol); return SOCKET_ERROR; } return 1;

1 0

Francois Gouget : loader: Fix the clean target to delete the generated wine_info.plist file.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 93f77f461a469dea8d6233be5bca2d90b1667629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f77f461a469dea8d6233be5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 6 14:31:52 2013 +0200 loader: Fix the clean target to delete the generated wine_info.plist file. --- loader/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index a7ab893..a7859b2 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -66,3 +66,6 @@ uninstall:: $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)/wine.$(prog_manext) + +clean:: + $(RM) wine_info.plist

1 0

Francois Gouget : winegcc: Add a trailing '\n' to the try_link() test file.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 4343c9e1f70457e37f75ec06947854c455dc1b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4343c9e1f70457e37f75ec069… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 6 14:33:17 2013 +0200 winegcc: Add a trailing '\n' to the try_link() test file. This stops the tested gcc command from issuing a warning on Solaris. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 969da3e..5cac73d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -337,7 +337,7 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch strarray *link = strarray_dup( link_tool ); int ret; - create_file( in, 0644, "int main(void){return 1;}" ); + create_file( in, 0644, "int main(void){return 1;}\n" ); strarray_add( link, "-o" ); strarray_add( link, out );

1 0

Francois Gouget : winegcc: Ignore the test link command stdout and stderr messages.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 7d3f6d4c60a33100c879f68746182334f0f49ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f6d4c60a33100c879f6874… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 6 14:33:24 2013 +0200 winegcc: Ignore the test link command stdout and stderr messages. Otherwise invoking winegcc on any platform where our first guess at the link options fails results in a lot of confusing error messages. --- tools/winegcc/winegcc.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5cac73d..273210a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -334,7 +334,9 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch { const char *in = get_temp_file( "try_link", ".c" ); const char *out = get_temp_file( "try_link", ".out" ); + const char *err = get_temp_file( "try_link", ".err" ); strarray *link = strarray_dup( link_tool ); + int sout = -1, serr = -1; int ret; create_file( in, 0644, "int main(void){return 1;}\n" ); @@ -344,7 +346,21 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch strarray_addall( link, strarray_fromstring( cflags, " " ) ); strarray_add( link, in ); + sout = dup( fileno(stdout) ); + freopen( err, "w", stdout ); + serr = dup( fileno(stderr) ); + freopen( err, "w", stderr ); ret = spawn( prefix, link, 1 ); + if (sout >= 0) + { + dup2( sout, fileno(stdout) ); + close( sout ); + } + if (serr >= 0) + { + dup2( serr, fileno(stderr) ); + close( serr ); + } strarray_free( link ); return ret; }

1 0

Ralf Habacker : gdi32: Fixed Rectangle() rotation with GM_ADVANCED graphics mode in dib driver.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 39629a3d35f1bf4453733f70685110208c4f778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39629a3d35f1bf4453733f706… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Fri Aug 30 12:39:12 2013 +0200 gdi32: Fixed Rectangle() rotation with GM_ADVANCED graphics mode in dib driver. --- dlls/gdi32/dibdrv/graphics.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d91ef11..f3aaeb6 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1285,6 +1285,15 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); + if (GetGraphicsMode( dev->hdc ) == GM_ADVANCED) + { + pts[0].x = pts[3].x = left; + pts[0].y = pts[1].y = top; + pts[1].x = pts[2].x = right; + pts[2].y = pts[3].y = bottom; + return dibdrv_Polygon( dev, pts, 4 ); + } + if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;

1 0

Marcus Meissner : mciqtz32: Do not print uninitialized variables (Coverity) .
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: c6761b8b9dc13eca8293ffcefb5bd19608fbffc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6761b8b9dc13eca8293ffcef… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 31 13:17:56 2013 +0200 mciqtz32: Do not print uninitialized variables (Coverity). --- dlls/mciqtz32/mciqtz.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 546f3ed..eb77929 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -733,13 +733,13 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_SOURCE_MAX stub\n"); IBasicVideo_GetSourcePosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub\n"); IBasicVideo_GetDestinationPosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_DESTINATION %s\n", wine_dbgstr_rect(&rc)); }

1 0

Frédéric Delanoy : loader: Mention builtin executables in wine manpage.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: ee771fddaacfdcc3d33b8cb46ac1f638b353b3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee771fddaacfdcc3d33b8cb46… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 17:14:36 2013 +0200 loader: Mention builtin executables in wine manpage. --- loader/wine.man.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 6b60000..f5647a3 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -53,6 +53,10 @@ a shell, e.g. .PP wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMyPrg\(rs\(rstest.exe .PP +It can also be one of the Windows executables shipped with Wine, in +which case specifying the full path is not mandatory, e.g. \fIwine +explorer\fR or \fIwine notepad\fR. +.PP .SH ENVIRONMENT .B wine makes the environment variables of the shell from which it

1 0

Ken Thomases : winemac: Add support for mouse-move and right- and middle-click events on systray icons in the Mac status bar .
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 7ed00f6d975718ab32cf30a7fe6c6c27c8f69364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed00f6d975718ab32cf30a7f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 5 22:23:52 2013 -0500 winemac: Add support for mouse-move and right- and middle-click events on systray icons in the Mac status bar. --- dlls/winemac.drv/cocoa_status_item.m | 136 +++++++++++++++++++++++++++++---- dlls/winemac.drv/event.c | 13 ++- dlls/winemac.drv/macdrv.h | 3 +- dlls/winemac.drv/macdrv_cocoa.h | 10 ++- dlls/winemac.drv/systray.c | 69 ++++++++++++----- 5 files changed, 186 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ed00f6d975718ab32cf3…

1 0

Henri Verbeet : wined3d: Return 1 instead of 0 for max_vertex_blend_matrices in glsl_vertex_pipe_vp_get_caps ().
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 137590be3106c0589947c09ba0a626349e2e4a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=137590be3106c0589947c09ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:39 2013 +0200 wined3d: Return 1 instead of 0 for max_vertex_blend_matrices in glsl_vertex_pipe_vp_get_caps(). It's not necessarily clear to me that one is better than the other here, but this is what we returned in the old GL fixed function implementation of the D3D fixed function vertex pipe, and apparently EverQuest depends on this. This fixes a regression introduced by commit 2014141a253a791fc9c79aae3c8ef3c35b73e658. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0dd0197..37661d3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6808,7 +6808,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, { caps->xyzrhw = TRUE; caps->max_active_lights = gl_info->limits.lights; - caps->max_vertex_blend_matrices = 0; + caps->max_vertex_blend_matrices = 1; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN | WINED3DVTXPCAPS_MATERIALSOURCE7

1 0

Henri Verbeet : wined3d: Get rid of the SFLAG_INTEXTURE / SFLAG_INSRGBTEX check in surface_set_texture_name().
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 7859509f5b09ee2184c8c9e971ebeb92eec80fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7859509f5b09ee2184c8c9e97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:40 2013 +0200 wined3d: Get rid of the SFLAG_INTEXTURE / SFLAG_INSRGBTEX check in surface_set_texture_name(). --- dlls/wined3d/surface.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e36f61d..011be7a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1709,36 +1709,15 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_unmap, }; -void surface_set_texture_name(struct wined3d_surface *surface, GLuint new_name, BOOL srgb) +void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb) { - GLuint *name; - DWORD flag; + TRACE("surface %p, name %u, srgb %#x.\n", surface, name, srgb); - TRACE("surface %p, new_name %u, srgb %#x.\n", surface, new_name, srgb); - - if(srgb) - { - name = &surface->texture_name_srgb; - flag = SFLAG_INSRGBTEX; - } + if (srgb) + surface->texture_name_srgb = name; else - { - name = &surface->texture_name; - flag = SFLAG_INTEXTURE; - } - - if (!*name && new_name) - { - /* FIXME: We shouldn't need to remove SFLAG_INTEXTURE if the - * surface has no texture name yet. See if we can get rid of this. */ - if (surface->flags & flag) - { - ERR("Surface has %s set, but no texture name.\n", debug_surflocation(flag)); - surface_modify_location(surface, flag, FALSE); - } - } + surface->texture_name = name; - *name = new_name; surface_force_reload(surface); }

1 0