May 2009 - Wine-commits - list.winehq.org

Paul Vriens : gdi32/tests: Fix a test failure on Win9x/WinME.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 9f4283dcc69f3911acc1a0e362c1ad7922805b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4283dcc69f3911acc1a0e36… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri May 22 13:54:26 2009 +0200 gdi32/tests: Fix a test failure on Win9x/WinME. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a0d4531..a0e767d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1954,7 +1954,9 @@ static void test_select_object(void) ok(bm.bmWidthBytes == BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel), "wrong bmWidthBytes %d\n", bm.bmWidthBytes); ok(bm.bmPlanes == planes, "wrong bmPlanes %u\n", bm.bmPlanes); if(depths[i] == 15) { - ok(bm.bmBitsPixel == 16, "wrong bmBitsPixel %d(15 bpp special)\n", bm.bmBitsPixel); + ok(bm.bmBitsPixel == 16 || + broken(bm.bmBitsPixel == 15), /* Win9x/WinME */ + "wrong bmBitsPixel %d(15 bpp special)\n", bm.bmBitsPixel); } else { ok(bm.bmBitsPixel == depths[i], "wrong bmBitsPixel %d\n", bm.bmBitsPixel); }

1 0

Jacek Caban : urlmon: Fixed tests on Windows.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: d86143b3e40ea4df6cffb1f97c1ca9b62bfdf22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86143b3e40ea4df6cffb1f97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 22 13:56:38 2009 +0200 urlmon: Fixed tests on Windows. --- dlls/urlmon/tests/protocol.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 05f8602..e8aa8f9 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -786,10 +786,7 @@ static HRESULT WINAPI MimeProtocolSink_ReportData(IInternetProtocolSink *iface, ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); - SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); - hres = IInternetProtocolSink_ReportProgress(filtered_sink, BINDSTATUS_CACHEFILENAMEAVAILABLE, expect_wsz = emptyW); - ok(hres == S_OK, "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres); - CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); + /* FIXME: test BINDSTATUS_CACHEFILENAMEAVAILABLE */ } SET_EXPECT(ReportData); @@ -842,6 +839,8 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &protocol_sink; if(IsEqualGUID(&IID_IServiceProvider, riid)) *ppv = &service_provider; + if(IsEqualGUID(&IID_IUriContainer, riid)) + return E_NOINTERFACE; /* TODO */ if(*ppv) return S_OK;

1 0

Paul Vriens : kernel32/tests: Fix test failure on older W2K boxes.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 43ccb8abd8fcded95ca47b14a7f75081a00196c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ccb8abd8fcded95ca47b14a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri May 22 15:04:53 2009 +0200 kernel32/tests: Fix test failure on older W2K boxes. --- dlls/kernel32/tests/volume.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 498c2d8..6454731 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -67,7 +67,8 @@ static void test_query_dos_deviceA(void) } for (;drivestr[0] <= 'z'; drivestr[0]++) { - ret = QueryDosDeviceA( drivestr, buffer, buflen); + /* Older W2K fails with ERROR_INSUFFICIENT_BUFFER when buflen is > 32767 big */ + ret = QueryDosDeviceA( drivestr, buffer, buflen - 1); if(ret) { for (p = buffer; *p; p++) *p = toupper(*p); if (strstr(buffer, "HARDDISK") || strstr(buffer, "RAMDISK")) found = TRUE;

1 0

Alexandre Julliard : ntdll: Initial support for dispatching exceptions to stack handlers on x86_64.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: ad7b2824395fe10038bbfc47f66b5e50ddd5b7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7b2824395fe10038bbfc47f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 11:52:13 2009 +0200 ntdll: Initial support for dispatching exceptions to stack handlers on x86_64. --- dlls/ntdll/signal_x86_64.c | 109 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 103 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index cc65dc8..c9db2fe 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -52,6 +52,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); +struct _DISPATCHER_CONTEXT; + +typedef EXCEPTION_DISPOSITION (WINAPI *PEXCEPTION_ROUTINE)( EXCEPTION_RECORD *rec, + ULONG64 frame, + CONTEXT *context, + struct _DISPATCHER_CONTEXT *dispatch ); + +typedef struct _DISPATCHER_CONTEXT +{ + ULONG64 ControlPc; + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; + ULONG64 EstablisherFrame; + ULONG64 TargetIp; + PCONTEXT ContextRecord; + PEXCEPTION_ROUTINE LanguageHandler; + PVOID HandlerData; + PUNWIND_HISTORY_TABLE HistoryTable; + ULONG ScopeIndex; +} DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; + /*********************************************************************** * signal context platform-specific definitions @@ -649,15 +670,92 @@ static RUNTIME_FUNCTION *find_function_info( ULONG64 pc, HMODULE module, * * Call the stack handlers chain. */ -static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) +static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) { EXCEPTION_POINTERS ptrs; + UNWIND_HISTORY_TABLE table; + ULONG64 frame; + RUNTIME_FUNCTION *dir, *info; + PEXCEPTION_ROUTINE handler; + DISPATCHER_CONTEXT dispatch; + CONTEXT context, new_context; + LDR_MODULE *module; + DWORD size; + + context = *orig_context; + for (;;) + { + /* FIXME: should use the history table to make things faster */ + + if (LdrFindEntryForAddress( (void *)context.Rip, &module )) + { + ERR( "no module found for rip %p, can't dispatch exception\n", (void *)context.Rip ); + break; + } + if (!(dir = RtlImageDirectoryEntryToData( module->BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) + { + ERR( "module %s doesn't contain exception data, can't dispatch exception\n", + debugstr_w(module->BaseDllName.Buffer) ); + break; + } + if (!(info = find_function_info( context.Rip, module->BaseAddress, dir, size ))) + { + /* leaf function */ + context.Rip = *(ULONG64 *)context.Rsp; + context.Rsp += sizeof(ULONG64); + continue; + } + + new_context = context; - FIXME( "not implemented on x86_64\n" ); + handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)module->BaseAddress, context.Rip, + info, &new_context, &dispatch.HandlerData, &frame, NULL ); + + if ((frame & 7) || + frame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || + frame >= (ULONG64)NtCurrentTeb()->Tib.StackBase) + { + ERR( "invalid frame %lx\n", frame ); + rec->ExceptionFlags |= EH_STACK_INVALID; + break; + } + + if (handler) + { + dispatch.ControlPc = context.Rip; + dispatch.ImageBase = (ULONG64)module->BaseAddress; + dispatch.FunctionEntry = info; + dispatch.EstablisherFrame = frame; + dispatch.TargetIp = 0; /* FIXME */ + dispatch.ContextRecord = &context; + dispatch.LanguageHandler = handler; + dispatch.HistoryTable = &table; + dispatch.ScopeIndex = 0; /* FIXME */ + + TRACE( "calling handler %p (rec=%p, frame=%lx context=%p, dispatch=%p)\n", + handler, rec, frame, &context, &dispatch ); + + switch( handler( rec, frame, &context, &dispatch )) + { + case ExceptionContinueExecution: + if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; + *orig_context = context; + return STATUS_SUCCESS; + case ExceptionContinueSearch: + break; + case ExceptionNestedException: + break; + default: + return STATUS_INVALID_DISPOSITION; + } + } + context = new_context; + } /* hack: call unhandled exception filter directly */ ptrs.ExceptionRecord = rec; - ptrs.ContextRecord = context; + ptrs.ContextRecord = orig_context; unhandled_exception_filter( &ptrs ); return STATUS_UNHANDLED_EXCEPTION; } @@ -679,7 +777,7 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f TRACE( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip, GetCurrentThreadId() ); - for (c = 0; c < rec->NumberParameters; c++) + for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) TRACE( " info[%d]=%08lx\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) { @@ -1241,8 +1339,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, unsigned int i, prolog_offset; TRACE( "type %x rip %lx rsp %lx\n", type, pc, context->Rsp ); - - dump_unwind_info( base, function ); + if (TRACE_ON(seh)) dump_unwind_info( base, function ); frame = *frame_ret = context->Rsp; for (;;)

1 0

Alexandre Julliard : ntdll: Implement __C_specific_handler for x86_64.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 2c63d1d7dddfd1126e0650bc3257acb646bec57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c63d1d7dddfd1126e0650bc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 12:00:43 2009 +0200 ntdll: Implement __C_specific_handler for x86_64. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 78 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4b5dfec..484ae8e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1231,6 +1231,7 @@ @ cdecl -private _CIpow() NTDLL__CIpow # @ stub _CIsin # @ stub _CIsqrt +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) # @ stub __isascii # @ stub __iscsym # @ stub __iscsymf diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c9db2fe..673c2ec 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -54,6 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); struct _DISPATCHER_CONTEXT; +typedef LONG (WINAPI *PC_LANGUAGE_EXCEPTION_HANDLER)( EXCEPTION_POINTERS *ptrs, ULONG64 frame ); typedef EXCEPTION_DISPOSITION (WINAPI *PEXCEPTION_ROUTINE)( EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, @@ -73,6 +74,18 @@ typedef struct _DISPATCHER_CONTEXT ULONG ScopeIndex; } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; +typedef struct _SCOPE_TABLE +{ + ULONG Count; + struct + { + ULONG BeginAddress; + ULONG EndAddress; + ULONG HandlerAddress; + ULONG JumpTarget; + } ScopeRecord[1]; +} SCOPE_TABLE, *PSCOPE_TABLE; + /*********************************************************************** * signal context platform-specific definitions @@ -322,6 +335,19 @@ static void dump_unwind_info( ULONG64 base, RUNTIME_FUNCTION *function ) } } +static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) +{ + unsigned int i; + + TRACE( "scope table at %p\n", table ); + for (i = 0; i < table->Count; i++) + TRACE( " %u: %lx-%lx handler %lx target %lx\n", i, + base + table->ScopeRecord[i].BeginAddress, + base + table->ScopeRecord[i].EndAddress, + base + table->ScopeRecord[i].HandlerAddress, + base + table->ScopeRecord[i].JumpTarget ); +} + /*********************************************************************** * dispatch_signal */ @@ -1455,7 +1481,6 @@ void WINAPI RtlUnwindEx( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec rec->ExceptionFlags |= EH_UNWINDING | (frame ? 0 : EH_EXIT_UNWIND); FIXME( "code=%x flags=%x not implemented on x86_64\n", rec->ExceptionCode, rec->ExceptionFlags ); - NtTerminateProcess( GetCurrentProcess(), 1 ); } @@ -1471,6 +1496,57 @@ DEFINE_REGS_ENTRYPOINT( RtlUnwind, 4 ) /******************************************************************* + * __C_specific_handler (NTDLL.@) + */ +EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, + ULONG64 frame, + CONTEXT *context, + struct _DISPATCHER_CONTEXT *dispatch ) +{ + SCOPE_TABLE *table = dispatch->HandlerData; + ULONG i; + + TRACE( "%p %lx %p %p\n", rec, frame, context, dispatch ); + if (TRACE_ON(seh)) dump_scope_table( dispatch->ImageBase, table ); + + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) /* FIXME */ + return ExceptionContinueSearch; + + for (i = 0; i < table->Count; i++) + { + if (context->Rip >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + context->Rip < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + if (!table->ScopeRecord[i].JumpTarget) continue; + if (table->ScopeRecord[i].HandlerAddress != EXCEPTION_EXECUTE_HANDLER) + { + EXCEPTION_POINTERS ptrs; + PC_LANGUAGE_EXCEPTION_HANDLER filter; + + filter = (PC_LANGUAGE_EXCEPTION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); + ptrs.ExceptionRecord = rec; + ptrs.ContextRecord = context; + TRACE( "calling filter %p ptrs %p frame %lx\n", filter, &ptrs, frame ); + switch (filter( &ptrs, frame )) + { + case EXCEPTION_EXECUTE_HANDLER: + break; + case EXCEPTION_CONTINUE_SEARCH: + continue; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + } + } + TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); + RtlUnwindEx( frame, dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, + rec, 0, context, dispatch->HistoryTable ); + } + } + return ExceptionContinueSearch; +} + + +/******************************************************************* * NtRaiseException (NTDLL.@) */ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance )

1 0

Alexandre Julliard : ntdll: Implement RtlUnwindEx for x86_64.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 3aa266f8f369b064e4298d86b364da3962ef3106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa266f8f369b064e4298d86b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 12:47:15 2009 +0200 ntdll: Implement RtlUnwindEx for x86_64. --- dlls/ntdll/signal_x86_64.c | 92 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 673c2ec..1748221 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1462,10 +1462,17 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, /******************************************************************* * RtlUnwindEx (NTDLL.@) */ -void WINAPI RtlUnwindEx( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec, +void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD *rec, ULONG64 retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) { EXCEPTION_RECORD record; + ULONG64 frame; + RUNTIME_FUNCTION *dir, *info; + PEXCEPTION_ROUTINE handler; + DISPATCHER_CONTEXT dispatch; + CONTEXT new_context; + LDR_MODULE *module; + DWORD size; /* build an exception record, if we do not have one */ if (!rec) @@ -1478,9 +1485,88 @@ void WINAPI RtlUnwindEx( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec rec = &record; } - rec->ExceptionFlags |= EH_UNWINDING | (frame ? 0 : EH_EXIT_UNWIND); + rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND); + + FIXME( "code=%x flags=%x end_frame=%lx target_ip=%lx\n", + rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip ); + + frame = context->Rsp; + while (frame != end_frame) + { + /* FIXME: should use the history table to make things faster */ + + if (LdrFindEntryForAddress( (void *)context->Rip, &module )) + { + ERR( "no module found for rip %p, can't unwind exception\n", (void *)context->Rip ); + raise_status( STATUS_BAD_FUNCTION_TABLE, rec ); + } + if (!(dir = RtlImageDirectoryEntryToData( module->BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) + { + ERR( "module %s doesn't contain exception data, can't unwind exception\n", + debugstr_w(module->BaseDllName.Buffer) ); + raise_status( STATUS_BAD_FUNCTION_TABLE, rec ); + } + if (!(info = find_function_info( context->Rip, module->BaseAddress, dir, size ))) + { + /* leaf function */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64); + continue; + } + + new_context = *context; + + handler = RtlVirtualUnwind( UNW_FLAG_UHANDLER, (ULONG64)module->BaseAddress, context->Rip, + info, &new_context, &dispatch.HandlerData, &frame, NULL ); + + if ((frame & 7) || + frame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || + frame >= (ULONG64)NtCurrentTeb()->Tib.StackBase) + { + ERR( "invalid frame %lx\n", frame ); + raise_status( STATUS_BAD_STACK, rec ); + } + + if (end_frame && (frame > end_frame)) + { + ERR( "invalid frame %lx/%lx\n", frame, end_frame ); + raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); + } + + if (handler) + { + dispatch.ControlPc = context->Rip; + dispatch.ImageBase = (ULONG64)module->BaseAddress; + dispatch.FunctionEntry = info; + dispatch.EstablisherFrame = frame; + dispatch.TargetIp = target_ip; + dispatch.ContextRecord = context; + dispatch.LanguageHandler = handler; + dispatch.HistoryTable = table; + dispatch.ScopeIndex = 0; /* FIXME */ - FIXME( "code=%x flags=%x not implemented on x86_64\n", rec->ExceptionCode, rec->ExceptionFlags ); + TRACE( "calling handler %p (rec=%p, frame=%lx context=%p, dispatch=%p)\n", + handler, rec, frame, context, &dispatch ); + + switch( handler( rec, frame, context, &dispatch )) + { + case ExceptionContinueSearch: + break; + case ExceptionCollidedUnwind: + FIXME( "ExceptionCollidedUnwind not supported yet\n" ); + break; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; + } + } + *context = new_context; + } + context->Rax = retval; + context->Rip = target_ip; + TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + set_cpu_context( context ); }

