January 2013 - Wine-Commits

Henri Verbeet : ddraw: Get rid of the local "window" variable in ddraw7_SetCooperativeLevel().
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: a7f4ac283b40d15fa023b5b28e3140069288cf3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f4ac283b40d15fa023b5b28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 08:46:55 2013 +0100 ddraw: Get rid of the local "window" variable in ddraw7_SetCooperativeLevel(). Having both a "hwnd" and a "window" here doesn't exactly make things much easier to follow. --- dlls/ddraw/ddraw.c | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 21acc28..a04de34 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -696,23 +696,19 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win * (Probably others too, have to investigate) * *****************************************************************************/ -static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, DWORD cooplevel) +static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND window, DWORD cooplevel) { struct ddraw *This = impl_from_IDirectDraw7(iface); struct wined3d_surface *rt = NULL, *ds = NULL; struct wined3d_stateblock *stateblock; BOOL restore_state = FALSE; - HWND window; HRESULT hr; - TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, cooplevel); + TRACE("iface %p, window %p, flags %#x.\n", iface, window, cooplevel); DDRAW_dump_cooperativelevel(cooplevel); wined3d_mutex_lock(); - /* Get the old window */ - window = This->dest_window; - /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | DDSCL_NORMAL | @@ -749,14 +745,14 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } - hr = ddraw_set_focus_window(This, hwnd); + hr = ddraw_set_focus_window(This, window); wined3d_mutex_unlock(); return hr; } if (cooplevel & DDSCL_EXCLUSIVE) { - if (!(cooplevel & DDSCL_FULLSCREEN) || !(hwnd || (cooplevel & DDSCL_CREATEDEVICEWINDOW))) + if (!(cooplevel & DDSCL_FULLSCREEN) || !(window || (cooplevel & DDSCL_CREATEDEVICEWINDOW))) { WARN("DDSCL_EXCLUSIVE requires DDSCL_FULLSCREEN and a window.\n"); wined3d_mutex_unlock(); @@ -794,20 +790,20 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if (cooplevel & DDSCL_SETFOCUSWINDOW) { - if (!hwnd) + if (!window) { wined3d_mutex_unlock(); return DDERR_NOHWND; } - if (FAILED(hr = ddraw_set_focus_window(This, hwnd))) + if (FAILED(hr = ddraw_set_focus_window(This, window))) { wined3d_mutex_unlock(); return hr; } } - hwnd = device_window; + window = device_window; } } else @@ -819,28 +815,28 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } if ((This->cooperative_level & DDSCL_EXCLUSIVE) - && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) + && (window != This->dest_window || !(cooplevel & DDSCL_EXCLUSIVE))) wined3d_device_release_focus_window(This->wined3d_device); - if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || hwnd != window) + if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || window != This->dest_window) { if (This->cooperative_level & DDSCL_FULLSCREEN) - wined3d_device_restore_fullscreen_window(This->wined3d_device, window); + wined3d_device_restore_fullscreen_window(This->wined3d_device, This->dest_window); if (cooplevel & DDSCL_FULLSCREEN) { struct wined3d_display_mode display_mode; wined3d_get_adapter_display_mode(This->wined3d, WINED3DADAPTER_DEFAULT, &display_mode, NULL); - wined3d_device_setup_fullscreen_window(This->wined3d_device, hwnd, + wined3d_device_setup_fullscreen_window(This->wined3d_device, window, display_mode.width, display_mode.height); } } if ((cooplevel & DDSCL_EXCLUSIVE) - && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) + && (window != This->dest_window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) { - hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd); + hr = wined3d_device_acquire_focus_window(This->wined3d_device, window); if (FAILED(hr)) { ERR("Failed to acquire focus window, hr %#x.\n", hr); @@ -879,7 +875,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, ddraw_destroy_swapchain(This); } - if (FAILED(hr = ddraw_create_swapchain(This, hwnd, !(cooplevel & DDSCL_FULLSCREEN)))) + if (FAILED(hr = ddraw_create_swapchain(This, window, !(cooplevel & DDSCL_FULLSCREEN)))) ERR("Failed to create swapchain, hr %#x.\n", hr); if (restore_state) @@ -915,7 +911,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, /* Store the cooperative_level */ This->cooperative_level = cooplevel; - This->dest_window = hwnd; + This->dest_window = window; TRACE("SetCooperativeLevel retuning DD_OK\n"); wined3d_mutex_unlock();

1 0

