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

Ken Thomases : winemac: Add support for delay-rendered (a.k.a. promised) clipboard data.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 449e2655c2ca59eb0ab3b32e95bd9071c665d921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449e2655c2ca59eb0ab3b32e9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:51 2013 -0500 winemac: Add support for delay-rendered (a.k.a. promised) clipboard data. --- dlls/winemac.drv/clipboard.c | 154 +++++++++++++++++++++++++++--------- dlls/winemac.drv/cocoa_clipboard.m | 8 +- dlls/winemac.drv/cocoa_event.m | 2 + dlls/winemac.drv/cocoa_window.m | 15 ++++ dlls/winemac.drv/event.c | 4 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 8 ++- 7 files changed, 149 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=449e2655c2ca59eb0ab3b…

1 0

André Hentschel : winapi: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: a7e240194ac75ddf9838da17e1c95e24f42a046c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e240194ac75ddf9838da17e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:43:37 2013 +0100 winapi: Remove SPARC support. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 2eac716..926cd1f 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,7 +279,7 @@ sub parse_spec_file($$) { } my $ordinal; - my $ARCHES="arm|i386|powerpc|sparc|win32|win64|x86_64|arm64"; + my $ARCHES="arm|arm64|i386|powerpc|win32|win64|x86_64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x)

1 0

Jacek Caban : jscript: Use BSTR also for pure IDispatch call in disp_delete_name.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 587d007d69152fed5fcbacbb4a890dec73440996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587d007d69152fed5fcbacbb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 16:02:58 2013 +0100 jscript: Use BSTR also for pure IDispatch call in disp_delete_name. --- dlls/jscript/dispex.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 721ad16..6a0153b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1518,6 +1518,7 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL { IDispatchEx *dispex; jsdisp_t *jsdisp; + BSTR bstr; HRESULT hres; jsdisp = iface_to_jsdisp((IUnknown*)disp); @@ -1536,26 +1537,21 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL return hres; } + bstr = SysAllocStringLen(NULL, jsstr_length(name)); + if(!bstr) + return E_OUTOFMEMORY; + jsstr_flush(name, bstr); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - BSTR bstr; - - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(bstr) { - hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); - SysFreeString(bstr); - if(SUCCEEDED(hres)) - *ret = hres == S_OK; - }else { - hres = E_OUTOFMEMORY; - } - + hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); + if(SUCCEEDED(hres)) + *ret = hres == S_OK; IDispatchEx_Release(dispex); }else { - WCHAR *name_str = name->str; DISPID id; - hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name_str, 1, 0, &id); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &bstr, 1, 0, &id); if(SUCCEEDED(hres)) { /* Property exists and we can't delete it from pure IDispatch interface, so return false. */ *ret = FALSE; @@ -1566,6 +1562,7 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL } } + SysFreeString(bstr); return hres; }

1 0

Ken Thomases : winemac: Implement IsClipboardFormatAvailable() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: af10783e18f59c62829ea0fd723270829ead1ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=af10783e18f59c62829ea0fd7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:09 2013 -0500 winemac: Implement IsClipboardFormatAvailable() with support for text formats. --- dlls/winemac.drv/clipboard.c | 43 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 90788ce..3f15a37 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -647,6 +647,49 @@ INT CDECL macdrv_CountClipboardFormats(void) /************************************************************************** + * IsClipboardFormatAvailable (MACDRV.@) + */ +BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) +{ + CFArrayRef types; + int count; + UINT i; + BOOL found = FALSE; + + TRACE("desired_format %s\n", debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return FALSE; + } + + count = CFArrayGetCount(types); + TRACE("got %d types\n", count); + + for (i = 0; !found && i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while (!found && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); + + if (format->format_id == desired_format) + found = TRUE; + } + } + + CFRelease(types); + TRACE(" -> %d\n", found); + return found; +} + + +/************************************************************************** * MACDRV Private Clipboard Exports **************************************************************************/ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 809ee2a..f5d1f15 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -20,6 +20,7 @@ @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo +@ cdecl IsClipboardFormatAvailable(long) macdrv_IsClipboardFormatAvailable @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC

1 0

André Hentschel : libport: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: fc08021151d499ec09cb5c115316afa1d4bc0f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc08021151d499ec09cb5c115… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:40:54 2013 +0100 libport: Remove SPARC support. --- libs/wine/port.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 87e5833..a532b2d 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -169,19 +169,6 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "ldr x19, [sp,#16]\n\t" /* restore register from stack */ "ldp x29, x30, [sp],#32\n\t" /* restore return address */ "ret") /* return */ -#elif defined(__sparc__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack, - "save %sp, -96, %sp\n\t" /* push: change register window */ - "mov %sp, %l2\n\t" /* store old sp in local var */ - "mov %i0, %l0\n\t" /* func */ - "mov %i1, %l1\n\t" /* arg */ - "sub %i2, 96, %sp\n\t" /* stack */ - "call %l0, 0\n\t" /* call func */ - "mov %l1, %o0\n\t" /* delay slot: arg for func */ - "mov %l2, %sp\n\t" /* restore old sp from local var */ - "mov %o0, %i0\n\t" /* move return value to right register window */ - "ret\n\t" /* return */ - "restore\n\t") /* delay slot: pop */ #else #error You must implement wine_call_on_stack for your platform #endif

1 0

