wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Jacek Caban : jscript: Use BSTR also for pure IDispatch call in disp_delete_name.
by Alexandre Julliard 11 Mar '13

11 Mar '13

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

Andrew Eikum : winmm/tests: Add tests for non-block-aligned fragment sizes.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: dd0751ae83529d8229325e1d0b790d3b33ba781a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0751ae83529d8229325e1d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 11 06:42:25 2013 -0500 winmm/tests: Add tests for non-block-aligned fragment sizes. --- dlls/winmm/tests/wave.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index eb619cd..09c7c89 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1508,9 +1508,88 @@ static void test_sndPlaySound(void) ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); } +static void test_fragmentsize(void) +{ + MMRESULT rc; + WAVEHDR hdr[2]; + HWAVEOUT wout; + WAVEFORMATEX fmt; + MMTIME mmtime; + DWORD wait; + HANDLE hevent; + + if(waveOutGetNumDevs() == 0) + return; + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = sizeof(WAVEFORMATEX); + + hevent = CreateEvent(NULL, FALSE, FALSE, NULL); + g_tid = GetCurrentThreadId(); + + rc = waveOutOpen(&wout, WAVE_MAPPER, &fmt, (DWORD_PTR)callback_func, + (DWORD_PTR)hevent, CALLBACK_FUNCTION); + ok(rc == MMSYSERR_NOERROR || rc == WAVERR_BADFORMAT || + rc == MMSYSERR_INVALFLAG || rc == MMSYSERR_INVALPARAM, + "waveOutOpen(%s) failed: %s\n", dev_name(WAVE_MAPPER), wave_out_error(rc)); + if(rc != MMSYSERR_NOERROR){ + CloseHandle(hevent); + return; + } + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "wave open callback missed\n"); + + memset(hdr, 0, sizeof(hdr)); + hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 4) + 1; + hdr[1].dwBufferLength = hdr[0].dwBufferLength - 2; + hdr[1].lpData = hdr[0].lpData = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + + rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + rc = waveOutPrepareHeader(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + trace("writing %u bytes then %u bytes\n", hdr[0].dwBufferLength, hdr[1].dwBufferLength); + rc = waveOutWrite(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + rc = waveOutWrite(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 1 callback missed\n"); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 2 callback missed\n"); + + memset(&mmtime, 0, sizeof(mmtime)); + mmtime.wType = TIME_BYTES; + + rc = waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); + ok(rc == MMSYSERR_NOERROR, "waveOutGetPosition failed: %s\n", wave_out_error(rc)); + + /* windows behavior is inconsistent */ + ok(mmtime.u.cb == 88200 || + mmtime.u.cb == 88196, "after position: %u\n", mmtime.u.cb); + + rc = waveOutClose(wout); + ok(rc == MMSYSERR_NOERROR, "waveOutClose failed: %s\n", wave_out_error(rc)); + + CloseHandle(hevent); +} + START_TEST(wave) { test_multiple_waveopens(); wave_out_tests(); test_sndPlaySound(); + test_fragmentsize(); }

1 0

Andrew Eikum : winmm: Truncate buffers to align to frame size.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: f74128f132df677999c26bbb409bc16bbb1e5e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74128f132df677999c26bbb4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 11 06:42:19 2013 -0500 winmm: Truncate buffers to align to frame size. --- dlls/winmm/waveform.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1dceb26..0368790 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1467,6 +1467,11 @@ static LRESULT WID_Close(HWAVEIN hwave) return MMSYSERR_NOERROR; } +static DWORD WINMM_FixedBufferLen(DWORD length, WINMM_Device *device) +{ + return length - length % device->bytes_per_frame; +} + static LRESULT WINMM_PrepareHeader(HWAVE hwave, WAVEHDR *header) { WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); @@ -1550,10 +1555,10 @@ static UINT32 WINMM_HeaderLenBytes(WINMM_Device *device, WAVEHDR *header) { if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved; - return ash->cbDstLengthUsed; + return WINMM_FixedBufferLen(ash->cbDstLengthUsed, device); } - return header->dwBufferLength; + return WINMM_FixedBufferLen(header->dwBufferLength, device); } static UINT32 WINMM_HeaderLenFrames(WINMM_Device *device, WAVEHDR *header) @@ -1690,14 +1695,11 @@ static void WOD_PushData(WINMM_Device *device) queue = device->playing; - if(device->acm_handle){ - ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)queue->reserved; - queue_bytes = ash->cbDstLengthUsed; - queue_data = ash->pbDst; - }else{ - queue_bytes = queue->dwBufferLength; + queue_bytes = WINMM_HeaderLenBytes(device, queue); + if(device->acm_handle) + queue_data = ((ACMSTREAMHEADER*)queue->reserved)->pbDst; + else queue_data = (BYTE*)queue->lpData; - } queue_frames = (queue_bytes - device->ofs_bytes) / device->bytes_per_frame; @@ -1817,8 +1819,8 @@ static void WID_PullACMData(WINMM_Device *device) while(queue){ UINT32 to_copy_bytes; - to_copy_bytes = min(queue->dwBufferLength - queue->dwBytesRecorded, - device->acm_hdr.cbDstLengthUsed - device->acm_offs); + to_copy_bytes = min(WINMM_FixedBufferLen(queue->dwBufferLength, device) - queue->dwBytesRecorded, + WINMM_FixedBufferLen(device->acm_hdr.cbDstLengthUsed, device) - device->acm_offs); memcpy(queue->lpData + queue->dwBytesRecorded, device->acm_hdr.pbDst + device->acm_offs, to_copy_bytes); @@ -1833,7 +1835,7 @@ static void WID_PullACMData(WINMM_Device *device) device->first = queue = queue->lpNext; } - if(device->acm_offs >= device->acm_hdr.cbDstLengthUsed){ + if(device->acm_offs >= WINMM_FixedBufferLen(device->acm_hdr.cbDstLengthUsed, device)){ acmStreamUnprepareHeader(device->acm_handle, &device->acm_hdr, 0); HeapFree(GetProcessHeap(), 0, device->acm_hdr.pbDst); device->acm_hdr.cbDstLength = 0; @@ -1893,7 +1895,7 @@ static void WID_PullData(WINMM_Device *device) UINT32 to_copy_bytes; to_copy_bytes = min(packet * device->bytes_per_frame, - queue->dwBufferLength - queue->dwBytesRecorded); + WINMM_FixedBufferLen(queue->dwBufferLength, device) - queue->dwBytesRecorded); memcpy(queue->lpData + queue->dwBytesRecorded, data + (packet_len - packet) * device->bytes_per_frame, @@ -2832,6 +2834,8 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) return WAVERR_STILLPLAYING; } + TRACE("dwBufferLength: %u\n", header->dwBufferLength); + if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved;