1 0

Huw Davies : ole32: Explicitly add the three ULONGs from the METAFILEPICT struct to allow for padding in the 64-bit version .
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 485811cf9c745041d97164063897c6ea17276ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485811cf9c745041d97164063… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 11:51:31 2009 +0100 ole32: Explicitly add the three ULONGs from the METAFILEPICT struct to allow for padding in the 64-bit version. --- dlls/ole32/usrmarshal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 98e0691..46fba8b 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1390,7 +1390,7 @@ ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG StartingSize, HMETA METAFILEPICT *mfpict = GlobalLock(*phMfp); /* FIXME: raise an exception if mfpict is NULL? */ - size += FIELD_OFFSET(remoteMETAFILEPICT, hMF); + size += 3 * sizeof(ULONG); size += sizeof(ULONG); size = HMETAFILE_UserSize(pFlags, size, &mfpict->hMF); @@ -1451,7 +1451,7 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal(ULONG *pFlags, unsigned cha remmfpict->mm = mfpict->mm; remmfpict->xExt = mfpict->xExt; remmfpict->yExt = mfpict->yExt; - pBuffer += FIELD_OFFSET(remoteMETAFILEPICT, hMF); + pBuffer += 3 * sizeof(ULONG); *(ULONG *)pBuffer = USER_MARSHAL_PTR_PREFIX; pBuffer += sizeof(ULONG); @@ -1518,7 +1518,7 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *pFlags, unsigned c mfpict->mm = remmfpict->mm; mfpict->xExt = remmfpict->xExt; mfpict->yExt = remmfpict->yExt; - pBuffer += FIELD_OFFSET(remoteMETAFILEPICT, hMF); + pBuffer += 3 * sizeof(ULONG); user_marshal_prefix = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG);

