wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Marcus Meissner : dinput: Add a dumper for LPDIACTIONFORMAT.
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: 9ce27fc7c104abdc6b0d5d55060c1311627ce491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce27fc7c104abdc6b0d5d550… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 15 14:50:15 2008 +0100 dinput: Add a dumper for LPDIACTIONFORMAT. Also make the DINPUT_instance static. --- dlls/dinput/device.c | 2 +- dlls/dinput/dinput_main.c | 31 ++++++++++++++++++++++++++++++- dlls/dinput/dinput_private.h | 4 ++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 43cd946..8641803 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1339,7 +1339,7 @@ HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A ifa DWORD dwFlags) { FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, lpszUserName, dwFlags); - + _dump_diactionformatA(lpdiaf); return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2638710..0424f72 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -82,7 +82,7 @@ static const struct dinput_device *dinput_devices[] = }; #define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) -HINSTANCE DINPUT_instance = NULL; +static HINSTANCE DINPUT_instance = NULL; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) { @@ -210,6 +210,35 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { TRACE("\n"); } +void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { + int i; + + FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); + FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize); + FIXME("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize); + FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); + FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); + for (i=0;i<lpdiActionFormat->dwNumActions;i++) { + FIXME("diaf.rgoAction[%d]:\n", i); + FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); + FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics); + FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); + FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].lptszActionName)); + FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); + FIXME("\tdwObjID=%x\n", lpdiActionFormat->rgoAction[i].dwObjID); + FIXME("\tdwHow=%x\n", lpdiActionFormat->rgoAction[i].dwHow); + } + FIXME("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap)); + FIXME("diaf.dwGenre = %d\n", lpdiActionFormat->dwGenre); + FIXME("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize); + FIXME("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin); + FIXME("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax); + FIXME("diaf.hInstString = %p\n", lpdiActionFormat->hInstString); + FIXME("diaf.ftTimeStamp ...\n"); + FIXME("diaf.dwCRC = %x\n", lpdiActionFormat->dwCRC); + FIXME("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap)); +} + /****************************************************************************** * IDirectInputA_EnumDevices */ diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index a9d12de..15783e2 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -59,9 +59,9 @@ extern const struct dinput_device keyboard_device; extern const struct dinput_device joystick_linux_device; extern const struct dinput_device joystick_linuxinput_device; -extern HINSTANCE DINPUT_instance; - extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A); typedef void (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); +extern void _dump_diactionformatA(LPDIACTIONFORMATA); + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */

1 0

Steven Edwards : quartz: Bump the amount of time in the referenceclock test slightly.
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: 973c29716bd7503f01da44875aaaf77a2f7b5646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=973c29716bd7503f01da44875… Author: Steven Edwards <winehacker(a)gmail.com> Date: Fri Feb 15 08:48:27 2008 -0500 quartz: Bump the amount of time in the referenceclock test slightly. --- dlls/quartz/tests/referenceclock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index 639af46..a56fb25 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -84,9 +84,9 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock ok (hr == S_OK, "%s - Expected S_OK, got 0x%08x\n", clockdesc, hr); /* FIXME: How much deviation should be allowed after a sleep? */ - /* 0.3% is common, and 0.4% is sometimes observed. Let's try 0.6%. */ + /* 0.3% is common, and 0.4% is sometimes observed. */ diff = time2 - time1; - ok (9940000 <= diff && diff <= 10060000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); + ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); }

1 0

