November 2018 - Wine-commits

Julian Rüger : German translation for release 3.16
by Jeremy Newman 09 Nov '18

09 Nov '18

Module: website Branch: master Commit: 824500b5ed180f12ce56acb484ea5aeb8db631f0 URL: https://source.winehq.org/git/website.git/?a=commit;h=824500b5ed180f12ce56a… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 9 11:59:12 2018 +0100 German translation for release 3.16 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018091401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018091401.xml b/news/de/2018091401.xml new file mode 100644 index 0000000..9ff2754 --- /dev/null +++ b/news/de/2018091401.xml @@ -0,0 +1,16 @@ +<news> +<date>14. September 2018</date> +<title>Wine 3.16 freigegeben</title> +<body> + Die Entwicklungsversion 3.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Erste Implementierung der OPC-Dienste.</li> + <li>Unterstützung für das Rendern von Schaltflächen aus einer ImageList.</li> + <li>Verbesserte Unterstützung von CSS-Eigenschaften in MSHTML.</li> + <li>Namespace-Korrekturen im XML-Writer.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.16.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.17
by Jeremy Newman 09 Nov '18

09 Nov '18

Module: website Branch: master Commit: 7e6be2088e8bc0431dada04daf06e0fe12730cb5 URL: https://source.winehq.org/git/website.git/?a=commit;h=7e6be2088e8bc0431dada… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 9 12:02:00 2018 +0100 German translation for release 3.17 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018092801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2018092801.xml b/news/de/2018092801.xml new file mode 100644 index 0000000..ac82bd4 --- /dev/null +++ b/news/de/2018092801.xml @@ -0,0 +1,15 @@ +<news> +<date>28. September 2018</date> +<title>Wine 3.17 freigegeben</title> +<body> + Die Entwicklungsversion 3.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Unterstützung von Shell-Autovervollständigung.</li> + <li>Weitere Implementierung der OPC-Dienste.</li> + <li>Verbesserungen am Standard-Kontrollelement Pager.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.17.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.18
by Jeremy Newman 09 Nov '18

09 Nov '18

Module: website Branch: master Commit: 07ca25e7f7ac629eae88fa58612bff17a6d2cd4f URL: https://source.winehq.org/git/website.git/?a=commit;h=07ca25e7f7ac629eae88f… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 9 12:07:23 2018 +0100 German translation for release 3.18 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018101301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018101301.xml b/news/de/2018101301.xml new file mode 100644 index 0000000..08cd546 --- /dev/null +++ b/news/de/2018101301.xml @@ -0,0 +1,16 @@ +<news> +<date>13. Oktober 2018</date> +<title>Wine 3.18 freigegeben</title> +<body> + Die Entwicklungsversion 3.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Subpixel-Rendering für Schriftarten mit FreeType >= 2.8.1.</li> + <li>Unterstützung des OAEP-Algorithmus bei RSA-Verschlüsselung.</li> + <li>Korrekturen am Array-Marshalling in DCOM.</li> + <li>Bessere DPI-Skalierung der Winekonsole.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.18.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.19
by Jeremy Newman 09 Nov '18

09 Nov '18

