January 2012 - Wine-Commits

Michael Stefaniuc : dsound: Merge IDirectSoundNotify into the secondary buffer object.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: c7f5f10aab5a66a5bde93d31263afa095183c3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f5f10aab5a66a5bde93d312… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 20 00:28:16 2012 +0100 dsound: Merge IDirectSoundNotify into the secondary buffer object. --- dlls/dsound/buffer.c | 138 +++++++++++++----------------------------- dlls/dsound/dsound_private.h | 9 +-- 2 files changed, 46 insertions(+), 101 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 0d03686..18af3f9 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -40,59 +40,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); * IDirectSoundNotify */ -struct IDirectSoundNotifyImpl +static inline struct IDirectSoundBufferImpl *impl_from_IDirectSoundNotify(IDirectSoundNotify *iface) { - /* IUnknown fields */ - const IDirectSoundNotifyVtbl *lpVtbl; - LONG ref; - IDirectSoundBufferImpl* dsb; -}; + return CONTAINING_RECORD(iface, struct IDirectSoundBufferImpl, IDirectSoundNotify_iface); +} -static HRESULT IDirectSoundNotifyImpl_Create(IDirectSoundBufferImpl *dsb, - IDirectSoundNotifyImpl **pdsn); -static HRESULT IDirectSoundNotifyImpl_Destroy(IDirectSoundNotifyImpl *pdsn); +static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface(IDirectSoundNotify *iface, REFIID riid, + void **ppobj) +{ + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); -static HRESULT WINAPI IDirectSoundNotifyImpl_QueryInterface( - LPDIRECTSOUNDNOTIFY iface,REFIID riid,LPVOID *ppobj -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj); - if (This->dsb == NULL) { - WARN("invalid parameter\n"); - return E_INVALIDARG; - } - - return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER)This->dsb, riid, ppobj); + return IDirectSoundBuffer8_QueryInterface(&This->IDirectSoundBuffer8_iface, riid, ppobj); } -static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(LPDIRECTSOUNDNOTIFY iface) +static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + ULONG ref = InterlockedIncrement(&This->refn); + TRACE("(%p) ref was %d\n", This, ref - 1); + + if(ref == 1) + InterlockedIncrement(&This->numIfaces); + return ref; } -static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) +static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + ULONG ref = InterlockedDecrement(&This->refn); + TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { - This->dsb->notify = NULL; - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); - } + if (!ref && !InterlockedDecrement(&This->numIfaces)) + secondarybuffer_destroy(This); + return ref; } -static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( - LPDIRECTSOUNDNOTIFY iface,DWORD howmuch,LPCDSBPOSITIONNOTIFY notify -) { - IDirectSoundNotifyImpl *This = (IDirectSoundNotifyImpl *)iface; +static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, + DWORD howmuch, const DSBPOSITIONNOTIFY *notify) +{ + IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); + TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify); if (howmuch > 0 && notify == NULL) { @@ -110,20 +103,20 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( if (howmuch > 0) { /* Make an internal copy of the caller-supplied array. * Replace the existing copy if one is already present. */ - HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = HeapAlloc(GetProcessHeap(), 0, + HeapFree(GetProcessHeap(), 0, This->notifies); + This->notifies = HeapAlloc(GetProcessHeap(), 0, howmuch * sizeof(DSBPOSITIONNOTIFY)); - if (This->dsb->notifies == NULL) { + if (This->notifies == NULL) { WARN("out of memory\n"); return DSERR_OUTOFMEMORY; } - CopyMemory(This->dsb->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); - This->dsb->nrofnotifies = howmuch; + CopyMemory(This->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); + This->nrofnotifies = howmuch; } else { - HeapFree(GetProcessHeap(), 0, This->dsb->notifies); - This->dsb->notifies = NULL; - This->dsb->nrofnotifies = 0; + HeapFree(GetProcessHeap(), 0, This->notifies); + This->notifies = NULL; + This->nrofnotifies = 0; } return S_OK; @@ -137,40 +130,6 @@ static const IDirectSoundNotifyVtbl dsnvt = IDirectSoundNotifyImpl_SetNotificationPositions, }; -static HRESULT IDirectSoundNotifyImpl_Create( - IDirectSoundBufferImpl * dsb, - IDirectSoundNotifyImpl **pdsn) -{ - IDirectSoundNotifyImpl * dsn; - TRACE("(%p,%p)\n",dsb,pdsn); - - dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dsn)); - - if (dsn == NULL) { - WARN("out of memory\n"); - return DSERR_OUTOFMEMORY; - } - - dsn->ref = 0; - dsn->lpVtbl = &dsnvt; - dsn->dsb = dsb; - dsb->notify = dsn; - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)dsb); - - *pdsn = dsn; - return DS_OK; -} - -static HRESULT IDirectSoundNotifyImpl_Destroy( - IDirectSoundNotifyImpl *pdsn) -{ - TRACE("(%p)\n",pdsn); - - while (IDirectSoundNotifyImpl_Release((LPDIRECTSOUNDNOTIFY)pdsn) > 0); - - return DS_OK; -} - /******************************************************************************* * IDirectSoundBuffer */ @@ -800,15 +759,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8 } if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { - if (!This->notify) - IDirectSoundNotifyImpl_Create(This, &(This->notify)); - if (This->notify) { - IDirectSoundNotify_AddRef((LPDIRECTSOUNDNOTIFY)This->notify); - *ppobj = This->notify; - return S_OK; - } - WARN("IID_IDirectSoundNotify\n"); - return E_NOINTERFACE; + IDirectSoundNotify_AddRef(&This->IDirectSoundNotify_iface); + *ppobj = &This->IDirectSoundNotify_iface; + return S_OK; } if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { @@ -889,11 +842,13 @@ HRESULT IDirectSoundBufferImpl_Create( TRACE("Created buffer at %p\n", dsb); dsb->ref = 0; + dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; dsb->numIfaces = 0; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; + dsb->IDirectSoundNotify_iface.lpVtbl = &dsnvt; dsb->IDirectSound3DBuffer_iface.lpVtbl = &ds3dbvt; dsb->IKsPropertySet_iface.lpVtbl = &iksbvt; @@ -915,7 +870,6 @@ HRESULT IDirectSoundBufferImpl_Create( dsb->buflen = dsbd->dwBufferBytes; dsb->freq = dsbd->lpwfxFormat->nSamplesPerSec; - dsb->notify = NULL; dsb->notifies = NULL; dsb->nrofnotifies = 0; @@ -1036,12 +990,6 @@ HRESULT IDirectSoundBufferImpl_Destroy( * this object until it is ready to be deleted */ InterlockedIncrement(&pdsb->numIfaces); - if (pdsb->notify) { - WARN("notify not NULL\n"); - IDirectSoundNotifyImpl_Destroy(pdsb->notify); - pdsb->notify = NULL; - } - secondarybuffer_destroy(pdsb); return S_OK; @@ -1080,12 +1028,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->buffer->ref++; list_add_head(&dsb->buffer->buffers, &dsb->entry); dsb->ref = 0; + dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; dsb->numIfaces = 0; dsb->state = STATE_STOPPED; dsb->buf_mixpos = dsb->sec_mixpos = 0; - dsb->notify = NULL; dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d63ee24..10bd281 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -48,7 +48,6 @@ typedef struct IDirectSound8_IDirectSound8 IDirectSound8_IDirectSound8; typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct IDirectSoundCaptureImpl IDirectSoundCaptureImpl; typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; -typedef struct IDirectSoundNotifyImpl IDirectSoundNotifyImpl; typedef struct DirectSoundDevice DirectSoundDevice; typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; @@ -163,11 +162,12 @@ HRESULT DirectSoundDevice_VerifyCertification(DirectSoundDevice * device, struct IDirectSoundBufferImpl { IDirectSoundBuffer8 IDirectSoundBuffer8_iface; + IDirectSoundNotify IDirectSoundNotify_iface; IDirectSound3DListener IDirectSound3DListener_iface; /* only primary buffer */ IDirectSound3DBuffer IDirectSound3DBuffer_iface; /* only secondary buffer */ IKsPropertySet IKsPropertySet_iface; LONG numIfaces; /* "in use interfaces" refcount */ - LONG ref, ref3D, refiks; + LONG ref, refn, ref3D, refiks; /* IDirectSoundBufferImpl fields */ DirectSoundDevice* device; RTL_RWLOCK lock; @@ -183,12 +183,9 @@ struct IDirectSoundBufferImpl ULONG freqneeded, freqAdjust, freqAcc, freqAccNext; /* used for mixing */ DWORD primary_mixpos, buf_mixpos, sec_mixpos; - - /* IDirectSoundNotifyImpl fields */ - IDirectSoundNotifyImpl* notify; + /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; - /* DirectSound3DBuffer fields */ DS3DBUFFER ds3db_ds3db; LONG ds3db_lVolume;

1 0

Nikolay Sivov : msxml3: Move some xdr tests data to a table.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 7c319885547f700da7dbe098efaacbbdaf9e65e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c319885547f700da7dbe098e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 04:01:36 2012 +0300 msxml3: Move some xdr tests data to a table. --- dlls/msxml3/tests/schema.c | 972 +++++++++----------------------------------- 1 files changed, 193 insertions(+), 779 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c319885547f700da7dbe…

1 0

Nikolay Sivov : msxml3: Use debugstr_* functions instead of wine_* prefixed for consistency.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: ae5c984b12f8810c866c08084d9f0b66326c31d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5c984b12f8810c866c08084… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 04:00:47 2012 +0300 msxml3: Use debugstr_* functions instead of wine_* prefixed for consistency. --- dlls/msxml3/domdoc.c | 10 +++++----- dlls/msxml3/schema.c | 10 +++++----- dlls/msxml3/selection.c | 2 +- dlls/msxml3/stylesheet.c | 8 ++++---- dlls/msxml3/xslpattern.l | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8943507..72f9a31 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2828,7 +2828,7 @@ static HRESULT WINAPI domdoc_setProperty( { hr = E_FAIL; WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", - wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); + debugstr_w(bstr), debugstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); continue; } @@ -2849,7 +2849,7 @@ static HRESULT WINAPI domdoc_setProperty( { hr = E_FAIL; WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", - wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); + debugstr_w(bstr), debugstr_an((const char*)pTokBegin, pTokEnd-pTokBegin)); continue; } @@ -2876,7 +2876,7 @@ static HRESULT WINAPI domdoc_setProperty( else { WARN("Syntax error in xmlns string: %s\n\tat token: %s\n", - wine_dbgstr_w(bstr), wine_dbgstr_an((const char*)pTokInner, pTokEnd-pTokInner)); + debugstr_w(bstr), debugstr_an((const char*)pTokInner, pTokEnd-pTokInner)); list_add_tail(pNsList, &ns_entry->entry); ns_entry = NULL; @@ -2906,7 +2906,7 @@ static HRESULT WINAPI domdoc_setProperty( return S_OK; } - FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + FIXME("Unknown property %s\n", debugstr_w(p)); return E_FAIL; } @@ -2966,7 +2966,7 @@ static HRESULT WINAPI domdoc_getProperty( return S_OK; } - FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + FIXME("Unknown property %s\n", debugstr_w(p)); return E_FAIL; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2312f6d..2c97639 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -589,7 +589,7 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) xmlNsPtr ns; HRESULT hr; - TRACE("(dt:%s, %s)\n", debugstr_dt(dt), wine_dbgstr_a((char const*)content)); + TRACE("(dt:%s, %s)\n", debugstr_dt(dt), debugstr_a((char const*)content)); if (!datatypes_schema) { @@ -688,7 +688,7 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, { xmlParserInputPtr input; - TRACE("(%s %s %p)\n", wine_dbgstr_a(URL), wine_dbgstr_a(ID), ctxt); + TRACE("(%s %s %p)\n", debugstr_a(URL), debugstr_a(ID), ctxt); assert(MSXML_hInstance != NULL); assert(datatypes_rsrc != NULL); @@ -922,7 +922,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI, MSXM ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr); if (b != VARIANT_TRUE) { - FIXME("Failed to load doc at %s\n", wine_dbgstr_w(V_BSTR(&url))); + FIXME("Failed to load doc at %s\n", debugstr_w(V_BSTR(&url))); IXMLDOMDocument3_Release(domdoc); return NULL; } @@ -1142,7 +1142,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri cache_entry* entry; xmlChar* name; - TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_w(uri), node); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(uri), node); if (This->version == MSXML6) return E_NOTIMPL; @@ -1165,7 +1165,7 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); - TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(uri)); + TRACE("(%p)->(%s)\n", This, debugstr_w(uri)); xmlHashRemoveEntry(This->cache, name, cache_free); heap_free(name); diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 8871817..ba173f9 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -749,7 +749,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); HRESULT hr; - TRACE("(%p, %s, %p)\n", node, wine_dbgstr_a((char const*)query), out); + TRACE("(%p, %s, %p)\n", node, debugstr_a((char const*)query), out); *out = NULL; if (!This || !ctxt || !query) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 5ee71af..9106b40 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -418,7 +418,7 @@ static HRESULT WINAPI xslprocessor_setStartMode( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%s %s): stub\n", This, wine_dbgstr_w(p), wine_dbgstr_w(uri)); + FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(p), debugstr_w(uri)); return E_NOTIMPL; } @@ -557,8 +557,8 @@ static HRESULT WINAPI xslprocessor_addParameter( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%s %s %s): stub\n", This, wine_dbgstr_w(p), debugstr_variant(&var), - wine_dbgstr_w(uri)); + FIXME("(%p)->(%s %s %s): stub\n", This, debugstr_w(p), debugstr_variant(&var), + debugstr_w(uri)); return E_NOTIMPL; } @@ -569,7 +569,7 @@ static HRESULT WINAPI xslprocessor_addObject( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%p %s): stub\n", This, obj, wine_dbgstr_w(uri)); + FIXME("(%p)->(%p %s): stub\n", This, obj, debugstr_w(uri)); return E_NOTIMPL; } diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index caea1be..eb84e40 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -155,7 +155,7 @@ ANY (.) xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p; - TRACE("(%s)\n", wine_dbgstr_a((char const*)xslpat_str)); + TRACE("(%s)\n", debugstr_a((char const*)xslpat_str)); memset(&p, 0, sizeof(parser_param)); p.ctx = ctxt; p.in = xslpat_str; @@ -166,7 +166,7 @@ xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) xslpattern_parse(&p, p.yyscanner); - TRACE("=> %s\n", wine_dbgstr_a((char const*)p.out)); + TRACE("=> %s\n", debugstr_a((char const*)p.out)); xslpattern_lex_destroy(p.yyscanner); if (p.err)

