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

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

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

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 : 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

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

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

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

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

11 Mar '13

Module: wine Branch: master Commit: 67d86e630e83098ea2e4e250b8048bfd93a00e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d86e630e83098ea2e4e250b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 16:03:15 2013 +0100 jscript: Use BSTR also for pure IDispatch call in disp_get_id. --- dlls/jscript/engine.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 52cdc88..f05fedf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -350,6 +350,7 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR { IDispatchEx *dispex; jsdisp_t *jsdisp; + BSTR bstr; HRESULT hres; jsdisp = iface_to_jsdisp((IUnknown*)disp); @@ -359,24 +360,27 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR return hres; } + if(name_bstr) { + bstr = name_bstr; + }else { + bstr = SysAllocString(name); + if(!bstr) + return E_OUTOFMEMORY; + } + *id = 0; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - BSTR str = name_bstr; - - if(!str) - str = SysAllocString(name); - if(str) - hres = IDispatchEx_GetDispID(dispex, str, make_grfdex(ctx, flags|fdexNameCaseSensitive), id); - else - hres = E_OUTOFMEMORY; + hres = IDispatchEx_GetDispID(dispex, bstr, make_grfdex(ctx, flags|fdexNameCaseSensitive), id); IDispatchEx_Release(dispex); - return hres; + }else { + TRACE("using IDispatch\n"); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); } - TRACE("using IDispatch\n"); - - return IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); + if(name_bstr != bstr) + SysFreeString(bstr); + return hres; } static inline BOOL var_is_null(const VARIANT *v)

1 0

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

11 Mar '13

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

