April 2008 - Wine-commits - list.winehq.org

Rob Shearman : rpcrt4: Improve trace in RPCRT4_find_interface to print the interface identifier data as well as the object guid .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: c7f9b9347fdf7a073329d9b3fada993c2ea74717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f9b9347fdf7a073329d9b3f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:06 2008 +0100 rpcrt4: Improve trace in RPCRT4_find_interface to print the interface identifier data as well as the object guid. --- dlls/rpcrt4/rpc_server.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 40e9e7e..f93d264 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -138,7 +138,9 @@ static RpcServerInterface* RPCRT4_find_interface(UUID* object, } LeaveCriticalSection(&server_cs); if (&cif->entry == &server_interfaces) cif = NULL; - TRACE("returning %p for %s\n", cif, debugstr_guid(object)); + TRACE("returning %p for object %s, if_id { %d.%d %s }\n", cif, + debugstr_guid(object), if_id->SyntaxVersion.MajorVersion, + if_id->SyntaxVersion.MinorVersion, debugstr_guid(&if_id->SyntaxGUID)); return cif; }

1 0

Alexandre Julliard : ntdll: Add support for handling page faults caused by guard pages on the thread stack .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 061bfac076b1c191b123f64f51579cc9ea8b68cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=061bfac076b1c191b123f64f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 1 17:37:17 2008 +0200 ntdll: Add support for handling page faults caused by guard pages on the thread stack. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 44 +++++++++++++++++++++++++++++++++----------- dlls/ntdll/virtual.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3a12b8f..cba9643 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -134,6 +134,7 @@ extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] /* virtual memory */ extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); +extern BOOL virtual_handle_stack_fault( void *addr ); extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); extern void VIRTUAL_SetForceExec( BOOL enable ); extern void VIRTUAL_UseLargeAddressSpace(void); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index bb8332a..7920d0a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1009,13 +1009,12 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) /*********************************************************************** - * setup_exception + * setup_exception_record * - * Setup a proper stack frame for the raise function, and modify the - * sigcontext so that the return from the signal handler will call - * the raise function. + * Setup the exception record and context on the thread stack. */ -static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) +static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *stack_ptr, + WORD fs, WORD gs, raise_func func ) { struct stack_layout { @@ -1026,11 +1025,7 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun EXCEPTION_RECORD rec; DWORD ebp; DWORD eip; - } *stack; - - WORD fs, gs; - - stack = init_handler( sigcontext, &fs, &gs ); + } *stack = stack_ptr; /* stack sanity checks */ @@ -1097,6 +1092,22 @@ static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func fun /*********************************************************************** + * setup_exception + * + * Setup a proper stack frame for the raise function, and modify the + * sigcontext so that the return from the signal handler will call + * the raise function. + */ +static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) +{ + WORD fs, gs; + void *stack = init_handler( sigcontext, &fs, &gs ); + + return setup_exception_record( sigcontext, stack, fs, gs, func ); +} + + +/*********************************************************************** * get_exception_context * * Get a pointer to the context built by setup_exception. @@ -1259,8 +1270,19 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { + WORD fs, gs; + EXCEPTION_RECORD *rec; SIGCONTEXT *context = sigcontext; - EXCEPTION_RECORD *rec = setup_exception( context, raise_segv_exception ); + void *stack = init_handler( sigcontext, &fs, &gs ); + + /* check for page fault inside the thread stack */ + if (get_trap_code(context) == TRAP_x86_PAGEFLT && + (char *)siginfo->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && + (char *)siginfo->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && + virtual_handle_stack_fault( siginfo->si_addr )) + return; + + rec = setup_exception_record( context, stack, fs, gs, raise_segv_exception ); switch(get_trap_code(context)) { diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 548e819..5e4327b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -571,6 +571,19 @@ static BOOL VIRTUAL_SetProt( FILE_VIEW *view, /* [in] Pointer to view */ TRACE("%p-%p %s\n", base, (char *)base + size - 1, VIRTUAL_GetProtStr( vprot ) ); + /* if setting stack guard pages, store the permissions first, as the guard may be + * triggered at any point after mprotect and change the permissions again */ + if ((vprot & VPROT_GUARD) && + ((char *)base >= (char *)NtCurrentTeb()->DeallocationStack) && + ((char *)base < (char *)NtCurrentTeb()->Tib.StackBase)) + { + memset( view->prot + (((char *)base - (char *)view->base) >> page_shift), + vprot, size >> page_shift ); + mprotect( base, size, unix_prot ); + VIRTUAL_DEBUG_DUMP_VIEW( view ); + return TRUE; + } + if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); @@ -1327,6 +1340,36 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID addr ) } + +/*********************************************************************** + * virtual_handle_stack_fault + * + * Handle an access fault inside the current thread stack. + * Called from inside a signal handler. + */ +BOOL virtual_handle_stack_fault( void *addr ) +{ + FILE_VIEW *view; + BOOL ret = FALSE; + + RtlEnterCriticalSection( &csVirtual ); /* no need for signal masking inside signal handler */ + if ((view = VIRTUAL_FindView( addr ))) + { + void *page = ROUND_ADDR( addr, page_mask ); + BYTE vprot = view->prot[((const char *)page - (const char *)view->base) >> page_shift]; + if (vprot & VPROT_GUARD) + { + VIRTUAL_SetProt( view, page, page_size, vprot & ~VPROT_GUARD ); + if ((char *)page + page_size == NtCurrentTeb()->Tib.StackLimit) + NtCurrentTeb()->Tib.StackLimit = page; + ret = TRUE; + } + } + RtlLeaveCriticalSection( &csVirtual ); + return ret; +} + + /*********************************************************************** * VIRTUAL_SetForceExec *

1 0

Alexandre Julliard : ntdll: Moved stack allocation for thread and process to a common routine in virtual .c.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 600694546f6805c2e1a88a05e056a8b00d187d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=600694546f6805c2e1a88a05e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 1 14:11:44 2008 +0200 ntdll: Moved stack allocation for thread and process to a common routine in virtual.c. --- dlls/ntdll/loader.c | 45 ++++------------------------------------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 16 +-------------- dlls/ntdll/virtual.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3b60d60..1091c32 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -27,9 +27,6 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif -#ifdef HAVE_VALGRIND_MEMCHECK_H -# include <valgrind/memcheck.h> -#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -2320,42 +2317,6 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) /*********************************************************************** - * alloc_process_stack - * - * Allocate the stack of new process. - */ -static NTSTATUS alloc_process_stack( IMAGE_NT_HEADERS *nt ) -{ - NTSTATUS status; - void *base = NULL; - SIZE_T stack_size, page_size = getpagesize(); - - stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); - stack_size += page_size; /* for the guard page */ - stack_size = (stack_size + 0xffff) & ~0xffff; /* round to 64K boundary */ - if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ - - if ((status = NtAllocateVirtualMemory( GetCurrentProcess(), &base, 16, &stack_size, - MEM_COMMIT, PAGE_READWRITE ))) - return status; - - /* note: limit is lower than base since the stack grows down */ - NtCurrentTeb()->DeallocationStack = base; - NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; - NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; - -#ifdef VALGRIND_STACK_REGISTER - /* no need to de-register the stack as it's the one of the main thread */ - VALGRIND_STACK_REGISTER(NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase); -#endif - - /* setup guard page */ - NtProtectVirtualMemory( GetCurrentProcess(), &base, &page_size, PAGE_NOACCESS, NULL ); - return STATUS_SUCCESS; -} - - -/*********************************************************************** * attach_process_dlls * * Initial attach to all the dlls loaded by the process. @@ -2387,6 +2348,7 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path; + SIZE_T stack_size; PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); @@ -2409,7 +2371,10 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); - if ((status = alloc_process_stack( nt )) != STATUS_SUCCESS) goto error; + stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); + if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ + + if ((status = virtual_alloc_thread_stack( NULL, stack_size )) != STATUS_SUCCESS) goto error; if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error; actctx_init(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8c04557..3a12b8f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -133,6 +133,7 @@ extern NTSTATUS DIR_get_unix_cwd( char **cwd ); extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ); /* virtual memory */ +extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); extern void VIRTUAL_SetForceExec( BOOL enable ); extern void VIRTUAL_UseLargeAddressSpace(void); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 65283e0..4298e95 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -418,7 +418,6 @@ static void start_thread( struct wine_pthread_thread_info *info ) PRTL_THREAD_START_ROUTINE func = startup_info->entry_point; void *arg = startup_info->entry_arg; struct debug_info debug_info; - SIZE_T size, page_size = getpagesize(); debug_info.str_pos = debug_info.strings; debug_info.out_pos = debug_info.output; @@ -428,20 +427,7 @@ static void start_thread( struct wine_pthread_thread_info *info ) SIGNAL_Init(); server_init_thread( info->pid, info->tid, func ); pthread_functions.init_thread( info ); - - /* allocate a memory view for the stack */ - size = info->stack_size; - teb->DeallocationStack = info->stack_base; - NtAllocateVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, 0, - &size, MEM_SYSTEM, PAGE_READWRITE ); - /* limit is lower than base since the stack grows down */ - teb->Tib.StackBase = (char *)info->stack_base + info->stack_size; - teb->Tib.StackLimit = (char *)info->stack_base + page_size; - - /* setup the guard page */ - size = page_size; - NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, PAGE_NOACCESS, NULL ); - + virtual_alloc_thread_stack( info->stack_base, info->stack_size ); pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); RtlAcquirePebLock(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1c44d49..548e819 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -41,6 +41,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_VALGRIND_MEMCHECK_H +# include <valgrind/memcheck.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -1253,6 +1256,53 @@ void virtual_init_threading(void) /*********************************************************************** + * virtual_alloc_thread_stack + */ +NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T size ) +{ + FILE_VIEW *view; + NTSTATUS status; + sigset_t sigset; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + + if (base) /* already allocated, create a system view */ + { + size = ROUND_SIZE( base, size ); + base = ROUND_ADDR( base, page_mask ); + if ((status = create_view( &view, base, size, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED )) != STATUS_SUCCESS) + goto done; + view->flags |= VFLAG_VALLOC | VFLAG_SYSTEM; + } + else + { + size = (size + 0xffff) & ~0xffff; /* round to 64K boundary */ + if ((status = map_view( &view, NULL, size, 0xffff, 0, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED )) != STATUS_SUCCESS) + goto done; + view->flags |= VFLAG_VALLOC; +#ifdef VALGRIND_STACK_REGISTER + /* no need to de-register the stack as it's the one of the main thread */ + VALGRIND_STACK_REGISTER( view->base, (char *)view->base + view->size ); +#endif + } + + /* setup no access guard page */ + VIRTUAL_SetProt( view, view->base, page_size, VPROT_COMMITTED ); + + /* note: limit is lower than base since the stack grows down */ + NtCurrentTeb()->DeallocationStack = view->base; + NtCurrentTeb()->Tib.StackBase = (char *)view->base + view->size; + NtCurrentTeb()->Tib.StackLimit = (char *)view->base + page_size; + +done: + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return status; +} + + +/*********************************************************************** * VIRTUAL_HandleFault */ NTSTATUS VIRTUAL_HandleFault( LPCVOID addr )

