June 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Avoid using a breakpoint instruction in DebugBreak().
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 71ae4774938ee6a5d7988abedc7ec3630b0ab488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ae4774938ee6a5d7988abed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 10:39:06 2011 +0200 kernel32: Avoid using a breakpoint instruction in DebugBreak(). --- dlls/kernel32/debugger.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 4ac0a72..9122876 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -366,7 +366,7 @@ void WINAPI OutputDebugStringW( LPCWSTR str ) * can take some action. */ #if defined(__i386__) || defined(__x86_64__) -__ASM_STDCALL_FUNC( DebugBreak, 0, "int $3; ret" ) +__ASM_STDCALL_FUNC( DebugBreak, 0, "jmp " __ASM_NAME("DbgBreakPoint") ) #else void WINAPI DebugBreak(void) {

1 0

André Hentschel : ntdll: Improved implementation of the segv handler on ARM.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: de1d35eabc1cab5f314e300da726c5bed7ba563b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1d35eabc1cab5f314e300da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 20 19:52:51 2011 +0200 ntdll: Improved implementation of the segv handler on ARM. --- dlls/ntdll/signal_arm.c | 157 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 132 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index ce65688..6f9b9bf 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -66,6 +66,8 @@ static pthread_key_t teb_key; */ #ifdef linux +typedef ucontext_t SIGCONTEXT; + /* All Registers access - only for local access */ # define REG_sig(reg_name, context) ((context)->uc_mcontext.reg_name) # define REGn_sig(reg_num, context) ((context)->uc_mcontext.arm_r##reg_num) @@ -75,11 +77,25 @@ static pthread_key_t teb_key; # define LR_sig(context) REG_sig(arm_lr, context) /* Link register */ # define PC_sig(context) REG_sig(arm_pc, context) /* Program counter */ # define CPSR_sig(context) REG_sig(arm_cpsr, context) /* Current State Register */ -# define IP_sig(context) REG_sig(arm_ip, context) /* Program counter (2?) */ +# define IP_sig(context) REG_sig(arm_ip, context) /* Intra-Procedure-call scratch register */ # define FP_sig(context) REG_sig(arm_fp, context) /* Frame pointer */ +/* Exceptions */ +# define ERROR_sig(context) REG_sig(error_code, context) +# define FAULT_sig(context) REG_sig(fault_address, context) +# define TRAP_sig(context) REG_sig(trap_no, context) + #endif /* linux */ +enum arm_trap_code +{ + TRAP_ARM_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ + TRAP_ARM_PRIVINFLT = 6, /* Invalid opcode exception */ + TRAP_ARM_PAGEFLT = 14, /* Page fault */ + TRAP_ARM_ALIGNFLT = 17, /* Alignment check exception */ +}; + +typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; @@ -206,11 +222,25 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, * * Set the new CPU context. */ -void set_cpu_context( const CONTEXT *context ) -{ - FIXME("not implemented\n"); - return; -} +/* FIXME: What about the CPSR? */ +__ASM_GLOBAL_FUNC( set_cpu_context, + "mov IP, r0\n\t" + "ldr r0, [IP, #0x4]\n\t" /* context->R0 */ + "ldr r1, [IP, #0x8]\n\t" /* context->R1 */ + "ldr r2, [IP, #0xc]\n\t" /* context->R2 */ + "ldr r3, [IP, #0x10]\n\t" /* context->R3 */ + "ldr r4, [IP, #0x14]\n\t" /* context->R4 */ + "ldr r5, [IP, #0x18]\n\t" /* context->R5 */ + "ldr r6, [IP, #0x1c]\n\t" /* context->R6 */ + "ldr r7, [IP, #0x20]\n\t" /* context->R7 */ + "ldr r8, [IP, #0x24]\n\t" /* context->R8 */ + "ldr r9, [IP, #0x28]\n\t" /* context->R9 */ + "ldr r10, [IP, #0x2c]\n\t" /* context->R10 */ + "ldr r11, [IP, #0x30]\n\t" /* context->Fp */ + "ldr SP, [IP, #0x38]\n\t" /* context->Sp */ + "ldr LR, [IP, #0x3c]\n\t" /* context->Lr */ + "ldr PC, [IP, #0x40]\n\t" /* context->Pc */ + ) /*********************************************************************** @@ -326,6 +356,63 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) return STATUS_SUCCESS; } +/*********************************************************************** + * setup_exception_record + * + * Setup the exception record and context on the thread stack. + */ +static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *stack_ptr, raise_func func ) +{ + struct stack_layout + { + CONTEXT context; + EXCEPTION_RECORD rec; + } *stack = stack_ptr; + DWORD exception_code = 0; + + stack--; /* push the stack_layout structure */ + + stack->rec.ExceptionRecord = NULL; + stack->rec.ExceptionCode = exception_code; + stack->rec.ExceptionFlags = EXCEPTION_CONTINUABLE; + stack->rec.ExceptionAddress = (LPVOID)PC_sig(sigcontext); + stack->rec.NumberParameters = 0; + + save_context( &stack->context, sigcontext ); + + /* now modify the sigcontext to return to the raise function */ + SP_sig(sigcontext) = (DWORD)stack; + PC_sig(sigcontext) = (DWORD)func; + REGn_sig(0, sigcontext) = (DWORD)&stack->rec; /* first arg for raise_func */ + REGn_sig(1, sigcontext) = (DWORD)&stack->context; /* second arg for raise_func */ + + + return &stack->rec; +} + +/********************************************************************** + * raise_segv_exception + */ +static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + NTSTATUS status; + + switch(rec->ExceptionCode) + { + case EXCEPTION_ACCESS_VIOLATION: + if (rec->NumberParameters == 2) + { + if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], + rec->ExceptionInformation[0] ))) + goto done; + } + break; + } + status = NtRaiseException( rec, context, TRUE ); + if (status) raise_status( status, rec ); +done: + set_cpu_context( context ); +} /********************************************************************** * call_stack_handlers @@ -453,27 +540,47 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f */ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { - EXCEPTION_RECORD rec; - CONTEXT context; - NTSTATUS status; + EXCEPTION_RECORD *rec; + SIGCONTEXT *context = ucontext; + void *stack = (void *) (SP_sig(context) & ~3); - rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + /* check for page fault inside the thread stack */ + if (TRAP_sig(context) == TRAP_ARM_PAGEFLT && + (char *)info->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && + (char *)info->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && + virtual_handle_stack_fault( info->si_addr )) + { + /* check if this was the last guard page */ + if ((char *)info->si_addr < (char *)NtCurrentTeb()->DeallocationStack + 2*4096) + { + rec = setup_exception_record( context, stack, raise_segv_exception ); + rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; + } + return; + } - /* we want the page-fault case to be fast */ - if ( info->si_code == SEGV_ACCERR ) - if (!(rec.ExceptionCode = virtual_handle_fault( info->si_addr, 0 ))) return; + rec = setup_exception_record( context, stack, raise_segv_exception ); + if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; - save_context( &context, ucontext ); - rec.ExceptionRecord = NULL; - rec.ExceptionFlags = EXCEPTION_CONTINUABLE; - rec.ExceptionAddress = (LPVOID)context.Pc; - rec.NumberParameters = 2; - rec.ExceptionInformation[0] = 0; /* FIXME: read/write access ? */ - rec.ExceptionInformation[1] = (ULONG_PTR)info->si_addr; - - status = raise_exception( &rec, &context, TRUE ); - if (status) raise_status( status, &rec ); - restore_context( &context, ucontext ); + switch(TRAP_sig(context)) + { + case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ + rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; + case TRAP_ARM_PAGEFLT: /* Page fault */ + rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + rec->NumberParameters = 2; + rec->ExceptionInformation[0] = (ERROR_sig(context) & 0x800) != 0; + rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; + break; + case TRAP_ARM_ALIGNFLT: /* Alignment check exception */ + rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; + break; + default: + WINE_ERR( "Got unexpected trap %ld\n", TRAP_sig(context) ); + rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; + } } /**********************************************************************

