May 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Added some test cases for RtlVirtualUnwind.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 8c017aafbdbc03ed2d40b915a818b889384ee71e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c017aafbdbc03ed2d40b915a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 20:19:42 2009 +0200 ntdll/tests: Added some test cases for RtlVirtualUnwind. --- dlls/ntdll/tests/exception.c | 213 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 198 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c017aafbdbc03ed2d40b…

1 0

Alexandre Julliard : ntdll: Free old memory block when reallocating to a large block.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 13a33b73c349530b17347d3ec6a1f5bb268cc917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a33b73c349530b17347d3ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 16 11:33:06 2009 +0200 ntdll: Free old memory block when reallocating to a large block. --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4abd35e..2d7d53d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1555,7 +1555,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (!(ret = allocate_large_block( heapPtr, flags, size ))) goto oom; notify_alloc( ret, size, flags & HEAP_ZERO_MEMORY ); memcpy( ret, pArena + 1, oldActualSize ); - /* FIXME: free old memory here! */ + notify_free( pArena + 1 ); + HEAP_MakeInUseBlockFree( subheap, pArena ); goto done; } if ((pNext < (char *)subheap->base + subheap->size) &&

1 0

Gerald Pfeifer : libwine: Remove redundant prototype for wine_call_on_stack ().
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 5a28d37fe6fda229fbeff5172569f43267e954be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a28d37fe6fda229fbeff5172… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 15 15:51:53 2009 +0200 libwine: Remove redundant prototype for wine_call_on_stack(). --- libs/wine/port.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 859818f..65f4912 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -132,7 +132,7 @@ void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, vo * * Switch to the specified stack to call the function and return. */ -int wine_call_on_stack( int (*func)(void *), void *arg, void *stack ); + #if defined(__i386__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack, "pushl %ebp\n\t"

1 0

Vincent Povirk : remove the # character from the #winehq irc: url
by Jeremy Newman 15 May '09

15 May '09

Module: website Branch: master Commit: 173ea2afa4a86d2f1e228597b34d587d1536ebd2 URL: http://source.winehq.org/git/website.git/?a=commit;h=173ea2afa4a86d2f1e2285… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 15 16:49:48 2009 -0500 remove the # character from the #winehq irc: url --- templates/en/irc.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/irc.template b/templates/en/irc.template index 72786aa..0c8e24e 100644 --- a/templates/en/irc.template +++ b/templates/en/irc.template @@ -14,6 +14,6 @@ Wine. You can access the chat room using an IRC program such as </blockquote> If you use Mozilla or any other browser that supports IRC urls, you can -join the chat by clicking on <a href="irc://irc.freenode.net/#winehq">irc://irc.freenode.net/#winehq</a>. +join the chat by clicking on <a href="irc://irc.freenode.net/winehq">irc://irc.freenode.net/winehq</a>.

1 0

Paul Vriens : setupapi/tests: Fix remaining failures on Win9x.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 644f57679b984df4b55d9de000ac090b7d48a8a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644f57679b984df4b55d9de00… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri May 15 11:05:48 2009 +0200 setupapi/tests: Fix remaining failures on Win9x. --- dlls/setupapi/tests/parser.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 91a8425..a67a5cd 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -589,6 +589,12 @@ static void test_SetupGetIntField(void) retb = SetupGetIntField( &context, keys[i].index, &intfield ); if ( keys[i].err == ERROR_SUCCESS ) { + if ( !retb && !lstrcmpA( keys[i].key, "123=" ) ) + { + win_skip( "results differ on Win9x\n" ); + SetupCloseInfFile( hinf ); + continue; + } ok( retb, "%u: Expected success\n", i ); ok( GetLastError() == ERROR_SUCCESS || GetLastError() == 0xdeadbeef /* win9x, NT4 */,

1 0

Eric Pouech : msvideo16: Make msvideo16 a separate 16-bit module.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: b8aa4e4fc7ca35f05c5a5d7065740612b2f57629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aa4e4fc7ca35f05c5a5d706… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 14 21:36:39 2009 +0200 msvideo16: Make msvideo16 a separate 16-bit module. --- .gitignore | 1 - configure | 9 ++++ configure.ac | 1 + dlls/Makefile.in | 4 -- dlls/msvfw32/Makefile.in | 5 -- dlls/msvideo.dll16/Makefile.in | 16 +++++++ .../msvideo.dll16.spec} | 0 dlls/{msvfw32 => msvideo.dll16}/msvideo16.c | 46 ++++++++++---------- dlls/{msvfw32 => msvideo.dll16}/vfw16.h | 0 9 files changed, 49 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8aa4e4fc7ca35f05c5a5…

1 0

Stefan Dösinger : wined3d: Don' t use TMP_COLOR unless srgb is enabled.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 6fe1a5daa5879a516a2fd3e7e6f647c4f45d054f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe1a5daa5879a516a2fd3e7e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:54:20 2009 +0200 wined3d: Don't use TMP_COLOR unless srgb is enabled. This was needed unconditionally in the past to apply fog, but since we're using the ARBfp fog defines it is only needed if an sRGB correction is done at the end of the shader. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2814e1b..c9e1ed8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -543,7 +543,14 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, case WINED3DSPR_COLOROUT: if (reg->idx == 0) { - strcpy(register_name, "TMP_COLOR"); + if(((IWineD3DPixelShaderImpl *)This)->cur_args->srgb_correction) + { + strcpy(register_name, "TMP_COLOR"); + } + else + { + strcpy(register_name, "result.color"); + } } else { @@ -1930,8 +1937,12 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, { fragcolor = "R0"; } else { - shader_addline(buffer, "TEMP TMP_COLOR;\n"); - fragcolor = "TMP_COLOR"; + if(args->srgb_correction) { + shader_addline(buffer, "TEMP TMP_COLOR;\n"); + fragcolor = "TMP_COLOR"; + } else { + fragcolor = "result.color"; + } } /* Base Declarations */ @@ -1942,8 +1953,10 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TMP2", "TA", "TB"); + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + } else if(reg_maps->shader_version.major < 2) { + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } - shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); shader_addline(buffer, "END\n"); /* TODO: change to resource.glObjectHandle or something like that */

1 0

Roderick Colenbrander : wgl: Duplicate some single buffered pixel formats for bitmap rendering and restrict bitmap rendering to these formats .
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: b5a62756aa6f9d046efc0cff76d2c4e0ca9349ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a62756aa6f9d046efc0cff7… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu May 14 17:05:20 2009 +0200 wgl: Duplicate some single buffered pixel formats for bitmap rendering and restrict bitmap rendering to these formats. The use of direct / indirect rendering is now tied to the bitmapFormat flag of a pixel format. Indirect is fine for bitmap rendering since on windows it is only supported using the software gdi renderer and indirect rendering can also indicate software rendering. --- dlls/winex11.drv/opengl.c | 91 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 69 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5a62756aa6f9d046efc0…

1 0

Roderick Colenbrander : wgl: Select bitmap capable formats when PFD_DRAW_TO_BITMAP is requested by the caller .
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 2b58d2dc067f819d73160b29634f736915150dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b58d2dc067f819d73160b296… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu May 14 21:03:19 2009 +0200 wgl: Select bitmap capable formats when PFD_DRAW_TO_BITMAP is requested by the caller. --- dlls/winex11.drv/opengl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 50c2563..da04e3e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1158,6 +1158,14 @@ int CDECL X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, continue; } + /* Only use bitmap capable for formats for bitmap rendering. + * See get_formats for more info. */ + if( (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) != (fmt->dwFlags & PFD_DRAW_TO_BITMAP)) + { + TRACE("PFD_DRAW_TO_BITMAP mismatch for iPixelFormat=%d\n", i+1); + continue; + } + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value); if (value) dwFlags |= PFD_DOUBLEBUFFER; pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_STEREO, &value);