1 0

Francois Gouget : po: Translate a couple of keys for Catalan.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: ccdacc7fafd6fcdb524e3ec13db7088f9e098859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdacc7fafd6fcdb524e3ec13… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 19 23:28:20 2012 +0100 po: Translate a couple of keys for Catalan. --- po/ca.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ca.po b/po/ca.po index 2553e79..eb6cbb4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -14150,12 +14150,12 @@ msgstr "S'ha fallat durant la lectura de '%1'\n" #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "" +msgstr "F" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "" +msgstr "D" #: xcopy.rc:77 msgid ""

1 0

Francois Gouget : po: Remove English strings from the Catalan translation.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 03001c15b0a1459c433a18c56c96b1cba5339918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03001c15b0a1459c433a18c56… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 19 23:32:15 2012 +0100 po: Remove English strings from the Catalan translation. --- po/ca.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/po/ca.po b/po/ca.po index eb6cbb4..3cc3651 100644 --- a/po/ca.po +++ b/po/ca.po @@ -301,7 +301,7 @@ msgstr "Ajuda" #: comctl32.rc:62 msgid "Wizard" -msgstr "Wizard" +msgstr "" #: comctl32.rc:65 msgid "< &Back" @@ -317,7 +317,7 @@ msgstr "Finalitza" #: comctl32.rc:78 msgid "Customize Toolbar" -msgstr "Customize Toolbar" +msgstr "" #: comctl32.rc:81 cryptui.rc:348 ieframe.rc:40 oleview.rc:80 oleview.rc:185 #: oleview.rc:198 oleview.rc:210 taskmgr.rc:139 @@ -496,7 +496,7 @@ msgstr "&Vertical" #: comdlg32.rc:231 comdlg32.rc:436 wineps.rc:34 msgid "&Landscape" -msgstr "&Horizontal" +msgstr "" #: comdlg32.rc:234 comdlg32.rc:409 comdlg32.rc:429 wineps.rc:25 msgid "Paper" @@ -681,7 +681,7 @@ msgstr "Comentari:" #: comdlg32.rc:371 msgid "Copies" -msgstr "Copies" +msgstr "" #: comdlg32.rc:372 msgid "Number of &copies:" @@ -693,7 +693,7 @@ msgstr "C&ompagina" #: comdlg32.rc:379 msgid "Pa&ges" -msgstr "Pa&ges" +msgstr "" #: comdlg32.rc:380 msgid "&Selection" @@ -8247,7 +8247,7 @@ msgstr "%d bytes" #: shlwapi.rc:28 msgctxt "time unit: hours" msgid " hr" -msgstr " hr" +msgstr "" #: shlwapi.rc:29 msgctxt "time unit: minutes" @@ -8257,7 +8257,7 @@ msgstr " min" #: shlwapi.rc:30 msgctxt "time unit: seconds" msgid " sec" -msgstr " sec" +msgstr "" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -10006,7 +10006,7 @@ msgstr "No es pot trucar a una etiqueta batch fora d'un script batch\n" #: cmd.rc:312 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "A" +msgstr "" #: cmd.rc:313 msgid "%1, Delete" @@ -14136,6 +14136,7 @@ msgid "%1? (Yes|No)\n" msgstr "%1? (Sí|No)\n" #: xcopy.rc:36 +#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" msgstr "Sobreescriure %1? (Yes|No|All)\n"