1 0

Henri Verbeet : wined3d: Initialize format block info with sane values for uncompressed formats.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 17eb3e2c74309c52028948e73639ab38e93e7690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17eb3e2c74309c52028948e73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:09 2011 +0200 wined3d: Initialize format block info with sane values for uncompressed formats. --- dlls/wined3d/utils.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f86a047..fe767ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -923,6 +923,9 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) format->byte_count = formats[i].bpp; format->depth_size = formats[i].depthSize; format->stencil_size = formats[i].stencilSize; + format->block_width = 1; + format->block_height = 1; + format->block_byte_count = formats[i].bpp; } for (i = 0; i < (sizeof(format_base_flags) / sizeof(*format_base_flags)); ++i)

1 0

André Hentschel : documentation.template: Add German translation
by Jeremy Newman 20 Jun '11

20 Jun '11

Module: website Branch: master Commit: ba83133f7cba9637ae72cbd709709fbbfd35ac6f URL: http://source.winehq.org/git/website.git/?a=commit;h=ba83133f7cba9637ae72cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 20 19:50:02 2011 +0200 documentation.template: Add German translation --- templates/de/documentation.template | 83 +++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/templates/de/documentation.template b/templates/de/documentation.template new file mode 100644 index 0000000..825aa2b --- /dev/null +++ b/templates/de/documentation.template @@ -0,0 +1,83 @@ + + + +<h1 class="title">Dokumentation</h1> + + <h2>Handbücher</h2> + <ul> + <li> + <a href="{$root}/docs/wineusr-guide/index">Wine Benutzerhandbuch (en)</a><br> + Wie man Wine benutzt und konfiguriert um Windows Anwendungen auszuführen.<br> + <span class=small>   <b>Formate:</b> + <a href="{$root}/docs/wineusr-guide/index">Online</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/wineusr-guide.ps">PostScript</a> + </span> + </li><br> + + <li> + <a href="{$root}/docs/winelib-guide/index">Winelib Benutzerhandbuch (en)</a><br> + Wine man Wine benutzt um Windows Anwendungen nach Linux zu portieren.<br> + <span class=small>   <b>Formate:</b> + <a href="{$root}/docs/winelib-guide/index">Online</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.ps">PostScript</a> + </span> + </li><br> + + <li> + <a href="{$root}/docs/winedev-guide/index">Wine Entwicklerhandbuch (en)</a><br> + Wie man Wine hackt.<br> + <span class=small>   <b>Formate:</b> + <a href="{$root}/docs/winedev-guide/index">Online</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.html">HTML</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.pdf">PDF</a> | + <a href="http://ftp.winehq.org/pub/wine/docs/en/winedev-guide.ps">PostScript</a> + </span> + </li><br> + + <li> + <a href="{$root}/howto">Wie man dabei hilft Programme mit Wine zum laufen zu kriegen (en)</a><br> + Eine kurze Einführung für alle die uns helfen wollen das es funktioniert.<br> + </li><br> + + <li> + <a href="{$root}/developer-cheatsheet">Erste Schritte zur Wine Entwicklung (en)</a><br> + Ein Crashkurs im Wine entwickeln und debuggen.<br> + </li> + + </ul> + + <h2>Man Pages</h2> + <ul> + <li><a href="{$root}/docs/wine">wine man page</a> + <br>Kommandozeilen Parameter für wine.</li><br> + + <li><a href="{$root}/docs/wineserver">wineserver man page</a> + <br>Kommandozeilen Parameter für wineserver.</li><br> + + <li><a href="{$root}/docs/winebuild">winebuild man page</a> + <br>Kommandozeilen Parameter für winebuild.</li><br> + + <li><a href="{$root}/docs/winedump">winedump man page</a> + <br>Kommandozeilen Parameter für winedump.</li><br> + + <li><a href="{$root}/docs/winemaker">winemaker man page</a> + <br>Kommandozeilen Parameter für den winemaker Skript.</li><br> + + <li><a href="{$root}/docs/widl">widl man page</a> + <br>Kommandozeilen Parameter für den IDL Compiler.</li><br> + + <li><a href="{$root}/docs/wmc">wmc man page</a> + <br>Kommandozeilen Parameter für den Message Compiler.</li><br> + + <li><a href="{$root}/docs/wrc">wrc man page</a> + <br>Kommandozeilen Parameter für den Resourcen Compiler.</li><br> + + <li><a href="{$root}/docs/winegcc">winegcc man page</a> + <br>Kommandozeilen Parameter für den winegcc Compiler.</li><br> + </ul> + +<p> </p>