Damjan Jovanovic : qcap: Use the BaseOutputPin's IMemAllocator.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 632d82f4ac0f51a1c2773667d5dccc800bd27dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d82f4ac0f51a1c2773667d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 15 08:46:28 2013 +0200 qcap: Use the BaseOutputPin's IMemAllocator. --- dlls/qcap/v4l.c | 34 +++++----------------------------- 1 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 2562c48..41cc752 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -684,7 +684,6 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) *state = State_Running; if (!capBox->iscommitted++) { - IMemAllocator * pAlloc = NULL; ALLOCATOR_PROPERTIES ap, actual; BaseOutputPin *out; @@ -698,16 +697,11 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) ap.cbPrefix = 0; out = (BaseOutputPin *)capBox->pOut; - hr = IMemInputPin_GetAllocator(out->pMemInputPin, &pAlloc); - if (SUCCEEDED(hr)) - hr = IMemAllocator_SetProperties(pAlloc, &ap, &actual); + hr = IMemAllocator_SetProperties(out->pAllocator, &ap, &actual); if (SUCCEEDED(hr)) - hr = IMemAllocator_Commit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); + hr = IMemAllocator_Commit(out->pAllocator); TRACE("Committing allocator: %x\n", hr); } @@ -765,32 +759,14 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) capBox->thread = 0; if (capBox->iscommitted) { - IMemInputPin *pMem = NULL; - IMemAllocator * pAlloc = NULL; - IPin *pConnect = NULL; + BaseOutputPin *out; HRESULT hr; capBox->iscommitted = 0; - hr = IPin_ConnectedTo(capBox->pOut, &pConnect); - - if (SUCCEEDED(hr)) - hr = IPin_QueryInterface(pConnect, &IID_IMemInputPin, (void **) &pMem); - - if (SUCCEEDED(hr)) - hr = IMemInputPin_GetAllocator(pMem, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - - if (pMem) - IMemInputPin_Release(pMem); + out = (BaseOutputPin*)capBox->pOut; - if (pConnect) - IPin_Release(pConnect); + hr = IMemAllocator_Decommit(out->pAllocator); if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr);

1 0

Vincent Povirk : winex11.drv: Don' t join INCR data until the transfer finishes.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 9dcc21e3e79bf4b3dcfab233fb57348112de31d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcc21e3e79bf4b3dcfab233f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 14 13:35:53 2013 -0600 winex11.drv: Don't join INCR data until the transfer finishes. --- dlls/winex11.drv/clipboard.c | 68 +++++++++++++++++++++++++++++++++-------- 1 files changed, 54 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0df355a..730b6c9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2347,6 +2347,12 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, } +struct clipboard_data_packet { + struct list entry; + unsigned long size; + unsigned char *data; +}; + /************************************************************************** * X11DRV_CLIPBOARD_ReadProperty * Reads the contents of the X selection property. @@ -2368,13 +2374,21 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (atype == x11drv_atom(INCR)) { - unsigned char *buf = *data; + unsigned char *buf; unsigned long bufsize = 0; + struct list packets; + struct clipboard_data_packet *packet, *packet2; + BOOL res; + + HeapFree(GetProcessHeap(), 0, *data); + *data = NULL; + + list_init(&packets); for (;;) { int i; - unsigned char *prop_data, *tmp; + unsigned char *prop_data; unsigned long prop_size; /* Wait until PropertyNotify is received */ @@ -2392,32 +2406,58 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (i >= SELECTION_RETRIES || !X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, &prop_data, &prop_size)) { - HeapFree(GetProcessHeap(), 0, buf); - return FALSE; + res = FALSE; + break; } /* Retrieved entire data. */ if (prop_size == 0) { HeapFree(GetProcessHeap(), 0, prop_data); - *data = buf; - *datasize = bufsize; - return TRUE; + res = TRUE; + break; } - tmp = HeapReAlloc(GetProcessHeap(), 0, buf, bufsize + prop_size + 1); - if (!tmp) + packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet)); + if (!packet) { - HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, prop_data); - return FALSE; + res = FALSE; + break; } - buf = tmp; - memcpy(buf + bufsize, prop_data, prop_size + 1); + packet->size = prop_size; + packet->data = prop_data; + list_add_tail(&packets, &packet->entry); bufsize += prop_size; - HeapFree(GetProcessHeap(), 0, prop_data); } + + if (res) + { + buf = HeapAlloc(GetProcessHeap(), 0, bufsize + 1); + if (buf) + { + unsigned long bytes_copied = 0; + *datasize = bufsize; + LIST_FOR_EACH_ENTRY( packet, &packets, struct clipboard_data_packet, entry) + { + memcpy(&buf[bytes_copied], packet->data, packet->size); + bytes_copied += packet->size; + } + buf[bufsize] = 0; + *data = buf; + } + else + res = FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE( packet, packet2, &packets, struct clipboard_data_packet, entry) + { + HeapFree(GetProcessHeap(), 0, packet->data); + HeapFree(GetProcessHeap(), 0, packet); + } + + return res; } return TRUE;