1 0

Jeremy Newman : fix links to CodeWeavers appdb
by Jeremy Newman 01 Apr '08

01 Apr '08

Module: website Branch: master Commit: 5d673b5139d941129b3b1840b4ee4dc311cae302 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d673b5139d941129b3b18… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Apr 1 09:03:50 2008 -0500 fix links to CodeWeavers appdb --- wwn/wn20080331_344.xml | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/wwn/wn20080331_344.xml b/wwn/wn20080331_344.xml index 87bd3dd..62eac78 100644 --- a/wwn/wn20080331_344.xml +++ b/wwn/wn20080331_344.xml @@ -151,26 +151,26 @@ CrossOver Games is built on the latest versions of Wine, based on contributions </p> <p> <ul> - <li><a href="/compatibility/browse/name?app_id=1185">World of Warcraft</a></li> - <li><a href="/compatibility/browse/name?app_id=1860">EVE Online</a></li> - <li><a href="/compatibility/browse/name?app_id=1658">Guild Wars</a></li> - <li><a href="/compatibility/browse/name?app_id=1791">Prey</a></li> - <li><a href="/compatibility/browse/group/?app_parent=2034;">Steam Games</a>, including: + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=1185">World of Warcraft</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=1860">EVE Online</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=1658">Guild Wars</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=1791">Prey</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/group/?app_parent=2034;">Steam Games</a>, including: <ul> - <li><a href="/compatibility/browse/name?app_id=1168">Half-Life 2</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=1168">Half-Life 2</a></li> - <li><a href="/compatibility/browse/name?app_id=3379">Team Fortress 2</a></li> - <li><a href="/compatibility/browse/name?app_id=2035">Counterstrike</a></li> - <li><a href="/compatibility/browse/name?app_id=2036">Counterstrike: Source</a></li> - <li><a href="/compatibility/browse/name?app_id=1728">Civilization IV</a></li> - <li><a href="/compatibility/browse/name?app_id=3996">Peggle Extreme</a></li> - <li><a href="/compatibility/browse/name?app_id=2710">Call of Duty 2</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=3379">Team Fortress 2</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=2035">Counterstrike</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=2036">Counterstrike: Source</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=1728">Civilization IV</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=3996">Peggle Extreme</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=2710">Call of Duty 2</a></li> - <li><a href="/compatibility/browse/name?app_id=49">Max Payne 2</a></li> - <li><a href="/compatibility/browse/name?app_id=2555">Grand Theft Auto 2</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=49">Max Payne 2</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/name?app_id=2555">Grand Theft Auto 2</a></li> </ul> </li> - <li><a href="/compatibility/browse/group/?app_parent=4100">and more...</a></li> + <li><a href="http://www.codeweavers.com/compatibility/browse/group/?app_parent=4100">and more...</a></li> </ul> </p> </quote>