1 0

André Hentschel : home.template: Improve German translation
by Jeremy Newman 20 Jun '11

20 Jun '11

Module: website Branch: master Commit: a69f2ba479692c73ba5961089a9cddca814de42a URL: http://source.winehq.org/git/website.git/?a=commit;h=a69f2ba479692c73ba5961… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 20 19:50:07 2011 +0200 home.template: Improve German translation --- templates/de/home.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index 636f194..03457c2 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -22,8 +22,8 @@ <div class="dl" onClick="document.location='{$root}/download/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/download/">Hol Dir Wine</a></div> - <div class="subtitle">Installiere die aktuellste Wine-Version.</div> + <div class="title"><a href="{$root}/download/">Download</a></div> + <div class="subtitle">Installiere die aktuellste Wine-Version.</div> </div> </div> @@ -31,7 +31,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/help/">Unterstützung</a></div> - <div class="subtitle">Hol Dir Hilfe zum Benutzen von Wine.</div> + <div class="subtitle">Bekomme Hilfe zum Benutzen von Wine.</div> </div> </div>

1 0

Ričardas Barkauskas : ddraw: Fix ddraw4_EnumSurfaces to pass correct iface in callbacks.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 4c0c0d3aeb4a411d2f99ae9f953b46c09f682b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0c0d3aeb4a411d2f99ae9f9… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sun Jun 12 13:38:32 2011 +0300 ddraw: Fix ddraw4_EnumSurfaces to pass correct iface in callbacks. --- dlls/ddraw/ddraw.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f6d4191..cadc444 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3803,12 +3803,28 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU #undef DDENUMSURFACES_SEARCHTYPE #undef DDENUMSURFACES_MATCHTYPE +struct surfacescallback2_context +{ + LPDDENUMSURFACESCALLBACK2 func; + void *context; +}; + struct surfacescallback_context { LPDDENUMSURFACESCALLBACK func; void *context; }; +static HRESULT CALLBACK EnumSurfacesCallback2Thunk(IDirectDrawSurface7 *surface, + DDSURFACEDESC2 *surface_desc, void *context) +{ + IDirectDrawSurfaceImpl *surface_impl = impl_from_IDirectDrawSurface7(surface); + struct surfacescallback2_context *cbcontext = context; + + return cbcontext->func(&surface_impl->IDirectDrawSurface4_iface, + surface_desc, cbcontext->context); +} + static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *context) { @@ -3890,12 +3906,16 @@ static HRESULT WINAPI ddraw4_EnumSurfaces(IDirectDraw4 *iface, DWORD flags, DDSURFACEDESC2 *surface_desc, void *context, LPDDENUMSURFACESCALLBACK2 callback) { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); + struct surfacescallback2_context cbcontext; TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n", iface, flags, surface_desc, context, callback); - return ddraw7_EnumSurfaces(&This->IDirectDraw7_iface, flags, surface_desc, context, - (LPDDENUMSURFACESCALLBACK7)callback); + cbcontext.func = callback; + cbcontext.context = context; + + return ddraw7_EnumSurfaces(&This->IDirectDraw7_iface, flags, (DDSURFACEDESC2 *)surface_desc, + &cbcontext, EnumSurfacesCallback2Thunk); } static HRESULT WINAPI ddraw3_EnumSurfaces(IDirectDraw3 *iface, DWORD flags,

