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

Michael Stefaniuc : kernel32: Avoid TRUE FALSE conditional expressions.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 2dcc12aac3b50876bed880ce8acaeb02a43444ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcc12aac3b50876bed880ce8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 12 10:28:04 2013 +0100 kernel32: Avoid TRUE FALSE conditional expressions. --- dlls/kernel32/sync.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 3264884..6b5a949 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1398,9 +1398,9 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, options = 0; if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; - pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) ? TRUE : FALSE; - read_mode = (dwPipeMode & PIPE_READMODE_MESSAGE) ? TRUE : FALSE; - non_block = (dwPipeMode & PIPE_NOWAIT) ? TRUE : FALSE; + pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) != 0; + read_mode = (dwPipeMode & PIPE_READMODE_MESSAGE) != 0; + non_block = (dwPipeMode & PIPE_NOWAIT) != 0; if (nMaxInstances >= PIPE_UNLIMITED_INSTANCES) nMaxInstances = ~0U; timeout.QuadPart = (ULONGLONG)nDefaultTimeOut * -10000;

1 0

Stefan Dösinger : ddraw/tests: Use hardware VP only if available in the visual tests.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 3eb6045325e007270c5ce3a1cc068655887c7064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb6045325e007270c5ce3a1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:33 2013 -0700 ddraw/tests: Use hardware VP only if available in the visual tests. --- dlls/ddraw/tests/visual.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 02ba913..b8a4b76 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -64,6 +64,17 @@ static HRESULT WINAPI enum_z_fmt(DDPIXELFORMAT *fmt, void *ctx) return DDENUMRET_OK; } +static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) +{ + BOOL *hal_ok = ctx; + if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + { + *hal_ok = TRUE; + return DDENUMRET_CANCEL; + } + return DDENUMRET_OK; +} + static BOOL createObjects(void) { HRESULT hr; @@ -71,6 +82,8 @@ static BOOL createObjects(void) WNDCLASS wc = {0}; DDSURFACEDESC2 ddsd; DDPIXELFORMAT zfmt; + BOOL hal_ok = FALSE; + const GUID *devtype = &IID_IDirect3DHALDevice; if(!hmod) return FALSE; pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); @@ -116,8 +129,12 @@ static BOOL createObjects(void) hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); if(FAILED(hr)) goto err; + hr = IDirect3D7_EnumDevices(Direct3D, enum_devtype_cb, &hal_ok); + ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + memset(&zfmt, 0, sizeof(zfmt)); - hr = IDirect3D7_EnumZBufferFormats(Direct3D, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &zfmt); + hr = IDirect3D7_EnumZBufferFormats(Direct3D, devtype, enum_z_fmt, &zfmt); if (FAILED(hr)) goto err; if (zfmt.dwSize == 0) goto err; @@ -136,7 +153,7 @@ static BOOL createObjects(void) ok(SUCCEEDED(hr), "AddAttachedSurface failed, hr %#x.\n", hr); if (FAILED(hr)) goto err; - hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DTnLHalDevice, Surface, &Direct3DDevice); + hr = IDirect3D7_CreateDevice(Direct3D, devtype, Surface, &Direct3DDevice); if (FAILED(hr) || !Direct3DDevice) goto err; return TRUE;

1 0