1 0

Hans Leidekker : winhttp: Download PAC scripts in a separate session.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: f37b94e69a92ae1f5c984f51f7df6110831ab083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37b94e69a92ae1f5c984f51f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 20 09:04:51 2012 +0100 winhttp: Download PAC scripts in a separate session. --- dlls/winhttp/session.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b4ed568..2d899ab 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1905,11 +1905,11 @@ done: return ret; } -static BSTR download_script( HINTERNET ses, const WCHAR *url ) +static BSTR download_script( const WCHAR *url ) { static const WCHAR typeW[] = {'*','/','*',0}; static const WCHAR *acceptW[] = {typeW, NULL}; - HINTERNET con, req = NULL; + HINTERNET ses, con = NULL, req = NULL; WCHAR *hostname; URL_COMPONENTSW uc; DWORD size = 4096, offset, to_read, bytes_read, flags = 0; @@ -1924,6 +1924,7 @@ static BSTR download_script( HINTERNET ses, const WCHAR *url ) memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); hostname[uc.dwHostNameLength] = 0; + if (!(ses = WinHttpOpen( NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ))) goto done; if (!(con = WinHttpConnect( ses, hostname, uc.nPort, 0 ))) goto done; if (uc.nScheme == INTERNET_SCHEME_HTTPS) flags |= WINHTTP_FLAG_SECURE; if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done; @@ -1955,6 +1956,7 @@ static BSTR download_script( HINTERNET ses, const WCHAR *url ) done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); heap_free( buffer ); heap_free( hostname ); if (!script) set_last_error( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); @@ -2005,7 +2007,7 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO if (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) pac_url = options->lpszAutoConfigUrl; else pac_url = detected_pac_url; - if (!(script = download_script( hsession, pac_url ))) goto done; + if (!(script = download_script( pac_url ))) goto done; ret = run_script( script, url, info ); SysFreeString( script );

