wine-commits May 2007

wine-commits@winehq.org

3 participants
715 discussions

Peter Oberndorfer : winedbg: Only check for break/ watch points on first chance exceptions.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 394a36c25a143bb34627ec2bb13b12b7042fef98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394a36c25a143bb34627ec2bb… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue May 22 18:28:55 2007 +0200 winedbg: Only check for break/watch points on first chance exceptions. --- programs/winedbg/break.c | 11 +++++++++-- programs/winedbg/debugger.h | 2 +- programs/winedbg/tgt_active.c | 13 ++++++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 4c1e3fe..be6e6c5 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -775,15 +775,22 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) } /*********************************************************************** - * break_ajust_pc + * break_adjust_pc * * Adjust PC to the address where the trap (if any) actually occurred * Also sets dbg_curr_thread->stopped_xpoint */ -void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break) +void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break) { DWORD oldval = 0; + /* break / watch points are handled on first chance */ + if ( !first_chance ) + { + *is_break = TRUE; + dbg_curr_thread->stopped_xpoint = -1; + return; + } *is_break = FALSE; /* If not single-stepping, back up to the break instruction */ diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index e09d5f3..556bc08 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -288,7 +288,7 @@ extern void break_delete_xpoint(int num); extern void break_delete_xpoints_from_module(unsigned long base); extern void break_enable_xpoint(int num, BOOL enable); extern void break_info(void); -extern void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break); +extern void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break); extern BOOL break_should_continue(ADDRESS64* addr, DWORD code); extern void break_suspend_execution(void); extern void break_restart_execution(int count); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 1698201..348895d 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -107,7 +107,14 @@ static unsigned dbg_fetch_context(void) return TRUE; } -static unsigned dbg_exception_prolog(BOOL is_debug, const EXCEPTION_RECORD* rec) +/*********************************************************************** + * dbg_exception_prolog + * + * Examine exception and decide if interactive mode is entered(return TRUE) + * or exception is silently continued(return FALSE) + * is_debug means the exception is a breakpoint or single step exception + */ +static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXCEPTION_RECORD* rec) { ADDRESS64 addr; BOOL is_break; @@ -143,7 +150,7 @@ static unsigned dbg_exception_prolog(BOOL is_debug, const EXCEPTION_RECORD* rec) /* this will resynchronize builtin dbghelp's internal ELF module list */ SymLoadModule(dbg_curr_process->handle, 0, 0, 0, 0, 0); - if (is_debug) break_adjust_pc(&addr, rec->ExceptionCode, &is_break); + if (is_debug) break_adjust_pc(&addr, rec->ExceptionCode, first_chance, &is_break); /* * Do a quiet backtrace so that we have an idea of what the situation * is WRT the source files. @@ -398,7 +405,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance dbg_printf( ", invalid program stack" ); } - if (dbg_exception_prolog(is_debug, rec)) + if (dbg_exception_prolog(is_debug, first_chance, rec)) { dbg_interactiveP = TRUE; return 0;

1 0

Peter Oberndorfer : winedbg: Show some info for msvcrt C++ exceptions.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 0bfb26aa996a618b3160d7944f561353e46a2638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfb26aa996a618b3160d7944… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue May 22 20:25:03 2007 +0200 winedbg: Show some info for msvcrt C++ exceptions. --- programs/winedbg/debugger.h | 9 +++++++++ programs/winedbg/tgt_active.c | 8 ++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 3ad2bd3..e09d5f3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -141,6 +141,15 @@ struct dbg_breakpoint struct expr* condition; }; +/* used for C++ exceptions in msvcrt + * parameters: + * [0] CXX_FRAME_MAGIC + * [1] pointer to exception object + * [2] pointer to type + */ +#define CXX_EXCEPTION 0xe06d7363 +#define CXX_FRAME_MAGIC 0x19930520 + /* Wine extension; Windows doesn't have a name for this code. This is an undocumented exception understood by MS VC debugger, allowing the program to name a particular thread. Search google.com or deja.com for "0x406d1388" diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 21e8966..1698201 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -381,6 +381,14 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance case EXCEPTION_FLT_STACK_CHECK: dbg_printf("floating point stack check"); break; + case CXX_EXCEPTION: + if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + else + dbg_printf("C++ exception with strange parameter count %d or magic 0x%08lx", + rec->NumberParameters, rec->ExceptionInformation[0]); + break; default: dbg_printf("0x%08x", rec->ExceptionCode); break;

1 0

Peter Oberndorfer : ntdll: Fix up instruction pointer in context inside raise_exception.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: eab168cf9eaa6ed9f8800b25155d329376f2343f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab168cf9eaa6ed9f8800b251… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue May 22 18:28:53 2007 +0200 ntdll: Fix up instruction pointer in context inside raise_exception. --- dlls/ntdll/exception.c | 5 +++++ dlls/ntdll/tests/exception.c | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 7f0da0c..8974ced 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -336,6 +336,11 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return STATUS_SUCCESS; +#ifdef __i386__ + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; +#endif + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) return STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9ebbda7..83613f7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -215,10 +215,8 @@ LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionIn */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine { ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xa); - } } else { @@ -247,10 +245,8 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine { ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xa); - } } else { @@ -525,9 +521,7 @@ static DWORD int3_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD { ok( rec->ExceptionAddress == code_mem, "exception address not at: %p, but at %p\n", code_mem, rec->ExceptionAddress); - todo_wine { - ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); - } + ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); if(context->Eip == (DWORD)code_mem) context->Eip++; /* skip breakpoint */ return ExceptionContinueExecution; @@ -692,10 +686,8 @@ static void test_debugger(void) /* ctx.Eip is the same value the exception handler got */ if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine{ ok((char *)ctx.Eip == (char *)code_mem_address + 0xa, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); - } /* need to fixup Eip for debuggee */ if ((char *)ctx.Eip == (char *)code_mem_address + 0xa) ctx.Eip += 1;

1 0

Rob Shearman : ole32: Allow the getting of different interfaces from the global interface table than that with what the object was registered with .
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 7d90b6ce295fe876dc7b3474146e965cdc4a5cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d90b6ce295fe876dc7b34741… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:32:19 2007 +0100 ole32: Allow the getting of different interfaces from the global interface table than that with what the object was registered with. --- dlls/ole32/git.c | 6 +----- dlls/ole32/tests/marshal.c | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index b51990d..c310249 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -271,15 +271,11 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); if (entry == NULL) { + WARN("Entry for cookie 0x%x not found\n", dwCookie); LeaveCriticalSection(&git_section); return E_INVALIDARG; } - if (!IsEqualIID(&entry->iid, riid)) { - LeaveCriticalSection(&git_section); - WARN("entry->iid (%s) != riid\n", debugstr_guid(&entry->iid)); - return E_INVALIDARG; - } TRACE("entry=%p\n", entry); hres = IStream_Clone(entry->stream, &stream); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index d0735fc..0b3cfeb 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2640,9 +2640,8 @@ static void test_globalinterfacetable(void) /* test getting interface from global with different iid */ hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IUnknown, (void **)&object); - todo_wine ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); - if (SUCCEEDED(hr)) IUnknown_Release(object); + IUnknown_Release(object); /* test getting interface from global with same iid */ hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IClassFactory, (void **)&object);