Module: website Branch: master Commit: 45268f92b805342057a42ba7c44e4791d2de1d38 URL: https://source.winehq.org/git/website.git/?a=commit;h=45268f92b805342057a42… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 9 12:11:18 2018 +0100 German translation for release 3.19 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018102601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018102601.xml b/news/de/2018102601.xml new file mode 100644 index 0000000..1af3dd1 --- /dev/null +++ b/news/de/2018102601.xml @@ -0,0 +1,16 @@ +<news> +<date>26. Oktober 2018</date> +<title>Wine 3.19 freigegeben</title> +<body> + Die Entwicklungsversion 3.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Komplettierungs-Modi bei Dateioperationen.</li> + <li>WaitOnAddress-Synchronisierungs-Primitive.</li> + <li>Bessere Unterstützung von 32-Bit .NET-Anwendungen unter 64-Bit.</li> + <li>Verbesserte Wiederherstellung von unterbrochenen RPC-Verbindungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.19.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 5e0d1c89ed774e78d60709e5239d56927150d03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e0d1c89ed774e78d60709e5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Nov 8 22:25:07 2018 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index c532949..1224815 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2439,16 +2439,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Olet menestyksekkäästi suoriutunut ohjatusta varmenteen viennistä." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Valitse varmennesäilö" +msgstr "Valitse varmenne" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Valitse varmennesäilö, jota haluat käyttää:" +msgstr "Valitse varmenne, jota haluat käyttää" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2978,20 +2974,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Huomio: Tämän varmenteen yksityistä avainta ei voi viedä." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "Suunniteltu tarkoitus:" +msgstr "Suunniteltu käyttö" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Sijainti" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Valitse varmennesäilö" +msgstr "Valitse varmenne" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented"

1 0