1 0

Dmitry Timoshkov : gdiplus: Fix reading the mask bits in GdipCreateBitmapFromHICON.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 34ef07fda20a5fdd92961a016d0e7465b2316da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ef07fda20a5fdd92961a016… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:48:08 2013 +0800 gdiplus: Fix reading the mask bits in GdipCreateBitmapFromHICON. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9d88629..558e300 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1691,7 +1691,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biSize = sizeof(bih); bih.biWidth = width; - bih.biHeight = -height; + bih.biHeight = iinfo.hbmColor ? -height: -height * 2; bih.biPlanes = 1; bih.biBitCount = 32; bih.biCompression = BI_RGB;

1 0

Damjan Jovanovic : strmbase: Store and use the chosen IMemAllocator instead of getting it from the input pin .
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 7f767bb1957fc5ebdf0f145226d01f4fe3f7d80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f767bb1957fc5ebdf0f14522… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jan 15 08:43:33 2013 +0200 strmbase: Store and use the chosen IMemAllocator instead of getting it from the input pin. --- dlls/strmbase/pin.c | 52 ++++++++++------------------------------------- include/wine/strmbase.h | 1 + 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 936ae0c..750752e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -402,6 +402,9 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) if (!refCount) { FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; CoTaskMemFree(This); return 0; } @@ -584,18 +587,10 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa hr = VFW_E_NOT_CONNECTED; else { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); + hr = IMemAllocator_GetBuffer(This->pAllocator, ppSample, tStart, tStop, dwFlags); if (SUCCEEDED(hr)) hr = IMediaSample_SetTime(*ppSample, tStart, tStop); - - if (pAlloc) - IMemAllocator_Release(pAlloc); } return hr; @@ -653,17 +648,7 @@ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) if (!This->pin.pConnectedTo || !This->pMemInputPin) hr = VFW_E_NOT_CONNECTED; else - { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Commit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + hr = IMemAllocator_Commit(This->pAllocator); } LeaveCriticalSection(This->pin.pCritSec); @@ -683,17 +668,7 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) if (!This->pin.pConnectedTo || !This->pMemInputPin) hr = VFW_E_NOT_CONNECTED; else - { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); - } + hr = IMemAllocator_Decommit(This->pAllocator); } LeaveCriticalSection(This->pin.pCritSec); @@ -714,15 +689,7 @@ HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This) hr = VFW_E_NOT_CONNECTED; else { - IMemAllocator * pAlloc = NULL; - - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); - - if (SUCCEEDED(hr)) - hr = IMemAllocator_Decommit(pAlloc); - - if (pAlloc) - IMemAllocator_Release(pAlloc); + hr = IMemAllocator_Decommit(This->pAllocator); if (SUCCEEDED(hr)) hr = IPin_Disconnect(This->pin.pConnectedTo); @@ -795,7 +762,9 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei if (SUCCEEDED(hr)) { hr = This->pFuncsTable->pfnDecideAllocator(This, This->pMemInputPin, &pMemAlloc); - if (pMemAlloc) + if (SUCCEEDED(hr)) + This->pAllocator = pMemAlloc; + else if (pMemAlloc) IMemAllocator_Release(pMemAlloc); } @@ -839,6 +808,7 @@ static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * p /* Output pin attributes */ pPinImpl->pMemInputPin = NULL; + pPinImpl->pAllocator = NULL; pPinImpl->pFuncsTable = pBaseOutputFuncsTable; return S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index da6475d..cbb7d23 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -61,6 +61,7 @@ typedef struct BaseOutputPin /* inheritance C style! */ BasePin pin; IMemInputPin * pMemInputPin; + IMemAllocator * pAllocator; const struct BaseOutputPinFuncTable* pFuncsTable; } BaseOutputPin;

1 0

