wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Zebediah Figura : quartz/dsoundrender: Use flush_event instead of reimplementing it.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 221a0cdb94d4c8ff8a96d20ee191ad5b9a07421f URL: https://source.winehq.org/git/wine.git/?a=commit;h=221a0cdb94d4c8ff8a96d20e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:43 2019 -0500 quartz/dsoundrender: Use flush_event instead of reimplementing it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f74b673..fd04212 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,8 +64,6 @@ typedef struct DSoundRenderImpl REFERENCE_TIME play_time; - HANDLE blocked; - LONG volume; LONG pan; @@ -245,7 +243,7 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) This->in_loop = 1; LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); - WaitForSingleObject(This->blocked, 10); + WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; @@ -270,7 +268,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM if (hr != S_OK) { This->in_loop = 1; LeaveCriticalSection(&This->renderer.csRenderLock); - ret = WaitForSingleObject(This->blocked, 10); + ret = WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); This->in_loop = 0; if (This->renderer.sink.flushing || This->renderer.filter.state == State_Stopped) @@ -434,7 +432,6 @@ static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) IDirectSoundBuffer_Stop(This->dsbuffer); This->writepos = This->buf_size; - SetEvent(This->blocked); } static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) @@ -445,13 +442,7 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) if (This->renderer.sink.pin.pConnectedTo) { - if (This->renderer.filter.state == State_Paused) - { - /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ - SetEvent(This->blocked); - } IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); - ResetEvent(This->blocked); } } @@ -548,17 +539,6 @@ static HRESULT WINAPI DSoundRender_EndOfStream(BaseRenderer* iface) return hr; } -static HRESULT WINAPI DSoundRender_BeginFlush(BaseRenderer* iface) -{ - DSoundRenderImpl *This = impl_from_BaseRenderer(iface); - - TRACE("\n"); - BaseRendererImpl_BeginFlush(iface); - SetEvent(This->blocked); - - return S_OK; -} - static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -566,8 +546,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) TRACE("\n"); BaseRendererImpl_EndFlush(iface); - if (This->renderer.filter.state != State_Stopped) - ResetEvent(This->blocked); if (This->dsbuffer) { @@ -602,8 +580,6 @@ static void dsound_render_destroy(BaseRenderer *iface) IDirectSound8_Release(filter->dsound); filter->dsound = NULL; - CloseHandle(filter->blocked); - strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -643,7 +619,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CompleteConnect, DSoundRender_BreakConnect, DSoundRender_EndOfStream, - DSoundRender_BeginFlush, + NULL, DSoundRender_EndFlush, dsound_render_destroy, dsound_render_query_interface, @@ -695,14 +671,6 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out) if (SUCCEEDED(hr)) { - pDSoundRender->blocked = CreateEventW(NULL, TRUE, TRUE, NULL); - - if (!pDSoundRender->blocked || FAILED(hr)) - { - IBaseFilter_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); - return HRESULT_FROM_WIN32(GetLastError()); - } - *out = &pDSoundRender->renderer.filter.IUnknown_inner; } else @@ -735,7 +703,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (SUCCEEDED(hr)) This->renderer.filter.state = State_Paused; - ResetEvent(This->blocked); ResetEvent(This->renderer.flush_event); } LeaveCriticalSection(&This->renderer.csRenderLock);

1 0