Rob Shearman : include: Fix the C_ASSERT macro to not generate an unused variable warning when compiling with gcc .
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: f59570db68f20dfe9155dad0cc677d11ab5600e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59570db68f20dfe9155dad0c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 15:44:19 2008 +0000 include: Fix the C_ASSERT macro to not generate an unused variable warning when compiling with gcc. Provide a fallback case for other compilers to avoid C_ASSERT being undefined and causing an error. --- include/winnt.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 7ac4703..4489e93 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -282,7 +282,9 @@ extern "C" { #if defined(_MSC_VER) # define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] #elif defined(__GNUC__) -# define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] +# define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] __attribute__((unused)) +#else +# define C_ASSERT(e) #endif /* Eliminate Microsoft C/C++ compiler warning 4715 */

1 0

Rob Shearman : Add a new convenience macro for an exception handler that handles all exceptions .
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: 8608e895ebb3241ada19b4745aa61f2a14928416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8608e895ebb3241ada19b4745… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 15:43:24 2008 +0000 Add a new convenience macro for an exception handler that handles all exceptions. When using native compiler exceptions, the previous method of doing this, __EXCEPT(NULL), would expand to __except( (NULL)(GetExceptionInformation())) which doesn't compile as NULL isn't a function. So add a new macro, __EXCEPT_ALL, which works correctly both when using native compiler exceptions and without and which makes the meaning of code in which it is used clearer. --- dlls/ntdll/loader.c | 4 ++-- dlls/oleaut32/tmarshal.c | 2 +- dlls/rpcrt4/ndr_stubless.c | 2 +- dlls/rpcrt4/rpc_server.c | 2 +- include/wine/exception.h | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a9b8a5e..8ce5a62 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -858,7 +858,7 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) { (*callback)( module, reason, NULL ); } - __EXCEPT(NULL) + __EXCEPT_ALL { if (TRACE_ON(relay)) DPRINTF("%04x:exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", @@ -908,7 +908,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (!retv) status = STATUS_DLL_INIT_FAILED; } - __EXCEPT(NULL) + __EXCEPT_ALL { if (TRACE_ON(relay)) DPRINTF("%04x:exception in PE entry point (proc=%p,module=%p,reason=%s,res=%p)\n", diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 52c8e8a..2e5ae14 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2068,7 +2068,7 @@ TMStubImpl_Invoke( args ); } - __EXCEPT(NULL) + __EXCEPT_ALL { DWORD dwExceptionCode = GetExceptionCode(); ERR("invoke call failed with exception 0x%08x (%d)\n", dwExceptionCode, dwExceptionCode); diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 1f6cd57..85c63d2 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -718,7 +718,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } } } - __EXCEPT(NULL) + __EXCEPT_ALL { RetVal = NdrProxyErrorHandler(GetExceptionCode()); } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 5404259..7849e4e 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -286,7 +286,7 @@ static RPC_STATUS process_request_packet(RpcConnection *conn, RpcPktRequestHdr * RPCRT4_SetThreadCurrentCallHandle(msg->Handle); __TRY { if (func) func(msg); - } __EXCEPT(NULL) { + } __EXCEPT_ALL { WARN("exception caught with code 0x%08x = %d\n", GetExceptionCode(), GetExceptionCode()); exception = TRUE; if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) diff --git a/include/wine/exception.h b/include/wine/exception.h index 10b6c90..3a14a18 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -72,6 +72,7 @@ #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } #define __ENDTRY /*nothing*/ #define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) +#define __EXCEPT_ALL __except(EXCEPTION_EXECUTE_HANDLER) #else /* USE_COMPILER_EXCEPTIONS */ @@ -125,6 +126,8 @@ typedef void (CALLBACK *__WINE_FINALLY)(BOOL); /* convenience handler for page fault exceptions */ #define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) +/* convenience handler for all exception */ +#define __EXCEPT_ALL __EXCEPT( NULL ) #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode)

1 0

Rob Shearman : user32: Fix MonitorFromRect to cope with the absence of the MONITOR_DEFAULTTONEAREST flag .
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: 386427e73901f2d520c583ff9fae3ad2642c1a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=386427e73901f2d520c583ff9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 15:22:44 2008 +0000 user32: Fix MonitorFromRect to cope with the absence of the MONITOR_DEFAULTTONEAREST flag. Previously, the code would return any monitor found, regardless of whether it intersected the given rect or was the nearest monitor. This is fixed by adding a new flag that causes monitor_enum to only find the nearest monitor if MONITOR_DEFAULTTONEAREST is specified. Also add a trace for MonitorFromWindow, since it is called in many places within user32 and so can't be traced using a relay trace. --- dlls/user32/misc.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index f8cb157..65176e3 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -344,6 +344,7 @@ struct monitor_enum_info UINT max_area; UINT min_distance; HMONITOR primary; + HMONITOR nearest; HMONITOR ret; }; @@ -376,7 +377,7 @@ static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARA if (distance < info->min_distance) { info->min_distance = distance; - info->ret = monitor; + info->nearest = monitor; } } if (!info->primary) @@ -403,9 +404,14 @@ HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) info.max_area = 0; info.min_distance = ~0u; info.primary = 0; + info.nearest = 0; info.ret = 0; if (!EnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; - if (!info.ret && (flags & MONITOR_DEFAULTTOPRIMARY)) info.ret = info.primary; + if (!info.ret) + { + if (flags & MONITOR_DEFAULTTOPRIMARY) info.ret = info.primary; + else if (flags & MONITOR_DEFAULTTONEAREST) info.ret = info.nearest; + } TRACE( "%s flags %x returning %p\n", wine_dbgstr_rect(rect), flags, info.ret ); return info.ret; @@ -430,6 +436,8 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) RECT rect; WINDOWPLACEMENT wp; + TRACE("(%p, 0x%08x)\n", hWnd, dwFlags); + if (IsIconic(hWnd) && GetWindowPlacement(hWnd, &wp)) return MonitorFromRect( &wp.rcNormalPosition, dwFlags );

1 0

Rob Shearman : Don' t use GetExceptionCode and GetExceptionInformation in exception filter functions .
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: a82f4dd9b77d5d880b948ceef213fb36ece10461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82f4dd9b77d5d880b948ceef… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 15 15:19:29 2008 +0000 Don't use GetExceptionCode and GetExceptionInformation in exception filter functions. When using native compiler exceptions, it isn't valid to use GetExceptionCode and GetExceptionInformation anywhere other than in the filter or handler blocks since it would be very hard for the compiler to work out where to retrieve the exception information from on the stack. Therefore, remove the WINE_EXCEPTION_FILTER and WINE_FINALLY_FUNC macros which enabled GetExceptionCode, GetExceptionInformation and AbnormalTermination to be used inside of the functions they declared and fix up all callers to access the information directly. --- dlls/kernel32/console.c | 4 ++-- dlls/ole32/moniker.c | 4 ++-- dlls/rpcrt4/cstub.c | 4 ++-- dlls/rpcrt4/rpc_server.c | 11 ++--------- dlls/winedos/dosvm.c | 6 +++--- dlls/winedos/int31.c | 6 +++--- include/wine/exception.h | 3 --- programs/explorer/hal.c | 5 +++-- programs/winedbg/dbg.y | 6 +++--- 9 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b14b9c0..1d86f8a 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1642,9 +1642,9 @@ BOOL WINAPI SetConsoleCtrlHandler(PHANDLER_ROUTINE func, BOOL add) return ret; } -static WINE_EXCEPTION_FILTER(CONSOLE_CtrlEventHandler) +static LONG WINAPI CONSOLE_CtrlEventHandler(EXCEPTION_POINTERS *eptr) { - TRACE("(%x)\n", GetExceptionCode()); + TRACE("(%x)\n", eptr->ExceptionRecord->ExceptionCode); return EXCEPTION_EXECUTE_HANDLER; } diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index cc83d95..b191821 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -53,9 +53,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); * constant is (http://msdn2.microsoft.com/en-us/library/ms693773.aspx) */ #define MAX_COMPARISON_DATA 2048 -static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) +static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) { - switch (GetExceptionCode()) + switch (eptr->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION: diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index cd07c29..b416a10 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define STUB_HEADER(This) (((const CInterfaceStubHeader*)((This)->lpVtbl))[-1]) -static WINE_EXCEPTION_FILTER(stub_filter) +static LONG WINAPI stub_filter(EXCEPTION_POINTERS *eptr) { - if (GetExceptionInformation()->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) + if (eptr->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_EXECUTE_HANDLER; } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9ffec50..5404259 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -153,14 +153,6 @@ static void RPCRT4_release_server_interface(RpcServerInterface *sif) } } -static WINE_EXCEPTION_FILTER(rpc_filter) -{ - WARN("exception caught with code 0x%08x = %d\n", GetExceptionCode(), GetExceptionCode()); - TRACE("returning failure packet\n"); - /* catch every exception */ - return EXCEPTION_EXECUTE_HANDLER; -} - static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, RPC_MESSAGE *msg) { RPC_STATUS status; @@ -294,7 +286,8 @@ static RPC_STATUS process_request_packet(RpcConnection *conn, RpcPktRequestHdr * RPCRT4_SetThreadCurrentCallHandle(msg->Handle); __TRY { if (func) func(msg); - } __EXCEPT(rpc_filter) { + } __EXCEPT(NULL) { + WARN("exception caught with code 0x%08x = %d\n", GetExceptionCode(), GetExceptionCode()); exception = TRUE; if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) status = ERROR_NOACCESS; diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index 2d1b915..51e8e56 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -521,10 +521,10 @@ DWORD WINAPI DOSVM_Loop( HANDLE hThread ) } } -static WINE_EXCEPTION_FILTER(exception_handler) +static LONG WINAPI exception_handler(EXCEPTION_POINTERS *eptr) { - EXCEPTION_RECORD *rec = GetExceptionInformation()->ExceptionRecord; - CONTEXT *context = GetExceptionInformation()->ContextRecord; + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + CONTEXT *context = eptr->ContextRecord; int arg = rec->ExceptionInformation[0]; BOOL ret; diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index dc7351c..b1dfe4b 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -108,11 +108,11 @@ static WORD alloc_pm_selector( WORD seg, unsigned char flags ) * Handle EXCEPTION_VM86_STI exceptions generated * when there are pending asynchronous events. */ -static WINE_EXCEPTION_FILTER(dpmi_exception_handler) +static LONG WINAPI dpmi_exception_handler(EXCEPTION_POINTERS *eptr) { #ifdef __i386__ - EXCEPTION_RECORD *rec = GetExceptionInformation()->ExceptionRecord; - CONTEXT *context = GetExceptionInformation()->ContextRecord; + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + CONTEXT *context = eptr->ContextRecord; if (rec->ExceptionCode == EXCEPTION_VM86_STI) { diff --git a/include/wine/exception.h b/include/wine/exception.h index adf8926..10b6c90 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -126,9 +126,6 @@ typedef void (CALLBACK *__WINE_FINALLY)(BOOL); /* convenience handler for page fault exceptions */ #define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) -#define WINE_EXCEPTION_FILTER(func) LONG WINAPI func( EXCEPTION_POINTERS *__eptr ) -#define WINE_FINALLY_FUNC(func) void WINAPI func( BOOL __normal ) - #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) #define AbnormalTermination() (!__normal) diff --git a/programs/explorer/hal.c b/programs/explorer/hal.c index 38b0523..df31c6b 100644 --- a/programs/explorer/hal.c +++ b/programs/explorer/hal.c @@ -102,9 +102,10 @@ failed: return FALSE; } -static WINE_EXCEPTION_FILTER(assert_fault) +static LONG WINAPI assert_fault(EXCEPTION_POINTERS *eptr) { - if (GetExceptionCode() == EXCEPTION_WINE_ASSERTION) return EXCEPTION_EXECUTE_HANDLER; + if (eptr->ExceptionRecord->ExceptionCode == EXCEPTION_WINE_ASSERTION) + return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 4679986..70bc66f 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -401,9 +401,9 @@ lvalue: %% -static WINE_EXCEPTION_FILTER(wine_dbg_cmd) +static LONG WINAPI wine_dbg_cmd(EXCEPTION_POINTERS *eptr) { - switch (GetExceptionCode()) + switch (eptr->ExceptionRecord->ExceptionCode) { case DEBUG_STATUS_INTERNAL_ERROR: dbg_printf("\nWineDbg internal error\n"); @@ -436,7 +436,7 @@ static WINE_EXCEPTION_FILTER(wine_dbg_cmd) dbg_interrupt_debuggee(); return EXCEPTION_CONTINUE_EXECUTION; default: - dbg_printf("\nException %x\n", GetExceptionCode()); + dbg_printf("\nException %x\n", eptr->ExceptionRecord->ExceptionCode); break; }

1 0

Alexandre Julliard : browseui: Remove WINAPI from functions that don' t need it.
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: 1d0bcb3b37177d7476540b727d4348c2f5c88431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0bcb3b37177d7476540b727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 16 14:05:32 2008 +0100 browseui: Remove WINAPI from functions that don't need it. --- dlls/browseui/aclmulti.c | 2 +- dlls/browseui/browseui.h | 6 +++--- dlls/browseui/browseui_main.c | 2 +- dlls/browseui/compcatcachedaemon.c | 2 +- dlls/browseui/progressdlg.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index b0a0ec8..11ba3b1 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -81,7 +81,7 @@ static void release_obj(struct ACLMultiSublist *obj) IACList_Release(obj->pACL); } -HRESULT WINAPI ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ACLMulti *This; if (pUnkOuter) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 2c538d6..fb46462 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -24,9 +24,9 @@ extern LONG BROWSEUI_refCount; extern HINSTANCE BROWSEUI_hinstance; -HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -HRESULT WINAPI ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut); -HRESULT WINAPI CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut); extern const GUID CLSID_CompCatCacheDaemon; diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index a7210a8..c370408 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -46,7 +46,7 @@ LONG BROWSEUI_refCount = 0; HINSTANCE BROWSEUI_hinstance = 0; -typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); +typedef HRESULT (*LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); static const struct { REFCLSID clsid; diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 755fd8d..f4fd5e6 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -51,7 +51,7 @@ typedef struct tagCCCD { static const IRunnableTaskVtbl CompCatCacheDaemonVtbl; -HRESULT WINAPI CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { CompCatCacheDaemon *This; if (pUnkOuter) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index aa568e7..28538d3 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -246,7 +246,7 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) return 0; } -HRESULT WINAPI ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ProgressDialog *This; if (pUnkOuter)

1 0

Maarten Lankhorst : browseui: Add undocumented Component Category Cache Daemon stub.
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: a33ab3484e8b12f426448cedc6104d5db988a9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33ab3484e8b12f426448cedc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 11 10:18:07 2008 -0800 browseui: Add undocumented Component Category Cache Daemon stub. --- dlls/browseui/Makefile.in | 1 + dlls/browseui/browseui.h | 3 + dlls/browseui/browseui_main.c | 4 + dlls/browseui/compcatcachedaemon.c | 159 ++++++++++++++++++++++++++++++++++++ dlls/browseui/regsvr.c | 8 ++ 5 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index b48886d..70de186 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -10,6 +10,7 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ aclmulti.c \ browseui_main.c \ + compcatcachedaemon.c \ progressdlg.c \ regsvr.c diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 74fd2d7..2c538d6 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -26,5 +26,8 @@ extern HINSTANCE BROWSEUI_hinstance; HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); HRESULT WINAPI ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut); +HRESULT WINAPI CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **ppOut); + +extern const GUID CLSID_CompCatCacheDaemon; #endif /* __WINE_SHDOCVW_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 8e93cf3..a7210a8 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -37,6 +37,9 @@ #include "browseui.h" +#include "initguid.h" +DEFINE_GUID(CLSID_CompCatCacheDaemon, 0x8C7461EF, 0x2b13, 0x11d2, 0xbe, 0x35, 0x30, 0x78, 0x30, 0x2c, 0x20, 0x30); + WINE_DEFAULT_DEBUG_CHANNEL(browseui); LONG BROWSEUI_refCount = 0; @@ -51,6 +54,7 @@ static const struct { } ClassesTable[] = { {&CLSID_ACLMulti, ACLMulti_Constructor}, {&CLSID_ProgressDialog, ProgressDialog_Constructor}, + {&CLSID_CompCatCacheDaemon, CompCatCacheDaemon_Constructor}, {NULL, NULL} }; diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c new file mode 100644 index 0000000..755fd8d --- /dev/null +++ b/dlls/browseui/compcatcachedaemon.c @@ -0,0 +1,159 @@ +/* + * Component Category Cache 'Daemon' + * + * Copyright (C) 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "shlguid.h" +#include "shlobj.h" + +#include "wine/unicode.h" + +#include "browseui.h" +#include "resids.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +typedef struct tagCCCD { + const IRunnableTaskVtbl *vtbl; + LONG refCount; + CRITICAL_SECTION cs; +} CompCatCacheDaemon; + +static const IRunnableTaskVtbl CompCatCacheDaemonVtbl; + +HRESULT WINAPI CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + CompCatCacheDaemon *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = CoTaskMemAlloc(sizeof(CompCatCacheDaemon)); + if (This == NULL) + return E_OUTOFMEMORY; + ZeroMemory(This, sizeof(*This)); + This->vtbl = &CompCatCacheDaemonVtbl; + This->refCount = 1; + InitializeCriticalSection(&This->cs); + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + BROWSEUI_refCount++; + return S_OK; +} + +static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) +{ + TRACE("destroying %p\n", This); + DeleteCriticalSection(&This->cs); + CoTaskMemFree(This); + BROWSEUI_refCount--; +} + +static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, REFIID iid, LPVOID *ppvOut) +{ + CompCatCacheDaemon *This = (CompCatCacheDaemon *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IRunnableTask) || IsEqualIID(iid, &IID_IUnknown)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IRunnableTask_AddRef(iface); + return S_OK; + } + + FIXME("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI CompCatCacheDaemon_AddRef(IRunnableTask *iface) +{ + CompCatCacheDaemon *This = (CompCatCacheDaemon *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI CompCatCacheDaemon_Release(IRunnableTask *iface) +{ + CompCatCacheDaemon *This = (CompCatCacheDaemon *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + CompCatCacheDaemon_Destructor(This); + return ret; +} + +static HRESULT WINAPI CompCatCacheDaemon_Run(IRunnableTask *iface) +{ + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI CompCatCacheDaemon_Kill(IRunnableTask *iface, BOOL fWait) +{ + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI CompCatCacheDaemon_Suspend(IRunnableTask *iface) +{ + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI CompCatCacheDaemon_Resume(IRunnableTask *iface) +{ + FIXME("stub\n"); + return S_OK; +} + +static ULONG WINAPI CompCatCacheDaemon_IsRunning(IRunnableTask *iface) +{ + FIXME("stub\n"); + return 0; +} + +static const IRunnableTaskVtbl CompCatCacheDaemonVtbl = +{ + CompCatCacheDaemon_QueryInterface, + CompCatCacheDaemon_AddRef, + CompCatCacheDaemon_Release, + CompCatCacheDaemon_Run, + CompCatCacheDaemon_Kill, + CompCatCacheDaemon_Suspend, + CompCatCacheDaemon_Resume, + CompCatCacheDaemon_IsRunning +}; diff --git a/dlls/browseui/regsvr.c b/dlls/browseui/regsvr.c index 5019f21..746e20b 100644 --- a/dlls/browseui/regsvr.c +++ b/dlls/browseui/regsvr.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "shlguid.h" +#include "browseui.h" #include "wine/debug.h" @@ -454,6 +455,13 @@ static struct regsvr_coclass const coclass_list[] = { "browseui.dll", "Both" }, + { + &CLSID_CompCatCacheDaemon, + "Component Catagory Cache Daemon", + NULL, + "browseui.dll", + "Both" + }, { NULL } /* list terminator */ };

