January 2013 - Wine-Commits

André Hentschel : dbghelp: Implement rudimentary stack walk for ARM64.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: 49f59ccf7136df09fb1cd2a6e56a13986674c7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f59ccf7136df09fb1cd2a6e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 22 20:34:28 2013 +0100 dbghelp: Implement rudimentary stack walk for ARM64. --- dlls/dbghelp/cpu_arm64.c | 100 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index 26407f7..c816fe3 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -46,11 +46,109 @@ static unsigned arm64_get_addr(HANDLE hThread, const CONTEXT* ctx, } } +#ifdef __aarch64__ +enum st_mode {stm_start, stm_arm64, stm_done}; + +/* indexes in Reserved array */ +#define __CurrentModeCount 0 + +#define curr_mode (frame->Reserved[__CurrentModeCount] & 0x0F) +#define curr_count (frame->Reserved[__CurrentModeCount] >> 4) + +#define set_curr_mode(m) {frame->Reserved[__CurrentModeCount] &= ~0x0F; frame->Reserved[__CurrentModeCount] |= (m & 0x0F);} +#define inc_curr_count() (frame->Reserved[__CurrentModeCount] += 0x10) + +/* fetch_next_frame() + * + * modify (at least) context.Pc using unwind information + * either out of debug info (dwarf), or simple Lr trace + */ +static BOOL fetch_next_frame(struct cpu_stack_walk* csw, + CONTEXT* context, DWORD_PTR curr_pc) +{ + DWORD_PTR xframe; + DWORD_PTR oldReturn = context->X30; + + if (dwarf2_virtual_unwind(csw, curr_pc, context, &xframe)) + { + context->Sp = xframe; + context->Pc = oldReturn; + return TRUE; + } + + if (context->Pc == context->X30) return FALSE; + context->Pc = oldReturn; + + return TRUE; +} + +static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +{ + unsigned deltapc = curr_count <= 1 ? 0 : 4; + + /* sanity check */ + if (curr_mode >= stm_done) return FALSE; + + TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "ARM64", + wine_dbgstr_longlong(curr_count)); + + if (curr_mode == stm_start) + { + /* Init done */ + set_curr_mode(stm_arm64); + frame->AddrReturn.Mode = frame->AddrStack.Mode = AddrModeFlat; + /* don't set up AddrStack on first call. Either the caller has set it up, or + * we will get it in the next frame + */ + memset(&frame->AddrBStore, 0, sizeof(frame->AddrBStore)); + } + else + { + if (context->Sp != frame->AddrStack.Offset) FIXME("inconsistent Stack Pointer\n"); + if (context->Pc != frame->AddrPC.Offset) FIXME("inconsistent Program Counter\n"); + + if (frame->AddrReturn.Offset == 0) goto done_err; + if (!fetch_next_frame(csw, context, frame->AddrPC.Offset - deltapc)) + goto done_err; + } + + memset(&frame->Params, 0, sizeof(frame->Params)); + + /* set frame information */ + frame->AddrStack.Offset = context->Sp; + frame->AddrReturn.Offset = context->X30; + frame->AddrFrame.Offset = context->X29; + frame->AddrPC.Offset = context->Pc; + + frame->Far = TRUE; + frame->Virtual = TRUE; + inc_curr_count(); + + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s FuncTable=%p\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "ARM", + wine_dbgstr_longlong(curr_count), + frame->FuncTableEntry); + + return TRUE; +done_err: + set_curr_mode(stm_done); + return FALSE; +} +#else static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) { - FIXME("not done for ARM64\n"); return FALSE; } +#endif static unsigned arm64_map_dwarf_register(unsigned regno) {

1 0

