August 2015 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Fix resource misc flags conversion.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: a24ff273861239421f213340c31f81686e689ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24ff273861239421f213340c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:41 2015 +0200 d3d11: Fix resource misc flags conversion. Tests with ID3D11Buffers have shown that not all resource misc flags are translated to d3d10 flags. --- dlls/d3d11/utils.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 7accfcd..3ad00da 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -488,17 +488,14 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc { static const UINT bitwise_identical_flags = D3D11_RESOURCE_MISC_GENERATE_MIPS | D3D11_RESOURCE_MISC_SHARED - | D3D11_RESOURCE_MISC_TEXTURECUBE - | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED - | D3D11_RESOURCE_MISC_RESOURCE_CLAMP - | D3D11_RESOURCE_MISC_SHARED_NTHANDLE - | D3D11_RESOURCE_MISC_RESTRICTED_CONTENT - | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE - | D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER - | D3D11_RESOURCE_MISC_GUARDED; + | D3D11_RESOURCE_MISC_TEXTURECUBE; const UINT handled_flags = bitwise_identical_flags + | D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS + | D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS + | D3D11_RESOURCE_MISC_BUFFER_STRUCTURED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX - | D3D11_RESOURCE_MISC_GDI_COMPATIBLE; + | D3D11_RESOURCE_MISC_GDI_COMPATIBLE + | D3D11_RESOURCE_MISC_SHARED_NTHANDLE; UINT d3d10_resource_misc_flags = resource_misc_flags & bitwise_identical_flags; if (resource_misc_flags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX)

1 0

Hugh McMaster : regsvr32: Process flags before files.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: d3b55e99e98a966d5357613656c99b5d1b0a0913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b55e99e98a966d535761365… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 31 19:51:44 2015 +1000 regsvr32: Process flags before files. --- programs/regsvr32/regsvr32.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 449124f..8d1ab17 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -231,10 +231,8 @@ int wmain(int argc, WCHAR* argv[]) OleInitialize(NULL); - /* Strictly, the Microsoft version processes all the flags before + /* We mirror the Microsoft version by processing all of the flags before * the files (e.g. regsvr32 file1 /s file2 is silent even for file1). - * For ease, we will not replicate that and will process the arguments - * in order. * * Note the complication that this version may be passed Unix format filenames * which could be mistaken for flags. The Windows version conveniently @@ -270,8 +268,13 @@ int wmain(int argc, WCHAR* argv[]) output_write(STRING_USAGE); return 1; } + argv[i] = NULL; } - else + } + + for (i = 1; i < argc; i++) + { + if (argv[i]) { WCHAR *DllName = argv[i]; int res = 0;

1 0

Nikolay Sivov : dwrite: Recognize semi light weight patterns.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 9a6b0750c7ab3da676a7fc7f857a2d5007b5f6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6b0750c7ab3da676a7fc7f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 31 08:13:44 2015 +0300 dwrite: Recognize semi light weight patterns. --- dlls/dwrite/font.c | 10 ++++++++++ include/dwrite.idl | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b1a3cae..63ad277 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2236,6 +2236,11 @@ static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_W { NULL } }; + static const struct name_pattern semilight_patterns[] = { + { semiW, lightW }, + { NULL } + }; + static const struct name_pattern demibold_patterns[] = { { semiW, boldW }, { demiW, boldW }, @@ -2302,6 +2307,9 @@ static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_W if (match_pattern_list(tokens, extralight_patterns, match)) return DWRITE_FONT_WEIGHT_EXTRA_LIGHT; + if (match_pattern_list(tokens, semilight_patterns, match)) + return DWRITE_FONT_WEIGHT_SEMI_LIGHT; + if (match_pattern_list(tokens, demibold_patterns, match)) return DWRITE_FONT_WEIGHT_DEMI_BOLD; @@ -2362,6 +2370,7 @@ static int compare_knownweights(const void *a, const void* b) static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { static const WCHAR extralightW[] = {'E','x','t','r','a',' ','L','i','g','h','t',0}; + static const WCHAR semilightW[] = {'S','e','m','i',' ','L','i','g','h','t',0}; static const WCHAR extrablackW[] = {'E','x','t','r','a',' ','B','l','a','c','k',0}; static const WCHAR extraboldW[] = {'E','x','t','r','a',' ','B','o','l','d',0}; static const WCHAR demiboldW[] = {'D','e','m','i',' ','B','o','l','d',0}; @@ -2371,6 +2380,7 @@ static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { thinW, DWRITE_FONT_WEIGHT_THIN }, { extralightW, DWRITE_FONT_WEIGHT_EXTRA_LIGHT }, { lightW, DWRITE_FONT_WEIGHT_LIGHT }, + { semilightW, DWRITE_FONT_WEIGHT_SEMI_LIGHT }, { mediumW, DWRITE_FONT_WEIGHT_MEDIUM }, { demiboldW, DWRITE_FONT_WEIGHT_DEMI_BOLD }, { boldW, DWRITE_FONT_WEIGHT_BOLD }, diff --git a/include/dwrite.idl b/include/dwrite.idl index f8644ba..9452e11 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -73,6 +73,7 @@ typedef enum DWRITE_FONT_WEIGHT DWRITE_FONT_WEIGHT_EXTRA_LIGHT = 200, DWRITE_FONT_WEIGHT_ULTRA_LIGHT = 200, DWRITE_FONT_WEIGHT_LIGHT = 300, + DWRITE_FONT_WEIGHT_SEMI_LIGHT = 350, DWRITE_FONT_WEIGHT_NORMAL = 400, DWRITE_FONT_WEIGHT_REGULAR = 400, DWRITE_FONT_WEIGHT_MEDIUM = 500,

1 0

Nikolay Sivov : dwrite: Implement family and face name resolution.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: c0ab20caf907ff841d0d8a1784150aa6c56b5480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ab20caf907ff841d0d8a178… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 31 08:13:03 2015 +0300 dwrite: Implement family and face name resolution. --- dlls/dwrite/font.c | 262 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 208 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0ab20caf907ff841d0d8…

1 0

André Hentschel : winedbg: Update minidump output.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: b952703a2e6bbdff3b27fdb770ac359977fd4021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b952703a2e6bbdff3b27fdb77… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 28 20:24:42 2015 +0200 winedbg: Update minidump output. --- programs/winedbg/tgt_minidump.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index e3a823a..5bf5a60 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -289,6 +289,9 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_ARM: str = "ARM"; break; + case PROCESSOR_ARCHITECTURE_ARM64: + str = "ARM64"; + break; case PROCESSOR_ARCHITECTURE_MSIL: str = "MSIL"; break; @@ -346,10 +349,29 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) else if (msi->u.s.ProductType == 3) str = "Server 2008"; else str = "6-????"; break; - case 2: str = "Win8"; break; + case 2: + if (msi->u.s.ProductType == 1) str = "Win8"; + else if (msi->u.s.ProductType == 3) str = "Server 2012"; + else str = "6-????"; + break; + case 3: + if (msi->u.s.ProductType == 1) str = "Win8.1"; + else if (msi->u.s.ProductType == 3) str = "Server 2012 R2"; + else str = "6-????"; + break; default: str = "6-????"; break; } break; + case 10: + switch (msi->MinorVersion) + { + case 0: + if (msi->u.s.ProductType == 1) str = "Win10"; + else str = "10-????"; + break; + default: str = "10-????"; break; + } + break; default: str = "???"; break; } dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber);

1 0

Francois Gouget : dwrite: Make opentype_get_font_strings_from_id() static.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: f87491d5cd8f900e998bba367e9c6bcecdc19e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87491d5cd8f900e998bba367… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 28 14:34:05 2015 +0200 dwrite: Make opentype_get_font_strings_from_id() static. --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index d0411bd..fd471ef 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1196,7 +1196,7 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la } } -HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) +static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; BYTE *storage_area = 0;

1 0

Bruno Jesus : mciavi32: Add partial support for MCI_DGV_PLAY_REPEAT.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 1c82aca1d444d198d3cdeacc808faf15e7619d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c82aca1d444d198d3cdeacc8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 31 01:39:56 2015 +0800 mciavi32: Add partial support for MCI_DGV_PLAY_REPEAT. --- dlls/mciavi32/mciavi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 079c696..b1c89f0 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -402,14 +402,19 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP } ReleaseDC(wma->hWndPaint, hDC); } - if(wma->dwCurrVideoFrame >= wma->dwToVideoFrame) - break; + if (wma->dwCurrVideoFrame >= wma->dwToVideoFrame) + { + if (!(dwFlags & MCI_DGV_PLAY_REPEAT)) + break; + TRACE("repeat media as requested\n"); + wma->dwCurrVideoFrame = wma->dwCurrAudioBlock = 0; + } if (wma->lpWaveFormat) MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); tc = currenttime_us(); - if(tc < next_frame_us) + if (tc < next_frame_us) delta = next_frame_us - tc; else delta = 0; @@ -532,7 +537,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION; if (dwFlags & MCI_TEST) return 0; - if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) + if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) FIXME("Unsupported flag %08x\n", dwFlags); EnterCriticalSection(&wma->cs);

1 0

Jacek Caban : ole32: Use proper interface pointer in CreateStub call.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 9bdb97e69498cd8d77f370f994ec1f320c741c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdb97e69498cd8d77f370f99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:59:31 2015 +0200 ole32: Use proper interface pointer in CreateStub call. --- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 11 ++--------- dlls/ole32/stubmanager.c | 15 ++++++++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f11186c..9f56d47 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -187,7 +187,7 @@ HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; ULONG stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, +struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d142b93..73b9409 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -148,16 +148,10 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno ifstub = stub_manager_find_ifstub(manager, riid, mshlflags); if (!ifstub) { IRpcStubBuffer *stub = NULL; - IUnknown *iobject = NULL; /* object of type riid */ - - hr = IUnknown_QueryInterface(object, riid, (void **)&iobject); - if (hr != S_OK) - ERR("object doesn't expose interface %s, failing with error 0x%08x\n", - debugstr_guid(riid), hr); /* IUnknown doesn't require a stub buffer, because it never goes out on * the wire */ - if (hr == S_OK && !IsEqualIID(riid, &IID_IUnknown)) + if (!IsEqualIID(riid, &IID_IUnknown)) { IPSFactoryBuffer *psfb; @@ -176,12 +170,11 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno } if (hr == S_OK) { - ifstub = stub_manager_new_ifstub(manager, stub, iobject, riid, dest_context, dest_context_data, mshlflags); + ifstub = stub_manager_new_ifstub(manager, stub, riid, dest_context, dest_context_data, mshlflags); if (!ifstub) hr = E_OUTOFMEMORY; } if (stub) IRpcStubBuffer_Release(stub); - if (iobject) IUnknown_Release(iobject); if (hr != S_OK) { stub_manager_int_release(manager); diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 1f79ff5..3b9086d 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -65,21 +65,28 @@ static inline HRESULT generate_ipid(struct stub_manager *m, IPID *ipid) } /* registers a new interface stub COM object with the stub manager and returns registration record */ -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, DWORD dest_context, +struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) { struct ifstub *stub; HRESULT hr; - TRACE("oid=%s, stubbuffer=%p, iptr=%p, iid=%s\n", - wine_dbgstr_longlong(m->oid), sb, iptr, debugstr_guid(iid)); + TRACE("oid=%s, stubbuffer=%p, iid=%s\n", wine_dbgstr_longlong(m->oid), sb, debugstr_guid(iid)); stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub)); if (!stub) return NULL; + hr = IUnknown_QueryInterface(m->object, iid, (void **)&stub->iface); + if (hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, stub); + return NULL; + } + hr = RPC_CreateServerChannel(dest_context, dest_context_data, &stub->chan); if (hr != S_OK) { + IUnknown_Release(stub->iface); HeapFree(GetProcessHeap(), 0, stub); return NULL; } @@ -87,8 +94,6 @@ struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *s stub->stubbuffer = sb; if (sb) IRpcStubBuffer_AddRef(sb); - IUnknown_AddRef(iptr); - stub->iface = iptr; stub->flags = flags; stub->iid = *iid;