1 0

Zachary Goldberg : WWN 344
by Jeremy Newman 01 Apr '08

01 Apr '08

Module: website Branch: master Commit: 67d194dc4010c0e804e76e78c885fd61da8a3acc URL: http://source.winehq.org/git/website.git/?a=commit;h=67d194dc4010c0e804e76e… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Mar 31 23:43:40 2008 -0400 WWN 344 Crossover Games Edition. --- news/2008033101.xml | 7 + wwn/wn20080331_344.xml | 1201 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1208 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=67d194dc4010c0e804…

1 0

Jacek Caban : mshtml: Fixed copy&paste mistake.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 2d1cf6ce34b110defa122c4ac0c49a89ea8b60c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1cf6ce34b110defa122c4ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 1 11:50:20 2008 +0000 mshtml: Fixed copy&paste mistake. --- dlls/mshtml/htmllocation.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index b05a2a9..0881023 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" @@ -38,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define HTMLLOCATION_THIS(iface) DEFINE_THIS(HTMLLocation, HTMLLocation, iface) -static struct list window_list = LIST_INIT(window_list); - static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID riid, void **ppv) { HTMLLocation *This = HTMLLOCATION_THIS(iface);

1 0

Jacek Caban : include: Added activedbg.idl.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 1ab87d4dee37800b3f44a01dda66e430a7d0d92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab87d4dee37800b3f44a01dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 1 11:48:29 2008 +0000 include: Added activedbg.idl. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/activdbg.idl | 383 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 386 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ab87d4dee37800b3f44a…

