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

Dan Kegel : wintab: Expand whitelist of tablets.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 8e4d5d21fd2236cba706bfe24a853a17e34de1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e4d5d21fd2236cba706bfe24… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Mar 13 08:56:05 2008 -0700 wintab: Expand whitelist of tablets. --- dlls/winex11.drv/wintab.c | 49 ++++++++++++++++++++------------------------ 1 files changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index e5d7071..9645cda 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -388,23 +388,27 @@ BOOL match_token(const char *haystack, const char *needle) ** by Wacom tablets. This code will likely need to be expanded for alternate tablet types */ -#define IS_TABLET_CURSOR(n, t) (is_wacom((n), (t)) || is_cursor((n), (t)) || is_stylus((n), (t)) || is_eraser((n), (t)) || is_pad((n), (t))) - -static BOOL is_wacom(const char *name, const char *type) -{ - if (name && match_token(name, "wacom")) - return TRUE; - if (type && match_token(type, "wacom")) - return TRUE; - return FALSE; -} - -static BOOL is_cursor(const char *name, const char *type) +static BOOL is_tablet_cursor(const char *name, const char *type) { - if (name && match_token(name, "cursor")) - return TRUE; - if (type && match_token(type, "cursor")) - return TRUE; + int i; + static const char *tablet_cursor_whitelist[] = { + "wacom", + "wizardpen", + "acecad", + "tablet", + "cursor", + "stylus", + "eraser", + "pad", + NULL + }; + + for (i=0; tablet_cursor_whitelist[i] != NULL; i++) { + if (name && match_token(name, tablet_cursor_whitelist[i])) + return TRUE; + if (type && match_token(type, tablet_cursor_whitelist[i])) + return TRUE; + } return FALSE; } @@ -426,15 +430,6 @@ static BOOL is_eraser(const char *name, const char *type) return FALSE; } -static BOOL is_pad(const char *name, const char *type) -{ - if (name && match_token(name, "pad")) - return TRUE; - if (type && match_token(type, "pad")) - return TRUE; - return FALSE; -} - /*********************************************************************** * X11DRV_LoadTabletInfo (X11DRV.@) @@ -580,9 +575,9 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) } MultiByteToWideChar(CP_UNIXCP, 0, target->name, -1, cursor->NAME, WT_MAX_NAME_LEN); - if (! IS_TABLET_CURSOR(target->name, device_type)) + if (! is_tablet_cursor(target->name, device_type)) { - WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device\n", + WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report to http://forums.winehq.org\n", loop, devices[loop].name, device_type ? device_type : ""); XFree(device_type); cursor_target --;

1 0