1 0

Michael Stefaniuc : quartz/tests: Simplify the file handling in filtergraph .c.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: d2910bb7faaf0ec11d70cbda510c6e7b25feeb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2910bb7faaf0ec11d70cbda5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 19 14:40:08 2011 +0200 quartz/tests: Simplify the file handling in filtergraph.c. --- dlls/quartz/tests/filtergraph.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index cd3daaf..596d115 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -41,9 +41,8 @@ typedef struct TestFilterImpl UINT nPins; } TestFilterImpl; -#define FILE_LEN 9 -static const char avifileA[FILE_LEN] = "test.avi"; -static const char mpegfileA[FILE_LEN] = "test.mpg"; +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; +static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; static IGraphBuilder *pgraph; @@ -53,17 +52,6 @@ static int createfiltergraph(void) &CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); } -static void renderfile(const char * fileA) -{ - HRESULT hr; - WCHAR fileW[FILE_LEN]; - - MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); - - hr = IGraphBuilder_RenderFile(pgraph, fileW, NULL); - ok(hr==S_OK, "RenderFile returned: %x\n", hr); -} - static void rungraph(void) { HRESULT hr; @@ -155,17 +143,19 @@ static void releasefiltergraph(void) ok(hr==0, "Releasing filtergraph returned: %x\n", hr); } -static void test_render_run(const char * fileA) +static void test_render_run(const WCHAR *file) { HANDLE h; + HRESULT hr; if (!createfiltergraph()) return; - h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle(h); - renderfile(fileA); + hr = IGraphBuilder_RenderFile(pgraph, file, NULL); + ok(hr==S_OK, "RenderFile returned: %x\n", hr); rungraph(); } @@ -1883,8 +1873,8 @@ static void test_render_filter_priority(void) START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); - test_render_run(avifileA); - test_render_run(mpegfileA); + test_render_run(avifile); + test_render_run(mpegfile); test_graph_builder(); test_graph_builder_addfilter(); test_mediacontrol();

