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

Sergey Guralnik : user32/tests: Fix a typo.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: e3219fa426f141098558dcb069cf7c96b2584bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3219fa426f141098558dcb06… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed May 29 10:56:17 2013 +0300 user32/tests: Fix a typo. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 37d210e..20d8d9f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7353,12 +7353,12 @@ static void test_update_region(void) rgn1 = CreateRectRgn(0, 0, 0, 0); ok(GetUpdateRgn(parent, rgn1, FALSE) == NULLREGION, - "has invalid area after ValidRgn(NULL)\n"); + "has invalid area after ValidateRgn(NULL)\n"); GetUpdateRgn(hwnd, rgn1, FALSE); rgn2 = CreateRectRgnIndirect(&rc); ok(EqualRgn(rgn1, rgn2), "assigned and retrieved update regions are different\n"); ok(GetUpdateRgn(child, rgn2, FALSE) == NULLREGION, - "has invalid area after ValidRgn(NULL)\n"); + "has invalid area after ValidateRgn(NULL)\n"); SetWindowPos(hwnd, 0, wnd_orig.x, wnd_orig.y, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);

1 0

Daniel Jelinski : include: Add txdtc.idl and txcoord.idl.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 7cb98146c6aafc94cad53eeecaa9c3ce3af8b443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb98146c6aafc94cad53eeec… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 20:28:10 2013 +0200 include: Add txdtc.idl and txcoord.idl. --- .gitignore | 2 + include/Makefile.in | 2 + include/txcoord.idl | 181 ++++++++++++++++++ include/txdtc.idl | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 700 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cb98146c6aafc94cad53…

1 0