Ken Thomases : winemac: Add support for "query" events which wait for synchronous responses.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 69e631e04e75e7596f58d2d16ba674b343886877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e631e04e75e7596f58d2d16… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:26 2013 -0500 winemac: Add support for "query" events which wait for synchronous responses. --- dlls/winemac.drv/cocoa_app.h | 7 ++- dlls/winemac.drv/cocoa_app.m | 86 ++++++++++++++++-- dlls/winemac.drv/cocoa_clipboard.m | 1 + dlls/winemac.drv/cocoa_event.h | 7 ++ dlls/winemac.drv/cocoa_event.m | 169 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_opengl.m | 2 +- dlls/winemac.drv/event.c | 32 +++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 26 ++++++- dlls/winemac.drv/macdrv_main.c | 2 +- 10 files changed, 314 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69e631e04e75e7596f58d…

1 0

Jacek Caban : jscript: Use BSTR also for pure IDispatch call in Object. hasOwnProperty.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 52fc8b3d94853e66d7c854bc33095759008245d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fc8b3d94853e66d7c854bc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 16:05:27 2013 +0100 jscript: Use BSTR also for pure IDispatch call in Object.hasOwnProperty. --- dlls/jscript/object.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 8047d3f..1139f3c 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -113,6 +113,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl { jsstr_t *name; DISPID id; + BSTR bstr; HRESULT hres; TRACE("\n"); @@ -131,6 +132,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl BOOL result; hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name->str, &result); + jsstr_release(name); if(FAILED(hres)) return hres; @@ -139,22 +141,20 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return S_OK; } - if(is_dispex(jsthis)) { - BSTR bstr; - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(!bstr) - return E_OUTOFMEMORY; + bstr = SysAllocStringLen(NULL, jsstr_length(name)); + if(bstr) + jsstr_flush(name, bstr); + jsstr_release(name); + if(!bstr) + return E_OUTOFMEMORY; - hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, - make_grfdex(ctx, fdexNameCaseSensitive), &id); - SysFreeString(bstr); - } else { - OLECHAR *names = name->str; - hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, - &names, 1, ctx->lcid, &id); - } + if(is_dispex(jsthis)) + hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive), &id); + else + hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, &bstr, 1, ctx->lcid, &id); + SysFreeString(bstr); if(r) *r = jsval_bool(SUCCEEDED(hres)); return S_OK;

1 0

André Hentschel : winebuild: Remove get_asm_short_keyword.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 4f1beed10628c17b087f9162b3762995060b837e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1beed10628c17b087f9162b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:37:05 2013 +0100 winebuild: Remove get_asm_short_keyword. --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 2 +- tools/winebuild/res16.c | 12 ++-- tools/winebuild/res32.c | 9 ++-- tools/winebuild/spec16.c | 130 ++++++++++++++++++++-------------------------- tools/winebuild/spec32.c | 40 ++++++-------- tools/winebuild/utils.c | 8 --- 7 files changed, 85 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1beed10628c17b087f9…

1 0

André Hentschel : ntdll: Unify the usage of internal SIGCONTEXT type on ARM and ARM64.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 6e8be236eec5b532d0f1715b376fea07b9bc3e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8be236eec5b532d0f1715b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 10 15:43:12 2013 +0100 ntdll: Unify the usage of internal SIGCONTEXT type on ARM and ARM64. --- dlls/ntdll/signal_arm.c | 8 ++++---- dlls/ntdll/signal_arm64.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index bf94b17..ce6a6b6 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -124,7 +124,7 @@ static inline BOOL is_valid_frame( void *frame ) * * Set the register values from a sigcontext. */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(x) context->R##x = REGn_sig(x,sigcontext) /* Save normal registers */ @@ -146,7 +146,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) * * Build a sigcontext from the register values. */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { #define C(x) REGn_sig(x,sigcontext) = context->R##x /* Restore normal registers */ @@ -167,7 +167,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) * * Set the FPU context from a sigcontext. */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME("not implemented\n"); } @@ -178,7 +178,7 @@ static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME("not implemented\n"); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 01af577..018d84f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -115,7 +115,7 @@ static inline BOOL is_valid_frame( void *frame ) * * Set the register values from a sigcontext. */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(n) context->X##n = REGn_sig(n,sigcontext) /* Save normal registers */ @@ -136,7 +136,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) * * Build a sigcontext from the register values. */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { #define C(n) REGn_sig(n,sigcontext) = context->X##n /* Restore normal registers */ @@ -156,7 +156,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) * * Set the FPU context from a sigcontext. */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME( "Not implemented on ARM64\n" ); } @@ -167,7 +167,7 @@ static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME( "Not implemented on ARM64\n" ); }

1 0

André Hentschel : winecrt0: Android NDK doesn' t have _init and _fini.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: e0f3e6bcf2045c6a0ff00af631a508dabd13420f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f3e6bcf2045c6a0ff00af63… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 10 12:04:00 2013 +0100 winecrt0: Android NDK doesn't have _init and _fini. --- dlls/winecrt0/crt0_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecrt0/crt0_private.h b/dlls/winecrt0/crt0_private.h index 05cf75d..b2c902e 100644 --- a/dlls/winecrt0/crt0_private.h +++ b/dlls/winecrt0/crt0_private.h @@ -21,7 +21,7 @@ #ifndef __WINE_CRT0_PRIVATE_H__ #define __WINE_CRT0_PRIVATE_H__ -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__ANDROID__) static inline void _init(int argc, char **argv, char **envp ) { /* nothing */ } static inline void _fini(void) { /* nothing */ } #else

1 0