wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Michael Stefaniuc : ole32: COM cleanup for the IMalloc iface.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: a9ae183d8a1567e98100898ed6574758384827c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ae183d8a1567e98100898ed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:58 2011 +0100 ole32: COM cleanup for the IMalloc iface. --- dlls/ole32/ifs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 1a10c3e..a4857d4 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); static const IMallocVtbl VT_IMalloc32; typedef struct { - const IMallocVtbl *lpVtbl; + IMalloc IMalloc_iface; DWORD dummy; /* nothing, we are static */ IMallocSpy * pSpy; /* the spy when active */ DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ @@ -60,7 +60,7 @@ typedef struct { } _Malloc32; /* this is the static object instance */ -static _Malloc32 Malloc32 = {&VT_IMalloc32, 0, NULL, 0, 0, NULL, 0}; +static _Malloc32 Malloc32 = {{&VT_IMalloc32}, 0, NULL, 0, 0, NULL, 0}; /* with a spy active all calls from pre to post methods are threadsave */ static CRITICAL_SECTION IMalloc32_SpyCS; @@ -374,7 +374,7 @@ static const IMallocVtbl VT_IMalloc32 = */ HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc) { - *lpMalloc = (LPMALLOC)&Malloc32; + *lpMalloc = &Malloc32.IMalloc_iface; return S_OK; } @@ -392,7 +392,7 @@ HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc) */ LPVOID WINAPI CoTaskMemAlloc(ULONG size) { - return IMalloc_Alloc((LPMALLOC)&Malloc32,size); + return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); } /*********************************************************************** @@ -408,7 +408,7 @@ LPVOID WINAPI CoTaskMemAlloc(ULONG size) */ VOID WINAPI CoTaskMemFree(LPVOID ptr) { - IMalloc_Free((LPMALLOC)&Malloc32, ptr); + IMalloc_Free(&Malloc32.IMalloc_iface, ptr); } /*********************************************************************** @@ -426,7 +426,7 @@ VOID WINAPI CoTaskMemFree(LPVOID ptr) */ LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) { - return IMalloc_Realloc((LPMALLOC)&Malloc32, pvOld, size); + return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); } /***********************************************************************

1 0

Michael Stefaniuc : urlmon: Use an iface instead of a vtbl pointer in ProxyBindStatusCallback.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 2796677f8cc77f05760c8275e7f18e87665ebbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2796677f8cc77f05760c8275e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:22 2011 +0100 urlmon: Use an iface instead of a vtbl pointer in ProxyBindStatusCallback. --- dlls/urlmon/umstream.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 5a942f6..792cd64 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -32,11 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct ProxyBindStatusCallback { - const IBindStatusCallbackVtbl *lpVtbl; + IBindStatusCallback IBindStatusCallback_iface; IBindStatusCallback *pBSC; } ProxyBindStatusCallback; +static inline ProxyBindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, ProxyBindStatusCallback, IBindStatusCallback_iface); +} + static HRESULT WINAPI ProxyBindStatusCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { if (IsEqualGUID(&IID_IBindStatusCallback, riid) || @@ -64,7 +69,7 @@ static ULONG WINAPI ProxyBindStatusCallback_Release(IBindStatusCallback *iface) static HRESULT WINAPI ProxyBindStatusCallback_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pib) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnStartBinding(This->pBSC, dwReserved, pib); @@ -74,7 +79,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStartBinding(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_GetPriority(This->pBSC, pnPriority); @@ -84,7 +89,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_GetPriority(IBindStatusCallback *i static HRESULT WINAPI ProxyBindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnLowResource(This->pBSC, reserved); @@ -95,7 +100,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnLowResource(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnProgress(This->pBSC, ulProgress, @@ -107,7 +112,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnProgress(IBindStatusCallback *if static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnStopBinding(This->pBSC, hresult, szError); @@ -117,7 +122,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnStopBinding(IBindStatusCallback static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); @@ -128,7 +133,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_GetBindInfo(IBindStatusCallback *i static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnDataAvailable(This->pBSC, grfBSCF, dwSize, @@ -139,7 +144,7 @@ static HRESULT WINAPI ProxyBindStatusCallback_OnDataAvailable(IBindStatusCallbac static HRESULT WINAPI ProxyBindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if(This->pBSC) return IBindStatusCallback_OnObjectAvailable(This->pBSC, riid, punk); @@ -170,7 +175,7 @@ static const IBindStatusCallbackVtbl BlockingBindStatusCallbackVtbl = static HRESULT WINAPI AsyncBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - ProxyBindStatusCallback *This = (ProxyBindStatusCallback *)iface; + ProxyBindStatusCallback *This = impl_from_IBindStatusCallback(iface); HRESULT hr = IBindStatusCallback_GetBindInfo(This->pBSC, grfBINDF, pbindinfo); *grfBINDF |= BINDF_PULLDATA | BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE; return hr; @@ -276,10 +281,10 @@ HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, if (!szURL || !ppStream) return E_INVALIDARG; - blocking_bsc.lpVtbl = &BlockingBindStatusCallbackVtbl; + blocking_bsc.IBindStatusCallback_iface.lpVtbl = &BlockingBindStatusCallbackVtbl; blocking_bsc.pBSC = lpfnCB; - return URLStartDownload(szURL, ppStream, (IBindStatusCallback *)&blocking_bsc); + return URLStartDownload(szURL, ppStream, &blocking_bsc.IBindStatusCallback_iface); } /*********************************************************************** @@ -326,10 +331,10 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved if (!szURL) return E_INVALIDARG; - async_bsc.lpVtbl = &AsyncBindStatusCallbackVtbl; + async_bsc.IBindStatusCallback_iface.lpVtbl = &AsyncBindStatusCallbackVtbl; async_bsc.pBSC = lpfnCB; - hr = URLStartDownload(szURL, &pStream, (IBindStatusCallback *)&async_bsc); + hr = URLStartDownload(szURL, &pStream, &async_bsc.IBindStatusCallback_iface); if (SUCCEEDED(hr) && pStream) IStream_Release(pStream);

1 0

Alexandre Julliard : wrc: Treat empty translation strings as missing.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 45ef8e8a180652570cec16f05cf85aecaae629be URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ef8e8a180652570cec16f05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 10:20:23 2011 +0100 wrc: Treat empty translation strings as missing. --- tools/wrc/po.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 6cfb5b4..c075a39 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -774,8 +774,9 @@ static string_t *translate_string( po_file_t po, string_t *str, int *found ) if (msg && !po_message_is_fuzzy( msg )) { - (*found)++; transl = po_message_msgstr( msg ); + if (!transl[0]) transl = msgid; /* ignore empty strings */ + else (*found)++; } else transl = msgid;