1 0

Maarten Lankhorst : include: Add IRunnableTask interface.
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: e07112ba5bce86aa6ed0001f9b16b0032cbae5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07112ba5bce86aa6ed0001f9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 11 10:14:00 2008 -0800 include: Add IRunnableTask interface. --- include/shobjidl.idl | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 5e937dc..3353268 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1296,6 +1296,22 @@ interface INewShortcutHookW : IUnknown [in] int cchExtension); } +/***************************************************************************** + * IRunnableTask interface + */ +[ + object, + uuid(85788d00-6807-11d0-b810-00c04fd706ec), + pointer_default(unique) +] +interface IRunnableTask : IUnknown +{ + HRESULT Run(); + HRESULT Kill([in] BOOL fWait); + HRESULT Suspend(); + HRESULT Resume(); + ULONG IsRunning(); +} /***************************************************************************** * IShellChangeNotify interface

1 0

Austin English : README: Update some outdated information.
by Alexandre Julliard 16 Feb '08

16 Feb '08

Module: wine Branch: master Commit: 3f4c41b955ab0bce2953226756081219b59094ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4c41b955ab0bce295322675… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 15 16:14:36 2008 -0600 README: Update some outdated information. --- README | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index e3853ac..913e734 100644 --- a/README +++ b/README @@ -44,8 +44,9 @@ Linux info: it's best to have a current kernel such as 2.4.x or 2.6.x. FreeBSD info: - Wine should build on FreeBSD 5.x, but versions before FreeBSD 6.2 will - generally not work properly. + Wine should build on FreeBSD 5.x, but versions before FreeBSD 7.0 will + generally not work properly. FreeBSD 6.3 has patches available to allow + Wine to run. See <http://wiki.freebsd.org/Wine> for more information. More information can be found in the FreeBSD ports tree at <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/>. @@ -67,10 +68,9 @@ Mac OS X info: Supported file systems: Wine should run on most file systems. However, Wine will fail to start if umsdos is used for the /tmp directory. A few compatibility problems have - also been reported using files accessed through Samba. Also, as NTFS - can only be used safely with readonly access for now, we recommend against - using NTFS, as Windows programs need write access almost everywhere. - In case of NTFS files, copy over to a writable location. + also been reported using files accessed through Samba. Also, NTFS does not + provide all the file system features needed by some applications. + Using a native Linux file system such as ext3 is recommended. Basic requirements: You need to have the X11 development include files installed

1 0

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 February 2008