1 0

Jason Green : d3d9: Add a visual test for the DP2ADD shader instruction.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 9625d76b5e584d98a82fc10f50f2191922417d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9625d76b5e584d98a82fc10f5… Author: Jason Green <jave27(a)gmail.com> Date: Tue Apr 1 01:03:11 2008 -0400 d3d9: Add a visual test for the DP2ADD shader instruction. --- dlls/d3d9/tests/visual.c | 146 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 135 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a129621..ea9e5e8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3897,6 +3897,125 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_11); } +static void dp2add_ps_test(IDirect3DDevice9 *device) +{ + IDirect3DPixelShader9 *shader_dp2add = NULL; + IDirect3DPixelShader9 *shader_dp2add_sat = NULL; + HRESULT hr; + DWORD color; + + /* DP2ADD is defined as: (src0.r * src1.r) + (src0.g * src1.g) + src2. + * One D3D restriction of all shader instructions except SINCOS is that no more than 2 + * source tokens can be constants. So, for this excercise, we move contents of c0 to + * r0 first. + * The result here for the r,g,b components should be rougly 0.5: + * (0.5 * 0.5) + (0.5 * 0.5) + 0.0 = 0.5 */ + static const DWORD shader_code_dp2add[] = { + 0xffff0200, /* ps_2_0 */ + 0x05000051, 0xa00f0000, 0x3f000000, 0x3f000000, 0x3f800000, 0x00000000, /* def c0, 0.5, 0.5, 1.0, 0 */ + + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0400005a, 0x80070000, 0x80000000, 0x80000000, 0x80ff0000, /* dp2add r0.rgb, r0, r0, r0.a */ + + 0x02000001, 0x80080000, 0xa0aa0000, /* mov r0.a, c0.b */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ + }; + + /* Test the _sat modifier, too. Result here should be: + * DP2: (-0.5 * -0.5) + (-0.5 * -0.5) + 2.0 = 2.5 + * _SAT: ==> 1.0 + * ADD: (1.0 + -0.5) = 0.5 + */ + static const DWORD shader_code_dp2add_sat[] = { + 0xffff0200, /* ps_2_0 */ + 0x05000051, 0xa00f0000, 0xbf000000, 0xbf000000, 0x3f800000, 0x40000000, /* def c0, -0.5, -0.5, 1.0, 2.0 */ + + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0400005a, 0x80170000, 0x80000000, 0x80000000, 0x80ff0000, /* dp2add_sat r0.rgb, r0, r0, r0.a */ + 0x03000002, 0x80070000, 0x80e40000, 0xa0000000, /* add r0.rgb, r0, c0.r */ + + 0x02000001, 0x80080000, 0xa0aa0000, /* mov r0.a, c0.b */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ + }; + + const float quad[] = { + -1.0, -1.0, 0.1, + 1.0, -1.0, 0.1, + -1.0, 1.0, 0.1, + 1.0, 1.0, 0.1 + }; + + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_dp2add, &shader_dp2add); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_dp2add_sat, &shader_dp2add_sat); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %s\n", DXGetErrorString9(hr)); + + if (shader_dp2add) { + + hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %s\n", DXGetErrorString9(hr)); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + color = getPixelColor(device, 360, 240); + ok(color == 0x007f7f7f || color == 0x00808080, "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + + IDirect3DPixelShader9_Release(shader_dp2add); + } else { + skip("dp2add shader creation failed\n"); + } + + if (shader_dp2add_sat) { + + hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add_sat); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %s\n", DXGetErrorString9(hr)); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + color = getPixelColor(device, 360, 240); + ok(color == 0x007f7f7f || color == 0x00808080, "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + + IDirect3DPixelShader9_Release(shader_dp2add_sat); + } else { + skip("dp2add shader creation failed\n"); + } + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %s\n", DXGetErrorString9(hr)); +} + static void cnd_test(IDirect3DDevice9 *device) { IDirect3DPixelShader9 *shader_11, *shader_12, *shader_13, *shader_14; @@ -8005,20 +8124,25 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { constant_clamp_ps_test(device_ptr); cnd_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0)) { - nested_loop_test(device_ptr); - fixed_function_varying_test(device_ptr); - vFace_register_test(device_ptr); - vpos_register_test(device_ptr); - multiple_rendertargets_test(device_ptr); - if(caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { - vshader_version_varying_test(device_ptr); - pshader_version_varying_test(device_ptr); + if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { + dp2add_ps_test(device_ptr); + if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0)) { + nested_loop_test(device_ptr); + fixed_function_varying_test(device_ptr); + vFace_register_test(device_ptr); + vpos_register_test(device_ptr); + multiple_rendertargets_test(device_ptr); + if(caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { + vshader_version_varying_test(device_ptr); + pshader_version_varying_test(device_ptr); + } else { + skip("No vs_3_0 support\n"); + } } else { - skip("No vs_3_0 support\n"); + skip("No ps_3_0 support\n"); } } else { - skip("No ps_3_0 support\n"); + skip("No ps_2_0 support\n"); } } }