Zebediah Figura : rpcrt4: Add a stub implementation of CreateProxyFromTypeInfo().
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 12021a565a7f2e90952a8ec31cbd779d44e1c26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=12021a565a7f2e90952a8ec3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 3 18:07:13 2018 -0500 rpcrt4: Add a stub implementation of CreateProxyFromTypeInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/cproxy.c | 47 ++---------------------- dlls/rpcrt4/cpsf.h | 20 ++++++++++ dlls/rpcrt4/ndr_typelib.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 43 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 92070ea..ad67edf 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ ndr_marshall.c \ ndr_ole.c \ ndr_stubless.c \ + ndr_typelib.c \ rpc_assoc.c \ rpc_async.c \ rpc_binding.c \ diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 71ae560..7ca05e7 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -42,21 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -/* I don't know what MS's std proxy structure looks like, - so this probably doesn't match, but that shouldn't matter */ -typedef struct { - IRpcProxyBuffer IRpcProxyBuffer_iface; - LPVOID *PVtbl; - LONG RefCount; - const IID* piid; - LPUNKNOWN pUnkOuter; - IUnknown *base_object; /* must be at offset 0x10 from PVtbl */ - IRpcProxyBuffer *base_proxy; - PCInterfaceName name; - LPPSFACTORYBUFFER pPSFactory; - LPRPCCHANNELBUFFER pChannel; -} StdProxyImpl; - static const IRpcProxyBufferVtbl StdProxy_Vtbl; static inline StdProxyImpl *impl_from_IRpcProxyBuffer(IRpcProxyBuffer *iface) @@ -296,9 +281,7 @@ HRESULT StdProxy_Construct(REFIID riid, return S_OK; } -static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, - REFIID riid, - LPVOID *obj) +HRESULT WINAPI StdProxy_QueryInterface(IRpcProxyBuffer *iface, REFIID riid, void **obj) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj); @@ -319,7 +302,7 @@ static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, return E_NOINTERFACE; } -static ULONG WINAPI StdProxy_AddRef(LPRPCPROXYBUFFER iface) +ULONG WINAPI StdProxy_AddRef(IRpcProxyBuffer *iface) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->AddRef()\n",This); @@ -349,8 +332,7 @@ static ULONG WINAPI StdProxy_Release(LPRPCPROXYBUFFER iface) return refs; } -static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, - LPRPCCHANNELBUFFER pChannel) +HRESULT WINAPI StdProxy_Connect(IRpcProxyBuffer *iface, IRpcChannelBuffer *pChannel) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->Connect(%p)\n",This,pChannel); @@ -361,7 +343,7 @@ static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, return S_OK; } -static VOID WINAPI StdProxy_Disconnect(LPRPCPROXYBUFFER iface) +void WINAPI StdProxy_Disconnect(IRpcProxyBuffer *iface) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->Disconnect()\n",This); @@ -532,27 +514,6 @@ HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) } HRESULT WINAPI -CreateProxyFromTypeInfo( LPTYPEINFO pTypeInfo, LPUNKNOWN pUnkOuter, REFIID riid, - LPRPCPROXYBUFFER *ppProxy, LPVOID *ppv ) -{ - typedef INT (WINAPI *MessageBoxA)(HWND,LPCSTR,LPCSTR,UINT); - HMODULE hUser32 = LoadLibraryA("user32"); - MessageBoxA pMessageBoxA = (void *)GetProcAddress(hUser32, "MessageBoxA"); - - FIXME("%p %p %s %p %p\n", pTypeInfo, pUnkOuter, debugstr_guid(riid), ppProxy, ppv); - if (pMessageBoxA) - { - pMessageBoxA(NULL, - "The native implementation of OLEAUT32.DLL cannot be used " - "with Wine's RPCRT4.DLL. Remove OLEAUT32.DLL and try again.\n", - "Wine: Unimplemented CreateProxyFromTypeInfo", - 0x10); - ExitProcess(1); - } - return E_NOTIMPL; -} - -HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *pTypeInfo, REFIID riid, IUnknown *pUnkServer, IRpcStubBuffer **ppStub ) { diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 964fb45..0ada0d1 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -21,9 +21,29 @@ #ifndef __WINE_CPSF_H #define __WINE_CPSF_H +typedef struct +{ + IRpcProxyBuffer IRpcProxyBuffer_iface; + void **PVtbl; + LONG RefCount; + const IID *piid; + IUnknown *pUnkOuter; + /* offset of base_object from PVtbl must match assembly thunks; see + * fill_delegated_proxy_table() */ + IUnknown *base_object; + IRpcProxyBuffer *base_proxy; + PCInterfaceName name; + IPSFactoryBuffer *pPSFactory; + IRpcChannelBuffer *pChannel; +} StdProxyImpl; + HRESULT StdProxy_Construct(REFIID riid, LPUNKNOWN pUnkOuter, const ProxyFileInfo *ProxyInfo, int Index, LPPSFACTORYBUFFER pPSFactory, LPRPCPROXYBUFFER *ppProxy, LPVOID *ppvObj) DECLSPEC_HIDDEN; +HRESULT WINAPI StdProxy_QueryInterface(IRpcProxyBuffer *iface, REFIID iid, void **obj) DECLSPEC_HIDDEN; +ULONG WINAPI StdProxy_AddRef(IRpcProxyBuffer *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI StdProxy_Connect(IRpcProxyBuffer *iface, IRpcChannelBuffer *channel) DECLSPEC_HIDDEN; +void WINAPI StdProxy_Disconnect(IRpcProxyBuffer *iface) DECLSPEC_HIDDEN; HRESULT CStdStubBuffer_Construct(REFIID riid, LPUNKNOWN pUnkServer, PCInterfaceName name, CInterfaceStubVtbl *vtbl, LPPSFACTORYBUFFER pPSFactory, diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c new file mode 100644 index 0000000..13075ac --- /dev/null +++ b/dlls/rpcrt4/ndr_typelib.c @@ -0,0 +1,93 @@ +/* + * Type library proxy/stub implementation + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "oaidl.h" +#include "rpcproxy.h" +#include "wine/debug.h" +#include "wine/heap.h" + +#include "cpsf.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +struct typelib_proxy +{ + StdProxyImpl proxy; +}; + +static ULONG WINAPI typelib_proxy_Release(IRpcProxyBuffer *iface) +{ + struct typelib_proxy *proxy = CONTAINING_RECORD(iface, struct typelib_proxy, proxy.IRpcProxyBuffer_iface); + ULONG refcount = InterlockedDecrement(&proxy->proxy.RefCount); + + TRACE("(%p) decreasing refs to %d\n", proxy, refcount); + + if (!refcount) + { + heap_free(proxy); + } + return refcount; +} + +static const IRpcProxyBufferVtbl typelib_proxy_vtbl = +{ + StdProxy_QueryInterface, + StdProxy_AddRef, + typelib_proxy_Release, + StdProxy_Connect, + StdProxy_Disconnect, +}; + +static HRESULT typelib_proxy_init(struct typelib_proxy *proxy, IUnknown *outer, + IRpcProxyBuffer **proxy_buffer, void **out) +{ + if (!outer) outer = (IUnknown *)&proxy->proxy; + + proxy->proxy.IRpcProxyBuffer_iface.lpVtbl = &typelib_proxy_vtbl; + proxy->proxy.RefCount = 1; + proxy->proxy.pUnkOuter = outer; + + *proxy_buffer = &proxy->proxy.IRpcProxyBuffer_iface; + + return E_NOTIMPL; +} + +HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, + REFIID iid, IRpcProxyBuffer **proxy_buffer, void **out) +{ + struct typelib_proxy *proxy; + HRESULT hr; + + TRACE("typeinfo %p, outer %p, iid %s, proxy %p, out %p.\n", + typeinfo, outer, debugstr_guid(iid), proxy_buffer, out); + + if (!(proxy = heap_alloc_zero(sizeof(*proxy)))) + { + ERR("Failed to allocate proxy object.\n"); + return E_OUTOFMEMORY; + } + + hr = typelib_proxy_init(proxy, outer, proxy_buffer, out); + if (FAILED(hr)) + heap_free(proxy); + + return hr; +}