1 0

Roderick Colenbrander : wgl: Offer PFD_GENERIC_ACCELERATED on bitmap capable formats.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: c315d75dab48df8bd5466c9264b5fac8a509cf4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c315d75dab48df8bd5466c926… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri May 15 00:00:49 2009 +0200 wgl: Offer PFD_GENERIC_ACCELERATED on bitmap capable formats. Windows drivers do this as well and some apps rely on this (it might fix Sketchup but I can't reproduce the issues on this system). --- dlls/winex11.drv/opengl.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index da04e3e..ed46d69 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -944,7 +944,7 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].offscreenOnly = FALSE; - list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI; + list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_ACCELERATED; size++; onscreen_size++; } @@ -1413,9 +1413,12 @@ int CDECL X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, * offered the GDI bit either. */ ppfd->dwFlags |= fmt->dwFlags & (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_CONFIG_CAVEAT, &value); - if(value == GLX_SLOW_CONFIG) - ppfd->dwFlags |= PFD_GENERIC_ACCELERATED; + /* PFD_GENERIC_FORMAT - gdi software rendering + * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (ICD or MCD) + * none set - full hardware accelerated by a ICD + * + * We only set PFD_GENERIC_ACCELERATED on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do */ + ppfd->dwFlags |= fmt->dwFlags & PFD_GENERIC_ACCELERATED; pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value); if (value) {

1 0