March 2013 - Wine-Commits - list.winehq.org

Piotr Caban : vbscript: Added IMatchCollection interface to MatchCollection2 object.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: fbf01da470f57ce2282c03b443ca65caca5ca39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf01da470f57ce2282c03b44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 25 12:34:38 2013 +0100 vbscript: Added IMatchCollection interface to MatchCollection2 object. --- dlls/vbscript/tests/vbscript.c | 4 ++ dlls/vbscript/vbregexp.c | 89 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 6b25ddd..f37c7cb 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -852,6 +852,10 @@ static void test_RegExp(void) ok(hres == S_OK, "QueryInterface(IID_IMatchCollection2) returned %x\n", hres); IDispatch_Release(disp); + hres = IMatchCollection2_QueryInterface(mc, &IID_IMatchCollection, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IMatchCollection) returned %x\n", hres); + IUnknown_Release(unk); + hres = IMatchCollection2_get_Count(mc, NULL); ok(hres == E_POINTER, "get_Count returned %x, expected E_POINTER\n", hres); diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index f3fb874..b464232 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -110,6 +110,7 @@ typedef struct MatchCollectionEnum { typedef struct MatchCollection2 { IMatchCollection2 IMatchCollection2_iface; + IMatchCollection IMatchCollection_iface; LONG ref; @@ -700,6 +701,9 @@ static HRESULT WINAPI MatchCollection2_QueryInterface( }else if(IsEqualGUID(riid, &IID_IMatchCollection2)) { TRACE("(%p)->(IID_IMatchCollection2 %p)\n", This, ppv); *ppv = &This->IMatchCollection2_iface; + }else if(IsEqualGUID(riid, &IID_IMatchCollection)) { + TRACE("(%p)->(IID_IMatchCollection %p)\n", This, ppv); + *ppv = &This->IMatchCollection_iface; }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = NULL; @@ -842,6 +846,90 @@ static const IMatchCollection2Vtbl MatchCollection2Vtbl = { MatchCollection2_get__NewEnum }; +static inline MatchCollection2 *impl_from_IMatchCollection(IMatchCollection *iface) +{ + return CONTAINING_RECORD(iface, MatchCollection2, IMatchCollection_iface); +} + +static HRESULT WINAPI MatchCollection_QueryInterface(IMatchCollection *iface, REFIID riid, void **ppv) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_QueryInterface(&This->IMatchCollection2_iface, riid, ppv); +} + +static ULONG WINAPI MatchCollection_AddRef(IMatchCollection *iface) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_AddRef(&This->IMatchCollection2_iface); +} + +static ULONG WINAPI MatchCollection_Release(IMatchCollection *iface) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_Release(&This->IMatchCollection2_iface); +} + +static HRESULT WINAPI MatchCollection_GetTypeInfoCount(IMatchCollection *iface, UINT *pctinfo) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_GetTypeInfoCount(&This->IMatchCollection2_iface, pctinfo); +} + +static HRESULT WINAPI MatchCollection_GetTypeInfo(IMatchCollection *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_GetTypeInfo(&This->IMatchCollection2_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI MatchCollection_GetIDsOfNames(IMatchCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_GetIDsOfNames(&This->IMatchCollection2_iface, + riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI MatchCollection_Invoke(IMatchCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_Invoke(&This->IMatchCollection2_iface, dispIdMember, + riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI MatchCollection_get_Item(IMatchCollection *iface, LONG index, IDispatch **ppMatch) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_get_Item(&This->IMatchCollection2_iface, index, ppMatch); +} + +static HRESULT WINAPI MatchCollection_get_Count(IMatchCollection *iface, LONG *pCount) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_get_Count(&This->IMatchCollection2_iface, pCount); +} + +static HRESULT WINAPI MatchCollection_get__NewEnum(IMatchCollection *iface, IUnknown **ppEnum) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_get__NewEnum(&This->IMatchCollection2_iface, ppEnum); +} + +static const IMatchCollectionVtbl MatchCollectionVtbl = { + MatchCollection_QueryInterface, + MatchCollection_AddRef, + MatchCollection_Release, + MatchCollection_GetTypeInfoCount, + MatchCollection_GetTypeInfo, + MatchCollection_GetIDsOfNames, + MatchCollection_Invoke, + MatchCollection_get_Item, + MatchCollection_get_Count, + MatchCollection_get__NewEnum +}; + static HRESULT add_match(IMatchCollection2 *iface, IMatch2 *add) { MatchCollection2 *This = impl_from_IMatchCollection2(iface); @@ -881,6 +969,7 @@ static HRESULT create_match_collection2(IMatchCollection2 **match_collection) return E_OUTOFMEMORY; ret->IMatchCollection2_iface.lpVtbl = &MatchCollection2Vtbl; + ret->IMatchCollection_iface.lpVtbl = &MatchCollectionVtbl; ret->ref = 1; *match_collection = &ret->IMatchCollection2_iface;