Nikolay Sivov : xmllite: Support pending input reads for PI nodes.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: d1c52fe168c24ac61223b63cc41a10c63491271a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c52fe168c24ac61223b63cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 8 14:10:26 2013 +0400 xmllite: Support pending input reads for PI nodes. --- dlls/xmllite/reader.c | 99 +++++++++++++++++++++++++++++++++---------- dlls/xmllite/tests/reader.c | 1 + 2 files changed, 78 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c6f416d..b4a7f33 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -56,6 +56,23 @@ typedef enum XmlReadInState_MiscEnd } XmlReaderInternalState; +/* This state denotes where parsing was interrupted by input problem. + Reader resumes parsing using this information. */ +typedef enum +{ + XmlReadResumeState_Initial, + XmlReadResumeState_PITarget, + XmlReadResumeState_PIBody +} XmlReaderResumeState; + +/* saved pointer index to resume from particular input position */ +typedef enum +{ + XmlReadResume_Name, /* PITarget */ + XmlReadResume_Body, /* PI body, comment text */ + XmlReadResume_Last +} XmlReaderResume; + typedef enum { StringValue_LocalName, @@ -146,6 +163,7 @@ typedef struct IMalloc *imalloc; XmlReadState state; XmlReaderInternalState instate; + XmlReaderResumeState resumestate; XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ @@ -155,7 +173,7 @@ typedef struct struct list elements; strval strvalues[StringValue_Last]; UINT depth; - WCHAR *save; + WCHAR *resume[XmlReadResume_Last]; /* pointers used to resume reader */ } xmlreader; struct input_buffer @@ -1031,9 +1049,9 @@ static HRESULT reader_parse_comment(xmlreader *reader) { WCHAR *start, *ptr; - if (reader->save) + if (reader->resume[XmlReadResume_Body]) { - start = reader->save; + start = reader->resume[XmlReadResume_Body]; ptr = reader_get_cur(reader); } else @@ -1043,7 +1061,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_shrink(reader); ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; - reader->save = start; + reader->resume[XmlReadResume_Body] = start; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1067,7 +1085,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); - reader->save = NULL; + reader->resume[XmlReadResume_Body] = NULL; return S_OK; } else @@ -1166,10 +1184,18 @@ static inline int is_namechar(WCHAR ch) [5] Name ::= NameStartChar (NameChar)* */ static HRESULT reader_parse_name(xmlreader *reader, strval *name) { - WCHAR *ptr, *start = reader_get_cur(reader); + WCHAR *ptr, *start; - ptr = start; - if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + if (reader->resume[XmlReadResume_Name]) + { + start = reader->resume[XmlReadResume_Name]; + ptr = reader_get_cur(reader); + } + else + { + ptr = start = reader_get_cur(reader); + if (!is_namestartchar(*ptr)) return WC_E_NAMECHARACTER; + } while (is_namechar(*ptr)) { @@ -1177,6 +1203,14 @@ static HRESULT reader_parse_name(xmlreader *reader, strval *name) ptr = reader_get_cur(reader); } + if (is_reader_pending(reader)) + { + reader->resume[XmlReadResume_Name] = start; + return E_PENDING; + } + else + reader->resume[XmlReadResume_Name] = NULL; + TRACE("name %s:%d\n", debugstr_wn(start, ptr-start), (int)(ptr-start)); name->str = start; name->len = ptr-start; @@ -1193,7 +1227,7 @@ static HRESULT reader_parse_pitarget(xmlreader *reader, strval *target) UINT i; hr = reader_parse_name(reader, &name); - if (FAILED(hr)) return WC_E_PI; + if (FAILED(hr)) return is_reader_pending(reader) ? E_PENDING : WC_E_PI; /* now that we got name check for illegal content */ if (name.len == 3 && !strncmpiW(name.str, xmlW, 3)) @@ -1216,12 +1250,20 @@ static HRESULT reader_parse_pi(xmlreader *reader) strval target; HRESULT hr; - /* skip '<?' */ - reader_skipn(reader, 2); - reader_shrink(reader); - - hr = reader_parse_pitarget(reader, &target); - if (FAILED(hr)) return hr; + switch (reader->resumestate) + { + case XmlReadResumeState_Initial: + /* skip '<?' */ + reader_skipn(reader, 2); + reader_shrink(reader); + reader->resumestate = XmlReadResumeState_PITarget; + case XmlReadResumeState_PITarget: + hr = reader_parse_pitarget(reader, &target); + if (FAILED(hr)) return hr; + reader->resumestate = XmlReadResumeState_PIBody; + default: + ; + } ptr = reader_get_cur(reader); /* exit earlier if there's no content */ @@ -1230,17 +1272,26 @@ static HRESULT reader_parse_pi(xmlreader *reader) /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } - /* now at least a single space char should be there */ - if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; - reader_skipspaces(reader); - - ptr = start = reader_get_cur(reader); + if (!reader->resume[XmlReadResume_Body]) + { + /* now at least a single space char should be there */ + if (!is_wchar_space(*ptr)) return WC_E_WHITESPACE; + reader_skipspaces(reader); + ptr = start = reader_get_cur(reader); + reader->resume[XmlReadResume_Body] = start; + } + else + { + start = reader->resume[XmlReadResume_Body]; + ptr = reader_get_cur(reader); + } while (*ptr) { @@ -1254,6 +1305,8 @@ static HRESULT reader_parse_pi(xmlreader *reader) /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; + reader->resumestate = XmlReadResumeState_Initial; + reader->resume[XmlReadResume_Body] = NULL; reader_set_strvalue(reader, StringValue_LocalName, &target); reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &value); @@ -1832,7 +1885,8 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->line = This->pos = 0; reader_clear_elements(This); This->depth = 0; - This->save = NULL; + This->resumestate = XmlReadResumeState_Initial; + memset(This->resume, 0, sizeof(This->resume)); /* just reset current input */ if (!input) @@ -2255,6 +2309,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->input = NULL; reader->state = XmlReadState_Closed; reader->instate = XmlReadInState_Initial; + reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; reader->imalloc = imalloc; @@ -2265,7 +2320,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->attr = NULL; list_init(&reader->elements); reader->depth = 0; - reader->save = NULL; + memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 65c3448..77e596a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -852,6 +852,7 @@ static void test_read_comment(void) static struct test_entry pi_tests[] = { { "<?pi?>", "pi", "", S_OK }, { "<?pi ?>", "pi", "", S_OK }, + { "<?pi ?>", "pi", "", S_OK }, { "<?pi pi data?>", "pi", "pi data", S_OK }, { "<?pi pi data ?>", "pi", "pi data ", S_OK }, { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER },

1 0