1 0

Stefan Leichter : traffic: Stub for TcRegisterClient.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 214311c620b6bf8756b392aedd60bf2189f5fb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=214311c620b6bf8756b392aed… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri May 22 14:00:21 2009 +0200 traffic: Stub for TcRegisterClient. --- dlls/traffic/traffic.spec | 2 +- dlls/traffic/traffic_main.c | 12 ++++++++++ include/Makefile.in | 1 + include/traffic.h | 48 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/traffic/traffic.spec b/dlls/traffic/traffic.spec index eed26e8..4638af3 100644 --- a/dlls/traffic/traffic.spec +++ b/dlls/traffic/traffic.spec @@ -15,7 +15,7 @@ @ stub TcQueryFlowA @ stub TcQueryFlowW @ stub TcQueryInterface -@ stub TcRegisterClient +@ stdcall TcRegisterClient(long ptr ptr ptr) @ stub TcSetFlowA @ stub TcSetFlowW @ stub TcSetInterface diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 421be6c..6efea89 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "traffic.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(traffic); @@ -42,3 +43,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/***************************************************************************** + * TcRegisterClient [TRAFFIC.@] + */ +ULONG WINAPI TcRegisterClient(ULONG version, HANDLE context, + PTCI_CLIENT_FUNC_LIST list, PHANDLE buffer) +{ + FIXME("(%u %p %p %p) stub\n", version, context, list, buffer); + if(buffer) *buffer = INVALID_HANDLE_VALUE; + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/Makefile.in b/include/Makefile.in index 5f7aacc..be2762a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -420,6 +420,7 @@ SRCDIR_INCLUDES = \ textserv.h \ tlhelp32.h \ tmschema.h \ + traffic.h \ twain.h \ userenv.h \ usp10.h \ diff --git a/include/traffic.h b/include/traffic.h new file mode 100644 index 0000000..5ffc1ec --- /dev/null +++ b/include/traffic.h @@ -0,0 +1,48 @@ +/* + * TRAFFIC definitions + * + * Copyright (c) 2009 Stefan Leichter + * + * 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 + */ + +#ifndef __WINE_TRAFFIC_H +#define __WINE_TRAFFIC_H + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +typedef VOID (CALLBACK * TCI_ADD_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG); +typedef VOID (CALLBACK * TCI_DEL_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG); +typedef VOID (CALLBACK * TCI_MOD_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG); +typedef VOID (CALLBACK * TCI_NOTIFY_HANDLER) + (HANDLE,HANDLE,ULONG,HANDLE,ULONG,PVOID); + +typedef struct _TCI_CLIENT_FUNC_LIST +{ + TCI_NOTIFY_HANDLER ClNotifyHandler; + TCI_ADD_FLOW_COMPLETE_HANDLER ClAddFlowCompleteHandler; + TCI_MOD_FLOW_COMPLETE_HANDLER ClModifyFlowCompleteHandler; + TCI_DEL_FLOW_COMPLETE_HANDLER ClDeleteFlowCompleteHandler; +} TCI_CLIENT_FUNC_LIST, *PTCI_CLIENT_FUNC_LIST; + +ULONG WINAPI TcRegisterClient(ULONG,HANDLE,PTCI_CLIENT_FUNC_LIST,PHANDLE); + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif /* __WINE_TRAFFIC_H */