Alistair Leslie-Hughes : msxml3: Implemented IXMLDOMCDATASection_insertData .
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 8746e387586907c371503048f36d1c650983ea3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8746e387586907c371503048f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 13 21:50:30 2008 +1100 msxml3: Implemented IXMLDOMCDATASection_insertData. --- dlls/msxml3/cdata.c | 65 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 41 +++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 4593257..f7f36b2 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -616,8 +616,69 @@ static HRESULT WINAPI domcdata_insertData( IXMLDOMCDATASection *iface, long offset, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pXmlContent; + BSTR sNewString; + HRESULT hr = S_FALSE; + long nLength = 0, nLengthP = 0; + xmlChar *str = NULL; + + TRACE("%p\n", This); + + /* If have a NULL or empty string, dont do anything. */ + if(SysStringLen(p) == 0) + return S_OK; + + if(offset < 0) + { + return E_INVALIDARG; + } + + pXmlContent = xmlNodeGetContent(pDOMNode->node); + if(pXmlContent) + { + BSTR sContent = bstr_from_xmlChar( pXmlContent ); + nLength = SysStringLen(sContent); + nLengthP = SysStringLen(p); + + if(nLength < offset) + { + SysFreeString(sContent); + xmlFree(pXmlContent); + + return E_INVALIDARG; + } + + sNewString = SysAllocStringLen(NULL, nLength + nLengthP + 1); + if(sNewString) + { + if(offset > 0) + memcpy(sNewString, sContent, offset * sizeof(WCHAR)); + + memcpy(&sNewString[offset], p, nLengthP * sizeof(WCHAR)); + + if(offset+nLengthP < nLength) + memcpy(&sNewString[offset+nLengthP], &sContent[offset], (nLength-offset) * sizeof(WCHAR)); + + sNewString[nLengthP + nLength] = 0; + + str = xmlChar_from_wchar((WCHAR*)sNewString); + if(str) + { + xmlNodeSetContent(pDOMNode->node, str); + hr = S_OK; + } + + SysFreeString(sNewString); + } + + SysFreeString(sContent); + + xmlFree(pXmlContent); + } + + return hr; } static HRESULT WINAPI domcdata_deleteData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fef4d73..9e3e72d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2578,6 +2578,47 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n"); SysFreeString(str); + /* test insertData */ + str = SysAllocStringLen(NULL, 0); + hr = IXMLDOMCDATASection_insertData(pCDataSec, -1, str); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, -1, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 1000, str); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 1000, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 0, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 0, str); + ok(hr == S_OK, "ret %08x\n", hr ); + SysFreeString(str); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, -1, _bstr_("Inserting")); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 1000, _bstr_("Inserting")); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 0, _bstr_("Begin ")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 17, _bstr_("Middle")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_insertData(pCDataSec, 39, _bstr_(" End")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMCDATASection_get_text(pCDataSec, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment_appendData.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 9b3234eb359cc6a2c738a649f936f54021a03c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3234eb359cc6a2c738a649f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 13 21:19:24 2008 +1100 msxml3: Implement IXMLDOMComment_appendData. --- dlls/msxml3/comment.c | 28 ++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 15 +++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index be2beb2..3229465 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -583,8 +583,32 @@ static HRESULT WINAPI domcomment_appendData( IXMLDOMComment *iface, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); + xmlChar *pContent; + HRESULT hr = S_FALSE; + + TRACE("%p\n", iface); + + /* Nothing to do if NULL or an Empty string passed in. */ + if(p == NULL || SysStringLen(p) == 0) + return S_OK; + + pContent = xmlChar_from_wchar( (WCHAR*)p ); + if(pContent) + { + if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) + hr = S_OK; + else + { + hr = E_FAIL; + xmlFree(pContent); + } + } + else + hr = E_FAIL; + + return hr; } static HRESULT WINAPI domcomment_insertData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 884c133..fef4d73 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2283,6 +2283,21 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); SysFreeString(str); + /* test appendData */ + hr = IXMLDOMComment_appendData(pComment, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_appendData(pComment, _bstr_("")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_appendData(pComment, _bstr_("Append")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_text(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMComment_Release(pComment); }

1 0

Alexandre Julliard : winex11: Store a pointer to the X11 event currently being handled instead of a simple count .
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 5977c723259b76c0d08e6a6cb77f78f08e806028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5977c723259b76c0d08e6a6cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 13 13:35:02 2008 +0100 winex11: Store a pointer to the X11 event currently being handled instead of a simple count. --- dlls/winex11.drv/event.c | 11 +++++++---- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 12 ++---------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index b85d0f1..cd6eaf6 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -291,6 +291,8 @@ static inline void call_event_handler( Display *display, XEvent *event ) { HWND hwnd; x11drv_event_handler handler; + XEvent *prev; + struct x11drv_thread_data *thread_data; if (!(handler = find_handler( event->type ))) { @@ -305,7 +307,11 @@ static inline void call_event_handler( Display *display, XEvent *event ) TRACE( "%s for hwnd/window %p/%lx\n", dbgstr_event( event->type ), hwnd, event->xany.window ); wine_tsx11_unlock(); + thread_data = x11drv_thread_data(); + prev = thread_data->current_event; + thread_data->current_event = event; handler( hwnd, event ); + thread_data->current_event = prev; wine_tsx11_lock(); } @@ -364,9 +370,7 @@ DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, timeout, flags & MWMO_ALERTABLE ); } - if (data->process_event_count) mask = 0; /* don't process nested events */ - - data->process_event_count++; + if (data->current_event) mask = 0; /* don't process nested events */ if (process_events( data->display, filter_event, mask )) ret = count - 1; else if (count || timeout) @@ -377,7 +381,6 @@ DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, } else ret = WAIT_TIMEOUT; - data->process_event_count--; return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a685e64..52670e8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -499,7 +499,7 @@ struct x11drv_escape_set_drawable struct x11drv_thread_data { Display *display; - int process_event_count; /* recursion count for event processing */ + XEvent *current_event; /* event currently being processed */ Cursor cursor; /* current cursor */ Window cursor_window; /* current window that contains the cursor */ Window grab_window; /* window that currently grabs the mouse */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 0ea3a1b..d445e64 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -617,7 +617,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) { struct x11drv_thread_data *data; - if (!(data = HeapAlloc( GetProcessHeap(), 0, sizeof(*data) ))) + if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) { ERR( "could not create data\n" ); ExitProcess(1); @@ -651,18 +651,10 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); wine_tsx11_unlock(); - if (!use_xim) - data->xim = NULL; - else if (!(data->xim = X11DRV_SetupXIM( data->display, input_style ))) + if (use_xim && !(data->xim = X11DRV_SetupXIM( data->display, input_style ))) WARN("Input Method is not available\n"); set_queue_display_fd( data->display ); - data->process_event_count = 0; - data->cursor = None; - data->cursor_window = None; - data->grab_window = None; - data->last_focus = 0; - data->selection_wnd = 0; TlsSetValue( thread_data_tls_index, data ); X11DRV_SetCursor( NULL ); return data;