1 0

Rob Shearman : ole32: Remove spurious AddRef of returned object on retrieval of an interface from the global interface table .
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 30cc21196e3b1397ba64e5fa2621bbde535c9bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cc21196e3b1397ba64e5fa2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:32:55 2007 +0100 ole32: Remove spurious AddRef of returned object on retrieval of an interface from the global interface table. --- dlls/ole32/git.c | 4 ---- dlls/ole32/tests/marshal.c | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index c310249..e878f83 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -262,7 +262,6 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( { StdGITEntry* entry; HRESULT hres; - LPUNKNOWN lpUnk; IStream *stream; TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv); @@ -296,9 +295,6 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( return hres; } - /* addref it */ - lpUnk = *ppv; - IUnknown_AddRef(lpUnk); TRACE("ppv=%p\n", *ppv); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 0b3cfeb..b089913 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2651,7 +2651,6 @@ static void test_globalinterfacetable(void) hr = IGlobalInterfaceTable_RevokeInterfaceFromGlobal(git, cookie); ok_ole_success(hr, IGlobalInterfaceTable_RevokeInterfaceFromGlobal); - todo_wine ok_no_locks(); IGlobalInterfaceTable_Release(git);

1 0

Rob Shearman : ole32: Add more tests for global interface table functions.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 05230781b006ed94cbf5e34bc6366595f55d0d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05230781b006ed94cbf5e34bc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:31:45 2007 +0100 ole32: Add more tests for global interface table functions. --- dlls/ole32/tests/marshal.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 1fd2fbb..d0735fc 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2588,10 +2588,11 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv) hr); CoInitialize(NULL); + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); - IGlobalInterfaceTable_Release(params->git); + IClassFactory_Release(cf); CoUninitialize(); @@ -2607,6 +2608,10 @@ static void test_globalinterfacetable(void) DWORD tid; struct git_params params; DWORD ret; + IUnknown *object; + + trace("test_globalinterfacetable\n"); + cLocks = 0; hr = CoCreateInstance(&CLSID_StdGlobalInterfaceTable, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalInterfaceTable, (void **)&git); ok_ole_success(hr, CoCreateInstance); @@ -2614,6 +2619,8 @@ static void test_globalinterfacetable(void) hr = IGlobalInterfaceTable_RegisterInterfaceInGlobal(git, (IUnknown *)&Test_ClassFactory, &IID_IClassFactory, &cookie); ok_ole_success(hr, IGlobalInterfaceTable_RegisterInterfaceInGlobal); + ok_more_than_one_lock(); + params.cookie = cookie; params.git = git; /* note: params is on stack so we MUST wait for get_global_interface_proc @@ -2630,6 +2637,25 @@ static void test_globalinterfacetable(void) } CloseHandle(thread); + + /* test getting interface from global with different iid */ + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IUnknown, (void **)&object); + todo_wine + ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); + if (SUCCEEDED(hr)) IUnknown_Release(object); + + /* test getting interface from global with same iid */ + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IClassFactory, (void **)&object); + ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); + IUnknown_Release(object); + + hr = IGlobalInterfaceTable_RevokeInterfaceFromGlobal(git, cookie); + ok_ole_success(hr, IGlobalInterfaceTable_RevokeInterfaceFromGlobal); + + todo_wine + ok_no_locks(); + + IGlobalInterfaceTable_Release(git); } static const char *debugstr_iid(REFIID riid)