1 0

Nikolay Sivov : comctl32/tests: A bunch of ListView hittest tests.
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: 691aa6e267c8d1c8e17924f06997ddfc2fea5cf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=691aa6e267c8d1c8e17924f06… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 22 00:57:30 2009 +0400 comctl32/tests: A bunch of ListView hittest tests. --- dlls/comctl32/tests/listview.c | 186 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1c002d9..d3e4ee8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -387,6 +387,89 @@ static HWND subclass_header(HWND hwndListview) return hwnd; } +/* Performs a single LVM_HITTEST test */ +static void test_lvm_hittest(HWND hwnd, INT x, INT y, INT item, UINT flags, + BOOL todo_item, BOOL todo_flags, int line) +{ + LVHITTESTINFO lpht; + DWORD ret; + + lpht.pt.x = x; + lpht.pt.y = y; + lpht.iSubItem = 10; + + trace("hittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); + ret = SendMessage(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht); + + if (todo_item) + { + todo_wine + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + ok_(__FILE__, line)(lpht.iSubItem == 10, "Expected subitem not overwrited\n"); + } + } + else + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + ok_(__FILE__, line)(lpht.iSubItem == 10, "Expected subitem not overwrited\n"); + } + + if (todo_flags) + { + todo_wine + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); + } + else + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); +} + +/* Performs a single LVM_SUBITEMHITTEST test */ +static void test_lvm_subitemhittest(HWND hwnd, INT x, INT y, INT item, INT subitem, UINT flags, + BOOL todo_item, BOOL todo_subitem, BOOL todo_flags, int line) +{ + LVHITTESTINFO lpht; + DWORD ret; + + lpht.pt.x = x; + lpht.pt.y = y; + + trace("subhittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); + ret = SendMessage(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht); + + if (todo_item) + { + todo_wine + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + } + } + else + { + ok_(__FILE__, line)(ret == item, "Expected %d item, got %d\n", item, ret); + ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); + } + + if (todo_subitem) + { + todo_wine + ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); + } + else + ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); + + if (todo_flags) + { + todo_wine + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); + } + else + ok_(__FILE__, line)(lpht.flags == flags, "Expected flags %x, got %x\n", flags, lpht.flags); +} + static void test_images(void) { HWND hwnd; @@ -2241,6 +2324,108 @@ static void test_setredraw(void) DestroyWindow(hwnd); } +static void test_hittest(void) +{ + HWND hwnd; + DWORD r; + RECT bounds; + LVITEMA item; + static CHAR text[] = "1234567890ABCDEFGHIJKLMNOPQRST"; + POINT pos; + INT x, y; + HIMAGELIST himl, himl2; + HBITMAP hbmp; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + /* LVS_REPORT with a single subitem (2 columns) */ + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + item.iSubItem = 0; + /* the only purpose of that line is to be as long as a half item rect */ + item.pszText = text; + r = SendMessage(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&item); + expect(TRUE, r); + + r = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); + expect(TRUE, r); + r = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(100, 0)); + expect(TRUE, r); + + memset(&bounds, 0, sizeof(bounds)); + bounds.left = LVIR_BOUNDS; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&bounds); + ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); + ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pos); + expect(TRUE, r); + + /* LVS_EX_FULLROWSELECT not set, no icons attached */ + x = pos.x + 50; /* column half width */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMLABEL, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + x = pos.x + 150; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + /* parent client area is 100x100 by default */ + MoveWindow(hwnd, 0, 0, 300, 100, FALSE); + x = pos.x + 150; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_NOWHERE, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* the same with LVS_EX_FULLROWSELECT */ + SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + x = pos.x + 150; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEM, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + MoveWindow(hwnd, 0, 0, 100, 100, FALSE); + x = pos.x + 150; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + /* try with icons */ + himl = ImageList_Create(16, 16, 0, 4, 4); + ok(himl != NULL, "failed to create imagelist\n"); + hbmp = CreateBitmap(16, 16, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + r = ImageList_Add(himl, hbmp, 0); + ok(r == 0, "should be zero\n"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + + item.mask = LVIF_IMAGE; + item.iImage = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + /* on state icon */ + x = pos.x + 8; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMSTATEICON, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMSTATEICON, FALSE, FALSE, TRUE, __LINE__); + + himl2 = (HIMAGELIST)SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); + ok(himl2 == himl, "should return handle\n"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + /* on item icon */ + x = pos.x + 8; /* outside column */ + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, 0, LVHT_ONITEMICON, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 0, LVHT_ONITEMICON, FALSE, FALSE, FALSE, __LINE__); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2284,6 +2469,7 @@ START_TEST(listview) test_norecompute(); test_nosortheader(); test_setredraw(); + test_hittest(); DestroyWindow(hwndparent); }