1 0

Jacek Caban : msxml3: Get rid of xmlnode_transformNodeToObject.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 510567d98ae1168b354e8e4c769ca78519d64457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510567d98ae1168b354e8e4c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 6 17:21:02 2011 +0100 msxml3: Get rid of xmlnode_transformNodeToObject. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 3 ++- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/node.c | 18 +++--------------- dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 10 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index d5768cb..4163831 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -529,7 +529,8 @@ static HRESULT WINAPI domattr_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static HRESULT WINAPI domattr_get_name( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 856ed93..041bc06 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -540,7 +540,8 @@ static HRESULT WINAPI domcdata_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static HRESULT WINAPI domcdata_get_data( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 08cf103..62fd7f2 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -533,7 +533,8 @@ static HRESULT WINAPI domcomment_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static HRESULT WINAPI domcomment_get_data( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 40af0d2..7ac3d4b 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -537,7 +537,8 @@ static HRESULT WINAPI domfrag_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static const struct IXMLDOMDocumentFragmentVtbl domfrag_vtbl = diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index bfb676a..6b1508c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1454,7 +1454,8 @@ static HRESULT WINAPI domdoc_transformNodeToObject( VARIANT outputObject) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), stylesheet, outputObject ); + FIXME("(%p)->(%p %s)\n", This, stylesheet, debugstr_variant(&outputObject)); + return E_NOTIMPL; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index f76bf60..5c8383e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -990,7 +990,8 @@ static HRESULT WINAPI domelem_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static HRESULT WINAPI domelem_get_tagName( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f3a4b19..5cf6fb3 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -531,7 +531,8 @@ static HRESULT WINAPI entityref_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static const struct IXMLDOMEntityReferenceVtbl entityref_vtbl = diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 228fa65..2af136e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1172,16 +1172,6 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } -static HRESULT WINAPI xmlnode_transformNodeToObject( - IXMLDOMNode *iface, - IXMLDOMNode* stylesheet, - VARIANT outputObject) -{ - xmlnode *This = impl_from_IXMLDOMNode( iface ); - FIXME("(%p)->(%p)\n", This, stylesheet); - return E_NOTIMPL; -} - static const struct IXMLDOMNodeVtbl xmlnode_vtbl = { NULL, @@ -1223,10 +1213,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = xmlnode_selectNodes, xmlnode_selectSingleNode, NULL, - xmlnode_get_namespaceURI, - NULL, - NULL, - xmlnode_transformNodeToObject, + xmlnode_get_namespaceURI }; void destroy_xmlnode(xmlnode *This) @@ -1745,7 +1732,8 @@ static HRESULT WINAPI unknode_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static const struct IXMLDOMNodeVtbl unknode_vtbl = diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index e78a6f3..b249418 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -548,7 +548,8 @@ static HRESULT WINAPI dom_pi_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static HRESULT WINAPI dom_pi_get_target( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 4a2bd21..988dd97 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -619,7 +619,8 @@ static HRESULT WINAPI domtext_transformNodeToObject( IXMLDOMNode* domNode, VARIANT var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(&This->node), domNode, var1 ); + FIXME("(%p)->(%p %s)\n", This, domNode, debugstr_variant(&var1)); + return E_NOTIMPL; } static HRESULT WINAPI domtext_get_data(

1 0

Michael Stefaniuc : mshtml: Remove some leftover *_THIS undefs.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: d214a96d5812d34bf4fca674e5af61a77129e3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d214a96d5812d34bf4fca674e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 16:18:25 2011 +0100 mshtml: Remove some leftover *_THIS undefs. --- dlls/mshtml/mutation.c | 2 -- dlls/mshtml/olecmd.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3c88744..fbbb398 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -659,8 +659,6 @@ static void NSAPI nsDocumentObserver_DoneAddingChildren(nsIDocumentObserver *ifa } } -#undef NSMUTATIONOBS_THIS - static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = { nsDocumentObserver_QueryInterface, nsDocumentObserver_AddRef, diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index d4f1863..97d2c4f 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -888,8 +888,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return OLECMDERR_E_UNKNOWNGROUP; } -#undef CMDTARGET_THIS - static const IOleCommandTargetVtbl OleCommandTargetVtbl = { OleCommandTarget_QueryInterface, OleCommandTarget_AddRef,

1 0

Michael Stefaniuc : mshtml: Finish the COM standardization in protocol.c.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: f242b1fb6c083095a378de4777153517db629db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f242b1fb6c083095a378de477… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 16:16:55 2011 +0100 mshtml: Finish the COM standardization in protocol.c. --- dlls/mshtml/mshtml_private.h | 2 - dlls/mshtml/protocol.c | 94 +++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f242b1fb6c083095a378d…

1 0

Greg Geldorp : dinput/tests: Skip acquire tests when not running in the foreground.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 62670dc39e00fd7855e26d46771fa6d10104c690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62670dc39e00fd7855e26d467… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 6 13:10:27 2011 +0100 dinput/tests: Skip acquire tests when not running in the foreground. If our window isn't the foreground window, we'll never be able to successfully Acquire with SetCooperativeLevel DISCL_FOREGROUND in effect. --- dlls/dinput/tests/mouse.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 09b2b27..25a9a5e 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -73,6 +73,12 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) DIMOUSESTATE m_state; HWND hwnd2; + if (! SetForegroundWindow(hwnd)) + { + skip("Not running as foreground app, skipping acquire tests\n"); + return; + } + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); if (FAILED(hr)) return;