Huw Davies : usp10: Don't compute a pair adjustment for the last glyph.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 0783987a2623448ed3d1064b4bc045dd88276c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0783987a2623448ed3d1064b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:18 2013 +0000 usp10: Don't compute a pair adjustment for the last glyph. --- dlls/usp10/opentype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index f8cf8a1..d054e32 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1253,6 +1253,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN int j; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return glyph_index + 1; + TRACE("Pair Adjustment Positioning Subtable\n"); for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++)

1 0

Huw Davies : usp10: Fix MarkToMark offset for RTL text.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 6ae41d015c67b58f81264b520b06ccf462eae4ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae41d015c67b58f81264b520… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:20 2013 +0000 usp10: Fix MarkToMark offset for RTL text. --- dlls/usp10/opentype.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 978c1d2..05b8cab 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1758,12 +1758,14 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c { double devX, devY; POINT desU = {0,0}; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; GPOS_apply_MarkToMark(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index-1].du; - pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index-1].dv; + if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index - write_dir].du; + pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index - write_dir].dv; } break; }

1 0

Nikolay Sivov : xmllite: Support whitespace nodes reporting.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: fc114a9b15e80131bd93cc92f2395449d595dea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc114a9b15e80131bd93cc92f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 13 22:36:30 2013 +0400 xmllite: Support whitespace nodes reporting. --- dlls/xmllite/reader.c | 32 +++++++++++++++++++--- dlls/xmllite/tests/reader.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4e99f1d..12b1d4a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -517,14 +517,18 @@ static int readerinput_get_convlen(xmlreaderinput *readerinput) return len - (buffer->cur - buffer->data); } -/* It's possbile that raw buffer has some leftovers from last conversion - some char +/* It's possible that raw buffer has some leftovers from last conversion - some char sequence that doesn't represent a full code point. Length argument should be calculated with - readerinput_get_convlen(). */ + readerinput_get_convlen(), if it's -1 it will be calculated here. */ static void readerinput_shrinkraw(xmlreaderinput *readerinput, int len) { encoded_buffer *buffer = &readerinput->buffer->encoded; + + if (len == -1) + len = readerinput_get_convlen(readerinput); + memmove(buffer->data, buffer->cur + (buffer->written - len), len); - /* everything lower cur is lost too */ + /* everything below cur is lost too */ buffer->written -= len + (buffer->cur - buffer->data); /* after this point we don't need cur pointer really, it's used only to mark where actual data begins when first chunk is read */ @@ -1099,6 +1103,25 @@ static HRESULT reader_parse_pi(xmlreader *reader) return S_OK; } +/* This one is used to parse significant whitespace nodes, like in Misc production */ +static HRESULT reader_parse_whitespace(xmlreader *reader) +{ + WCHAR *start, *ptr; + + reader_shrink(reader); + start = reader_get_cur(reader); + + reader_skipspaces(reader); + ptr = reader_get_cur(reader); + TRACE("%s\n", debugstr_wn(start, ptr-start)); + + reader->nodetype = XmlNodeType_Whitespace; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + return S_OK; +} + /* [27] Misc ::= Comment | PI | S */ static HRESULT reader_parse_misc(xmlreader *reader) { @@ -1111,7 +1134,7 @@ static HRESULT reader_parse_misc(xmlreader *reader) const WCHAR *cur = reader_get_cur(reader); if (is_wchar_space(*cur)) - reader_skipspaces(reader); + hr = reader_parse_whitespace(reader); else if (!reader_cmp(reader, commentW)) hr = reader_parse_comment(reader); else if (!reader_cmp(reader, piW)) @@ -1163,6 +1186,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) hr = reader_parse_xmldecl(reader); if (FAILED(hr)) return hr; + readerinput_shrinkraw(reader->input, -1); reader->instate = XmlReadInState_Misc_DTD; if (hr == S_OK) return hr; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 140c99e..a8614a1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -876,6 +876,66 @@ static void test_read_pi(void) IXmlReader_Release(reader); } +struct nodes_test { + const char *xml; + XmlNodeType types[10]; +}; + +static const char misc_test_xml[] = + "" + "" + "<?pi1 pi1body ?>" + "" + " \t \r \n" + "" +; + +static struct nodes_test misc_test = { + misc_test_xml, + { + XmlNodeType_Comment, + XmlNodeType_Comment, + XmlNodeType_ProcessingInstruction, + XmlNodeType_Comment, + XmlNodeType_Whitespace, + XmlNodeType_Comment, + XmlNodeType_None + } +}; + +static void test_read_full(void) +{ + struct nodes_test *test = &misc_test; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + int i; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + i = 0; + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + while (hr == S_OK) + { + ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); + if (test->types[i] == XmlNodeType_None) break; + ok(type == test->types[i], "%d: got wrong type %d, expected %d\n", i, type, test->types[i]); + hr = IXmlReader_Read(reader, &type); + i++; + } + ok(test->types[i] == XmlNodeType_None, "incomplete sequence\n"); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -894,6 +954,7 @@ START_TEST(reader) test_reader_state(); test_read_comment(); test_read_pi(); + test_read_full(); test_read_xmldeclaration(); CoUninitialize();