1 0

Zebediah Figura : rpcrt4: Add a stub implementation of CreateStubFromTypeInfo().
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 57493dc224fcfcb0cffc2894cf8c9522e8de8c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57493dc224fcfcb0cffc2894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 3 18:07:14 2018 -0500 rpcrt4: Add a stub implementation of CreateStubFromTypeInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 21 --------------------- dlls/rpcrt4/ndr_typelib.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 7ca05e7..6f15ed5 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -512,24 +512,3 @@ HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) else return HRESULT_FROM_WIN32(dwExceptionCode); } - -HRESULT WINAPI -CreateStubFromTypeInfo(ITypeInfo *pTypeInfo, REFIID riid, IUnknown *pUnkServer, - IRpcStubBuffer **ppStub ) -{ - typedef INT (WINAPI *MessageBoxA)(HWND,LPCSTR,LPCSTR,UINT); - HMODULE hUser32 = LoadLibraryA("user32"); - MessageBoxA pMessageBoxA = (void *)GetProcAddress(hUser32, "MessageBoxA"); - - FIXME("%p %s %p %p\n", pTypeInfo, debugstr_guid(riid), pUnkServer, ppStub); - if (pMessageBoxA) - { - pMessageBoxA(NULL, - "The native implementation of OLEAUT32.DLL cannot be used " - "with Wine's RPCRT4.DLL. Remove OLEAUT32.DLL and try again.\n", - "Wine: Unimplemented CreateProxyFromTypeInfo", - 0x10); - ExitProcess(1); - } - return E_NOTIMPL; -} diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 13075ac..c0db6b7 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -91,3 +91,39 @@ HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, return hr; } + +struct typelib_stub +{ + CStdStubBuffer stub; +}; + +static HRESULT typelib_stub_init(struct typelib_stub *stub, IUnknown *server, + IRpcStubBuffer **stub_buffer) +{ + stub->stub.RefCount = 1; + *stub_buffer = (IRpcStubBuffer *)&stub->stub; + + return E_NOTIMPL; +} + +HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *typeinfo, REFIID iid, + IUnknown *server, IRpcStubBuffer **stub_buffer) +{ + struct typelib_stub *stub; + HRESULT hr; + + TRACE("typeinfo %p, iid %s, server %p, stub_buffer %p.\n", + typeinfo, debugstr_guid(iid), server, stub_buffer); + + if (!(stub = heap_alloc_zero(sizeof(*stub)))) + { + ERR("Failed to allocate stub object.\n"); + return E_OUTOFMEMORY; + } + + hr = typelib_stub_init(stub, server, stub_buffer); + if (FAILED(hr)) + heap_free(stub); + + return hr; +}

1 0