1 0

Alexandre Julliard : winex11: Try harder to ignore broken raw motions events caused by pointer warping.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: adb86c5f2a2584dc8131b08d26aef7c82910d0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb86c5f2a2584dc8131b08d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 20 19:31:05 2011 +0200 winex11: Try harder to ignore broken raw motions events caused by pointer warping. --- dlls/winex11.drv/mouse.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8456d67..0ff701f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1220,9 +1220,10 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) struct x11drv_thread_data *data = x11drv_init_thread_data(); wine_tsx11_lock(); - data->warp_serial = NextRequest( data->display ); XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, x - virtual_screen_rect.left, y - virtual_screen_rect.top ); + data->warp_serial = NextRequest( data->display ); + XNoOp( data->display ); XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ wine_tsx11_unlock(); TRACE( "warped to %d,%d serial %lu\n", x, y, data->warp_serial ); @@ -1431,14 +1432,12 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) if (thread_data->warp_serial) { - long diff = xev->serial - thread_data->warp_serial; - - if (diff >= 0) thread_data->warp_serial = 0; /* we caught up now */ - if (diff <= 0) /* <= 0 because we also want to ignore the first event after the warp request */ + if ((long)(xev->serial - thread_data->warp_serial) < 0) { TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); return; } + thread_data->warp_serial = 0; /* we caught up now */ } TRACE( "pos %d,%d\n", input.u.mi.dx, input.u.mi.dy );

1 0

Jacek Caban : urlmon.idl: Added URL_MK_NO_CANONICALIZE declaration.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 2be16160293575fcbf45da3e7f89c716b923d4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be16160293575fcbf45da3e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 17:21:31 2011 +0200 urlmon.idl: Added URL_MK_NO_CANONICALIZE declaration. --- include/urlmon.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 2ea4063..f282dbb 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2017,3 +2017,4 @@ cpp_quote("#define IsLoggingEnabled WINELIB_NAME_AW(IsLoggingEnabled)") cpp_quote("#define MKSYS_URLMONIKER 6") cpp_quote("#define URL_MK_LEGACY 0") cpp_quote("#define URL_MK_UNIFORM 1") +cpp_quote("#define URL_MK_NO_CANONICALIZE 2")

1 0

Piotr Caban : comctl32: Fix area invalidated by LISTVIEW_SetItemT.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 1a67903b04001c7064f6e4705a66dc3cfa47feed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a67903b04001c7064f6e4705… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 20 12:46:37 2011 +0200 comctl32: Fix area invalidated by LISTVIEW_SetItemT. --- dlls/comctl32/listview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1b35c06..119e685 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4374,6 +4374,9 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, LVITEMW *lpLVItem, BOOL is if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iItem >= infoPtr->nItemCount) return FALSE; + /* Invalidate old item area */ + LISTVIEW_InvalidateItem(infoPtr, lpLVItem->iItem); + /* For efficiency, we transform the lpLVItem->pszText to Unicode here */ if ((lpLVItem->mask & LVIF_TEXT) && is_text(lpLVItem->pszText)) {

1 0