1 0

Jason Green : d3d9: Add some visual tests for Direct3DDevice9_StretchRect() .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 4f5cb4fb767ef7197a48eaa76cdde3f920c04426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5cb4fb767ef7197a48eaa76… Author: Jason Green <jave27(a)gmail.com> Date: Tue Apr 1 01:20:44 2008 -0400 d3d9: Add some visual tests for Direct3DDevice9_StretchRect(). --- dlls/d3d9/tests/visual.c | 566 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 566 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5cb4fb767ef7197a48e…

1 0

Vitaly Perov : comdlg32: When PD_USEDEVMODECOPIESANDCOLLATE flag is not set dmCopies must be 1.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: f5dd5a2deb895700047fd29906a5752284066174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dd5a2deb895700047fd2990… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Mon Mar 31 17:13:46 2008 +0400 comdlg32: When PD_USEDEVMODECOPIESANDCOLLATE flag is not set dmCopies must be 1. --- dlls/comdlg32/printdlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 5169d1b..ea5d34e 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -353,11 +353,14 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg, if (lpdm->dmFields & DM_COPIES) lpdm->u1.s1.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE); } else { + /* Application is responsible for multiple copies */ if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) lppd->Flags |= PD_COLLATE; else lppd->Flags &= ~PD_COLLATE; lppd->nCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE); + /* multiple copies already included in the document. Driver must print only one copy */ + lpdm->u1.s1.dmCopies = 1; } /* Print quality, PrintDlg16 */

1 0