1 0

André Hentschel : winebuild: Remove get_asm_short_keyword.
by Alexandre Julliard 11 Mar '13

11 Mar '13

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 11 Mar '13

11 Mar '13

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 11 Mar '13

11 Mar '13

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

Ken Thomases : winemac: Add support for delay-rendered (a.k.a. promised) clipboard data.
by Alexandre Julliard 11 Mar '13

11 Mar '13

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

Ken Thomases : winemac: Add support for "query" events which wait for synchronous responses.
by Alexandre Julliard 11 Mar '13

11 Mar '13

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

Ken Thomases : winemac: Implement setting of clipboard data with support for text formats.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: bf824ed38c62f90c0fe66b1b61f7fedc8c377900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf824ed38c62f90c0fe66b1b6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:21 2013 -0500 winemac: Implement setting of clipboard data with support for text formats. --- dlls/winemac.drv/clipboard.c | 372 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_clipboard.m | 77 ++++++++ dlls/winemac.drv/macdrv_cocoa.h | 3 + dlls/winemac.drv/winemac.drv.spec | 4 + 4 files changed, 444 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf824ed38c62f90c0fe66…

1 0

Ken Thomases : winemac: Implement GetClipboardData() with support for text formats.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 764a8edb0991b2aaca225923e00f4a1cb8d92e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764a8edb0991b2aaca225923e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:18 2013 -0500 winemac: Implement GetClipboardData() with support for text formats. --- dlls/winemac.drv/clipboard.c | 67 ++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_clipboard.m | 28 +++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2c07fc8..9ae9e9c 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -738,6 +738,73 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) /************************************************************************** + * GetClipboardData (MACDRV.@) + */ +HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + CFStringRef type, best_type; + WINE_CLIPFORMAT* best_format = NULL; + HANDLE data = NULL; + + TRACE("desired_format %s\n", debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) + { + WINE_CLIPFORMAT* format; + + type = CFArrayGetValueAtIndex(types, i); + + format = NULL; + while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); + + if (format->format_id == desired_format) + { + /* The best format is the matching one which is not synthesized. Failing that, + the best format is the first matching synthesized format. */ + if (!format->synthesized || !best_format) + { + best_type = type; + best_format = format; + } + } + } + } + + if (best_format) + { + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + + TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); + + if (pasteboard_data) + { + data = best_format->import_func(pasteboard_data); + CFRelease(pasteboard_data); + } + } + + CFRelease(types); + TRACE(" -> %p\n", data); + return data; +} + + +/************************************************************************** * IsClipboardFormatAvailable (MACDRV.@) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index f9f9c6a..753a497 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -50,3 +50,31 @@ CFArrayRef macdrv_copy_pasteboard_types(void) [pool release]; return ret; } + + +/*********************************************************************** + * macdrv_copy_pasteboard_data + * + * Returns the pasteboard data for a specified type, or NULL on error or + * if there's no such type on the pasteboard. The caller is responsible + * for releasing the returned data object with CFRelease(). + */ +CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +{ + __block NSData* ret = nil; + + OnMainThread(^{ + @try + { + NSPasteboard* pb = [NSPasteboard generalPasteboard]; + if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[pb dataForType:(NSString*)type] copy]; + } + @catch (id e) + { + ERR(@"Exception discarded while copying pasteboard types: %@\n", e); + } + }); + + return (CFDataRef)ret; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3bb03d6..e36c301 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -275,6 +275,7 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; /* opengl */ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 3bbaac2..d1195f1 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -16,6 +16,7 @@ @ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx +@ cdecl GetClipboardData(long) macdrv_GetClipboardData @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013