Francois Gouget : msxml3/tests: Make test_xmlns_attribute() static.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 78a52bd8670331186ec1bcbd428118310c3c753f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a52bd8670331186ec1bcbd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 12 11:34:43 2013 +0100 msxml3/tests: Make test_xmlns_attribute() static. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8775312..d5f2413 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10754,7 +10754,7 @@ static void test_nodeValue(void) IXMLDOMDocument_Release(doc); } -void test_xmlns_attribute(void) +static void test_xmlns_attribute(void) { BSTR str; IXMLDOMDocument *doc;

1 0

Sergey Guralnik : user32: Use window height/ width instead of client for combo resizing.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: ac0738471da49f57105d7d5498603d73fbc650f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0738471da49f57105d7d549… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Fri Mar 8 22:28:39 2013 +0200 user32: Use window height/width instead of client for combo resizing. --- dlls/user32/combo.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index d20005c..346b346 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1507,7 +1507,7 @@ static void CBResetPos( /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) +static void COMBO_Size( LPHEADCOMBO lphc ) { /* * Those controls are always the same height. So we have to make sure @@ -1515,8 +1515,12 @@ static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) */ if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { - int newComboHeight; + int newComboHeight, curComboHeight, curComboWidth; + RECT rc; + GetWindowRect(lphc->self, &rc); + curComboHeight = rc.bottom - rc.top; + curComboWidth = rc.right - rc.left; newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); /* @@ -1527,18 +1531,18 @@ static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) * the actual control, for example, to do the layout of a dialog that is * resized, the height of the dropdown is not changed. */ - if( HIWORD(lParam) > newComboHeight ) + if( curComboHeight > newComboHeight ) { TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", - HIWORD(lParam), newComboHeight, lphc->droppedRect.bottom, + curComboHeight, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); - lphc->droppedRect.bottom = lphc->droppedRect.top + HIWORD(lParam) - newComboHeight; + lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; } /* * Restore original height */ - if( HIWORD(lParam) != newComboHeight ) - SetWindowPos(lphc->self, 0, 0, 0, LOWORD(lParam), newComboHeight, + if( curComboHeight != newComboHeight ) + SetWindowPos(lphc->self, 0, 0, 0, curComboWidth, newComboHeight, SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } @@ -1862,7 +1866,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar } case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, lParam ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );

1 0

Stefan Leichter : msvcr110: Add VS2012 C/C++ runtime.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 0e7f39439da99ac7900fa32786b0cd81463573fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7f39439da99ac7900fa3278… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Mar 10 11:35:03 2013 +0100 msvcr110: Add VS2012 C/C++ runtime. --- configure | 1 + configure.ac | 1 + dlls/msvcr110/Makefile.in | 9 + dlls/msvcr110/msvcr110.c | 44 + dlls/msvcr110/msvcr110.spec | 2248 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 2303 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7f39439da99ac7900fa…

1 0

Jörg Höhle : winmm: Fix GetPosition when using MSACM codecs.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 2722f2cbfcd5f45a3f53e5b818439fba1de2c14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2722f2cbfcd5f45a3f53e5b81… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 10 14:43:51 2013 +0100 winmm: Fix GetPosition when using MSACM codecs. --- dlls/winmm/waveform.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 0368790..594d82c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2035,7 +2035,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) } static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, - UINT32 sample_rate, UINT32 bytes_per_frame) + UINT32 sample_rate, UINT32 bytes_per_sec) { switch(time->wType){ case TIME_SAMPLES: @@ -2058,7 +2058,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, time->wType = TIME_BYTES; /* fall through */ case TIME_BYTES: - time->u.cb = played_frames * bytes_per_frame; + time->u.cb = MulDiv(played_frames, bytes_per_sec, sample_rate); return MMSYSERR_NOERROR; } } @@ -2066,7 +2066,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) { WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); - UINT32 played_frames, sample_rate, bytes_per_frame; + UINT32 played_frames, sample_rate, bytes_per_sec; TRACE("(%p, %p)\n", hwave, time); @@ -2075,12 +2075,11 @@ static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) played_frames = device->played_frames; sample_rate = device->orig_fmt->nSamplesPerSec; - bytes_per_frame = device->orig_fmt->nBlockAlign; + bytes_per_sec = device->orig_fmt->nAvgBytesPerSec; LeaveCriticalSection(&device->lock); - return WINMM_FramesToMMTime(time, played_frames, sample_rate, - bytes_per_frame); + return WINMM_FramesToMMTime(time, played_frames, sample_rate, bytes_per_sec); } static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags,

1 0