Daniel Jelinski : xolehlp: Implement ITransactionImportWhereabouts.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: cabae2b02dcbc3e3bc856ff87ef9c6871693e17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabae2b02dcbc3e3bc856ff87… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 21:38:22 2013 +0200 xolehlp: Implement ITransactionImportWhereabouts. --- dlls/xolehlp/xolehlp.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 2ebc395..b6aaa0f 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" #include "transact.h" +#include "initguid.h" #include "txdtc.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -31,6 +32,7 @@ typedef struct { ITransactionDispenser ITransactionDispenser_iface; LONG ref; IResourceManagerFactory2 IResourceManagerFactory2_iface; + ITransactionImportWhereabouts ITransactionImportWhereabouts_iface; } TransactionManager; static inline TransactionManager *impl_from_ITransactionDispenser(ITransactionDispenser *iface) @@ -56,6 +58,10 @@ static HRESULT WINAPI TransactionDispenser_QueryInterface(ITransactionDispenser { *ppv = &This->IResourceManagerFactory2_iface; } + else if (IsEqualIID(&IID_ITransactionImportWhereabouts, iid)) + { + *ppv = &This->ITransactionImportWhereabouts_iface; + } else { FIXME("(%s): not implemented\n", debugstr_guid(iid)); @@ -170,6 +176,51 @@ static const IResourceManagerFactory2Vtbl ResourceManagerFactory2_Vtbl = { ResourceManagerFactory2_CreateEx }; +static inline TransactionManager *impl_from_ITransactionImportWhereabouts(ITransactionImportWhereabouts *iface) +{ + return CONTAINING_RECORD(iface, TransactionManager, ITransactionImportWhereabouts_iface); +} + +static HRESULT WINAPI TransactionImportWhereabouts_QueryInterface(ITransactionImportWhereabouts *iface, REFIID iid, + void **ppv) +{ + TransactionManager *This = impl_from_ITransactionImportWhereabouts(iface); + return TransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, iid, ppv); +} + +static ULONG WINAPI TransactionImportWhereabouts_AddRef(ITransactionImportWhereabouts *iface) +{ + TransactionManager *This = impl_from_ITransactionImportWhereabouts(iface); + return TransactionDispenser_AddRef(&This->ITransactionDispenser_iface); +} + +static ULONG WINAPI TransactionImportWhereabouts_Release(ITransactionImportWhereabouts *iface) +{ + TransactionManager *This = impl_from_ITransactionImportWhereabouts(iface); + return TransactionDispenser_Release(&This->ITransactionDispenser_iface); +} +static HRESULT WINAPI TransactionImportWhereabouts_GetWhereaboutsSize(ITransactionImportWhereabouts *iface, + ULONG *pcbWhereabouts) +{ + FIXME("(%p, %p): stub\n", iface, pcbWhereabouts); + + return E_NOTIMPL; +} +static HRESULT WINAPI TransactionImportWhereabouts_GetWhereabouts(ITransactionImportWhereabouts *iface, + ULONG cbWhereabouts, BYTE *rgbWhereabouts,ULONG *pcbUsed) +{ + FIXME("(%p, %u, %p, %p): stub\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); + + return E_NOTIMPL; +} +static const ITransactionImportWhereaboutsVtbl TransactionImportWhereabouts_Vtbl = { + TransactionImportWhereabouts_QueryInterface, + TransactionImportWhereabouts_AddRef, + TransactionImportWhereabouts_Release, + TransactionImportWhereabouts_GetWhereaboutsSize, + TransactionImportWhereabouts_GetWhereabouts +}; + static HRESULT TransactionManager_Create(REFIID riid, void **ppv) { TransactionManager *This; @@ -180,6 +231,7 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) This->ITransactionDispenser_iface.lpVtbl = &TransactionDispenser_Vtbl; This->IResourceManagerFactory2_iface.lpVtbl = &ResourceManagerFactory2_Vtbl; + This->ITransactionImportWhereabouts_iface.lpVtbl = &TransactionImportWhereabouts_Vtbl; This->ref = 1; ret = ITransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, riid, ppv);

1 0

Daniel Jelinski : xolehlp: Implement IResourceManager.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 1fca23e637037a8d0a661c484645f0bf17ba9735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fca23e637037a8d0a661c484… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 22:11:06 2013 +0200 xolehlp: Implement IResourceManager. --- dlls/xolehlp/xolehlp.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 125 insertions(+), 5 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index b6aaa0f..17d7281 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -28,6 +28,126 @@ WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); +/* Resource manager start */ + +typedef struct { + IResourceManager IResourceManager_iface; + LONG ref; +} ResourceManager; + +static inline ResourceManager *impl_from_IResourceManager(IResourceManager *iface) +{ + return CONTAINING_RECORD(iface, ResourceManager, IResourceManager_iface); +} + +static HRESULT WINAPI ResourceManager_QueryInterface(IResourceManager *iface, REFIID iid, + void **ppv) +{ + ResourceManager *This = impl_from_IResourceManager(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IResourceManager, iid)) + { + *ppv = &This->IResourceManager_iface; + } + else + { + FIXME("(%s): not implemented\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ResourceManager_AddRef(IResourceManager *iface) +{ + ResourceManager *This = impl_from_IResourceManager(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ResourceManager_Release(IResourceManager *iface) +{ + ResourceManager *This = impl_from_IResourceManager(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} +static HRESULT WINAPI ResourceManager_Enlist(IResourceManager *iface, + ITransaction *pTransaction,ITransactionResourceAsync *pRes,XACTUOW *pUOW, + LONG *pisoLevel,ITransactionEnlistmentAsync **ppEnlist) +{ + FIXME("(%p, %p, %p, %p, %p, %p): stub\n", iface, pTransaction,pRes,pUOW, + pisoLevel,ppEnlist); + return E_NOTIMPL; +} +static HRESULT WINAPI ResourceManager_Reenlist(IResourceManager *iface, + byte *pPrepInfo,ULONG cbPrepInfo,DWORD lTimeout,XACTSTAT *pXactStat) +{ + FIXME("(%p, %p, %u, %u, %p): stub\n", iface, pPrepInfo, cbPrepInfo, lTimeout, pXactStat); + return E_NOTIMPL; +} +static HRESULT WINAPI ResourceManager_ReenlistmentComplete(IResourceManager *iface) +{ + FIXME("(%p): stub\n", iface); + return S_OK; +} +static HRESULT WINAPI ResourceManager_GetDistributedTransactionManager(IResourceManager *iface, + REFIID iid,void **ppvObject) +{ + FIXME("(%p, %s, %p): stub\n", iface, debugstr_guid(iid), ppvObject); + return E_NOTIMPL; +} + +static const IResourceManagerVtbl ResourceManager_Vtbl = { + ResourceManager_QueryInterface, + ResourceManager_AddRef, + ResourceManager_Release, + ResourceManager_Enlist, + ResourceManager_Reenlist, + ResourceManager_ReenlistmentComplete, + ResourceManager_GetDistributedTransactionManager +}; + +static HRESULT ResourceManager_Create(REFIID riid, void **ppv) +{ + ResourceManager *This; + HRESULT ret; + + if (!ppv) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ResourceManager)); + if (!This) return E_OUTOFMEMORY; + + This->IResourceManager_iface.lpVtbl = &ResourceManager_Vtbl; + This->ref = 1; + + ret = IResourceManager_QueryInterface(&This->IResourceManager_iface, riid, ppv); + IResourceManager_Release(&This->IResourceManager_iface); + + return ret; +} + +/* Resource manager end */ + + +/* DTC Proxy Core Object start */ + typedef struct { ITransactionDispenser ITransactionDispenser_iface; LONG ref; @@ -155,18 +275,17 @@ static ULONG WINAPI ResourceManagerFactory2_Release(IResourceManagerFactory2 *if static HRESULT WINAPI ResourceManagerFactory2_Create(IResourceManagerFactory2 *iface, GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, IResourceManager **ppResMgr) { - FIXME("(%p, %s, %s, %p, %p): stub\n", iface, debugstr_guid(pguidRM), + FIXME("(%p, %s, %s, %p, %p): semi-stub\n", iface, debugstr_guid(pguidRM), debugstr_a(pszRMName), pIResMgrSink, ppResMgr); - - return E_NOTIMPL; + return ResourceManager_Create(&IID_IResourceManager, (void**)ppResMgr); } static HRESULT WINAPI ResourceManagerFactory2_CreateEx(IResourceManagerFactory2 *iface, GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, REFIID riidRequested, void **ppResMgr) { - FIXME("(%p, %s, %s, %p, %s, %p): stub\n", iface, debugstr_guid(pguidRM), + FIXME("(%p, %s, %s, %p, %s, %p): semi-stub\n", iface, debugstr_guid(pguidRM), debugstr_a(pszRMName), pIResMgrSink, debugstr_guid(riidRequested), ppResMgr); - return E_NOTIMPL; + return ResourceManager_Create(riidRequested, ppResMgr); } static const IResourceManagerFactory2Vtbl ResourceManagerFactory2_Vtbl = { ResourceManagerFactory2_QueryInterface, @@ -239,6 +358,7 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) return ret; } +/* DTC Proxy Core Object end */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) {

1 0

Daniel Jelinski : xolehlp: Implement TransactionOptions.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: b062977fb476010424a95cd139cd6011ddf2abb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b062977fb476010424a95cd13… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 21:53:30 2013 +0200 xolehlp: Implement TransactionOptions. --- dlls/xolehlp/xolehlp.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 70bae1c..616fe57 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -145,6 +145,114 @@ static HRESULT ResourceManager_Create(REFIID riid, void **ppv) /* Resource manager end */ +/* Transaction options start */ + +typedef struct { + ITransactionOptions ITransactionOptions_iface; + LONG ref; + XACTOPT opts; +} TransactionOptions; + +static inline TransactionOptions *impl_from_ITransactionOptions(ITransactionOptions *iface) +{ + return CONTAINING_RECORD(iface, TransactionOptions, ITransactionOptions_iface); +} + +static HRESULT WINAPI TransactionOptions_QueryInterface(ITransactionOptions *iface, REFIID iid, + void **ppv) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ITransactionOptions, iid)) + { + *ppv = &This->ITransactionOptions_iface; + } + else + { + FIXME("(%s): not implemented\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TransactionOptions_AddRef(ITransactionOptions *iface) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI TransactionOptions_Release(ITransactionOptions *iface) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} +static HRESULT WINAPI TransactionOptions_SetOptions(ITransactionOptions *iface, + XACTOPT *pOptions) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + + if (!pOptions) return E_INVALIDARG; + TRACE("(%p, %u, %s)\n", iface, pOptions->ulTimeout, debugstr_a(pOptions->szDescription)); + This->opts = *pOptions; + return S_OK; +} +static HRESULT WINAPI TransactionOptions_GetOptions(ITransactionOptions *iface, + XACTOPT *pOptions) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + + TRACE("(%p, %p)\n", iface, pOptions); + if (!pOptions) return E_INVALIDARG; + *pOptions = This->opts; + return S_OK; +} + +static const ITransactionOptionsVtbl TransactionOptions_Vtbl = { + TransactionOptions_QueryInterface, + TransactionOptions_AddRef, + TransactionOptions_Release, + TransactionOptions_SetOptions, + TransactionOptions_GetOptions +}; + +static HRESULT TransactionOptions_Create(ITransactionOptions **ppv) +{ + TransactionOptions *This; + + if (!ppv) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(TransactionOptions)); + if (!This) return E_OUTOFMEMORY; + + This->ITransactionOptions_iface.lpVtbl = &TransactionOptions_Vtbl; + This->ref = 1; + + *ppv = &This->ITransactionOptions_iface; + + return S_OK; +} + +/* Transaction options end */ /* DTC Proxy Core Object start */ @@ -226,10 +334,10 @@ static ULONG WINAPI TransactionDispenser_Release(ITransactionDispenser *iface) static HRESULT WINAPI TransactionDispenser_GetOptionsObject(ITransactionDispenser *iface, ITransactionOptions **ppOptions) { - FIXME("(%p, %p): stub\n", iface, ppOptions); + TRACE("(%p, %p)\n", iface, ppOptions); + if (!ppOptions) return E_INVALIDARG; - *ppOptions = NULL; - return E_NOTIMPL; + return TransactionOptions_Create(ppOptions); } static HRESULT WINAPI TransactionDispenser_BeginTransaction(ITransactionDispenser *iface, IUnknown *punkOuter,

1 0

Daniel Jelinski : xolehlp: Implement ITransaction.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 11589fa6e728b633524455b1a4514430a018fb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11589fa6e728b633524455b1a… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 23:39:03 2013 +0200 xolehlp: Implement ITransaction. --- dlls/xolehlp/xolehlp.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 616fe57..4714f8c 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -254,6 +254,121 @@ static HRESULT TransactionOptions_Create(ITransactionOptions **ppv) /* Transaction options end */ +/* Transaction start */ + +typedef struct { + ITransaction ITransaction_iface; + LONG ref; + XACTTRANSINFO info; +} Transaction; + +static inline Transaction *impl_from_ITransaction(ITransaction *iface) +{ + return CONTAINING_RECORD(iface, Transaction, ITransaction_iface); +} + +static HRESULT WINAPI Transaction_QueryInterface(ITransaction *iface, REFIID iid, + void **ppv) +{ + Transaction *This = impl_from_ITransaction(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ITransaction, iid)) + { + *ppv = &This->ITransaction_iface; + } + else + { + FIXME("(%s): not implemented\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI Transaction_AddRef(ITransaction *iface) +{ + Transaction *This = impl_from_ITransaction(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI Transaction_Release(ITransaction *iface) +{ + Transaction *This = impl_from_ITransaction(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} +static HRESULT WINAPI Transaction_Commit(ITransaction *iface, + BOOL fRetaining, DWORD grfTC, DWORD grfRM) +{ + FIXME("(%p, %d, %08x, %08x): stub\n", iface, fRetaining, grfTC, grfRM); + return E_NOTIMPL; +} +static HRESULT WINAPI Transaction_Abort(ITransaction *iface, + BOID *pboidReason, BOOL fRetaining, BOOL fAsync) +{ + FIXME("(%p, %p, %d, %d): stub\n", iface, pboidReason, fRetaining, fAsync); + return E_NOTIMPL; +} +static HRESULT WINAPI Transaction_GetTransactionInfo(ITransaction *iface, + XACTTRANSINFO *pinfo) +{ + Transaction *This = impl_from_ITransaction(iface); + TRACE("(%p, %p)\n", iface, pinfo); + if (!pinfo) return E_INVALIDARG; + *pinfo = This->info; + return S_OK; +} + +static const ITransactionVtbl Transaction_Vtbl = { + Transaction_QueryInterface, + Transaction_AddRef, + Transaction_Release, + Transaction_Commit, + Transaction_Abort, + Transaction_GetTransactionInfo +}; + +static HRESULT Transaction_Create(ISOLEVEL isoLevel, ULONG isoFlags, + ITransactionOptions *pOptions, ITransaction **ppv) +{ + Transaction *This; + + if (!ppv) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(Transaction)); + if (!This) return E_OUTOFMEMORY; + ZeroMemory(&This->info, sizeof(This->info)); + + This->ITransaction_iface.lpVtbl = &Transaction_Vtbl; + This->ref = 1; + This->info.isoLevel = isoLevel; + This->info.isoFlags = isoFlags; + + *ppv = &This->ITransaction_iface; + + return S_OK; +} + +/* Transaction end */ + /* DTC Proxy Core Object start */ typedef struct { @@ -346,13 +461,12 @@ static HRESULT WINAPI TransactionDispenser_BeginTransaction(ITransactionDispense ITransactionOptions *pOptions, ITransaction **ppTransaction) { - FIXME("(%p, %p, %08x, %08x, %p, %p): stub\n", iface, punkOuter, + FIXME("(%p, %p, %08x, %08x, %p, %p): semi-stub\n", iface, punkOuter, isoLevel, isoFlags, pOptions, ppTransaction); if (!ppTransaction) return E_INVALIDARG; - *ppTransaction = NULL; if (punkOuter) return CLASS_E_NOAGGREGATION; - return E_NOTIMPL; + return Transaction_Create(isoLevel, isoFlags, pOptions, ppTransaction); } static const ITransactionDispenserVtbl TransactionDispenser_Vtbl = { TransactionDispenser_QueryInterface,

1 0

Daniel Jelinski : xolehlp: Implement IResourceManagerFactory2.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: d673ae69027ae4f36abf6c26dfe1886fc6b989cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d673ae69027ae4f36abf6c26d… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 21:22:10 2013 +0200 xolehlp: Implement IResourceManagerFactory2. --- dlls/xolehlp/xolehlp.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 2d686cc..2ebc395 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" #include "transact.h" +#include "txdtc.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -29,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); typedef struct { ITransactionDispenser ITransactionDispenser_iface; LONG ref; + IResourceManagerFactory2 IResourceManagerFactory2_iface; } TransactionManager; static inline TransactionManager *impl_from_ITransactionDispenser(ITransactionDispenser *iface) @@ -49,6 +51,11 @@ static HRESULT WINAPI TransactionDispenser_QueryInterface(ITransactionDispenser { *ppv = &This->ITransactionDispenser_iface; } + else if (IsEqualIID(&IID_IResourceManagerFactory, iid) || + IsEqualIID(&IID_IResourceManagerFactory2, iid)) + { + *ppv = &This->IResourceManagerFactory2_iface; + } else { FIXME("(%s): not implemented\n", debugstr_guid(iid)); @@ -116,6 +123,53 @@ static const ITransactionDispenserVtbl TransactionDispenser_Vtbl = { TransactionDispenser_BeginTransaction }; +static inline TransactionManager *impl_from_IResourceManagerFactory2(IResourceManagerFactory2 *iface) +{ + return CONTAINING_RECORD(iface, TransactionManager, IResourceManagerFactory2_iface); +} + +static HRESULT WINAPI ResourceManagerFactory2_QueryInterface(IResourceManagerFactory2 *iface, REFIID iid, + void **ppv) +{ + TransactionManager *This = impl_from_IResourceManagerFactory2(iface); + return TransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, iid, ppv); +} + +static ULONG WINAPI ResourceManagerFactory2_AddRef(IResourceManagerFactory2 *iface) +{ + TransactionManager *This = impl_from_IResourceManagerFactory2(iface); + return TransactionDispenser_AddRef(&This->ITransactionDispenser_iface); +} + +static ULONG WINAPI ResourceManagerFactory2_Release(IResourceManagerFactory2 *iface) +{ + TransactionManager *This = impl_from_IResourceManagerFactory2(iface); + return TransactionDispenser_Release(&This->ITransactionDispenser_iface); +} +static HRESULT WINAPI ResourceManagerFactory2_Create(IResourceManagerFactory2 *iface, + GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, IResourceManager **ppResMgr) +{ + FIXME("(%p, %s, %s, %p, %p): stub\n", iface, debugstr_guid(pguidRM), + debugstr_a(pszRMName), pIResMgrSink, ppResMgr); + + return E_NOTIMPL; +} +static HRESULT WINAPI ResourceManagerFactory2_CreateEx(IResourceManagerFactory2 *iface, + GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, REFIID riidRequested, void **ppResMgr) +{ + FIXME("(%p, %s, %s, %p, %s, %p): stub\n", iface, debugstr_guid(pguidRM), + debugstr_a(pszRMName), pIResMgrSink, debugstr_guid(riidRequested), ppResMgr); + + return E_NOTIMPL; +} +static const IResourceManagerFactory2Vtbl ResourceManagerFactory2_Vtbl = { + ResourceManagerFactory2_QueryInterface, + ResourceManagerFactory2_AddRef, + ResourceManagerFactory2_Release, + ResourceManagerFactory2_Create, + ResourceManagerFactory2_CreateEx +}; + static HRESULT TransactionManager_Create(REFIID riid, void **ppv) { TransactionManager *This; @@ -125,6 +179,7 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) if (!This) return E_OUTOFMEMORY; This->ITransactionDispenser_iface.lpVtbl = &TransactionDispenser_Vtbl; + This->IResourceManagerFactory2_iface.lpVtbl = &ResourceManagerFactory2_Vtbl; This->ref = 1; ret = ITransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, riid, ppv);

1 0

Aric Stewart : gdi32/tests: Do not try to test OS/ 2 win metrics on non-windows fonts.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 3108f3cf3d99aac1983cc5256afa87752899275e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3108f3cf3d99aac1983cc5256… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 29 06:53:51 2013 -0500 gdi32/tests: Do not try to test OS/2 win metrics on non-windows fonts. --- dlls/gdi32/tests/font.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fdb6451..b57a630 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3077,19 +3077,13 @@ static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) ret = GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size); ok(ret == size, "GetFontData should return %u not %u\n", size, ret); - ascent = GET_BE_WORD(tt_os2.usWinAscent); - descent = GET_BE_WORD(tt_os2.usWinDescent); - cell_height = ascent + descent; - ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", - font_name, ntm->ntmCellHeight, cell_height, ascent, descent); - SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); if(!get_first_last_from_cmap(hdc, &cmap_first, &cmap_last, &cmap_type)) { - skip("Unable to retrieve first and last glyphs from cmap\n"); + skip("%s is not a Windows font, OS/2 metrics may be invalid.\n",font_name); } else { @@ -3099,6 +3093,12 @@ static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) USHORT version; TEXTMETRICW tmW; + ascent = GET_BE_WORD(tt_os2.usWinAscent); + descent = GET_BE_WORD(tt_os2.usWinDescent); + cell_height = ascent + descent; + ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", + font_name, ntm->ntmCellHeight, cell_height, ascent, descent); + version = GET_BE_WORD(tt_os2.version); os2_first_char = GET_BE_WORD(tt_os2.usFirstCharIndex);

1 0

Ken Thomases : winemac: Add Hide, Hide Others, and Show All items to the application menu.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: d8269a0586b75ca1be3ad28125f7af9c283bd275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8269a0586b75ca1be3ad2812… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 29 10:30:41 2013 -0500 winemac: Add Hide, Hide Others, and Show All items to the application menu. --- dlls/winemac.drv/cocoa_app.m | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index bdf4d92..4a54f66 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -205,8 +205,23 @@ int macdrv_err_on; mainMenu = [[[NSMenu alloc] init] autorelease]; + // Application menu submenu = [[[NSMenu alloc] initWithTitle:@"Wine"] autorelease]; bundleName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]; + + if ([bundleName length]) + title = [NSString stringWithFormat:@"Hide %@", bundleName]; + else + title = @"Hide"; + item = [submenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@""]; + + item = [submenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; + [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + + item = [submenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""]; + + [submenu addItem:[NSMenuItem separatorItem]]; + if ([bundleName length]) title = [NSString stringWithFormat:@"Quit %@", bundleName]; else @@ -218,6 +233,7 @@ int macdrv_err_on; [item setSubmenu:submenu]; [mainMenu addItem:item]; + // Window menu submenu = [[[NSMenu alloc] initWithTitle:@"Window"] autorelease]; [submenu addItemWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@""]; [submenu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];

1 0

Daniel Jelinski : xolehlp: Stub ITransactionImportWhereabouts.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 79d7e3955012cc57b75229f37c701d92e5cabbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d7e3955012cc57b75229f37… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 19:43:02 2013 +0200 xolehlp: Stub ITransactionImportWhereabouts. --- dlls/xolehlp/xolehlp.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 17d7281..595b578 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -321,16 +321,21 @@ static ULONG WINAPI TransactionImportWhereabouts_Release(ITransactionImportWhere static HRESULT WINAPI TransactionImportWhereabouts_GetWhereaboutsSize(ITransactionImportWhereabouts *iface, ULONG *pcbWhereabouts) { - FIXME("(%p, %p): stub\n", iface, pcbWhereabouts); + FIXME("(%p, %p): stub returning fake value\n", iface, pcbWhereabouts); - return E_NOTIMPL; + if (!pcbWhereabouts) return E_INVALIDARG; + *pcbWhereabouts = 1; + return S_OK; } static HRESULT WINAPI TransactionImportWhereabouts_GetWhereabouts(ITransactionImportWhereabouts *iface, ULONG cbWhereabouts, BYTE *rgbWhereabouts,ULONG *pcbUsed) { - FIXME("(%p, %u, %p, %p): stub\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); + FIXME("(%p, %u, %p, %p): stub returning fake value\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); - return E_NOTIMPL; + if (!rgbWhereabouts || !pcbUsed) return E_INVALIDARG; + *rgbWhereabouts = 0; + *pcbUsed = 1; + return S_OK; } static const ITransactionImportWhereaboutsVtbl TransactionImportWhereabouts_Vtbl = { TransactionImportWhereabouts_QueryInterface,

1 0