1 0

Michael Stefaniuc : dsound: Remove the now obsolete IDirectSoundBufferImpl_Destroy().
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: 84d5317302462527560d0ab6597c5d0cb3035ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d5317302462527560d0ab65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 20 00:53:51 2012 +0100 dsound: Remove the now obsolete IDirectSoundBufferImpl_Destroy(). --- dlls/dsound/buffer.c | 19 +++++-------------- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/dsound_private.h | 2 -- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 18af3f9..630d60e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -964,6 +964,11 @@ HRESULT IDirectSoundBufferImpl_Create( void secondarybuffer_destroy(IDirectSoundBufferImpl *This) { + ULONG ref = InterlockedIncrement(&This->numIfaces); + + if (ref > 1) + WARN("Destroying buffer with %u in use interfaces\n", ref - 1); + DirectSoundDevice_RemoveBuffer(This->device, This); RtlDeleteResource(&This->lock); @@ -981,20 +986,6 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) TRACE("(%p) released\n", This); } -HRESULT IDirectSoundBufferImpl_Destroy( - IDirectSoundBufferImpl *pdsb) -{ - TRACE("(%p)\n",pdsb); - - /* This keeps the *_Destroy functions from possibly deleting - * this object until it is ready to be deleted */ - InterlockedIncrement(&pdsb->numIfaces); - - secondarybuffer_destroy(pdsb); - - return S_OK; -} - HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index b3475ad..305bfeb0 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1244,7 +1244,7 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) /* The kill event should have allowed the timer process to expire * but try to grab the lock just in case. Can't hold lock because - * IDirectSoundBufferImpl_Destroy also grabs the lock */ + * secondarybuffer_destroy also grabs the lock */ RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); RtlReleaseResource(&(device->buffer_list_lock)); @@ -1256,7 +1256,7 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) if (device->buffers) { WARN("%d secondary buffers not released\n", device->nrofbuffers); for( i=0;i<device->nrofbuffers;i++) - IDirectSoundBufferImpl_Destroy(device->buffers[i]); + secondarybuffer_destroy(device->buffers[i]); } if (device->primary) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 10bd281..a7209ca 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -199,8 +199,6 @@ HRESULT IDirectSoundBufferImpl_Create( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, LPCDSBUFFERDESC dsbd) DECLSPEC_HIDDEN; -HRESULT IDirectSoundBufferImpl_Destroy( - IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb,

1 0

Nikolay Sivov : msxml3: IXMLDOMSchemaCollection::get() is a stub for version 6.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: ca046f9eb5ca9f0ca4cb05044fcd866dff10c4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca046f9eb5ca9f0ca4cb05044… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 04:00:23 2012 +0300 msxml3: IXMLDOMSchemaCollection::get() is a stub for version 6. --- dlls/msxml3/domdoc.c | 7 +++- dlls/msxml3/schema.c | 7 +++- dlls/msxml3/tests/domdoc.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/schema.c | 36 +++++++++++++++++++ 4 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 47ce60d..8943507 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2508,10 +2508,13 @@ static HRESULT WINAPI domdoc_put_onTransformNode( static HRESULT WINAPI domdoc_get_namespaces( IXMLDOMDocument3* iface, - IXMLDOMSchemaCollection** schemaCollection ) + IXMLDOMSchemaCollection** collection ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("(%p)->(%p)\n", This, schemaCollection); + FIXME("(%p)->(%p): stub\n", This, collection); + + if (!collection) return E_POINTER; + return E_NOTIMPL; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 7473dbb..2312f6d 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1139,10 +1139,13 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri IXMLDOMNode** node) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name; cache_entry* entry; + xmlChar* name; + TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_w(uri), node); + if (This->version == MSXML6) return E_NOTIMPL; + if (!node) return E_POINTER; @@ -1438,7 +1441,7 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) #else -HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* pUnkOuter, void** ppObj) +HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) { MESSAGE("This program tried to use a SchemaCache object, but\n" "libxml2 support was not present at compile time.\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 21809f8..cc01a25 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11140,6 +11140,86 @@ static void test_nodeValue(void) IXMLDOMDocument_Release(doc); } +static char namespacesA[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +" <ns1:elem1 xmlns:ns1=\"http://blah.org\">" +" <ns1:elem2/>" +" <ns1:elem3/>" +" <ns1:elem4/>" +" <elem5 xmlns=\"http://blahblah.org\"/>" +" <ns1:elem6>true</ns1:elem6>" +" </ns1:elem1>"; + +static void test_get_namespaces(void) +{ + IXMLDOMSchemaCollection *collection, *collection2; + IXMLDOMDocument2 *doc; + IXMLDOMNode *node; + VARIANT_BOOL b; + HRESULT hr; + LONG len; + + doc = create_document(&IID_IXMLDOMDocument2); + if (!doc) return; + + /* null pointer */ + hr = IXMLDOMDocument2_get_namespaces(doc, NULL); + EXPECT_HR(hr, E_POINTER); + + /* no document loaded */ + collection = (void*)0xdeadbeef; + hr = IXMLDOMDocument2_get_namespaces(doc, &collection); +todo_wine + EXPECT_HR(hr, S_OK); + if (hr != S_OK) + { + IXMLDOMDocument_Release(doc); + return; + } + EXPECT_REF(collection, 2); + + collection2 = (void*)0xdeadbeef; + hr = IXMLDOMDocument2_get_namespaces(doc, &collection2); + EXPECT_HR(hr, S_OK); + ok(collection == collection2, "got %p\n", collection2); + EXPECT_REF(collection, 3); + IXMLDOMSchemaCollection_Release(collection); + + len = -1; + hr = IXMLDOMSchemaCollection_get_length(collection, &len); + EXPECT_HR(hr, S_OK); + ok(len == 0, "got %d\n", len); + IXMLDOMSchemaCollection_Release(collection); + + /* now with document */ + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(namespacesA), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument2_get_namespaces(doc, &collection); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = IXMLDOMSchemaCollection_get_length(collection, &len); + EXPECT_HR(hr, S_OK); + ok(len == 2, "got %d\n", len); + + /* try to lookup some uris */ + node = (void*)0xdeadbeef; + hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah.org"), &node); + EXPECT_HR(hr, S_OK); + ok(node == NULL, "got %p\n", node); + + node = (void*)0xdeadbeef; + hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah1.org"), &node); + EXPECT_HR(hr, S_OK); + ok(node == NULL, "got %p\n", node); + + IXMLDOMSchemaCollection_Release(collection); + + IXMLDOMDocument2_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -11216,6 +11296,7 @@ START_TEST(domdoc) test_getAttributeNode(); test_supporterrorinfo(); test_nodeValue(); + test_get_namespaces(); test_xsltemplate(); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 59ceac5..e819264 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -2061,6 +2061,41 @@ static void test_dispex(void) IXMLDOMSchemaCollection_Release(cache); } +static void test_get(void) +{ + static const WCHAR uriW[] = {'u','r','i',0}; + IXMLDOMSchemaCollection2 *cache; + IXMLDOMNode *node; + HRESULT hr; + BSTR s; + + cache = create_cache_version(60, &IID_IXMLDOMSchemaCollection2); + if (!cache) return; + + hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); + EXPECT_HR(hr, E_NOTIMPL); + + s = SysAllocString(uriW); + hr = IXMLDOMSchemaCollection2_get(cache, s, &node); + EXPECT_HR(hr, E_NOTIMPL); + SysFreeString(s); + + IXMLDOMSchemaCollection2_Release(cache); + + cache = create_cache_version(40, &IID_IXMLDOMSchemaCollection2); + if (!cache) return; + + hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + s = SysAllocString(uriW); + hr = IXMLDOMSchemaCollection2_get(cache, s, &node); + EXPECT_HR(hr, S_OK); + SysFreeString(s); + + IXMLDOMSchemaCollection2_Release(cache); +} + START_TEST(schema) { HRESULT r; @@ -2076,6 +2111,7 @@ START_TEST(schema) test_XDR_datatypes(); test_validate_on_load(); test_dispex(); + test_get(); CoUninitialize(); }