Nikolay Sivov : msxml3: Fix some test failures on Windows 8.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 40d30cf39955c501201239c4774398a2215b99b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d30cf39955c501201239c47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 12:58:31 2013 +0400 msxml3: Fix some test failures on Windows 8. --- dlls/msxml3/httprequest.c | 16 ++++++++-------- dlls/msxml3/tests/httpreq.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f9db1cd..c67177b 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -948,7 +948,8 @@ static HRESULT httprequest_getResponseHeader(httprequest *This, BSTR header, BST { struct httpheader *entry; - if (!header || !value) return E_INVALIDARG; + if (!header) return E_INVALIDARG; + if (!value) return E_POINTER; if (This->raw_respheaders && list_empty(&This->respheaders)) { @@ -982,7 +983,7 @@ static HRESULT httprequest_getResponseHeader(httprequest *This, BSTR header, BST static HRESULT httprequest_getAllResponseHeaders(httprequest *This, BSTR *respheaders) { - if (!respheaders) return E_INVALIDARG; + if (!respheaders) return E_POINTER; *respheaders = SysAllocString(This->raw_respheaders); @@ -1015,17 +1016,16 @@ static HRESULT httprequest_abort(httprequest *This) static HRESULT httprequest_get_status(httprequest *This, LONG *status) { - if (!status) return E_INVALIDARG; - if (This->state != READYSTATE_COMPLETE) return E_FAIL; + if (!status) return E_POINTER; *status = This->status; - return S_OK; + return This->state == READYSTATE_COMPLETE ? S_OK : E_FAIL; } static HRESULT httprequest_get_statusText(httprequest *This, BSTR *status) { - if (!status) return E_INVALIDARG; + if (!status) return E_POINTER; if (This->state != READYSTATE_COMPLETE) return E_FAIL; *status = SysAllocString(This->status_text); @@ -1038,7 +1038,7 @@ static HRESULT httprequest_get_responseText(httprequest *This, BSTR *body) HGLOBAL hglobal; HRESULT hr; - if (!body) return E_INVALIDARG; + if (!body) return E_POINTER; if (This->state != READYSTATE_COMPLETE) return E_FAIL; hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); @@ -1184,7 +1184,7 @@ static HRESULT httprequest_get_responseStream(httprequest *This, VARIANT *body) static HRESULT httprequest_get_readyState(httprequest *This, LONG *state) { - if (!state) return E_INVALIDARG; + if (!state) return E_POINTER; *state = This->state; return S_OK; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 6744657..5c62772 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1469,12 +1469,12 @@ static void test_XMLHTTP(void) /* initial status code */ hr = IXMLHttpRequest_get_status(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(xhr, &status); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); - ok(status == 0xdeadbeef, "got %d\n", status); + ok(status == READYSTATE_UNINITIALIZED || broken(status == 0xdeadbeef) /* <win8 */, "got %d\n", status); hr = IXMLHttpRequest_get_statusText(xhr, &str); ok(hr == E_FAIL, "got 0x%08x\n", hr); @@ -1497,7 +1497,7 @@ static void test_XMLHTTP(void) ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_readyState(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); state = -1; hr = IXMLHttpRequest_get_readyState(xhr, &state); @@ -1523,7 +1523,7 @@ static void test_XMLHTTP(void) status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(xhr, &status); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); - ok(status == 0xdeadbeef, "got %d\n", status); + ok(status == READYSTATE_UNINITIALIZED || broken(status == 0xdeadbeef) /* <win8 */, "got %d\n", status); state = -1; hr = IXMLHttpRequest_get_readyState(xhr, &state); @@ -1564,7 +1564,7 @@ static void test_XMLHTTP(void) /* response headers */ hr = IXMLHttpRequest_getAllResponseHeaders(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); EXPECT_HR(hr, S_OK); /* status line is stripped already */ @@ -1579,7 +1579,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_getResponseHeader(xhr, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), &str); EXPECT_HR(hr, S_OK); ok(*str != ' ', "got leading space in header %s\n", wine_dbgstr_w(str)); @@ -1592,7 +1592,7 @@ static void test_XMLHTTP(void) ok(status == 200, "got %d\n", status); hr = IXMLHttpRequest_get_statusText(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_statusText(xhr, &str); EXPECT_HR(hr, S_OK); @@ -1640,7 +1640,7 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); hr = IXMLHttpRequest_get_responseText(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_responseText(xhr, &bstrResponse); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Added a simple test for CDATA processing with SAX reader.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 2321f8b06f2ad184b4c663f4e2fe8891334add2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2321f8b06f2ad184b4c663f4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 12:45:54 2013 +0400 msxml3: Added a simple test for CDATA processing with SAX reader. --- dlls/msxml3/tests/saxreader.c | 103 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 06fd56a..da662bb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -168,9 +168,11 @@ typedef enum _CH { CH_IGNORABLEWHITESPACE, CH_PROCESSINGINSTRUCTION, CH_SKIPPEDENTITY, + LH_STARTCDATA, + LH_ENDCDATA, EH_ERROR, EH_FATALERROR, - EG_IGNORABLEWARNING, + EH_IGNORABLEWARNING, EVENT_LAST } CH; @@ -187,6 +189,8 @@ static const char *event_names[EVENT_LAST] = { "ignorableWhitespace", "processingInstruction", "skippedEntity", + "startCDATA", + "endCDATA", "error", "fatalError", "ignorableWarning" @@ -410,6 +414,8 @@ static void ok_sequence_(struct call_sequence **seq, int sequence_index, case CH_PUTDOCUMENTLOCATOR: case CH_STARTDOCUMENT: case CH_ENDDOCUMENT: + case LH_STARTCDATA: + case LH_ENDCDATA: break; case CH_STARTPREFIXMAPPING: /* prefix, uri */ @@ -459,7 +465,7 @@ static void ok_sequence_(struct call_sequence **seq, int sequence_index, context, get_event_name(actual->id), expected->ret, actual->ret); break; case EH_ERROR: - case EG_IGNORABLEWARNING: + case EH_IGNORABLEWARNING: default: ok(0, "%s: callback not handled, %s\n", context, get_event_name(actual->id)); } @@ -570,6 +576,10 @@ static const char test_attributes[] = "<node1 xmlns:p=\"test\" />" "</document>\n"; +static const char test_cdata_xml[] = +"<?xml version=\"1.0\" ?>" +"<a><![CDATA[Some \r\ntext\n\rdata\n]]></a>"; + static struct call_entry content_handler_test1[] = { { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, { CH_STARTDOCUMENT, 0, 0, S_OK }, @@ -894,6 +904,37 @@ static struct call_entry attribute_norm_alt[] = { { CH_ENDTEST } }; +static struct call_entry cdata_test[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, + { CH_STARTDOCUMENT, 0, 0, S_OK }, + { CH_STARTELEMENT, 1, 26, S_OK, "", "a", "a" }, + { LH_STARTCDATA, 1, 35, S_OK }, + { CH_CHARACTERS, 1, 35, S_OK, "Some \n" }, + { CH_CHARACTERS, 1, 42, S_OK, "text\n\n" }, + { CH_CHARACTERS, 4, 1, S_OK, "data\n" }, + { LH_ENDCDATA, 4, 1, S_OK }, + { CH_ENDELEMENT, 4, 6, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 0, 0, S_OK }, + { CH_ENDTEST } +}; + +/* this is what MSXML6 does */ +static struct call_entry cdata_test_alt[] = { + { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, + { CH_STARTDOCUMENT, 1, 22, S_OK }, + { CH_STARTELEMENT, 1, 25, S_OK, "", "a", "a" }, + { LH_STARTCDATA, 1, 34, S_OK }, + { CH_CHARACTERS, 1, 40, S_OK, "Some " }, + { CH_CHARACTERS, 2, 0, S_OK, "\n" }, + { CH_CHARACTERS, 3, 1, S_OK, "text\n" }, + { CH_CHARACTERS, 4, 0, S_OK, "\n" }, + { CH_CHARACTERS, 5, 3, S_OK, "data\n" }, + { LH_ENDCDATA, 5, 3, S_OK }, + { CH_ENDELEMENT, 5, 7, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 5, 7, S_OK }, + { CH_ENDTEST } +}; + static const char xmlspace_attr[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" "<a xml:space=\"preserve\"> Some text data </a>"; @@ -1275,7 +1316,7 @@ static HRESULT WINAPI isaxerrorHandler_fatalError( return S_OK; } -static HRESULT WINAPI isaxerrorHanddler_ignorableWarning( +static HRESULT WINAPI isaxerrorHandler_ignorableWarning( ISAXErrorHandler* iface, ISAXLocator *pLocator, const WCHAR *pErrorMessage, @@ -1292,7 +1333,7 @@ static const ISAXErrorHandlerVtbl errorHandlerVtbl = isaxerrorHandler_Release, isaxerrorHandler_error, isaxerrorHandler_fatalError, - isaxerrorHanddler_ignorableWarning + isaxerrorHandler_ignorableWarning }; static ISAXErrorHandler errorHandler = { &errorHandlerVtbl }; @@ -1583,14 +1624,24 @@ static HRESULT WINAPI isaxlexical_endEntity(ISAXLexicalHandler *iface, static HRESULT WINAPI isaxlexical_startCDATA(ISAXLexicalHandler *iface) { - ok(0, "call not expected\n"); - return E_NOTIMPL; + struct call_entry call; + + init_call_entry(locator, &call); + call.id = LH_STARTCDATA; + add_call(sequences, CONTENT_HANDLER_INDEX, &call); + + return get_expected_ret(); } static HRESULT WINAPI isaxlexical_endCDATA(ISAXLexicalHandler *iface) { - ok(0, "call not expected\n"); - return E_NOTIMPL; + struct call_entry call; + + init_call_entry(locator, &call); + call.id = LH_ENDCDATA; + add_call(sequences, CONTENT_HANDLER_INDEX, &call); + + return get_expected_ret(); } static HRESULT WINAPI isaxlexical_comment(ISAXLexicalHandler *iface, @@ -1880,6 +1931,9 @@ static struct msxmlsupported_data_t reader_support_data[] = { NULL } }; +static struct saxlexicalhandler lexicalhandler; +static struct saxdeclhandler declhandler; + static void test_saxreader(void) { const struct msxmlsupported_data_t *table = reader_support_data; @@ -2230,6 +2284,36 @@ static void test_saxreader(void) hr = ISAXXMLReader_putEntityResolver(reader, NULL); ok(hr == S_OK || broken(hr == E_FAIL), "got 0x%08x\n", hr); + /* CDATA sections */ + CreateStreamOnHGlobal(NULL, TRUE, &stream); + size.QuadPart = strlen(test_cdata_xml); + IStream_SetSize(stream, size); + IStream_Write(stream, test_cdata_xml, strlen(test_cdata_xml), &written); + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + + init_saxlexicalhandler(&lexicalhandler, S_OK); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)&lexicalhandler.ISAXLexicalHandler_iface; + hr = ISAXXMLReader_putProperty(reader, _bstr_("http://xml.org/sax/properties/lexical-handler"), var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + test_seq = cdata_test_alt; + else + test_seq = cdata_test; + + set_expected_seq(test_seq); + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test", TRUE); + + IStream_Release(stream); + ISAXXMLReader_Release(reader); table++; } @@ -2243,9 +2327,6 @@ struct saxreader_props_test_t IUnknown *iface; }; -static struct saxlexicalhandler lexicalhandler; -static struct saxdeclhandler declhandler; - static const struct saxreader_props_test_t props_test_data[] = { { "http://xml.org/sax/properties/lexical-handler", (IUnknown*)&lexicalhandler.ISAXLexicalHandler_iface }, { "http://xml.org/sax/properties/declaration-handler", (IUnknown*)&declhandler.ISAXDeclHandler_iface },

1 0

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

March 11, 2013

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

Andrew Eikum : winmm: Truncate buffers to align to frame size.
by Alexandre Julliard March 11, 2013

March 11, 2013

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