Zebediah Figura : rpcrt4: Build the typelib proxy headers.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 297d9cabb832c182f44f0891100cbd962fc9fc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=297d9cabb832c182f44f0891… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 3 18:07:15 2018 -0500 rpcrt4: Build the typelib proxy headers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 2 +- dlls/rpcrt4/cpsf.h | 1 + dlls/rpcrt4/ndr_typelib.c | 112 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 110 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6f15ed5..ab24b81 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -197,7 +197,7 @@ static const struct thunk *allocate_block( unsigned int num ) return block; } -static BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) +BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) { const void **entry = (const void **)(vtbl + 1); DWORD i, j; diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 0ada0d1..c8980e5 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -61,5 +61,6 @@ extern const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl DECLSPEC_HIDDEN; BOOL fill_delegated_proxy_table(IUnknownVtbl *vtbl, DWORD num) DECLSPEC_HIDDEN; HRESULT create_proxy(REFIID iid, IUnknown *pUnkOuter, IRpcProxyBuffer **pproxy, void **ppv) DECLSPEC_HIDDEN; HRESULT create_stub(REFIID iid, IUnknown *pUnk, IRpcStubBuffer **ppstub) DECLSPEC_HIDDEN; +BOOL fill_stubless_table(IUnknownVtbl *vtbl, DWORD num) DECLSPEC_HIDDEN; #endif /* __WINE_CPSF_H */ diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index c0db6b7..25c4183 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "oaidl.h" +#define USE_STUBLESS_PROXY #include "rpcproxy.h" #include "wine/debug.h" #include "wine/heap.h" @@ -28,9 +29,62 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +static HRESULT build_format_strings(ITypeInfo *typeinfo, WORD funcs, + const unsigned char **type_ret, const unsigned char **proc_ret, + unsigned short **offset_ret) +{ + return E_NOTIMPL; +} + +/* Common helper for Create{Proxy,Stub}FromTypeInfo(). */ +static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfuncs) +{ + TYPEATTR *typeattr; + ITypeLib *typelib; + TLIBATTR *libattr; + SYSKIND syskind; + HRESULT hr; + + hr = ITypeInfo_GetContainingTypeLib(typeinfo, &typelib, NULL); + if (FAILED(hr)) + return hr; + + hr = ITypeLib_GetLibAttr(typelib, &libattr); + if (FAILED(hr)) + { + ITypeLib_Release(typelib); + return hr; + } + syskind = libattr->syskind; + ITypeLib_ReleaseTLibAttr(typelib, libattr); + ITypeLib_Release(typelib); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + if (FAILED(hr)) + return hr; + *funcs = typeattr->cFuncs; + *parentfuncs = typeattr->cbSizeVft / (syskind == SYS_WIN64 ? 8 : 4) - *funcs; + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); + + return S_OK; +} + +static void init_stub_desc(MIDL_STUB_DESC *desc) +{ + desc->pfnAllocate = NdrOleAllocate; + desc->pfnFree = NdrOleFree; + desc->Version = 0x50002; + /* type format string is initialized with proc format string and offset table */ +} + struct typelib_proxy { StdProxyImpl proxy; + IID iid; + MIDL_STUB_DESC stub_desc; + MIDL_STUBLESS_PROXY_INFO proxy_info; + CInterfaceProxyVtbl *proxy_vtbl; + unsigned short *offset_table; }; static ULONG WINAPI typelib_proxy_Release(IRpcProxyBuffer *iface) @@ -42,6 +96,12 @@ static ULONG WINAPI typelib_proxy_Release(IRpcProxyBuffer *iface) if (!refcount) { + if (proxy->proxy.pChannel) + IRpcProxyBuffer_Disconnect(&proxy->proxy.IRpcProxyBuffer_iface); + heap_free((void *)proxy->stub_desc.pFormatTypes); + heap_free((void *)proxy->proxy_info.ProcFormatString); + heap_free(proxy->offset_table); + heap_free(proxy->proxy_vtbl); heap_free(proxy); } return refcount; @@ -57,37 +117,81 @@ static const IRpcProxyBufferVtbl typelib_proxy_vtbl = }; static HRESULT typelib_proxy_init(struct typelib_proxy *proxy, IUnknown *outer, - IRpcProxyBuffer **proxy_buffer, void **out) + ULONG count, IRpcProxyBuffer **proxy_buffer, void **out) { + if (!fill_stubless_table((IUnknownVtbl *)proxy->proxy_vtbl->Vtbl, count)) + return E_OUTOFMEMORY; + if (!outer) outer = (IUnknown *)&proxy->proxy; proxy->proxy.IRpcProxyBuffer_iface.lpVtbl = &typelib_proxy_vtbl; + proxy->proxy.PVtbl = proxy->proxy_vtbl->Vtbl; proxy->proxy.RefCount = 1; + proxy->proxy.piid = proxy->proxy_vtbl->header.piid; proxy->proxy.pUnkOuter = outer; *proxy_buffer = &proxy->proxy.IRpcProxyBuffer_iface; + *out = &proxy->proxy.PVtbl; + IUnknown_AddRef((IUnknown *)*out); - return E_NOTIMPL; + return S_OK; } HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, REFIID iid, IRpcProxyBuffer **proxy_buffer, void **out) { struct typelib_proxy *proxy; + WORD funcs, parentfuncs, i; HRESULT hr; - TRACE("typeinfo %p, outer %p, iid %s, proxy %p, out %p.\n", + TRACE("typeinfo %p, outer %p, iid %s, proxy_buffer %p, out %p.\n", typeinfo, outer, debugstr_guid(iid), proxy_buffer, out); + hr = get_iface_info(typeinfo, &funcs, &parentfuncs); + if (FAILED(hr)) + return hr; + if (!(proxy = heap_alloc_zero(sizeof(*proxy)))) { ERR("Failed to allocate proxy object.\n"); return E_OUTOFMEMORY; } - hr = typelib_proxy_init(proxy, outer, proxy_buffer, out); + init_stub_desc(&proxy->stub_desc); + proxy->proxy_info.pStubDesc = &proxy->stub_desc; + + proxy->proxy_vtbl = heap_alloc_zero(sizeof(proxy->proxy_vtbl->header) + (funcs + parentfuncs) * sizeof(void *)); + if (!proxy->proxy_vtbl) + { + ERR("Failed to allocate proxy vtbl.\n"); + heap_free(proxy); + return E_OUTOFMEMORY; + } + proxy->proxy_vtbl->header.pStublessProxyInfo = &proxy->proxy_info; + proxy->iid = *iid; + proxy->proxy_vtbl->header.piid = &proxy->iid; + for (i = 0; i < funcs; i++) + proxy->proxy_vtbl->Vtbl[3 + i] = (void *)-1; + + hr = build_format_strings(typeinfo, funcs, &proxy->stub_desc.pFormatTypes, + &proxy->proxy_info.ProcFormatString, &proxy->offset_table); + if (FAILED(hr)) + { + heap_free(proxy->proxy_vtbl); + heap_free(proxy); + return hr; + } + proxy->proxy_info.FormatStringOffset = &proxy->offset_table[-3]; + + hr = typelib_proxy_init(proxy, outer, funcs + parentfuncs, proxy_buffer, out); if (FAILED(hr)) + { + heap_free((void *)proxy->stub_desc.pFormatTypes); + heap_free((void *)proxy->proxy_info.ProcFormatString); + heap_free((void *)proxy->offset_table); + heap_free(proxy->proxy_vtbl); heap_free(proxy); + } return hr; }

1 0

Zebediah Figura : rpcrt4: Build the typelib stub headers.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: ad3e8134ac66e4b1dae685b974f0b27010432336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad3e8134ac66e4b1dae685b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 3 18:07:16 2018 -0500 rpcrt4: Build the typelib stub headers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 25c4183..aa54db2 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -199,35 +199,104 @@ HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, struct typelib_stub { CStdStubBuffer stub; + IID iid; + MIDL_STUB_DESC stub_desc; + MIDL_SERVER_INFO server_info; + CInterfaceStubVtbl stub_vtbl; + unsigned short *offset_table; }; +static ULONG WINAPI typelib_stub_Release(IRpcStubBuffer *iface) +{ + struct typelib_stub *stub = CONTAINING_RECORD(iface, struct typelib_stub, stub); + ULONG refcount = InterlockedDecrement(&stub->stub.RefCount); + + TRACE("(%p) decreasing refs to %d\n", stub, refcount); + + if (!refcount) + { + /* test_Release shows that native doesn't call Disconnect here. + We'll leave it in for the time being. */ + IRpcStubBuffer_Disconnect(iface); + + heap_free((void *)stub->stub_desc.pFormatTypes); + heap_free((void *)stub->server_info.ProcString); + heap_free(stub->offset_table); + heap_free(stub); + } + + return refcount; +} + static HRESULT typelib_stub_init(struct typelib_stub *stub, IUnknown *server, IRpcStubBuffer **stub_buffer) { + HRESULT hr; + + hr = IUnknown_QueryInterface(server, stub->stub_vtbl.header.piid, + (void **)&stub->stub.pvServerObject); + if (FAILED(hr)) + { + WARN("Failed to get interface %s, hr %#x.\n", + debugstr_guid(stub->stub_vtbl.header.piid), hr); + stub->stub.pvServerObject = server; + IUnknown_AddRef(server); + } + + stub->stub.lpVtbl = &stub->stub_vtbl.Vtbl; stub->stub.RefCount = 1; - *stub_buffer = (IRpcStubBuffer *)&stub->stub; - return E_NOTIMPL; + *stub_buffer = (IRpcStubBuffer *)&stub->stub; + return S_OK; } HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *typeinfo, REFIID iid, IUnknown *server, IRpcStubBuffer **stub_buffer) { struct typelib_stub *stub; + WORD funcs, parentfuncs; HRESULT hr; TRACE("typeinfo %p, iid %s, server %p, stub_buffer %p.\n", typeinfo, debugstr_guid(iid), server, stub_buffer); + hr = get_iface_info(typeinfo, &funcs, &parentfuncs); + if (FAILED(hr)) + return hr; + if (!(stub = heap_alloc_zero(sizeof(*stub)))) { ERR("Failed to allocate stub object.\n"); return E_OUTOFMEMORY; } + init_stub_desc(&stub->stub_desc); + stub->server_info.pStubDesc = &stub->stub_desc; + + hr = build_format_strings(typeinfo, funcs, &stub->stub_desc.pFormatTypes, + &stub->server_info.ProcString, &stub->offset_table); + if (FAILED(hr)) + { + heap_free(stub); + return hr; + } + stub->server_info.FmtStringOffset = &stub->offset_table[-3]; + + stub->iid = *iid; + stub->stub_vtbl.header.piid = &stub->iid; + stub->stub_vtbl.header.pServerInfo = &stub->server_info; + stub->stub_vtbl.header.DispatchTableCount = funcs + parentfuncs; + stub->stub_vtbl.Vtbl = CStdStubBuffer_Vtbl; + stub->stub_vtbl.Vtbl.Release = typelib_stub_Release; + hr = typelib_stub_init(stub, server, stub_buffer); if (FAILED(hr)) + { + heap_free((void *)stub->stub_desc.pFormatTypes); + heap_free((void *)stub->server_info.ProcString); + heap_free(stub->offset_table); heap_free(stub); + } return hr; }

1 0

Alexandre Julliard : makefiles: Support file-specific IDL flags.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 39b24fa3faf94974eded06b2f14ec36562c8cf60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b24fa3faf94974eded06b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 18:54:21 2018 +0100 makefiles: Support file-specific IDL flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 66b21db..e3bb04a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2648,6 +2648,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames( make->define_args ); output_filenames( extradefs ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); + output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); output_filename( source->filename ); output( "\n" ); output_filenames_obj_dir( make, targets );

1 0