1 0

Hans Leidekker : msi/tests: Mark a test result on some old Wow64 platforms as broken.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 01286b97e3e0a610f8eae8e00c87653f9b7088c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01286b97e3e0a610f8eae8e00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 6 16:30:09 2011 +0100 msi/tests: Mark a test result on some old Wow64 platforms as broken. --- dlls/msi/tests/msi.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index bb0d65f..b5dc78c 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -5000,7 +5000,14 @@ static void test_MsiGetProductInfoEx(void) r = pMsiGetProductInfoExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_PRODUCTSTATE, buf, &sz); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS || broken(r == ERROR_UNKNOWN_PRODUCT), "Expected ERROR_SUCCESS, got %d\n", r); + if (r == ERROR_UNKNOWN_PRODUCT) + { + win_skip("skipping remaining tests for MsiGetProductInfoEx\n"); + delete_key(prodkey, "", access); + RegCloseKey(prodkey); + return; + } ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf); ok(sz == 1, "Expected 1, got %d\n", sz);

1 0

Alexandre Julliard : wldap32: Convert translations to po files.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: d1d494b3db73766b9026d157dcdce069db0540a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d494b3db73766b9026d157d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 17:57:43 2011 +0100 wldap32: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- dlls/wldap32/Makefile.in | 22 +--- dlls/wldap32/{wldap32_En.rc => wldap32.rc} | 0 dlls/wldap32/wldap32_Da.rc | 125 -------------- dlls/wldap32/wldap32_De.rc | 127 -------------- dlls/wldap32/wldap32_Es.rc | 125 -------------- dlls/wldap32/wldap32_Fr.rc | 129 -------------- dlls/wldap32/wldap32_Hu.rc | 128 -------------- dlls/wldap32/wldap32_It.rc | 128 -------------- dlls/wldap32/wldap32_Ko.rc | 125 -------------- dlls/wldap32/wldap32_Lt.rc | 128 -------------- dlls/wldap32/wldap32_Nl.rc | 125 -------------- dlls/wldap32/wldap32_No.rc | 125 -------------- dlls/wldap32/wldap32_Pl.rc | 126 -------------- dlls/wldap32/wldap32_Pt.rc | 232 ------------------------- dlls/wldap32/wldap32_Ro.rc | 127 -------------- dlls/wldap32/wldap32_Ru.rc | 128 -------------- dlls/wldap32/wldap32_Sr.rc | 232 ------------------------- dlls/wldap32/wldap32_Sv.rc | 125 -------------- dlls/wldap32/wldap32_Tr.rc | 125 -------------- dlls/wldap32/wldap32_Uk.rc | 130 -------------- po/bg.po | 243 ++++++++++++++++++++++++++ po/cs.po | 243 ++++++++++++++++++++++++++ po/da.po | 240 ++++++++++++++++++++++++++ po/de.po | 240 ++++++++++++++++++++++++++ po/el.po | 242 ++++++++++++++++++++++++++ po/en.po | 254 ++++++++++++++++++++++++++++ po/en_US.po | 240 ++++++++++++++++++++++++++ po/eo.po | 241 ++++++++++++++++++++++++++ po/es.po | 240 ++++++++++++++++++++++++++ po/fi.po | 245 +++++++++++++++++++++++++++ po/fr.po | 240 ++++++++++++++++++++++++++ po/he.po | 246 +++++++++++++++++++++++++++ po/hi.po | 241 ++++++++++++++++++++++++++ po/hu.po | 240 ++++++++++++++++++++++++++ po/it.po | 240 ++++++++++++++++++++++++++ po/ja.po | 254 ++++++++++++++++++++++++++++ po/ko.po | 240 ++++++++++++++++++++++++++ po/lt.po | 240 ++++++++++++++++++++++++++ po/ml.po | 241 ++++++++++++++++++++++++++ po/nb_NO.po | 240 ++++++++++++++++++++++++++ po/nl.po | 240 ++++++++++++++++++++++++++ po/or.po | 241 ++++++++++++++++++++++++++ po/pa.po | 241 ++++++++++++++++++++++++++ po/pl.po | 240 ++++++++++++++++++++++++++ po/pt_BR.po | 240 ++++++++++++++++++++++++++ po/pt_PT.po | 240 ++++++++++++++++++++++++++ po/ro.po | 240 ++++++++++++++++++++++++++ po/ru.po | 240 ++++++++++++++++++++++++++ po/sk.po | 241 ++++++++++++++++++++++++++ po/sl.po | 248 +++++++++++++++++++++++++++ po/sr_Latn_SP.po | 240 ++++++++++++++++++++++++++ po/sr_SP.po | 240 ++++++++++++++++++++++++++ po/sv.po | 240 ++++++++++++++++++++++++++ po/te.po | 241 ++++++++++++++++++++++++++ po/th.po | 241 ++++++++++++++++++++++++++ po/tr.po | 240 ++++++++++++++++++++++++++ po/uk.po | 240 ++++++++++++++++++++++++++ po/wa.po | 241 ++++++++++++++++++++++++++ po/wine.pot | 240 ++++++++++++++++++++++++++ po/zh_CN.po | 246 +++++++++++++++++++++++++++ po/zh_TW.po | 246 +++++++++++++++++++++++++++ 63 files changed, 9920 insertions(+), 2512 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d494b3db73766b9026d…