1 0

Alexandre Julliard : wordpad: Avoid Unicode macros.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: f2fe53d6ab8b8194123bf5ac3d10bf1a5126ee70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fe53d6ab8b8194123bf5ac3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 12:07:24 2012 +0100 wordpad: Avoid Unicode macros. --- programs/wordpad/Makefile.in | 2 +- programs/wordpad/print.c | 4 +- programs/wordpad/wordpad.c | 57 ++++++++++++++++++++--------------------- 3 files changed, 31 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2fe53d6ab8b8194123bf…

1 0

Henri Verbeet : wined3d: Properly enable / disable register combiners.
by Alexandre Julliard Jan. 20, 2012

Jan. 20, 2012

Module: wine Branch: master Commit: d1254eddb598ad2a6bddaf09ddb5d73247d460cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1254eddb598ad2a6bddaf09d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:25 2012 +0100 wined3d: Properly enable / disable register combiners. --- dlls/wined3d/nvidia_texture_shader.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index dc3f8b9..1fef980 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -629,15 +629,31 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d } /* Context activation is done by the caller. */ -static void nvrc_enable(BOOL enable) {} +static void nvrc_enable(BOOL enable) +{ + if (enable) + { + glEnable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); + } + else + { + glDisable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); + } +} /* Context activation and GL locking are done by the caller. */ static void nvts_enable(BOOL enable) { - if(enable) { + nvrc_enable(enable); + if (enable) + { glEnable(GL_TEXTURE_SHADER_NV); checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else { + } + else + { glDisable(GL_TEXTURE_SHADER_NV); checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); }

1 0