1 0

Alexandre Julliard : msvcrt: Fix incorrect use of the system wctomb function.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: afee133b65682108195ada323ad8c7f3cb68654f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afee133b65682108195ada323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 13:47:00 2013 +0100 msvcrt: Fix incorrect use of the system wctomb function. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f0d0f7d..dedfa30 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3390,7 +3390,7 @@ MSVCRT_wint_t CDECL MSVCRT_fputwc(MSVCRT_wint_t wc, MSVCRT_FILE* file) char buf[MSVCRT_MB_LEN_MAX]; int char_len; - char_len = wctomb(buf, mwc); + char_len = MSVCRT_wctomb(buf, mwc); if(char_len!=-1 && MSVCRT_fwrite(buf, char_len, 1, file)==1) ret = wc; else diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 77418e3..9b88d32 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -945,6 +945,7 @@ int* __cdecl __p___mb_cur_max(void); unsigned int* __cdecl __p__fmode(void); MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*); MSVCRT_wchar_t*** __cdecl MSVCRT___p__wenviron(void); +INT __cdecl MSVCRT_wctomb(char*,MSVCRT_wchar_t); char* __cdecl MSVCRT__strdate(char* date); char* __cdecl MSVCRT__strtime(char* date); int __cdecl _setmbcp(int);

1 0

Damjan Jovanovic : qcap: Use libv4l1.h when available, instead of linux/ videodev.h which is deprecated/obsolete.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 8d4f636d543362ef901e2233cc9f9149f5f14bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4f636d543362ef901e2233c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jan 13 21:06:14 2013 +0200 qcap: Use libv4l1.h when available, instead of linux/videodev.h which is deprecated/obsolete. --- configure | 2 +- configure.ac | 2 +- dlls/qcap/v4l.c | 8 +++++--- dlls/qcap/yuv.c | 2 +- include/config.h.in | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 8394dea..04b3dc3 100755 --- a/configure +++ b/configure @@ -6251,7 +6251,7 @@ fi done -for ac_header in linux/videodev.h linux/videodev2.h +for ac_header in linux/videodev.h linux/videodev2.h libv4l1.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_SYS_TIME_H diff --git a/configure.ac b/configure.ac index 78d4f4b..fd760cf 100644 --- a/configure.ac +++ b/configure.ac @@ -667,7 +667,7 @@ AC_CHECK_HEADERS([pthread_np.h],,, #include <pthread.h> #endif]) -AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h],,, +AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h libv4l1.h],,, [#ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 1851ba4..f5baaeb 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -45,7 +45,9 @@ #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif -#ifdef HAVE_LINUX_VIDEODEV_H +#ifdef HAVE_LIBV4L1_H +#include <libv4l1.h> +#elif defined(HAVE_LINUX_VIDEODEV_H) #include <linux/videodev.h> #endif #ifdef HAVE_UNISTD_H @@ -68,7 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); -#ifdef HAVE_LINUX_VIDEODEV_H +#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H) static typeof(open) *video_open = open; static typeof(close) *video_close = close; @@ -994,4 +996,4 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) FAIL_WITH_ERR; } -#endif /* HAVE_LINUX_VIDEODEV_H */ +#endif /* HAVE_LINUX_VIDEODEV_H || HAVE_LINUX_LIBV4L1_H */ diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 608e571..6b8ff29 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -32,7 +32,7 @@ #include "wine/debug.h" /* This is not used if V4L support is missing */ -#ifdef HAVE_LINUX_VIDEODEV_H +#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H) WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/include/config.h.in b/include/config.h.in index b8acb15..9a7d109 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -347,6 +347,9 @@ /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO +/* Define to 1 if you have the <libv4l1.h> header file. */ +#undef HAVE_LIBV4L1_H + /* Define if you have the libxml2 library */ #undef HAVE_LIBXML2

1 0