1 0

Jacek Caban : ole32: Use proper IUnknown implementation when finding and creating stub manager.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: e5edbc6fa00192a8048a3b81c70075537eaa2c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5edbc6fa00192a8048a3b81c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:58:55 2015 +0200 ole32: Use proper IUnknown implementation when finding and creating stub manager. --- dlls/ole32/compobj.c | 36 ++++++++++-------------------------- dlls/ole32/compobj_private.h | 3 +-- dlls/ole32/marshal.c | 14 +++----------- dlls/ole32/stubmanager.c | 21 +++++++++++++++++---- 4 files changed, 31 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6a30d7d..23c825a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3605,32 +3605,8 @@ HRESULT WINAPI CoLockObjectExternal( apt = COM_CurrentApt(); if (!apt) return CO_E_NOTINITIALIZED; - stubmgr = get_stub_manager_from_object(apt, pUnk); - - if (stubmgr) - { - if (fLock) - stub_manager_ext_addref(stubmgr, 1, FALSE); - else - stub_manager_ext_release(stubmgr, 1, FALSE, fLastUnlockReleases); - - stub_manager_int_release(stubmgr); - - return S_OK; - } - else if (fLock) - { - stubmgr = new_stub_manager(apt, pUnk); - - if (stubmgr) - { - stub_manager_ext_addref(stubmgr, 1, FALSE); - stub_manager_int_release(stubmgr); - } - - return S_OK; - } - else + stubmgr = get_stub_manager_from_object(apt, pUnk, fLock); + if (!stubmgr) { WARN("stub object not found %p\n", pUnk); /* Note: native is pretty broken here because it just silently @@ -3638,6 +3614,14 @@ HRESULT WINAPI CoLockObjectExternal( * think that the object was disconnected, when it actually wasn't */ return S_OK; } + + if (fLock) + stub_manager_ext_addref(stubmgr, 1, FALSE); + else + stub_manager_ext_release(stubmgr, 1, FALSE, fLastUnlockReleases); + + stub_manager_int_release(stubmgr); + return S_OK; } /*********************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 933b71c..f11186c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -185,14 +185,13 @@ HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; /* Stub Manager */ ULONG stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; -struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) DECLSPEC_HIDDEN; ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid) DECLSPEC_HIDDEN; -struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, void *object) DECLSPEC_HIDDEN; +struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *object, BOOL alloc) DECLSPEC_HIDDEN; BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 9a640c9..d142b93 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -132,22 +132,14 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno if (hr != S_OK) return hr; + if (!(manager = get_stub_manager_from_object(apt, object, TRUE))) + return E_OUTOFMEMORY; + stdobjref->flags = SORF_NULL; if (mshlflags & MSHLFLAGS_TABLEWEAK) stdobjref->flags |= SORFP_TABLEWEAK; if (mshlflags & MSHLFLAGS_NOPING) stdobjref->flags |= SORF_NOPING; - - if ((manager = get_stub_manager_from_object(apt, object))) - TRACE("registering new ifstub on pre-existing manager\n"); - else - { - TRACE("constructing new stub manager\n"); - - manager = new_stub_manager(apt, object); - if (!manager) - return E_OUTOFMEMORY; - } stdobjref->oid = manager->oid; tablemarshal = ((mshlflags & MSHLFLAGS_TABLESTRONG) || (mshlflags & MSHLFLAGS_TABLEWEAK)); diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index fda4944..1f79ff5 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -168,7 +168,7 @@ struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHL /* creates a new stub manager and adds it into the apartment. caller must * release stub manager when it is no longer required. the apartment and * external refs together take one implicit ref */ -struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) +static struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) { struct stub_manager *sm; HRESULT hres; @@ -298,10 +298,18 @@ ULONG stub_manager_int_release(struct stub_manager *This) /* gets the stub manager associated with an object - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, void *object) +struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obj, BOOL alloc) { struct stub_manager *result = NULL; struct list *cursor; + IUnknown *object; + HRESULT hres; + + hres = IUnknown_QueryInterface(obj, &IID_IUnknown, (void**)&object); + if (FAILED(hres)) { + ERR("QueryInterface(IID_IUnknown failed): %08x\n", hres); + return NULL; + } EnterCriticalSection(&apt->cs); LIST_FOR_EACH( cursor, &apt->stubmgrs ) @@ -317,11 +325,16 @@ struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, void *object) } LeaveCriticalSection(&apt->cs); - if (result) + if (result) { TRACE("found %p for object %p\n", result, object); - else + }else if (alloc) { + TRACE("not found, creating new stub manager...\n"); + result = new_stub_manager(apt, object); + }else { TRACE("not found for object %p\n", object); + } + IUnknown_Release(object); return result; }

1 0

Jacek Caban : ole32: Create interface stub only if it' s not already created.
by Alexandre Julliard Aug. 31, 2015

Aug. 31, 2015

Module: wine Branch: master Commit: 60451f9855791a6ee4d10ca569153df51249711b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60451f9855791a6ee4d10ca56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 28 14:55:53 2015 +0200 ole32: Create interface stub only if it's not already created. --- dlls/ole32/marshal.c | 92 ++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 14f6a5a..9a640c9 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -122,9 +122,7 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno struct stub_manager *manager; struct ifstub *ifstub; BOOL tablemarshal; - IRpcStubBuffer *stub = NULL; HRESULT hr; - IUnknown *iobject = NULL; /* object of type riid */ hr = apartment_getoxid(apt, &stdobjref->oxid); if (hr != S_OK) @@ -134,39 +132,6 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno if (hr != S_OK) return hr; - hr = IUnknown_QueryInterface(object, riid, (void **)&iobject); - if (hr != S_OK) - { - ERR("object doesn't expose interface %s, failing with error 0x%08x\n", - debugstr_guid(riid), hr); - return E_NOINTERFACE; - } - - /* IUnknown doesn't require a stub buffer, because it never goes out on - * the wire */ - if (!IsEqualIID(riid, &IID_IUnknown)) - { - IPSFactoryBuffer *psfb; - - hr = get_facbuf_for_iid(riid, &psfb); - if (hr != S_OK) - { - ERR("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); - IUnknown_Release(iobject); - return hr; - } - - hr = IPSFactoryBuffer_CreateStub(psfb, riid, iobject, &stub); - IPSFactoryBuffer_Release(psfb); - if (hr != S_OK) - { - ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", - debugstr_guid(riid), hr); - IUnknown_Release(iobject); - return hr; - } - } - stdobjref->flags = SORF_NULL; if (mshlflags & MSHLFLAGS_TABLEWEAK) stdobjref->flags |= SORFP_TABLEWEAK; @@ -181,11 +146,7 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno manager = new_stub_manager(apt, object); if (!manager) - { - if (stub) IRpcStubBuffer_Release(stub); - IUnknown_Release(iobject); return E_OUTOFMEMORY; - } } stdobjref->oid = manager->oid; @@ -193,19 +154,50 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno /* make sure ifstub that we are creating is unique */ ifstub = stub_manager_find_ifstub(manager, riid, mshlflags); - if (!ifstub) - ifstub = stub_manager_new_ifstub(manager, stub, iobject, riid, dest_context, dest_context_data, mshlflags); + if (!ifstub) { + IRpcStubBuffer *stub = NULL; + IUnknown *iobject = NULL; /* object of type riid */ - if (stub) IRpcStubBuffer_Release(stub); - IUnknown_Release(iobject); + hr = IUnknown_QueryInterface(object, riid, (void **)&iobject); + if (hr != S_OK) + ERR("object doesn't expose interface %s, failing with error 0x%08x\n", + debugstr_guid(riid), hr); - if (!ifstub) - { - stub_manager_int_release(manager); - /* destroy the stub manager if it has no ifstubs by releasing - * zero external references */ - stub_manager_ext_release(manager, 0, FALSE, TRUE); - return E_OUTOFMEMORY; + /* IUnknown doesn't require a stub buffer, because it never goes out on + * the wire */ + if (hr == S_OK && !IsEqualIID(riid, &IID_IUnknown)) + { + IPSFactoryBuffer *psfb; + + hr = get_facbuf_for_iid(riid, &psfb); + if (hr == S_OK) { + hr = IPSFactoryBuffer_CreateStub(psfb, riid, manager->object, &stub); + IPSFactoryBuffer_Release(psfb); + if (hr != S_OK) + ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", + debugstr_guid(riid), hr); + }else { + ERR("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); + hr = E_NOINTERFACE; + } + + } + + if (hr == S_OK) { + ifstub = stub_manager_new_ifstub(manager, stub, iobject, riid, dest_context, dest_context_data, mshlflags); + if (!ifstub) + hr = E_OUTOFMEMORY; + } + if (stub) IRpcStubBuffer_Release(stub); + if (iobject) IUnknown_Release(iobject); + + if (hr != S_OK) { + stub_manager_int_release(manager); + /* destroy the stub manager if it has no ifstubs by releasing + * zero external references */ + stub_manager_ext_release(manager, 0, FALSE, TRUE); + return hr; + } } if (!tablemarshal)

1 0