Henri Verbeet : wined3d: Get rid of CheckFilterCapability().
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: d6105c5f0fb4921a32ca194545500e1c64963016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6105c5f0fb4921a32ca19454… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 23 08:50:13 2013 +0100 wined3d: Get rid of CheckFilterCapability(). --- dlls/wined3d/directx.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b49e897..5b3de2e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3482,15 +3482,6 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckFilterCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* The flags entry of a format contains the filtering capability */ - if (format->flags & WINED3DFMT_FLAG_FILTERING) - return TRUE; - - return FALSE; -} - /* Check the render target capabilities of a format */ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *check_format) @@ -3983,7 +3974,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_FILTER) { - if (!CheckFilterCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_FILTERING)) { TRACE("[FAILED] - No filter support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4139,7 +4130,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_FILTER) { - if (!CheckFilterCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_FILTERING)) { TRACE("[FAILED] - No filter support.\n"); return WINED3DERR_NOTAVAILABLE; @@ -4317,7 +4308,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_FILTER) { - if (!CheckFilterCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_FILTERING)) { TRACE("[FAILED] - No filter support.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

André Hentschel : configure: Add ARM64 define.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: e80de55bca6a1296e8bb04542a35362d42294e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80de55bca6a1296e8bb04542… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 22 20:02:03 2013 +0100 configure: Add ARM64 define. --- configure | 26 ++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ec6a94b..ccd0283 100755 --- a/configure +++ b/configure @@ -14995,6 +14995,32 @@ if test $ac_cv_cpp_def___powerpc__ = yes; then : CFLAGS="$CFLAGS -D__powerpc__" LINTFLAGS="$LINTFLAGS -D__powerpc__" fi ;; + *aarch64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __aarch64__" >&5 +$as_echo_n "checking whether we need to define __aarch64__... " >&6; } +if ${ac_cv_cpp_def___aarch64__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __aarch64__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + ac_cv_cpp_def___aarch64__=yes +else + ac_cv_cpp_def___aarch64__=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___aarch64__" >&5 +$as_echo "$ac_cv_cpp_def___aarch64__" >&6; } +if test $ac_cv_cpp_def___aarch64__ = yes; then : + CFLAGS="$CFLAGS -D__aarch64__" + LINTFLAGS="$LINTFLAGS -D__aarch64__" +fi ;; *arm*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __arm__" >&5 $as_echo_n "checking whether we need to define __arm__... " >&6; } if ${ac_cv_cpp_def___arm__+:} false; then : diff --git a/configure.ac b/configure.ac index fd760cf..dde896f 100644 --- a/configure.ac +++ b/configure.ac @@ -2486,6 +2486,7 @@ case $host_cpu in *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; *powerpc64*) WINE_CHECK_DEFINE([__powerpc64__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; + *aarch64*) WINE_CHECK_DEFINE([__aarch64__]) ;; *arm*) WINE_CHECK_DEFINE([__arm__]) ;; esac

1 0

Stefan Dösinger : wined3d: Ignore clears if count = 0 and rects != NULL.
by Alexandre Julliard Jan. 23, 2013

Jan. 23, 2013

Module: wine Branch: master Commit: aaa11492db5af6a77ec8c1977e80a9634ca9b80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa11492db5af6a77ec8c1977… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 23 15:02:45 2013 +0100 wined3d: Ignore clears if count = 0 and rects != NULL. --- dlls/d3d8/tests/visual.c | 27 +++++++++++++++++ dlls/d3d9/tests/visual.c | 27 +++++++++++++++++ dlls/ddraw/tests/ddraw1.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 44 ++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 45 +++++++++++++++++++++++++++++ dlls/ddraw/viewport.c | 12 ++++++++ dlls/wined3d/device.c | 6 ++++ 8 files changed, 296 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa11492db5af6a77ec8c…

1 0

Huw Davies : riched20: Avoid an unnecessary string duplication.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 7a27ffb28ccadb611e623bf0e7c20595a48ee7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a27ffb28ccadb611e623bf0e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 22 14:04:08 2013 +0000 riched20: Avoid an unnecessary string duplication. --- dlls/riched20/caret.c | 25 ++++++++----------------- dlls/riched20/undo.c | 2 +- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 7decff2..490f39c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -361,6 +361,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, else { ME_Cursor cursor; + ME_UndoItem *undo; int nCharsToDelete = min(nChars, c.nOffset); int i; @@ -378,25 +379,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, nCharsToDelete, nChars, c.nOffset, debugstr_w(run->strText->szData), run->strText->nLen); - if (!c.nOffset && run->strText->nLen == nCharsToDelete) + undo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); + if (undo) { - /* undo = reinsert whole run */ - /* nOfs is a character offset (from the start of the document - to the current (deleted) run */ - ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); - if (pUndo) - pUndo->di.member.run.nCharOfs = nOfs+nChars; - } - else - { - /* undo = reinsert partial run */ - ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); - if (pUndo) { - ME_DestroyString(pUndo->di.member.run.strText); - pUndo->di.member.run.nCharOfs = nOfs+nChars; - pUndo->di.member.run.strText = ME_MakeStringN(run->strText->szData+c.nOffset, nCharsToDelete); - } + /* nOfs is a character offset (from the start of the document + to the current (deleted) run */ + undo->di.member.run.nCharOfs = nOfs + nChars; + undo->di.member.run.strText = ME_MakeStringN(run->strText->szData + c.nOffset, nCharsToDelete); } + TRACE("Post deletion string: %s (%d)\n", debugstr_w(run->strText->szData), run->strText->nLen); TRACE("Shift value: %d\n", shift); ME_StrDeleteV(run->strText, c.nOffset, nCharsToDelete); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index a101cc1..af27238 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -73,7 +73,7 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp case diUndoInsertRun: assert(pdi); pItem->member.run = pdi->member.run; - pItem->member.run.strText = ME_StrDup(pItem->member.run.strText); + pItem->member.run.strText = NULL; ME_AddRefStyle(pItem->member.run.style); if (pdi->member.run.ole_obj) {

1 0

Huw Davies : wineps: Use a file mapping to read the ppd file.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: c22be15a98ce763199752a59ac664c465d50b387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22be15a98ce763199752a59a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 22 15:51:47 2013 +0000 wineps: Use a file mapping to read the ppd file. --- dlls/wineps.drv/init.c | 16 +++--- dlls/wineps.drv/ppd.c | 144 +++++++++++++++++++++++++++++++--------------- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 106 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c22be15a98ce763199752…

1 0

Hans Leidekker : wbemprox: Add a stub implementation of IWbemQualifierSet.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 2797cd8ec1b2af0f96c4c58d155aa20b482eca42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2797cd8ec1b2af0f96c4c58d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 22 16:28:36 2013 +0100 wbemprox: Add a stub implementation of IWbemQualifierSet. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/class.c | 2 +- dlls/wbemprox/qualifier.c | 183 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + include/wbemcli.idl | 38 ++++++++ 5 files changed, 224 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 31d83cf..613f3ff 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ class.c \ main.c \ process.c \ + qualifier.c \ query.c \ reg.c \ service.c \ diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 4e27c5c..616c521 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -547,7 +547,7 @@ static HRESULT WINAPI class_object_GetPropertyQualifierSet( IWbemQualifierSet **ppQualSet ) { FIXME("%p, %s, %p\n", iface, debugstr_w(wszProperty), ppQualSet); - return E_NOTIMPL; + return WbemQualifierSet_create( NULL, (void **)ppQualSet ); } static HRESULT WINAPI class_object_Clone( diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c new file mode 100644 index 0000000..b73bf1d --- /dev/null +++ b/dlls/wbemprox/qualifier.c @@ -0,0 +1,183 @@ +/* + * Copyright 2013 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +struct qualifier_set +{ + IWbemQualifierSet IWbemQualifierSet_iface; + LONG refs; +}; + +static inline struct qualifier_set *impl_from_IWbemQualifierSet( + IWbemQualifierSet *iface ) +{ + return CONTAINING_RECORD(iface, struct qualifier_set, IWbemQualifierSet_iface); +} + +static ULONG WINAPI qualifier_set_AddRef( + IWbemQualifierSet *iface ) +{ + struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI qualifier_set_Release( + IWbemQualifierSet *iface ) +{ + struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE("destroying %p\n", set); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI qualifier_set_QueryInterface( + IWbemQualifierSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); + + TRACE("%p, %s, %p\n", set, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IWbemQualifierSet ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = set; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemQualifierSet_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI qualifier_set_Get( + IWbemQualifierSet *iface, + LPCWSTR wszName, + LONG lFlags, + VARIANT *pVal, + LONG *plFlavor ) +{ + FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_Put( + IWbemQualifierSet *iface, + LPCWSTR wszName, + VARIANT *pVal, + LONG lFlavor ) +{ + FIXME("%p, %s, %p, %d\n", iface, debugstr_w(wszName), pVal, lFlavor); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_Delete( + IWbemQualifierSet *iface, + LPCWSTR wszName ) +{ + FIXME("%p, %s\n", iface, debugstr_w(wszName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_GetNames( + IWbemQualifierSet *iface, + LONG lFlags, + SAFEARRAY **pNames ) +{ + FIXME("%p, %08x, %p\n", iface, lFlags, pNames); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_BeginEnumeration( + IWbemQualifierSet *iface, + LONG lFlags ) +{ + FIXME("%p, %08x\n", iface, lFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_Next( + IWbemQualifierSet *iface, + LONG lFlags, + BSTR *pstrName, + VARIANT *pVal, + LONG *plFlavor ) +{ + FIXME("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_EndEnumeration( + IWbemQualifierSet *iface ) +{ + FIXME("%p\n", iface); + return E_NOTIMPL; +} + +static const IWbemQualifierSetVtbl qualifier_set_vtbl = +{ + qualifier_set_QueryInterface, + qualifier_set_AddRef, + qualifier_set_Release, + qualifier_set_Get, + qualifier_set_Put, + qualifier_set_Delete, + qualifier_set_GetNames, + qualifier_set_BeginEnumeration, + qualifier_set_Next, + qualifier_set_EndEnumeration +}; + +HRESULT WbemQualifierSet_create( + IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + struct qualifier_set *set; + + TRACE("%p, %p\n", pUnkOuter, ppObj); + + if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY; + + set->IWbemQualifierSet_iface.lpVtbl = &qualifier_set_vtbl; + set->refs = 1; + + *ppObj = &set->IWbemQualifierSet_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 54cb84e..621603d 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -197,6 +197,7 @@ HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemQualifierSet_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index c76d465..af5e5bc 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -597,3 +597,41 @@ interface IWbemClassObject : IUnknown [in,string] LPCWSTR wszMethodName, [out] BSTR *pstrClassName); } + +[ + object, + restricted, + local, + uuid(dc12a680-737f-11cf-884d-00aa004b2e24) +] +interface IWbemQualifierSet : IUnknown +{ + HRESULT Get( + [in,string] LPCWSTR wszName, + [in] long lFlags, + [out] VARIANT *pVal, + [out] long *plFlavor); + + HRESULT Put( + [in,string] LPCWSTR wszName, + [in] VARIANT *pVal, + [in] long lFlavor); + + HRESULT Delete( + [in,string] LPCWSTR wszName); + + HRESULT GetNames( + [in] long lFlags, + [out] SAFEARRAY **pNames); + + HRESULT BeginEnumeration( + [in] long lFlags); + + HRESULT Next( + [in] long lFlags, + [out] BSTR *pstrName, + [out] VARIANT *pVal, + [out] long *plFlavor); + + HRESULT EndEnumeration(); +};

1 0

Huw Davies : wineps: Cope with '\r'-only end-of-line markers.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: cb3815aead2588030f002616ffbb03ab5eea760e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3815aead2588030f002616f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 22 15:51:48 2013 +0000 wineps: Cope with '\r'-only end-of-line markers. --- dlls/wineps.drv/ppd.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index a18c42c..adb6a21 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -266,7 +266,15 @@ static BOOL get_line( char *buf, int size, struct map_context *ctx ) { if (ctx->pos > ctx->end) break; buf[i] = *ctx->pos++; - if (buf[i] == '\n') + + /* \r\n -> \n */ + if (buf[i] == '\r' && ctx->pos <= ctx->end && *ctx->pos == '\n') + { + ctx->pos++; + buf[i] = '\n'; + } + + if (buf[i] == '\n' || buf[i] == '\r') { i++; break; @@ -394,9 +402,11 @@ static BOOL PSDRV_PPDGetNextTuple(struct map_context *ctx, PPDTuple *tuple) break; } while(1); - if(line[strlen(line)-1] != '\n') { + cp = line + strlen(line) - 1; + if (*cp != '\n' && *cp != '\r') + { ERR("Line too long.\n"); - goto start; + goto start; } for(cp = line; !isspace(*cp) && *cp != ':'; cp++)

1 0

Francois Gouget : winmm/tests: Allow more margin in the test_asyncWAVE() playback check.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 6ad54620f06eb757b6ffd22dc6a4e8ea680b09ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad54620f06eb757b6ffd22dc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 22 17:37:18 2013 +0100 winmm/tests: Allow more margin in the test_asyncWAVE() playback check. --- dlls/winmm/tests/mci.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ce06d07..ffde6b9 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -964,10 +964,7 @@ static void test_asyncWAVE(HWND hwnd) err = mciSendString("play mysound notify", NULL, 0, hwnd); ok(!err,"mci play returned %s\n", dbg_mcierr(err)); - /* Give Wine's asynchronous thread time to start up. Furthermore, - * it uses 3 buffers per second, so that the positions reported - * will be 333ms, 667ms etc. at best. */ - Sleep(100); /* milliseconds */ + Sleep(500); /* milliseconds */ /* Do not query time format as string because result depends on locale! */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT; @@ -981,11 +978,19 @@ static void test_asyncWAVE(HWND hwnd) err = mciSendString("status mysound position", buf, sizeof(buf), hwnd); ok(!err,"mci status position returned %s\n", dbg_mcierr(err)); - ok(strcmp(buf,"2000"), "mci status position: %s, expected 2000\n", buf); - trace("position after Sleep: %sms\n",buf); + trace("position after Sleep: %sms\n", buf); p2 = atoi(buf); - /* Some machines reach 79ms only during the 100ms sleep. */ - ok(p2>=67,"not enough time elapsed %ums\n",p2); + /* Check that the 2s sound plays at a normal pace, giving a wide margin to + * account for timing granularity and small delays. + */ + todo_wine ok(400 <= p2 && p2 <= 600, "%ums is not in the expected 400-600ms range\n", p2); + /* Wine's asynchronous thread needs some time to start up. Furthermore, it + * uses 3 buffers per second, so that the positions reported will be 333ms, + * 667ms etc. at best, which is why it fails the above test. So add a + * second test specifically to prevent Wine from getting even worse. + * FIXME: To be removed when Wine is fixed and passes the above test. + */ + ok(400 <= p2 && p2 <= 1000, "%ums is not even in the expected 400-1000ms range\n", p2); test_notification(hwnd,"play (nowait)",0); err = mciSendString("pause mysound wait", NULL, 0, hwnd);

1 0

Sergey Guralnik : user32/tests: Test standard scrollbar initialization.
by Alexandre Julliard Jan. 22, 2013

Jan. 22, 2013

Module: wine Branch: master Commit: 77337d75f2902486712b0a822853453ac118085f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77337d75f2902486712b0a822… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue Jan 15 11:15:56 2013 +0200 user32/tests: Test standard scrollbar initialization. --- dlls/user32/tests/scroll.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 1d7e75e..49f42bb 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -396,6 +396,101 @@ todo_wine DestroyWindow( hwnd); } +static LRESULT CALLBACK scroll_init_proc(HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + SCROLLINFO horz, vert; + CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; + BOOL h_ret, v_ret; + + switch(msg) + { + case WM_NCCREATE: + return cs->lpCreateParams ? DefWindowProcA(hwnd, msg, wparam, lparam) : + TRUE; + + case WM_CREATE: + horz.cbSize = sizeof horz; + horz.fMask = SIF_ALL; + horz.nMin = 0xdeadbeaf; + horz.nMax = 0xbaadc0de; + vert = horz; + h_ret = GetScrollInfo(hwnd, SB_HORZ, &horz); + v_ret = GetScrollInfo(hwnd, SB_VERT, &vert); + + if(cs->lpCreateParams) + { + /* WM_NCCREATE was passed to DefWindowProc */ + if(cs->style & (WS_VSCROLL | WS_HSCROLL)) + { + todo_wine + ok(h_ret && v_ret, "GetScrollInfo() should return NON-zero " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + todo_wine + ok(vert.nMin == 0 && vert.nMax == 100, + "unexpected init values(SB_VERT): min=%d max=%d\n", + vert.nMin, vert.nMax); + todo_wine + ok(horz.nMin == 0 && horz.nMax == 100, + "unexpected init values(SB_HORZ): min=%d max=%d\n", + horz.nMin, horz.nMax); + } + else + { + ok(!h_ret && !v_ret, "GetScrollInfo() should return zeru, " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + ok(vert.nMin == 0xdeadbeaf && vert.nMax == 0xbaadc0de, + "unexpected initialization(SB_VERT): min=%d max=%d\n", + vert.nMin, vert.nMax); + ok(horz.nMin == 0xdeadbeaf && horz.nMax == 0xbaadc0de, + "unexpected initialization(SB_HORZ): min=%d max=%d\n", + horz.nMin, horz.nMax); + } + } + else + { + ok(!h_ret && !v_ret, "GetScrollInfo() should return zeru, " + "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); + ok(horz.nMin == 0xdeadbeaf && horz.nMax == 0xbaadc0de && + vert.nMin == 0xdeadbeaf && vert.nMax == 0xbaadc0de, + "unexpected initialization\n"); + } + return FALSE; /* abort creation */ + + default: + /* need for WM_GETMINMAXINFO, which precedes WM_NCCREATE */ + return 0; + } +} + +static void scrollbar_test_init(void) +{ + WNDCLASSEXA wc; + CHAR cls_name[] = "scroll_test_class"; + LONG style[] = {WS_VSCROLL, WS_HSCROLL, WS_VSCROLL | WS_HSCROLL, 0}; + int i; + + memset( &wc, 0, sizeof wc ); + wc.cbSize = sizeof wc; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hInstance = GetModuleHandleA(0); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hbrBackground = GetStockObject(WHITE_BRUSH); + wc.lpszClassName = cls_name; + wc.lpfnWndProc = scroll_init_proc; + RegisterClassExA(&wc); + + for(i = 0; i < sizeof style / sizeof style[0]; i++) + { + /* need not to destroy these windows due creation abort */ + CreateWindowExA(0, cls_name, NULL, style[i], + 100, 100, 100, 100, NULL, NULL, wc.hInstance, (LPVOID)TRUE); + CreateWindowExA(0, cls_name, NULL, style[i], + 100, 100, 100, 100, NULL, NULL, wc.hInstance, (LPVOID)FALSE); + } + UnregisterClassA(cls_name, wc.hInstance); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -444,6 +539,8 @@ START_TEST ( scroll ) scrollbar_test_default( WS_VSCROLL); scrollbar_test_default( WS_HSCROLL | WS_VSCROLL); + scrollbar_test_init(); + DestroyWindow(hScroll); DestroyWindow(hMainWnd); }

1 0