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

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

May 18, 2009

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 May 18, 2009

May 18, 2009

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

Alexandre Julliard : ntdll: Added a stub for RtlUnwindEx on x86_64.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 47d77025227c3bd71d2f7896e0453d96081df018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d77025227c3bd71d2f7896e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 20:18:33 2009 +0200 ntdll: Added a stub for RtlUnwindEx on x86_64. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 82c3f02..4b5dfec 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -888,6 +888,7 @@ @ stdcall RtlUnlockHeap(long) # @ stub RtlUnlockMemoryStreamRegion @ stdcall -register RtlUnwind(ptr ptr ptr ptr) +@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 15785e5..dd8dad9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -897,30 +897,39 @@ PVOID WINAPI RtlVirtualUnwind ( ULONG type, ULONG64 base, ULONG64 pc, /******************************************************************* - * RtlUnwind (NTDLL.@) + * RtlUnwindEx (NTDLL.@) */ -void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID targetIp, - PEXCEPTION_RECORD pRecord, PVOID retval, CONTEXT *context ) +void WINAPI RtlUnwindEx( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec, + ULONG64 retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) { EXCEPTION_RECORD record; /* build an exception record, if we do not have one */ - if (!pRecord) + if (!rec) { record.ExceptionCode = STATUS_UNWIND; record.ExceptionFlags = 0; record.ExceptionRecord = NULL; record.ExceptionAddress = (void *)context->Rip; record.NumberParameters = 0; - pRecord = &record; + rec = &record; } - pRecord->ExceptionFlags |= EH_UNWINDING | (pEndFrame ? 0 : EH_EXIT_UNWIND); + rec->ExceptionFlags |= EH_UNWINDING | (frame ? 0 : EH_EXIT_UNWIND); - FIXME( "code=%x flags=%x not implemented on x86_64\n", - pRecord->ExceptionCode, pRecord->ExceptionFlags ); + FIXME( "code=%x flags=%x not implemented on x86_64\n", rec->ExceptionCode, rec->ExceptionFlags ); NtTerminateProcess( GetCurrentProcess(), 1 ); } + + +/******************************************************************* + * RtlUnwind (NTDLL.@) + */ +void WINAPI __regs_RtlUnwind( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec, + ULONG64 retval, CONTEXT *context ) +{ + RtlUnwindEx( frame, target_ip, rec, retval, context, NULL ); +} DEFINE_REGS_ENTRYPOINT( RtlUnwind, 4 )

1 0

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

May 15, 2009

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 May 15, 2009

May 15, 2009

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

Alexandre Julliard : shlwapi: Add a partial stub for IConnectionPoint_InvokeWithCancel.
by Alexandre Julliard May 15, 2009

May 15, 2009

Module: wine Branch: master Commit: 713183200bac8ee88af7ddc756277bf80aa55272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=713183200bac8ee88af7ddc75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 14:18:49 2009 +0200 shlwapi: Add a partial stub for IConnectionPoint_InvokeWithCancel. --- dlls/shlwapi/ordinal.c | 20 ++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 882058e..c18d1ea 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2914,6 +2914,26 @@ static HRESULT SHLWAPI_InvokeByIID( } /************************************************************************* + * IConnectionPoint_InvokeWithCancel [SHLWAPI.283] + */ +HRESULT WINAPI IConnectionPoint_InvokeWithCancel( IConnectionPoint* iCP, + DISPID dispId, DISPPARAMS* dispParams, + DWORD unknown1, DWORD unknown2 ) +{ + IID iid; + HRESULT result; + + FIXME("(%p)->(0x%x %p %x %x) partial stub\n", iCP, dispId, dispParams, unknown1, unknown2); + + result = IConnectionPoint_GetConnectionInterface(iCP, &iid); + if (SUCCEEDED(result)) + result = SHLWAPI_InvokeByIID(iCP, &iid, dispId, dispParams); + + return result; +} + + +/************************************************************************* * @ [SHLWAPI.284] * * IConnectionPoint_SimpleInvoke diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 0b1cd4c..d9cc3a5 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -280,7 +280,7 @@ 280 stdcall -noname SHRegGetIntW(ptr wstr long) 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) 282 varargs -noname SHPackDispParams(ptr ptr long) -283 stub -noname IConnectionPoint_InvokeWithCancel +283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long long long long) 284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr) 285 stdcall -noname IConnectionPoint_OnChanged(ptr long) 286 varargs -noname IUnknown_CPContainerInvokeParam(ptr ptr long ptr long)

1 0

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

May 15, 2009

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

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

May 15, 2009

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

Robert Key : wined3d: Fix ATI HD4800 being reported as ATI 9500.
by Alexandre Julliard May 15, 2009

May 15, 2009

Module: wine Branch: master Commit: cce62569df952e0656975beb38132cfb76d88535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce62569df952e0656975beb3… Author: Robert Key <hpestilence(a)gmail.com> Date: Thu May 14 19:14:02 2009 -0400 wined3d: Fix ATI HD4800 being reported as ATI 9500. --- dlls/wined3d/directx.c | 17 ++++++++++++++--- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 52e9be3..825d8f5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1272,10 +1272,20 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { break; case VENDOR_ATI: if(WINE_D3D9_CAPABLE(gl_info)) { + /* Radeon R7xx HD4800 - highend */ + if (strstr(gl_info->gl_renderer, "HD 4800") || + strstr(gl_info->gl_renderer, "HD 4830") || + strstr(gl_info->gl_renderer, "HD 4850") || + strstr(gl_info->gl_renderer, "HD 4870") || + strstr(gl_info->gl_renderer, "HD 4890")) + { + gl_info->gl_card = CARD_ATI_RADEON_HD4800; + vidmem = 512; /* HD4800 cards use 512-1024MB, up to 2048MB for X2 version */ + } /* Radeon R6xx HD2900/HD3800 - highend */ - if (strstr(gl_info->gl_renderer, "HD 2900") || - strstr(gl_info->gl_renderer, "HD 3870") || - strstr(gl_info->gl_renderer, "HD 3850")) + else if (strstr(gl_info->gl_renderer, "HD 2900") || + strstr(gl_info->gl_renderer, "HD 3870") || + strstr(gl_info->gl_renderer, "HD 3850")) { gl_info->gl_card = CARD_ATI_RADEON_HD2900; vidmem = 512; /* HD2900/HD3800 uses 256-1024MB */ @@ -4008,6 +4018,7 @@ static const struct driver_version_information driver_version_table[] = { {VENDOR_ATI, CARD_ATI_RADEON_HD2300, "ATI Mobility Radeon HD 2300", 6, 14, 10, 6764 }, {VENDOR_ATI, CARD_ATI_RADEON_HD2600, "ATI Mobility Radeon HD 2600", 6, 14, 10, 6764 }, {VENDOR_ATI, CARD_ATI_RADEON_HD2900, "ATI Radeon HD 2900 XT", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD4800, "ATI Radeon HD 4800 Series", 6, 14, 10, 6764 }, /* TODO: Add information about legacy ATI hardware, Intel and other cards */ }; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 1a9c925..615d914 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3302,6 +3302,7 @@ typedef enum _GL_Cards { CARD_ATI_RADEON_HD2600 = 0x9581, CARD_ATI_RADEON_HD2900 = 0x9400, CARD_ATI_RADEON_HD3200 = 0x9620, + CARD_ATI_RADEON_HD4800 = 0x944c, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

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

May 15, 2009

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