1 0

Aric Stewart : gdi32: Add loading and processing of GSUB table vert/ vrt2 functions for proper tategaki (vertical writing).
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 36ac341b559e1833f9a0b6b1e7a77859c78ec51d URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ac341b559e1833f9a0b6b1e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 13 18:40:58 2008 +0900 gdi32: Add loading and processing of GSUB table vert/vrt2 functions for proper tategaki (vertical writing). --- dlls/gdi32/freetype.c | 392 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 377 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36ac341b559e1833f9a0b…

1 0

Alexandre Julliard : makefiles: Consider all .res files as object files.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 1137f4bf318f8f4053f9e1c74f46b52cf7d32292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1137f4bf318f8f4053f9e1c74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 13 11:47:23 2008 +0100 makefiles: Consider all .res files as object files. --- .gitignore | 150 +------------------------------------------------- Make.rules.in | 5 +- tools/make_makefiles | 3 +- 3 files changed, 4 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1137f4bf318f8f4053f9e…

1 0

Alistair Leslie-Hughes : msxml3: Cannot use put_nodeValue on a IXMLDOMProcessingInstruction node whose target is xml .
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 52f6a33a85df3fbc1796de208f1cf24feff91ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f6a33a85df3fbc1796de208… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 13 20:30:12 2008 +1100 msxml3: Cannot use put_nodeValue on a IXMLDOMProcessingInstruction node whose target is xml. --- dlls/msxml3/pi.c | 19 +++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 44e8a8b..5fad22c 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -200,6 +200,25 @@ static HRESULT WINAPI dom_pi_put_nodeValue( VARIANT var1 ) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + BSTR sTarget; + static WCHAR szXML[] = {'x','m','l',0}; + HRESULT hr; + + TRACE("%p\n", This ); + + /* Cannot set data to a PI node whos target is 'xml' */ + hr = dom_pi_get_nodeName(iface, &sTarget); + if(hr == S_OK) + { + if(lstrcmpW( sTarget, szXML) == 0) + { + SysFreeString(sTarget); + return E_FAIL; + } + + SysFreeString(sTarget); + } + return IXMLDOMNode_put_nodeValue( This->node, var1 ); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b597670..884c133 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -786,6 +786,13 @@ static void test_domdoc( void ) r = IXMLDOMProcessingInstruction_put_data(nodePI, _bstr_("version=\"1.0\" encoding=\"UTF-8\"")); ok(r == E_FAIL, "ret %08x\n", r ); + /* test put_data */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(szOpen); /* Doesnt matter what the string is, cannot set an xml node. */ + r = IXMLDOMProcessingInstruction_put_nodeValue(nodePI, var); + ok(r == E_FAIL, "ret %08x\n", r ); + VariantClear(&var); + /* test get nodeName */ r = IXMLDOMProcessingInstruction_get_nodeName(nodePI, &str); ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n");

1 0

James Hawkins : msi: Test and fix MsiSourceListAddSource.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 65f99ed91be2afc988e912b20491a21c092a71c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f99ed91be2afc988e912b20… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Mar 12 18:31:06 2008 -0500 msi: Test and fix MsiSourceListAddSource. --- dlls/msi/source.c | 46 ++++++++-- dlls/msi/tests/source.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65f99ed91be2afc988e91…

1 0