1 0

Huw Davies : riched20: We don' t need to special case the PARAFORMAT2 fields since the masks have already been correctly sanitised . This fixes setting PFE_RTLPARA.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 503c6caba647d94035e421f8641fb22dbdd79712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503c6caba647d94035e421f86… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:54 2013 +0000 riched20: We don't need to special case the PARAFORMAT2 fields since the masks have already been correctly sanitised. This fixes setting PFE_RTLPARA. --- dlls/riched20/para.c | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ebe7eda..8cf3d24 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -154,35 +154,31 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); } - if (dwMask & (PFM_ALL2 & ~PFM_ALL)) - { - /* PARAFORMAT2 fields */ - #define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \ PFM_TABLE) - /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ - if (dwMask & EFFECTS_MASK) { - para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; - para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); - para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); - } + /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ + if (dwMask & EFFECTS_MASK) + { + para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; + para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); + para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); + } #undef EFFECTS_MASK - COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); - COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); - COPY_FIELD(PFM_LINESPACING, dyLineSpacing); - COPY_FIELD(PFM_STYLE, sStyle); - COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); - COPY_FIELD(PFM_SHADING, wShadingWeight); - COPY_FIELD(PFM_SHADING, wShadingStyle); - COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); - COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); - COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); - COPY_FIELD(PFM_BORDER, wBorderSpace); - COPY_FIELD(PFM_BORDER, wBorderWidth); - COPY_FIELD(PFM_BORDER, wBorders); - } + COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); + COPY_FIELD(PFM_LINESPACING, dyLineSpacing); + COPY_FIELD(PFM_STYLE, sStyle); + COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); + COPY_FIELD(PFM_SHADING, wShadingWeight); + COPY_FIELD(PFM_SHADING, wShadingStyle); + COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + COPY_FIELD(PFM_BORDER, wBorderSpace); + COPY_FIELD(PFM_BORDER, wBorderWidth); + COPY_FIELD(PFM_BORDER, wBorders); para->member.para.pFmt->dwMask |= dwMask; #undef COPY_FIELD

1 0

Ken Thomases : winemac: Don't read an array at index -1 in debugstr_pf().
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 3158fd764d5f765ad8701a48ab883e62c18cc621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3158fd764d5f765ad8701a48a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 25 00:34:32 2013 -0500 winemac: Don't read an array at index -1 in debugstr_pf(). --- dlls/winemac.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e3e9aa4..8627b70 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -366,7 +366,7 @@ static const char *debugstr_pf(const pixel_format *pf) color_modes[pf->color_mode].alpha_bits, pf->depth_bits, pf->stencil_bits, - color_modes[pf->accum_mode - 1].color_bits, + pf->accum_mode ? color_modes[pf->accum_mode - 1].color_bits : 0, pf->aux_buffers, pf->backing_store, pf->double_buffer,

1 0

André Hentschel : ntdll: Implement RtlLookupFunctionEntry on ARM.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 3c04958b8a47f56a6dfc9ac067ca88f34a4e29a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c04958b8a47f56a6dfc9ac06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:24:04 2013 +0100 ntdll: Implement RtlLookupFunctionEntry on ARM. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 68 +++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 4 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a07a9ff..72c1697 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1034,7 +1034,7 @@ @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d67c85e..b0cb43a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -738,7 +738,7 @@ @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stub RtlLookupElementGenericTable # @ stub RtlLookupElementGenericTableAvl -@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(long ptr) # @ stub RtlMapSecurityErrorToNtStatus diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f9cde38..bf144a0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -47,6 +47,8 @@ # include <sys/signal.h> #endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -100,6 +102,15 @@ typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; + +struct UNWIND_INFO +{ + WORD function_length; + WORD unknown1 : 7; + WORD count : 5; + WORD unknown2 : 4; +}; + /*********************************************************************** * dispatch_signal */ @@ -933,6 +944,63 @@ BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) return TRUE; } +/********************************************************************** + * find_function_info + */ +static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, HMODULE module, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size/sizeof(*func) - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + DWORD begin = (func[pos].BeginAddress & ~1), end; + if (func[pos].u.s.Flag) + end = begin + func[pos].u.s.FunctionLength * 2; + else + { + struct UNWIND_INFO *info; + info = (struct UNWIND_INFO *)((char *)module + func[pos].u.UnwindData); + end = begin + info->function_length * 2; + } + + if ((char *)pc < (char *)module + begin) max = pos - 1; + else if ((char *)pc >= (char *)module + end) min = pos + 1; + else return func + pos; + } + return NULL; +} + +/********************************************************************** + * RtlLookupFunctionEntry (NTDLL.@) + */ +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, DWORD *base, + UNWIND_HISTORY_TABLE *table ) +{ + LDR_MODULE *module; + RUNTIME_FUNCTION *func; + ULONG size; + + /* FIXME: should use the history table to make things faster */ + + if (LdrFindEntryForAddress( (void *)pc, &module )) + { + WARN( "module not found for %lx\n", pc ); + return NULL; + } + if (!(func = RtlImageDirectoryEntryToData( module->BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) + { + WARN( "no exception table found in module %p pc %lx\n", module->BaseAddress, pc ); + return NULL; + } + func = find_function_info( pc, module->BaseAddress, func, size ); + if (func) *base = (DWORD)module->BaseAddress; + return func; +} + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index a40ff75..79e91c0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1710,6 +1710,7 @@ typedef struct _CONTEXT { BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); #endif /* __arm__ */

1 0

Austin English : msvcp90/tests: Remove thiscall_thunk_retptr struct definitions.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: f3c154197edbf9a347b7a96a5ca105b568571b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c154197edbf9a347b7a96a5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 20 20:24:13 2013 -0700 msvcp90/tests: Remove thiscall_thunk_retptr struct definitions. --- dlls/msvcp90/tests/ios.c | 2 -- dlls/msvcp90/tests/misc.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 0ae34d3..9c78318 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -544,8 +544,6 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); static void * (WINAPI *call_thiscall_func2_ptr_fpos)( void *func, void *this, fpos_int a ); -struct thiscall_thunk_retptr *thunk_retptr; - static void init_thiscall_thunk(void) { struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index dc099d3..f8eee4e 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -149,7 +149,6 @@ static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, const void *c, const void *d ); -struct thiscall_thunk_retptr *thunk_retptr; static void init_thiscall_thunk(void) {

1 0

Qian Hong : atl100/tests: Added class name test for AtlAxWinInit.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c02bf8817e04cee335003527668ed954d24e1def URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02bf8817e04cee3350035276… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:11:55 2013 +0800 atl100/tests: Added class name test for AtlAxWinInit. --- dlls/atl100/tests/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/tests/Makefile.in b/dlls/atl100/tests/Makefile.in index 0b8353e..7ca6123 100644 --- a/dlls/atl100/tests/Makefile.in +++ b/dlls/atl100/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = atl100.dll -IMPORTS = uuid atl100 oleaut32 ole32 advapi32 +IMPORTS = uuid atl100 oleaut32 ole32 advapi32 user32 EXTRADEFS = -D_ATL_VER=_ATL_VER_100 C_SRCS = \ diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e7c3703..40d8583 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -22,6 +22,10 @@ #define COBJMACROS #define CONST_VTABLE +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #include <atlbase.h> #include <mshtml.h> @@ -562,6 +566,30 @@ static void test_source_iface(void) ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); } +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; + static const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); + todo_wine ok(ret, "AtlAxWin100 has not registered\n"); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); + todo_wine ok(ret, "AtlAxWinLic100 has not registered\n"); +} + START_TEST(atl) { CoInitialize(NULL); @@ -571,6 +599,7 @@ START_TEST(atl) test_typelib(); test_cp(); test_source_iface(); + test_ax_win(); CoUninitialize(); }

1 0

Huw Davies : riched20: Always write out the color table.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: a20d42de1565caf43b5693c6d455c9373a34029b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20d42de1565caf43b5693c6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:56 2013 +0000 riched20: Always write out the color table. --- dlls/riched20/writer.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index cd2362e..440cb1b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -297,20 +297,15 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; - /* Output colors table if not empty */ - if (pStream->nColorTblLen > 1) { - if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) - return FALSE; - for (i = 1; i < pStream->nColorTblLen; i++) { - if (!ME_StreamOutPrint(pStream, "\\red%u\\green%u\\blue%u;", - pStream->colortbl[i] & 0xFF, - (pStream->colortbl[i] >> 8) & 0xFF, - (pStream->colortbl[i] >> 16) & 0xFF)) - return FALSE; - } - if (!ME_StreamOutPrint(pStream, "}")) + /* Output the color table */ + if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) return FALSE; /* first entry is auto-color */ + for (i = 1; i < pStream->nColorTblLen; i++) + { + if (!ME_StreamOutPrint(pStream, "\\red%u\\green%u\\blue%u;", pStream->colortbl[i] & 0xFF, + (pStream->colortbl[i] >> 8) & 0xFF, (pStream->colortbl[i] >> 16) & 0xFF)) return FALSE; } + if (!ME_StreamOutPrint(pStream, "}")) return FALSE; return TRUE; }