Nikolay Sivov : d2d1: Remove unused function.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 436fb03a87ae6dcbbbe149e401942b7eb8369f51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=436fb03a87ae6dcbbbe149e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 2 20:42:19 2019 +0300 d2d1: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 9e4acb6..98f06a2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -207,11 +207,6 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); } -static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) -{ - return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); -} - static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { struct d2d_device_context *context = impl_from_IUnknown(iface);

1 0

Nikolay Sivov : shlwapi: Remove unused function.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: f7392a30ecb64d8165346200a912f0993bb84819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7392a30ecb64d8165346200… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 2 20:44:24 2019 +0300 shlwapi: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index a8d1c97..e7b56a7 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -54,21 +54,6 @@ static fnpIsNetDrive pIsNetDrive; HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); -static inline WCHAR* heap_strdupAtoW(LPCSTR str) -{ - WCHAR *ret = NULL; - - if (str) - { - DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - } - - return ret; -} - /************************************************************************* * PathBuildRootA [SHLWAPI.@] *

1 0

Jeff Smith : d3drm: Fix reference leak in d3drm_viewport2_Clear().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 8fb032916d6bfc1d0006392904b9dc5344b8e1a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fb032916d6bfc1d00063929… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 1 12:17:29 2019 -0500 d3drm: Fix reference leak in d3drm_viewport2_Clear(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a7cd594..8667819 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6739,10 +6739,12 @@ static void test_viewport_clear1(void) ret_color = IDirect3DRMFrame_GetSceneBackground(camera1); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMViewport_Clear(viewport1); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f); ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr); @@ -6942,10 +6944,12 @@ static void test_viewport_clear2(void) ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 81d3af4..51174cd 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -50,6 +50,7 @@ static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) if (FAILED(hr = IDirect3DRMFrame_GetScene(viewport->camera, &root_frame))) return hr; color = IDirect3DRMFrame_GetSceneBackground(root_frame); + IDirect3DRMFrame_Release(root_frame); memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat);

1 0

Dmitry Timoshkov : msvcrt: Fix handling of dst == src in wcscpy_s.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 9ade30d0ce7f107e775c72e628ff6e4444b9bdf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ade30d0ce7f107e775c72e6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 24 11:49:34 2019 +0800 msvcrt: Fix handling of dst == src in wcscpy_s. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0f1ee47..59f9e1d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1020,6 +1020,11 @@ static void test_wcscpy_s(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* dest == source */ + ret = p_wcscpy_s(szDest, 18, szDest); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* Copy smaller buffer size */ errno = EBADF; szDest[0] = 'A'; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e62ac25..6b8c7bb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2041,16 +2041,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con if(!MSVCRT_CHECK_PMT(wcDest)) return MSVCRT_EINVAL; if(!MSVCRT_CHECK_PMT(numElement)) return MSVCRT_EINVAL; - wcDest[0] = 0; - - if(!MSVCRT_CHECK_PMT(wcSrc)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(wcSrc)) + { + wcDest[0] = 0; + return MSVCRT_EINVAL; + } size = strlenW(wcSrc) + 1; if(!MSVCRT_CHECK_PMT_ERR(size <= numElement, MSVCRT_ERANGE)) + { + wcDest[0] = 0; return MSVCRT_ERANGE; + } - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + memmove( wcDest, wcSrc, size*sizeof(WCHAR) ); return 0; }

1 0

Ethan Lee : xaudio2: Export functions by ordinal.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 92a5299b1d0a0775e1158f334c0348a3ffe8f063 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a5299b1d0a0775e1158f33… Author: Ethan Lee <elee(a)codeweavers.com> Date: Tue Jul 2 11:01:06 2019 -0400 xaudio2: Export functions by ordinal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47437 Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_8/xaudio2_8.spec | 12 ++++++------ dlls/xaudio2_9/xaudio2_9.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec index 0b9f238..78bf05b 100644 --- a/dlls/xaudio2_8/xaudio2_8.spec +++ b/dlls/xaudio2_8/xaudio2_8.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr) diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec index 0b9f238..78bf05b 100644 --- a/dlls/xaudio2_9/xaudio2_9.spec +++ b/dlls/xaudio2_9/xaudio2_9.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr)

1 0

Ethan Lee : xaudio2: Add TRACE functions to CreateAudioReverb/ CreateAudioVolumeMeter.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 6103b8173b119fb8c80a107f0284a83399438066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6103b8173b119fb8c80a107f… Author: Ethan Lee <elee(a)codeweavers.com> Date: Mon Jul 1 13:53:54 2019 -0400 xaudio2: Add TRACE functions to CreateAudioReverb/CreateAudioVolumeMeter. Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index da0b0aa..a87e012 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2075,6 +2075,8 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr; @@ -2091,6 +2093,8 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr;

1 0