Andrew Talbot : quartz: Assign to structs instead of using memcpy.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 442f29ab4947faf9fb23e30d7f080550c7baf2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442f29ab4947faf9fb23e30d7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Mar 12 20:32:07 2008 +0000 quartz: Assign to structs instead of using memcpy. --- dlls/quartz/avisplit.c | 12 ++++++------ dlls/quartz/enummedia.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/memallocator.c | 6 +++--- dlls/quartz/mpegsplit.c | 6 +++--- dlls/quartz/pin.c | 2 +- dlls/quartz/waveparser.c | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3121ead..5f601a6 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -365,19 +365,19 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE switch (pStrHdr->fccType) { case streamtypeVIDEO: - memcpy(&amt.formattype, &FORMAT_VideoInfo, sizeof(GUID)); + amt.formattype = FORMAT_VideoInfo; amt.pbFormat = NULL; amt.cbFormat = 0; break; case streamtypeAUDIO: - memcpy(&amt.formattype, &FORMAT_WaveFormatEx, sizeof(GUID)); + amt.formattype = FORMAT_WaveFormatEx; break; default: - memcpy(&amt.formattype, &FORMAT_None, sizeof(GUID)); + amt.formattype = FORMAT_None; } - memcpy(&amt.majortype, &MEDIATYPE_Video, sizeof(GUID)); + amt.majortype = MEDIATYPE_Video; amt.majortype.Data1 = pStrHdr->fccType; - memcpy(&amt.subtype, &MEDIATYPE_Video, sizeof(GUID)); + amt.subtype = MEDIATYPE_Video; amt.subtype.Data1 = pStrHdr->fccHandler; TRACE("Subtype FCC: %.04s\n", (LPCSTR)&pStrHdr->fccHandler); amt.lSampleSize = pStrHdr->dwSampleSize; @@ -448,7 +448,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE if (IsEqualGUID(&amt.formattype, &FORMAT_WaveFormatEx)) { - memcpy(&amt.subtype, &MEDIATYPE_Video, sizeof(GUID)); + amt.subtype = MEDIATYPE_Video; amt.subtype.Data1 = ((WAVEFORMATEX *)amt.pbFormat)->wFormatTag; } diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c index 2f207d6..ed5edb3 100644 --- a/dlls/quartz/enummedia.c +++ b/dlls/quartz/enummedia.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); HRESULT CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc) { - memcpy(pDest, pSrc, sizeof(AM_MEDIA_TYPE)); + *pDest = *pSrc; if (!pSrc->pbFormat) return S_OK; if (!(pDest->pbFormat = CoTaskMemAlloc(pSrc->cbFormat))) return E_OUTOFMEMORY; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 73c92b2..1200802 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -609,7 +609,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt->pbFormat = NULL; This->pmt->pUnk = NULL; This->pmt->lSampleSize = 0; - memcpy(&This->pmt->formattype, &FORMAT_None, sizeof(FORMAT_None)); + This->pmt->formattype = FORMAT_None; hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype); if (FAILED(hr)) { diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f1700aa..6b68cf5 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -188,9 +188,9 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO hr = E_OUTOFMEMORY; else { - memcpy(This->pProps, pRequest, sizeof(*This->pProps)); - - memcpy(pActual, pRequest, sizeof(*pActual)); + *This->pProps = *pRequest; + + *pActual = *pRequest; hr = S_OK; } diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 205f645..edf39b3 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -317,9 +317,9 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade ppiOutput->pFilter = (IBaseFilter*)This; wsprintfW(ppiOutput->achName, wszAudioStream); - memcpy(&pamt->formattype, &FORMAT_WaveFormatEx, sizeof(GUID)); - memcpy(&pamt->majortype, &MEDIATYPE_Audio, sizeof(GUID)); - memcpy(&pamt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload, sizeof(GUID)); + pamt->formattype = FORMAT_WaveFormatEx; + pamt->majortype = MEDIATYPE_Audio; + pamt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; pamt->lSampleSize = 0; pamt->bFixedSizeSamples = TRUE; diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 08ddcef..1cb379f 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -200,7 +200,7 @@ HRESULT OutputPin_Init(const PIN_INFO * pPinInfo, const ALLOCATOR_PROPERTIES * p pPinImpl->pConnectSpecific = OutputPin_ConnectSpecific; if (props) { - memcpy(&pPinImpl->allocProps, props, sizeof(pPinImpl->allocProps)); + pPinImpl->allocProps = *props; if (pPinImpl->allocProps.cbAlign == 0) pPinImpl->allocProps.cbAlign = 1; } diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index cbb387e..fabd0d6 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -256,13 +256,13 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) return E_FAIL; } - memcpy(&amt.majortype, &MEDIATYPE_Audio, sizeof(GUID)); - memcpy(&amt.formattype, &FORMAT_WaveFormatEx, sizeof(GUID)); + amt.majortype = MEDIATYPE_Audio; + amt.formattype = FORMAT_WaveFormatEx; amt.cbFormat = chunk.cb; amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); amt.pUnk = NULL; hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); - memcpy(&amt.subtype, &MEDIATYPE_Audio, sizeof(GUID)); + amt.subtype = MEDIATYPE_Audio; amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; pos += chunk.cb;

