winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
809 discussions
Start a n
N
ew thread
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
0
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
0
0
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
0
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
0
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 @@ +<!--TITLE:[Dokumentation]--> +<!--BLURB:[Dokumentation]--> + +<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
0
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
0
0
Piotr Caban : comctl32: Don' t redraw whole listview in double buffering mode.
by Alexandre Julliard
20 Jun '11
20 Jun '11
Module: wine Branch: master Commit: 7366d159fc8e64689b8fcf22527315e442918ec0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7366d159fc8e64689b8fcf225…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 20 12:47:02 2011 +0200 comctl32: Don't redraw whole listview in double buffering mode. --- 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 2b3adf5..1a71fed 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4996,6 +4996,9 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra SelectObject(hdc, hbmp); SelectObject(hdc, infoPtr->hFont); + + if(GetClipBox(hdcOrig, &rcClient)) + IntersectClipRect(hdc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); } else { /* Save dc values we're gonna trash while drawing * FIXME: Should be done in LISTVIEW_DrawItem() */
1
0
0
0
Piotr Caban : comctl32: Refresh listview after sorting.
by Alexandre Julliard
20 Jun '11
20 Jun '11
Module: wine Branch: master Commit: 02c224edf986c329c0856289ed59e6029e0f3f48 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=02c224edf986c329c0856289e…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 20 12:46:49 2011 +0200 comctl32: Refresh listview after sorting. --- dlls/comctl32/listview.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 119e685..2b3adf5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9130,9 +9130,7 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, /* I believe nHotItem should be left alone, see LISTVIEW_ShiftIndices */ /* refresh the display */ - if (infoPtr->uView != LV_VIEW_ICON && infoPtr->uView != LV_VIEW_SMALLICON) - LISTVIEW_InvalidateList(infoPtr); - + LISTVIEW_InvalidateList(infoPtr); return TRUE; }
1
0
0
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
0
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
0
0
← Newer
1
...
23
24
25
26
27
28
29
...
81
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
Results per page:
10
25
50
100
200