1 0

Rein Klazes : win87em.dll16: Remove a unnecessary floating point instruction that can cause invalid operation exceptions .
by Alexandre Julliard 22 May '09

22 May '09

Module: wine Branch: master Commit: b0a40dafd9266c22dedd908d6e60ba0fdeed6d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a40dafd9266c22dedd908d6… Author: Rein Klazes <wijn(a)online.nl> Date: Fri May 22 09:02:00 2009 +0200 win87em.dll16: Remove a unnecessary floating point instruction that can cause invalid operation exceptions. --- dlls/win87em.dll16/win87em.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index d3fc96a..6154ac6 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -149,7 +149,6 @@ void WINAPI _fpMath( CONTEXT *context ) case 6: /* round top of stack to integer using method AX & 0x0C00 */ /* returns current controlword */ { - DWORD dw=0; WORD save,mask; /* I don't know much about asm() programming. This could be * wrong. @@ -160,10 +159,8 @@ void WINAPI _fpMath( CONTEXT *context ) __asm__ __volatile__("orw $0xC00,%0" : "=m" (mask) : : "memory"); __asm__ __volatile__("fldcw %0;wait" : : "m" (mask)); __asm__ __volatile__("frndint"); - __asm__ __volatile__("fist %0;wait" : "=m" (dw) : : "memory"); __asm__ __volatile__("fldcw %0" : : "m" (save)); #endif - TRACE("On top of stack is %d\n",dw); } break;

1 0