1 0

Dan Hipschman : qmgr: Add critical sections for jobs and files.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: fd499df4d5dca5aff2cd179b2149bafbcd3b81d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd499df4d5dca5aff2cd179b2… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Mar 12 11:56:13 2008 -0700 qmgr: Add critical sections for jobs and files. --- dlls/qmgr/enum_files.c | 3 +++ dlls/qmgr/file.c | 10 ++++++++-- dlls/qmgr/job.c | 33 ++++++++++++++++++++++----------- dlls/qmgr/qmgr.c | 2 +- dlls/qmgr/qmgr.h | 10 ++++++++-- 5 files changed, 42 insertions(+), 16 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 082b541..36afc33 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -186,6 +186,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob* iC /* Create array of files */ This->indexFiles = 0; + EnterCriticalSection(&job->cs); This->numFiles = list_count(&job->files); This->files = NULL; if (This->numFiles > 0) @@ -194,6 +195,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob* iC This->numFiles * sizeof This->files[0]); if (!This->files) { + LeaveCriticalSection(&job->cs); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } @@ -206,6 +208,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob* iC This->files[i] = (IBackgroundCopyFile *) file; ++i; } + LeaveCriticalSection(&job->cs); *ppObj = &This->lpVtbl; return S_OK; diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 93ffba4..f1ae06a 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) { + IBackgroundCopyJob_Release((IBackgroundCopyJob *) This->owner); HeapFree(GetProcessHeap(), 0, This->info.LocalName); HeapFree(GetProcessHeap(), 0, This->info.RemoteName); HeapFree(GetProcessHeap(), 0, This); @@ -105,9 +106,11 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetProgress( { BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + EnterCriticalSection(&This->owner->cs); pVal->BytesTotal = This->fileProgress.BytesTotal; pVal->BytesTransferred = This->fileProgress.BytesTransferred; pVal->Completed = This->fileProgress.Completed; + LeaveCriticalSection(&This->owner->cs); return S_OK; } @@ -122,8 +125,9 @@ static const IBackgroundCopyFileVtbl BITS_IBackgroundCopyFile_Vtbl = BITS_IBackgroundCopyFile_GetProgress }; -HRESULT BackgroundCopyFileConstructor(LPCWSTR remoteName, - LPCWSTR localName, LPVOID *ppObj) +HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, + LPCWSTR remoteName, LPCWSTR localName, + LPVOID *ppObj) { BackgroundCopyFileImpl *This; int n; @@ -160,6 +164,8 @@ HRESULT BackgroundCopyFileConstructor(LPCWSTR remoteName, This->fileProgress.BytesTotal = BG_SIZE_UNKNOWN; This->fileProgress.BytesTransferred = 0; This->fileProgress.Completed = FALSE; + This->owner = owner; + IBackgroundCopyJob_AddRef((IBackgroundCopyJob *) owner); *ppObj = &This->lpVtbl; return S_OK; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 8768027..6bc63f4 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static void BackgroundCopyJobDestructor(BackgroundCopyJobImpl *This) { + DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This); } @@ -88,15 +89,17 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFile( /* We should return E_INVALIDARG in these cases. */ FIXME("Check for valid filenames and supported protocols\n"); - res = BackgroundCopyFileConstructor(RemoteUrl, LocalName, (LPVOID *) &pFile); + res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, (LPVOID *) &pFile); if (res != S_OK) return res; /* Add a reference to the file to file list */ IBackgroundCopyFile_AddRef(pFile); file = (BackgroundCopyFileImpl *) pFile; + EnterCriticalSection(&This->cs); list_add_head(&This->files, &file->entryFromJob); ++This->jobProgress.FilesTotal; + LeaveCriticalSection(&This->cs); return S_OK; } @@ -120,24 +123,26 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_Resume( IBackgroundCopyJob* iface) { BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + HRESULT rv = S_OK; + EnterCriticalSection(&globalMgr.cs); if (This->state == BG_JOB_STATE_CANCELLED || This->state == BG_JOB_STATE_ACKNOWLEDGED) { - return BG_E_INVALID_STATE; + rv = BG_E_INVALID_STATE; } - - if (This->jobProgress.FilesTransferred == This->jobProgress.FilesTotal) - return BG_E_EMPTY; - - if (This->state == BG_JOB_STATE_CONNECTING - || This->state == BG_JOB_STATE_TRANSFERRING) + else if (This->jobProgress.FilesTransferred == This->jobProgress.FilesTotal) { - return S_OK; + rv = BG_E_EMPTY; } + else if (This->state != BG_JOB_STATE_CONNECTING + && This->state != BG_JOB_STATE_TRANSFERRING) + { + This->state = BG_JOB_STATE_QUEUED; + } + LeaveCriticalSection(&globalMgr.cs); - This->state = BG_JOB_STATE_QUEUED; - return S_OK; + return rv; } static HRESULT WINAPI BITS_IBackgroundCopyJob_Cancel( @@ -185,10 +190,12 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetProgress( if (!pVal) return E_INVALIDARG; + EnterCriticalSection(&This->cs); pVal->BytesTotal = This->jobProgress.BytesTotal; pVal->BytesTransferred = This->jobProgress.BytesTransferred; pVal->FilesTotal = This->jobProgress.FilesTotal; pVal->FilesTransferred = This->jobProgress.FilesTransferred; + LeaveCriticalSection(&This->cs); return S_OK; } @@ -210,6 +217,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetState( if (!pVal) return E_INVALIDARG; + /* Don't think we need a critical section for this */ *pVal = This->state; return S_OK; } @@ -441,6 +449,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, return E_OUTOFMEMORY; This->lpVtbl = &BITS_IBackgroundCopyJob_Vtbl; + InitializeCriticalSection(&This->cs); This->ref = 1; This->type = type; @@ -448,6 +457,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, This->displayName = HeapAlloc(GetProcessHeap(), 0, n); if (!This->displayName) { + DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } @@ -456,6 +466,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, hr = CoCreateGuid(&This->jobId); if (FAILED(hr)) { + DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This); return hr; diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index c6fbc42..b0a6013 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -127,7 +127,7 @@ static const IBackgroundCopyManagerVtbl BITS_IBackgroundCopyManager_Vtbl = BITS_IBackgroundCopyManager_GetErrorDescription }; -static BackgroundCopyManagerImpl globalMgr = { +BackgroundCopyManagerImpl globalMgr = { &BITS_IBackgroundCopyManager_Vtbl, { NULL, -1, 0, 0, 0, 0 }, LIST_INIT(globalMgr.jobs) diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 166ee40..a584694 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -41,6 +41,8 @@ typedef struct struct list files; BG_JOB_PROGRESS jobProgress; BG_JOB_STATE state; + /* Protects file list, and progress */ + CRITICAL_SECTION cs; struct list entryFromQmgr; } BackgroundCopyJobImpl; @@ -72,12 +74,14 @@ typedef struct BG_FILE_INFO info; BG_FILE_PROGRESS fileProgress; struct list entryFromJob; + BackgroundCopyJobImpl *owner; } BackgroundCopyFileImpl; /* Background copy manager vtbl and related data */ typedef struct { const IBackgroundCopyManagerVtbl *lpVtbl; + /* Protects job list and job states */ CRITICAL_SECTION cs; struct list jobs; } BackgroundCopyManagerImpl; @@ -88,14 +92,16 @@ typedef struct } ClassFactoryImpl; extern ClassFactoryImpl BITS_ClassFactory; +extern BackgroundCopyManagerImpl globalMgr; HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *pJobId, LPVOID *ppObj); HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, IBackgroundCopyManager* copyManager); -HRESULT BackgroundCopyFileConstructor(LPCWSTR remoteName, - LPCWSTR localName, LPVOID *ppObj); +HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, + LPCWSTR remoteName, LPCWSTR localName, + LPVOID *ppObj); HRESULT EnumBackgroundCopyFilesConstructor(LPVOID *ppObj, IBackgroundCopyJob* copyJob);

1 0