1 0

Rob Shearman : ole32: Fix some races in the global interface table implementation.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: eebf8df6015472de393c049c4daea6f7be06b905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebf8df6015472de393c049c4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:31:11 2007 +0100 ole32: Fix some races in the global interface table implementation. Fix a race between RevokeInterfaceFromGlobal and GetInterfaceFromGlobal by only using the entry inside the critical section. Fix a race between two GetInterfaceFromGlobal by cloning the stream, instead of using it and setting the current position back to zero. --- dlls/ole32/git.c | 55 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 222eb6f..b51990d 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -96,7 +96,7 @@ static void StdGlobalInterfaceTable_Destroy(void* self) /*** * A helper function to traverse the list and find the entry that matches the cookie. - * Returns NULL if not found + * Returns NULL if not found. Must be called inside git_section critical section. */ static StdGITEntry* StdGlobalInterfaceTable_FindEntry(IGlobalInterfaceTable* iface, DWORD cookie) @@ -106,14 +106,10 @@ StdGlobalInterfaceTable_FindEntry(IGlobalInterfaceTable* iface, DWORD cookie) TRACE("iface=%p, cookie=0x%x\n", iface, (UINT)cookie); - EnterCriticalSection(&git_section); LIST_FOR_EACH_ENTRY(e, &self->list, StdGITEntry, entry) { - if (e->cookie == cookie) { - LeaveCriticalSection(&git_section); + if (e->cookie == cookie) return e; - } } - LeaveCriticalSection(&git_section); TRACE("Entry not found\n"); return NULL; @@ -232,12 +228,19 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( HRESULT hr; TRACE("iface=%p, dwCookie=0x%x\n", iface, (UINT)dwCookie); - + + EnterCriticalSection(&git_section); + entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); if (entry == NULL) { TRACE("Entry not found\n"); + LeaveCriticalSection(&git_section); return E_INVALIDARG; /* not found */ } + + list_remove(&entry->entry); + + LeaveCriticalSection(&git_section); /* Free the stream */ hr = CoReleaseMarshalData(entry->stream); @@ -248,11 +251,6 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( } IStream_Release(entry->stream); - /* chop entry out of the list, and free the memory */ - EnterCriticalSection(&git_section); - list_remove(&entry->entry); - LeaveCriticalSection(&git_section); - HeapFree(GetProcessHeap(), 0, entry); return S_OK; } @@ -264,27 +262,38 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( { StdGITEntry* entry; HRESULT hres; - LARGE_INTEGER move; LPUNKNOWN lpUnk; - + IStream *stream; + TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv); - + + EnterCriticalSection(&git_section); + entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); - if (entry == NULL) return E_INVALIDARG; + if (entry == NULL) { + LeaveCriticalSection(&git_section); + return E_INVALIDARG; + } if (!IsEqualIID(&entry->iid, riid)) { + LeaveCriticalSection(&git_section); WARN("entry->iid (%s) != riid\n", debugstr_guid(&entry->iid)); return E_INVALIDARG; } TRACE("entry=%p\n", entry); - + + hres = IStream_Clone(entry->stream, &stream); + + LeaveCriticalSection(&git_section); + + if (hres) { + WARN("Failed to clone stream with error 0x%08x\n", hres); + return hres; + } + /* unmarshal the interface */ - hres = CoUnmarshalInterface(entry->stream, riid, ppv); - - /* rewind stream, in case it's used again */ - move.u.LowPart = 0; - move.u.HighPart = 0; - IStream_Seek(entry->stream, move, STREAM_SEEK_SET, NULL); + hres = CoUnmarshalInterface(stream, riid, ppv); + IStream_Release(stream); if (hres) { WARN("Failed to unmarshal stream\n");

1 0

Rob Shearman : ole32: Add spec entry for CoRegisterSurrogateEx.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 71a5b2d943d87786d72850196dacd3a84c6629fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a5b2d943d87786d72850196… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 16:27:25 2007 +0100 ole32: Add spec entry for CoRegisterSurrogateEx. --- dlls/ole32/ole32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 3ae0240..e018b0f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -58,6 +58,7 @@ @ stdcall CoRegisterMessageFilter(ptr ptr) @ stdcall CoRegisterPSClsid(ptr ptr) @ stub CoRegisterSurrogate +@ stub CoRegisterSurrogateEx @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects()

1 0

Misha Koshelev : msi: automation: Append copyright notice.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 864a7df10ef610da71b93c786d7b73664d191753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864a7df10ef610da71b93c786… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue May 22 00:07:06 2007 -0500 msi: automation: Append copyright notice. --- dlls/msi/msiserver.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 360e4f1..3c0428b 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Mike McCormack + * Copyright (C) 2007 Misha Koshelev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Kolbjoern Fredheim : wined3d: Implemented converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying .
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: cb8a8182d1b6900526eae763c5096cc7335db946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8a8182d1b6900526eae763c… Author: Kolbjoern Fredheim <hightower(a)tregt.net> Date: Tue May 22 03:29:44 2007 +0200 wined3d: Implemented converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. --- dlls/wined3d/surface.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12681c4..fe2fc08 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1532,6 +1532,15 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO } break; + case WINED3DFMT_X1R5G5B5: + if (colorkey_active) { + *convert = CONVERT_CK_5551; + *format = GL_BGRA; + *internal = GL_RGBA; + *type = GL_UNSIGNED_SHORT_1_5_5_5_REV; + } + break; + case WINED3DFMT_R8G8B8: if (colorkey_active) { *convert = CONVERT_CK_RGB24; @@ -1720,6 +1729,32 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN } break; + case CONVERT_CK_5551: + { + /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ + unsigned int x, y; + WORD *Source; + WORD *Dest; + TRACE("Color keyed 5551\n"); + for (y = 0; y < height; y++) { + Source = (WORD *) (src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + WORD color = *Source++; + *Dest = color; + if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || + (color > surf->SrcBltCKey.dwColorSpaceHighValue)) { + *Dest |= (1 << 15); + } + else { + *Dest &= ~(1 << 15); + } + Dest++; + } + } + } + break; + case CONVERT_V8U8: { unsigned int x, y;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2007