1 0

Huw Davies : riched20: Set the bidi base embedding level.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c409fc13fda7da2b60cd5ab04ad64bf21a0b5806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c409fc13fda7da2b60cd5ab04… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:55 2013 +0000 riched20: Set the bidi base embedding level. --- dlls/riched20/editor.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a19ceec..f490799 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -840,6 +840,14 @@ void ME_RTFParAttrHook(RTF_Info *info) } break; } + case rtfRTLPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = PFE_RTLPARA; + break; + case rtfLTRPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = 0; + break; } if (fmt.dwMask) { RTFFlushOutputBuffer(info);

1 0

Dmitry Timoshkov : ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c09c82b25a3c95e79f23f22571fe9a63b38b824c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09c82b25a3c95e79f23f2257… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 22 14:59:50 2013 +0900 ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately. --- dlls/ws2_32/socket.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f9e8a6c..a6a1b4c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -803,19 +803,19 @@ static void _enable_event( HANDLE s, unsigned int event, SERVER_END_REQ; } -static int _is_blocking(SOCKET s) +static NTSTATUS _is_blocking(SOCKET s, BOOL *ret) { - int ret; + NTSTATUS status; SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - wine_server_call( req ); - ret = (reply->state & FD_WINE_NONBLOCKING) == 0; + status = wine_server_call( req ); + *ret = (reply->state & FD_WINE_NONBLOCKING) == 0; } SERVER_END_REQ; - return ret; + return status; } static unsigned int _get_sock_mask(SOCKET s) @@ -835,9 +835,10 @@ static unsigned int _get_sock_mask(SOCKET s) static void _sync_sock_state(SOCKET s) { + BOOL dummy; /* do a dummy wineserver request in order to let the wineserver run through its select loop once */ - (void)_is_blocking(s); + (void)_is_blocking(s, &dummy); } static int _get_sock_error(SOCKET s, unsigned int bit) @@ -1950,7 +1951,12 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, BOOL is_blocking; TRACE("socket %04lx\n", s ); - is_blocking = _is_blocking(s); + status = _is_blocking(s, &is_blocking); + if (status) + { + set_error(status); + return INVALID_SOCKET; + } do { /* try accepting first (if there is a deferred connection) */ @@ -2341,6 +2347,8 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { + NTSTATUS status; + BOOL is_blocking; int ret = do_connect(fd, name, namelen); if (ret == 0) goto connect_success; @@ -2351,7 +2359,14 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); - if (_is_blocking(s)) + status = _is_blocking( s, &is_blocking ); + if (status) + { + release_sock_fd( s, fd ); + set_error( status ); + return SOCKET_ERROR; + } + if (is_blocking) { int result; /* block here */ @@ -3965,6 +3980,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; DWORD bytes_sent; + BOOL is_blocking; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", s, lpBuffers, dwBufferCount, dwFlags, @@ -4063,7 +4079,13 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; } - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { /* On a blocking non-overlapped stream socket, * sending blocks until the entire buffer is sent. */ @@ -5858,6 +5880,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; struct ws2_async *wsa; + BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -5961,7 +5984,13 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (n != -1) break; - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { struct pollfd pfd; int timeout = GET_RCVTIMEO(fd);

1 0

Lucas Zawacki : dinput: Initialize all axis (from 0 to ABS_MAX) with -1.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 45a19b0c9b32b9a02be11b597a7db5341b310474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a19b0c9b32b9a02be11b597… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Mar 20 19:35:08 2013 -0300 dinput: Initialize all axis (from 0 to ABS_MAX) with -1. --- dlls/dinput/joystick_linuxinput.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 0a044a5..5ed9bde 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -445,9 +445,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); /* Count number of available axes - supported Axis & POVs */ - for (i = 0; i < WINE_JOYSTICK_MAX_AXES; i++) + for (i = 0; i < ABS_MAX; i++) { - if (test_bit(newDevice->joydev->absbits, i)) + if (i < WINE_JOYSTICK_MAX_AXES && + test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx;

1 0