1 0

Alexandre Julliard : winmm: Convert translations to po files.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 8aefc9081c40a8d2168e2b02ec113a5c47210d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aefc9081c40a8d2168e2b02e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 17:50:17 2011 +0100 winmm: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- dlls/winmm/Makefile.in | 24 +-- dlls/winmm/{winmm_En.rc => winmm.rc} | 0 dlls/winmm/winmm_Cs.rc | 136 -------- dlls/winmm/winmm_Da.rc | 131 ------- dlls/winmm/winmm_De.rc | 133 ------- dlls/winmm/winmm_Es.rc | 132 ------- dlls/winmm/winmm_Fr.rc | 137 -------- dlls/winmm/winmm_It.rc | 136 -------- dlls/winmm/winmm_Ja.rc | 134 ------- dlls/winmm/winmm_Ko.rc | 134 ------- dlls/winmm/winmm_Lt.rc | 134 ------- dlls/winmm/winmm_Nl.rc | 134 ------- dlls/winmm/winmm_No.rc | 131 ------- dlls/winmm/winmm_Pl.rc | 131 ------- dlls/winmm/winmm_Pt.rc | 246 ------------- dlls/winmm/winmm_Ro.rc | 133 ------- dlls/winmm/winmm_Ru.rc | 138 -------- dlls/winmm/winmm_Si.rc | 133 ------- dlls/winmm/winmm_Sk.rc | 131 ------- dlls/winmm/winmm_Sv.rc | 133 ------- dlls/winmm/winmm_Tr.rc | 133 ------- dlls/winmm/winmm_Uk.rc | 136 -------- po/bg.po | 492 ++++++++++++++++++++++++++ po/cs.po | 588 +++++++++++++++++++++++++++++++ po/da.po | 598 ++++++++++++++++++++++++++++++++ po/de.po | 633 +++++++++++++++++++++++++++++++++ po/el.po | 492 ++++++++++++++++++++++++++ po/en.po | 493 ++++++++++++++++++++++++++ po/en_US.po | 605 ++++++++++++++++++++++++++++++++ po/eo.po | 492 ++++++++++++++++++++++++++ po/es.po | 631 +++++++++++++++++++++++++++++++++ po/fi.po | 492 ++++++++++++++++++++++++++ po/fr.po | 635 ++++++++++++++++++++++++++++++++++ po/he.po | 492 ++++++++++++++++++++++++++ po/hi.po | 492 ++++++++++++++++++++++++++ po/hu.po | 492 ++++++++++++++++++++++++++ po/it.po | 624 +++++++++++++++++++++++++++++++++ po/ja.po | 601 ++++++++++++++++++++++++++++++++ po/ko.po | 588 +++++++++++++++++++++++++++++++ po/lt.po | 613 ++++++++++++++++++++++++++++++++ po/ml.po | 492 ++++++++++++++++++++++++++ po/nb_NO.po | 597 ++++++++++++++++++++++++++++++++ po/nl.po | 618 +++++++++++++++++++++++++++++++++ po/or.po | 492 ++++++++++++++++++++++++++ po/pa.po | 492 ++++++++++++++++++++++++++ po/pl.po | 615 ++++++++++++++++++++++++++++++++ po/pt_BR.po | 630 +++++++++++++++++++++++++++++++++ po/pt_PT.po | 626 +++++++++++++++++++++++++++++++++ po/ro.po | 627 +++++++++++++++++++++++++++++++++ po/ru.po | 605 ++++++++++++++++++++++++++++++++ po/sk.po | 605 ++++++++++++++++++++++++++++++++ po/sl.po | 602 ++++++++++++++++++++++++++++++++ po/sr_Latn_SP.po | 492 ++++++++++++++++++++++++++ po/sr_SP.po | 492 ++++++++++++++++++++++++++ po/sv.po | 600 ++++++++++++++++++++++++++++++++ po/te.po | 492 ++++++++++++++++++++++++++ po/th.po | 492 ++++++++++++++++++++++++++ po/tr.po | 603 ++++++++++++++++++++++++++++++++ po/uk.po | 604 ++++++++++++++++++++++++++++++++ po/wa.po | 492 ++++++++++++++++++++++++++ po/wine.pot | 492 ++++++++++++++++++++++++++ po/zh_CN.po | 492 ++++++++++++++++++++++++++ po/zh_TW.po | 492 ++++++++++++++++++++++++++ 65 files changed, 22802 insertions(+), 2809 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8aefc9081c40a8d2168e2…

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011