Jacek Caban : msxml3: Fix string length handling in I[VB]SAXContentHandler ::characters.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 73af53c4bca6cc56b4fccc8139cc564715c08e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73af53c4bca6cc56b4fccc81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 18 16:55:40 2019 +0200 msxml3: Fix string length handling in I[VB]SAXContentHandler::characters. Windows crashes when -1 length is passed. Escaping should just copy embedded null bytes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 10 +++--- dlls/msxml3/tests/saxreader.c | 72 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 10be250..a5bfdf1 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -498,10 +498,10 @@ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) WCHAR *ptr, *ret; /* default buffer size to something if length is unknown */ - conv_len = *len == -1 ? default_alloc : max(2**len, default_alloc); + conv_len = max(2**len, default_alloc); ptr = ret = heap_alloc(conv_len*sizeof(WCHAR)); - while (*str && p) + while (p) { if (ptr - ret > conv_len - grow_thresh) { @@ -539,10 +539,10 @@ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) } str++; - if (*len != -1) p--; + p--; } - if (*len != -1) *len = ptr-ret; + *len = ptr-ret; *++ptr = 0; return ret; @@ -2206,7 +2206,7 @@ static HRESULT WINAPI VBSAXContentHandler_characters(IVBSAXContentHandler *iface if (!chars) return E_POINTER; - return ISAXContentHandler_characters(&This->ISAXContentHandler_iface, *chars, -1); + return ISAXContentHandler_characters(&This->ISAXContentHandler_iface, *chars, SysStringLen(*chars)); } static HRESULT WINAPI VBSAXContentHandler_ignorableWhitespace(IVBSAXContentHandler *iface, BSTR *chars) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index eeef5b6..d1076f5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3950,10 +3950,13 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; const struct writer_characters_t *table = writer_characters; + IVBSAXContentHandler *vb_content; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; + BSTR str; HRESULT hr; int i = 0; @@ -3964,6 +3967,9 @@ static void test_mxwriter_characters(void) hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); EXPECT_HR(hr, S_OK); + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + EXPECT_HR(hr, S_OK); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -3976,6 +3982,10 @@ static void test_mxwriter_characters(void) hr = ISAXContentHandler_characters(content, chardataW, 0); EXPECT_HR(hr, S_OK); + str = _bstr_("VbChars"); + hr = IVBSAXContentHandler_characters(vb_content, &str); + EXPECT_HR(hr, S_OK); + hr = ISAXContentHandler_characters(content, chardataW, ARRAY_SIZE(chardataW) - 1); EXPECT_HR(hr, S_OK); @@ -3983,13 +3993,14 @@ static void test_mxwriter_characters(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("TESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("VbCharsTESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endDocument(content); EXPECT_HR(hr, S_OK); ISAXContentHandler_Release(content); + IVBSAXContentHandler_Release(vb_content); IMXWriter_Release(writer); /* try empty characters data to see if element is closed */ @@ -4025,6 +4036,65 @@ static void test_mxwriter_characters(void) ISAXContentHandler_Release(content); IMXWriter_Release(writer); + /* test embedded null bytes */ + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_characters(content, embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(SysStringLen(V_BSTR(&dest)) == ARRAY_SIZE(embedded_nullbytes), "unexpected len %d\n", SysStringLen(V_BSTR(&dest))); + ok(!memcmp(V_BSTR(&dest), embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = IVBSAXContentHandler_startDocument(vb_content); + EXPECT_HR(hr, S_OK); + + str = SysAllocStringLen(embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)); + hr = IVBSAXContentHandler_characters(vb_content, &str); + EXPECT_HR(hr, S_OK); + SysFreeString(str); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(SysStringLen(V_BSTR(&dest)) == ARRAY_SIZE(embedded_nullbytes), "unexpected len %d\n", SysStringLen(V_BSTR(&dest))); + ok(!memcmp(V_BSTR(&dest), embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + IVBSAXContentHandler_Release(vb_content); + IMXWriter_Release(writer); + /* batch tests */ while (table->clsid) {

1 0

Jacek Caban : winedbg: Set auto attach event after processing the first exception.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 1bb98982d682a85b82e1496a2321daa043d8a6c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb98982d682a85b82e1496a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 18:02:30 2019 +0200 winedbg: Set auto attach event after processing the first exception. On Windows, the process is broken into by ordering an actual debug break execution in a new thread. We need to process this event before continuing exception handling in debuggee to avoid race. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/tgt_active.c | 14 +++++--------- programs/winedbg/winedbg.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ee33ca0..d8d7a69 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -235,8 +235,8 @@ struct dbg_process const WCHAR* imageName; struct list threads; struct backend_cpu* be_cpu; - BOOL continue_on_first_exception : 1, - active_debuggee : 1; + HANDLE event_on_first_exception; + BOOL active_debuggee; struct dbg_breakpoint bp[MAX_BREAKPOINTS]; unsigned next_bp; struct dbg_delayed_bp* delayed_bp; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f2ea753..71e0bc1 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -334,9 +334,11 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); - if (dbg_curr_process->continue_on_first_exception) + if (dbg_curr_process->event_on_first_exception) { - dbg_curr_process->continue_on_first_exception = FALSE; + SetEvent(dbg_curr_process->event_on_first_exception); + CloseHandle(dbg_curr_process->event_on_first_exception); + dbg_curr_process->event_on_first_exception = NULL; if (!DBG_IVAR(BreakOnAttach)) break; } if (dbg_fetch_context()) @@ -788,13 +790,7 @@ enum dbg_start dbg_active_attach(int argc, char* argv[]) SetEvent((HANDLE)evt); return start_error_init; } - dbg_curr_process->continue_on_first_exception = TRUE; - if (!SetEvent((HANDLE)evt)) - { - WINE_ERR("Invalid event handle: %lx\n", evt); - return start_error_init; - } - CloseHandle((HANDLE)evt); + dbg_curr_process->event_on_first_exception = (HANDLE)evt; } else return start_error_parse; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 92d248c..5dee3b7 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -312,7 +312,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->pio_data = NULL; p->imageName = NULL; list_init(&p->threads); - p->continue_on_first_exception = FALSE; + p->event_on_first_exception = NULL; p->active_debuggee = FALSE; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ memset(p->bp, 0, sizeof(p->bp)); @@ -372,6 +372,7 @@ void dbg_del_process(struct dbg_process* p) source_free_files(p); list_remove(&p->entry); if (p == dbg_curr_process) dbg_curr_process = NULL; + if (p->event_on_first_exception) CloseHandle(p->event_on_first_exception); HeapFree(GetProcessHeap(), 0, (char*)p->imageName); HeapFree(GetProcessHeap(), 0, p); } @@ -559,7 +560,12 @@ BOOL dbg_interrupt_debuggee(void) p = LIST_ENTRY(list_head(&dbg_process_list), struct dbg_process, entry); if (list_next(&dbg_process_list, &p->entry)) dbg_printf("Ctrl-C: only stopping the first process\n"); else dbg_printf("Ctrl-C: stopping debuggee\n"); - p->continue_on_first_exception = FALSE; + if (p->event_on_first_exception) + { + SetEvent(p->event_on_first_exception); + CloseHandle(p->event_on_first_exception); + p->event_on_first_exception = NULL; + } return DebugBreakProcess(p->handle); }

1 0

Jacek Caban : winedbg: Move continue_on_first_exception handling out of dbg_attach_debuggee.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 136a0ac49b419af5510ec5c55d3a65e2cbe79d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=136a0ac49b419af5510ec5c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 18:01:13 2019 +0200 winedbg: Move continue_on_first_exception handling out of dbg_attach_debuggee. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 2 +- programs/winedbg/stack.c | 2 +- programs/winedbg/tgt_active.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 6b080a5..126eef2 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -137,7 +137,7 @@ command: | tSYMBOLFILE pathname { symbol_read_symtable($2, 0); } | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } - | tATTACH tNUM { dbg_attach_debuggee($2, FALSE); dbg_active_wait_for_first_exception(); } + | tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 490bd06..ee33ca0 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -431,7 +431,7 @@ extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); extern enum dbg_start dbg_active_minidump(int argc, char* argv[]); extern void dbg_active_wait_for_first_exception(void); -extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe); +extern BOOL dbg_attach_debuggee(DWORD pid); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index ed02c33..f76996d 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -412,7 +412,7 @@ static void backtrace_all(void) } else if (entry.th32OwnerProcessID != dbg_curr_pid) { - if (!dbg_attach_debuggee(entry.th32OwnerProcessID, FALSE)) + if (!dbg_attach_debuggee(entry.th32OwnerProcessID)) { dbg_printf("\nwarning: could not attach to %04x\n", entry.th32OwnerProcessID); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5385d0e..f2ea753 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -71,7 +71,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de); * wfe is set to TRUE if dbg_attach_debuggee should also proceed with all debug events * until the first exception is received (aka: attach to an already running process) */ -BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) +BOOL dbg_attach_debuggee(DWORD pid) { if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; @@ -81,7 +81,6 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) dbg_del_process(dbg_curr_process); return FALSE; } - dbg_curr_process->continue_on_first_exception = cofe; SetEnvironmentVariableA("DBGHELP_NOLIVE", NULL); @@ -776,19 +775,20 @@ enum dbg_start dbg_active_attach(int argc, char* argv[]) /* try the form <myself> pid */ if (argc == 1 && str2int(argv[0], &pid) && pid != 0) { - if (!dbg_attach_debuggee(pid, FALSE)) + if (!dbg_attach_debuggee(pid)) return start_error_init; } /* try the form <myself> pid evt (Win32 JIT debugger) */ else if (argc == 2 && str2int(argv[0], &pid) && pid != 0 && str2int(argv[1], &evt) && evt != 0) { - if (!dbg_attach_debuggee(pid, TRUE)) + if (!dbg_attach_debuggee(pid)) { /* don't care about result */ SetEvent((HANDLE)evt); return start_error_init; } + dbg_curr_process->continue_on_first_exception = TRUE; if (!SetEvent((HANDLE)evt)) { WINE_ERR("Invalid event handle: %lx\n", evt);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
23
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 July 2019