wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Jacek Caban : rpcrt4: Moved formatting pipe names to helper functions.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 6c40b63d3e88f0117267ebb64db152fb6c8754f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c40b63d3e88f0117267ebb64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 27 19:27:48 2015 +0100 rpcrt4: Moved formatting pipe names to helper functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 53 +++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fbc2ad7..932fa64 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -247,10 +247,21 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, return RPC_S_OK; } +static char *ncalrpc_pipe_name(const char *endpoint) +{ + static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; + char *pipe_name; + + /* protseq=ncalrpc: supposed to use NT LPC ports, + * but we'll implement it with named pipes for now */ + pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(endpoint)); + strcat(strcpy(pipe_name, prefix), endpoint); + return pipe_name; +} + static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; LPSTR pname; @@ -258,10 +269,7 @@ static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) if (npc->pipe) return RPC_S_OK; - /* protseq=ncalrpc: supposed to use NT LPC ports, - * but we'll implement it with named pipes for now */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncalrpc_pipe_name(Connection->Endpoint); r = rpcrt4_conn_open_pipe(Connection, pname, TRUE); I_RpcFree(pname); @@ -270,7 +278,6 @@ static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, const char *endpoint) { - static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; LPSTR pname; RpcConnection *Connection; @@ -291,10 +298,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq if (r != RPC_S_OK) return r; - /* protseq=ncalrpc: supposed to use NT LPC ports, - * but we'll implement it with named pipes for now */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncalrpc_pipe_name(Connection->Endpoint); r = rpcrt4_conn_create_pipe(Connection, pname); I_RpcFree(pname); @@ -306,10 +310,20 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq return r; } +static char *ncacn_pipe_name(const char *endpoint) +{ + static const char prefix[] = "\\\\."; + char *pipe_name; + + /* protseq=ncacn_np: named pipes */ + pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(endpoint)); + strcat(strcpy(pipe_name, prefix), endpoint); + return pipe_name; +} + static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - static const char prefix[] = "\\\\."; RPC_STATUS r; LPSTR pname; @@ -317,9 +331,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) if (npc->pipe) return RPC_S_OK; - /* protseq=ncacn_np: named pipes */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncacn_pipe_name(Connection->Endpoint); r = rpcrt4_conn_open_pipe(Connection, pname, FALSE); I_RpcFree(pname); @@ -328,7 +340,6 @@ static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, const char *endpoint) { - static const char prefix[] = "\\\\."; RPC_STATUS r; LPSTR pname; RpcConnection *Connection; @@ -349,9 +360,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse if (r != RPC_S_OK) return r; - /* protseq=ncacn_np: named pipes */ - pname = I_RpcAllocate(strlen(prefix) + strlen(Connection->Endpoint) + 1); - strcat(strcpy(pname, prefix), Connection->Endpoint); + pname = ncacn_pipe_name(Connection->Endpoint); r = rpcrt4_conn_create_pipe(Connection, pname); I_RpcFree(pname); @@ -379,12 +388,10 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection { RPC_STATUS status; LPSTR pname; - static const char prefix[] = "\\\\."; rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - pname = I_RpcAllocate(strlen(prefix) + strlen(old_conn->Endpoint) + 1); - strcat(strcpy(pname, prefix), old_conn->Endpoint); + pname = ncacn_pipe_name(old_conn->Endpoint); status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); @@ -395,14 +402,12 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection { RPC_STATUS status; LPSTR pname; - static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; TRACE("%s\n", old_conn->Endpoint); rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); - pname = I_RpcAllocate(strlen(prefix) + strlen(old_conn->Endpoint) + 1); - strcat(strcpy(pname, prefix), old_conn->Endpoint); + pname = ncalrpc_pipe_name(old_conn->Endpoint); status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname);

1 0

Sebastian Lackner : gdiplus: Use the correct memory allocation function for PropVariants.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 2fdccc247e7ad136f30f8cabcb0fc1143ab37bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdccc247e7ad136f30f8cabc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 21 00:52:51 2015 +0200 gdiplus: Use the correct memory allocation function for PropVariants. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6725de8..1cef100 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3065,7 +3065,7 @@ static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, cons PropVariantInit(&value); id.vt = VT_LPWSTR; - id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); if (!id.u.pwszVal) return FALSE; lstrcpyW(id.u.pwszVal, prop_name); hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); @@ -3092,7 +3092,7 @@ static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, PropVariantInit(&value); id.vt = VT_LPWSTR; - id.u.pwszVal = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); if (!id.u.pwszVal) return NULL; lstrcpyW(id.u.pwszVal, prop_name); hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value);

1 0

Vincent Povirk : maintainers: Add myself.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: e914629415d96f0f36b0d8e90ac965803af509f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e914629415d96f0f36b0d8e90… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 27 16:04:05 2015 -0500 maintainers: Add myself. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b425b52..a5d3a39 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -51,6 +51,11 @@ Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ +Common Item Dialog +P: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/comdlg32/itemdlg.c +F: dlls/comdlg32/tests/itemdlg.c + Direct2D M: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ @@ -87,6 +92,14 @@ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ +DotNet Runtime +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/mscoree/ + +GDIPlus +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/gdiplus/ + HID support M: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/ @@ -127,6 +140,15 @@ Netstat M: André Hentschel <nerv(a)dawncrow.de> F: programs/netstat/ +OLE Storage +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/ole32/filelockbytes.c +F: dlls/ole32/memlockbytes.c +F: dlls/ole32/stg_stream.c +F: dlls/ole32/storage32.c +F: dlls/ole32/storage32.h +F: dlls/ole32/tests/storage32.c + OLE Typelibs P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/oleaut32/typelib.c @@ -143,6 +165,11 @@ Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ +Windows Imaging Component +M: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/windowscodecs/ +F: dlls/windowscodecsext/ + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> @@ -160,6 +187,11 @@ VB Script M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/vbscript/ +X11 Driver +M: Alexandre Julliard <julliard(a)winehq.org> +P: Vincent Povirk <vincent(a)codeweavers.com> +F: dlls/winex11.drv/ + XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/msxml*/ @@ -168,5 +200,6 @@ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Alex Henrie <alexhenrie24(a)gmail.com> +P: Vincent Povirk <vincent(a)codeweavers.com> F: * F: */

1 0

Huw Davies : ole32: Fix ref counting in GetDataHere Proxy.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 28b916b26eceb35a071e9aad76da1fbbaa857ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b916b26eceb35a071e9aad7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:34 2015 +0000 ole32: Fix ref counting in GetDataHere Proxy. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 236 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/usrmarshal.c | 38 +++++-- 2 files changed, 267 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index c68689c..529ad75 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -85,6 +85,91 @@ static void init_user_marshal_cb(USER_MARSHAL_CB *umcb, umcb->CBType = buffer ? USER_MARSHAL_CB_UNMARSHALL : USER_MARSHAL_CB_BUFFER_SIZE; } +#define RELEASEMARSHALDATA WM_USER + +struct host_object_data +{ + IStream *stream; + IID iid; + IUnknown *object; + MSHLFLAGS marshal_flags; + HANDLE marshal_event; + IMessageFilter *filter; +}; + +static DWORD CALLBACK host_object_proc(LPVOID p) +{ + struct host_object_data *data = p; + HRESULT hr; + MSG msg; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + if (data->filter) + { + IMessageFilter * prev_filter = NULL; + hr = CoRegisterMessageFilter(data->filter, &prev_filter); + if (prev_filter) IMessageFilter_Release(prev_filter); + ok(hr == S_OK, "got %08x\n", hr); + } + + hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); + ok(hr == S_OK, "got %08x\n", hr); + + /* force the message queue to be created before signaling parent thread */ + PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(data->marshal_event); + + while (GetMessageA(&msg, NULL, 0, 0)) + { + if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) + { + CoReleaseMarshalData(data->stream); + SetEvent((HANDLE)msg.lParam); + } + else + DispatchMessageA(&msg); + } + + HeapFree(GetProcessHeap(), 0, data); + + CoUninitialize(); + + return hr; +} + +static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread) +{ + DWORD tid = 0; + HANDLE marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); + struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + + data->stream = stream; + data->iid = *riid; + data->object = object; + data->marshal_flags = marshal_flags; + data->marshal_event = marshal_event; + data->filter = filter; + + *thread = CreateThread(NULL, 0, host_object_proc, data, 0, &tid); + + /* wait for marshaling to complete before returning */ + ok( !WaitForSingleObject(marshal_event, 10000), "wait timed out\n" ); + CloseHandle(marshal_event); + + return tid; +} + +static void end_host_object(DWORD tid, HANDLE thread) +{ + BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); + ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); + /* be careful of races - don't return until hosting thread has terminated */ + ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); + CloseHandle(thread); +} + static const char cf_marshaled[] = { 0x9, 0x0, 0x0, 0x0, @@ -1105,9 +1190,156 @@ static void test_marshal_HBRUSH(void) DeleteObject(hBrush); } +struct obj +{ + IDataObject IDataObject_iface; +}; + +static HRESULT WINAPI obj_QueryInterface(IDataObject *iface, REFIID iid, void **obj) +{ + *obj = NULL; + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IDataObject)) + *obj = iface; + + if (*obj) + { + IDataObject_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI obj_AddRef(IDataObject *iface) +{ + return 2; +} + +static ULONG WINAPI obj_Release(IDataObject *iface) +{ + return 1; +} + +static HRESULT WINAPI obj_DO_GetDataHere(IDataObject *iface, FORMATETC *fmt, + STGMEDIUM *med) +{ + ok( med->pUnkForRelease == NULL, "got %p\n", med->pUnkForRelease ); + + if (fmt->cfFormat == 2) + { + IStream_Release(U(med)->pstm); + U(med)->pstm = &Test_Stream2.IStream_iface; + } + + return S_OK; +} + +static const IDataObjectVtbl obj_data_object_vtbl = +{ + obj_QueryInterface, + obj_AddRef, + obj_Release, + NULL, /* GetData */ + obj_DO_GetDataHere, + NULL, /* QueryGetData */ + NULL, /* GetCanonicalFormatEtc */ + NULL, /* SetData */ + NULL, /* EnumFormatEtc */ + NULL, /* DAdvise */ + NULL, /* DUnadvise */ + NULL /* EnumDAdvise */ +}; + +static struct obj obj = +{ + {&obj_data_object_vtbl} +}; + +static void test_GetDataHere_Proxy(void) +{ + HRESULT hr; + IStream *stm; + HANDLE thread; + DWORD tid; + static const LARGE_INTEGER zero; + IDataObject *data; + FORMATETC fmt; + STGMEDIUM med; + + hr = CreateStreamOnHGlobal( NULL, TRUE, &stm ); + ok( hr == S_OK, "got %08x\n", hr ); + tid = start_host_object2( stm, &IID_IDataObject, (IUnknown *)&obj.IDataObject_iface, MSHLFLAGS_NORMAL, NULL, &thread ); + + IStream_Seek( stm, zero, STREAM_SEEK_SET, NULL ); + hr = CoUnmarshalInterface( stm, &IID_IDataObject, (void **)&data ); + ok( hr == S_OK, "got %08x\n", hr ); + IStream_Release( stm ); + + Test_Stream.refs = 1; + Test_Stream2.refs = 1; + Test_Unknown.refs = 1; + + fmt.cfFormat = 1; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + U(med).pstm = NULL; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + fmt.tymed = med.tymed = TYMED_NULL; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + + for (fmt.tymed = TYMED_HGLOBAL; fmt.tymed <= TYMED_ENHMF; fmt.tymed <<= 1) + { + med.tymed = fmt.tymed; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == (fmt.tymed <= TYMED_ISTORAGE ? S_OK : DV_E_TYMED), "got %08x for tymed %d\n", hr, fmt.tymed ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + } + + fmt.tymed = TYMED_ISTREAM; + med.tymed = TYMED_ISTORAGE; + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + + fmt.tymed = med.tymed = TYMED_ISTREAM; + U(med).pstm = &Test_Stream.IStream_iface; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + + ok( U(med).pstm == &Test_Stream.IStream_iface, "stm changed\n" ); + ok( med.pUnkForRelease == &Test_Unknown.IUnknown_iface, "punk changed\n" ); + + ok( Test_Stream.refs == 1, "got %d\n", Test_Stream.refs ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + + fmt.cfFormat = 2; + fmt.tymed = med.tymed = TYMED_ISTREAM; + U(med).pstm = &Test_Stream.IStream_iface; + med.pUnkForRelease = &Test_Unknown.IUnknown_iface; + + hr = IDataObject_GetDataHere( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + + ok( U(med).pstm == &Test_Stream.IStream_iface, "stm changed\n" ); + ok( med.pUnkForRelease == &Test_Unknown.IUnknown_iface, "punk changed\n" ); + + ok( Test_Stream.refs == 1, "got %d\n", Test_Stream.refs ); + ok( Test_Unknown.refs == 1, "got %d\n", Test_Unknown.refs ); + ok( Test_Stream2.refs == 0, "got %d\n", Test_Stream2.refs ); + + IDataObject_Release( data ); + end_host_object( tid, thread ); +} + START_TEST(usrmarshal) { - CoInitialize(NULL); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_marshal_CLIPFORMAT(); test_marshal_HWND(); @@ -1122,5 +1354,7 @@ START_TEST(usrmarshal) test_marshal_HICON(); test_marshal_HBRUSH(); + test_GetDataHere_Proxy(); + CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 1a3f6af..89d0675 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2783,13 +2783,39 @@ HRESULT __RPC_STUB IDataObject_GetData_Stub( return IDataObject_GetData(This, pformatetcIn, pRemoteMedium); } -HRESULT CALLBACK IDataObject_GetDataHere_Proxy( - IDataObject* This, - FORMATETC *pformatetc, - STGMEDIUM *pmedium) +HRESULT CALLBACK IDataObject_GetDataHere_Proxy(IDataObject *iface, FORMATETC *fmt, STGMEDIUM *med) { - TRACE("(%p)->(%p, %p)\n", This, pformatetc, pmedium); - return IDataObject_RemoteGetDataHere_Proxy(This, pformatetc, pmedium); + IUnknown *release; + IStorage *stg = NULL; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", iface, fmt, med); + + if ((med->tymed & (TYMED_HGLOBAL | TYMED_FILE | TYMED_ISTREAM | TYMED_ISTORAGE)) == 0) + return DV_E_TYMED; + if (med->tymed != fmt->tymed) + return DV_E_TYMED; + + release = med->pUnkForRelease; + med->pUnkForRelease = NULL; + + if (med->tymed == TYMED_ISTREAM || med->tymed == TYMED_ISTORAGE) + { + stg = med->u.pstg; /* This may actually be a stream, but that's ok */ + if (stg) IStorage_AddRef( stg ); + } + + hr = IDataObject_RemoteGetDataHere_Proxy(iface, fmt, med); + + med->pUnkForRelease = release; + if (stg) + { + if (med->u.pstg) + IStorage_Release( med->u.pstg ); + med->u.pstg = stg; + } + + return hr; } HRESULT __RPC_STUB IDataObject_GetDataHere_Stub(

1 0

Huw Davies : ole32: Correctly release an existing pointer when unmarshalling a NULL-ptr.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: ced5800b99d3251f372102bd23fb25df15debc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced5800b99d3251f372102bd2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:33 2015 +0000 ole32: Correctly release an existing pointer when unmarshalling a NULL-ptr. However, this should not be done in the case of pUnkForRelease. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 116 +++++++++++++++++++++++++++++++++++++----- dlls/ole32/usrmarshal.c | 9 +++- 2 files changed, 111 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ced5800b99d3251f37210…

1 0

Huw Davies : ole32/tests: Release the marshalled data in the expected buffers.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 9021b96772b31f54349bcae076910d2a2f2b5a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9021b96772b31f54349bcae07… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:32 2015 +0000 ole32/tests: Release the marshalled data in the expected buffers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 756e820..0ab4634 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -699,6 +699,8 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); expect_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 2 * sizeof(DWORD), unk, &IID_IUnknown); expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); + *(DWORD*)expect_buffer = TYMED_NULL; + *((DWORD*)expect_buffer + 1) = 0xdeadbeef; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 2 * sizeof(DWORD), unk, &IID_IUnknown); @@ -735,6 +737,14 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; + med2.pUnkForRelease = NULL; + STGMEDIUM_UserUnmarshal(&umcb.Flags, expect_buffer, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + HeapFree(GetProcessHeap(), 0, expect_buffer); /* TYMED_ISTREAM with pUnkForRelease */ @@ -746,6 +756,9 @@ static void test_marshal_STGMEDIUM(void) expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); /* There may be a hole between the two interfaces so init the buffer to something */ memset(expect_buffer, 0xcc, expect_size); + *(DWORD*)expect_buffer = TYMED_ISTREAM; + *((DWORD*)expect_buffer + 1) = 0xdeadbeef; + *((DWORD*)expect_buffer + 2) = 0xcafe; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 3 * sizeof(DWORD), (IUnknown*)stm, &IID_IStream); expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer_end, unk, &IID_IUnknown); @@ -786,6 +799,14 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + med2.tymed = TYMED_NULL; + U(med2).pstm = NULL; + med2.pUnkForRelease = NULL; + STGMEDIUM_UserUnmarshal(&umcb.Flags, expect_buffer, &med2); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + STGMEDIUM_UserFree(&umcb.Flags, &med2); + HeapFree(GetProcessHeap(), 0, expect_buffer); }

1 0

Huw Davies : ole32: WdtpInterfacePointer_UserUnmarshal() should release an interface if one is passed in.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 6aa797e66999780c306165d03a41e5061a12e9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa797e66999780c306165d03… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:31 2015 +0000 ole32: WdtpInterfacePointer_UserUnmarshal() should release an interface if one is passed in. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/usrmarshal.c | 32 ++++++++++++++++++++++++-------- dlls/ole32/usrmarshal.c | 4 ++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 23cb910..756e820 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -563,13 +563,14 @@ static const IStreamVtbl TestStream_Vtbl = }; static TestUnknown Test_Unknown = { {&TestUnknown_Vtbl}, 1 }; +static TestUnknown Test_Unknown2 = { {&TestUnknown_Vtbl}, 1 }; static IStream Test_Stream = { &TestStream_Vtbl }; ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsigned char *, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserUnmarshal(ULONG *, unsigned char *, IUnknown **, REFIID); -static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) +static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx, BOOL client, BOOL in, BOOL out) { USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; @@ -638,11 +639,17 @@ todo_wine CoReleaseMarshalData(stm); IStream_Release(stm); - unk2 = NULL; + Test_Unknown2.refs = 1; + unk2 = &Test_Unknown2.IUnknown_iface; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); + umcb.pStubMsg->IsClient = client; + umcb.pStubMsg->fIsIn = in; + umcb.pStubMsg->fIsOut = out; + WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); + ok(Test_Unknown2.refs == 0, "got %d\n", Test_Unknown2.refs); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); IUnknown_Release(unk2); @@ -657,14 +664,23 @@ static void test_marshal_WdtpInterfacePointer(void) */ /* All three are marshalled as inproc */ - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_INPROC); - marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC); - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_INPROC, 0xffff)); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_INPROC, 0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_INPROC,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_INPROC, 0xffff),0,0,0); /* All three are marshalled as remote */ - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE); - marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_DIFFERENTMACHINE); - marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff)); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_DIFFERENTMACHINE, MSHCTX_DIFFERENTMACHINE,0,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MAKELONG(MSHCTX_DIFFERENTMACHINE, 0xffff),0,0,0); + + /* Test different combinations of client, in and out */ + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,0,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,1,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,0,1,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,0,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,0,1); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,1,0); + marshal_WdtpInterfacePointer(MSHCTX_INPROC, MSHCTX_DIFFERENTMACHINE,1,1,1); } static void test_marshal_STGMEDIUM(void) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index fe8ff4f..3184be6 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1490,6 +1490,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigne IStream *stm; DWORD size; void *ptr; + IUnknown *orig; TRACE("(%s, %p, %p, %s)\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); @@ -1517,11 +1518,14 @@ unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigne memcpy(ptr, pBuffer, size); GlobalUnlock(h); + orig = *ppunk; hr = CoUnmarshalInterface(stm, riid, (void**)ppunk); IStream_Release(stm); if(hr != S_OK) RaiseException(hr, 0, 0, NULL); + if(orig) IUnknown_Release(orig); + return pBuffer + size; }

1 0

Huw Davies : oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal ().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 9ed47775d6a789f0c397c622279ab861a3e8425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed47775d6a789f0c397c6222… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:30 2015 +0000 oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal(). The code has already called VariantClear() which has released the interface yet not set it to NULL. This is to prevent a double-release after a forthcoming patch to WdtpInterfacePointer_UserUnmarshal(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 39a5f8c..303ec69 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -349,11 +349,12 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char * ptr = *(DWORD*)Buffer; Buffer += sizeof(DWORD); + /* Clear any existing interface which WdtpInterfacePointer_UserUnmarshal() + would try to release. This has been done already with a VariantClear(). */ + *ppunk = NULL; + if(!ptr) - { - *ppunk = NULL; return Buffer; - } return WdtpInterfacePointer_UserUnmarshal(pFlags, Buffer, ppunk, riid); }

1 0

Nikolay Sivov : gdiplus: Added GdipBitmapConvertFormat stub.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: c820139b0f8f3099cffbdd39e5bac6cf642f018e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c820139b0f8f3099cffbdd39e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 22:07:02 2015 +0300 gdiplus: Added GdipBitmapConvertFormat stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 ++++++++++ include/gdipluspixelformats.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index edf4e45..9f7ce5f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -620,7 +620,7 @@ 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stub GdipBitmapGetHistogram 622 stub GdipBitmapGetHistogramSize -623 stub GdipBitmapConvertFormat +623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort 626 stub GdipDrawImageFX diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0a8027a..6725de8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5268,3 +5268,13 @@ GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) FIXME("(%p, %p): stub\n", image, pabort); return NotImplemented; } + +/***************************************************************************** + * GdipBitmapConvertFormat [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipBitmapConvertFormat(GpBitmap *bitmap, PixelFormat format, DitherType dithertype, + PaletteType palettetype, ColorPalette *palette, REAL alphathreshold) +{ + FIXME("(%p, 0x%08x, %d, %d, %p, %f): stub\n", bitmap, format, dithertype, palettetype, palette, alphathreshold); + return NotImplemented; +} diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index 9922b24..2a2a3cc 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -102,4 +102,33 @@ typedef struct ColorPalette #endif /* end of c typedefs */ +typedef enum DitherType +{ + DitherTypeNone, + DitherTypeSolid, + DitherTypeOrdered4x4, + DitherTypeOrdered8x8, + DitherTypeOrdered16x16, + DitherTypeSpiral4x4, + DitherTypeSpiral8x8, + DitherTypeDualSpiral4x4, + DitherTypeDualSpiral8x8, + DitherTypeErrorDiffusion, + DitherTypeMax +} DitherType; + +typedef enum PaletteType +{ + PaletteTypeCustom, + PaletteTypeOptimal, + PaletteTypeFixedBW, + PaletteTypeFixedHalftone8, + PaletteTypeFixedHalftone27, + PaletteTypeFixedHalftone64, + PaletteTypeFixedHalftone125, + PaletteTypeFixedHalftone216, + PaletteTypeFixedHalftone252, + PaletteTypeFixedHalftone256 +} PaletteType; + #endif

1 0

Nikolay Sivov : prntvpt: Added PTOpenProvider() stub.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 577a75d76427eb367b1acdd004d76704beb3081d URL: http://source.winehq.org/git/wine.git/?a=commit;h=577a75d76427eb367b1acdd00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 16:06:19 2015 +0300 prntvpt: Added PTOpenProvider() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 7 +++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/Makefile.in | 1 + include/prntvpt.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index aa01252..72b1dcf 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "prntvpt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); @@ -48,3 +49,9 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) FIXME("stub:%s %p\n", debugstr_w(printer), version); return E_NOTIMPL; } + +HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) +{ + FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 246443e..bf9a8ca 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,5 +1,5 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) -@ stub PTOpenProvider +@ stdcall PTOpenProvider(wstr long ptr) @ stub PTOpenProviderEx @ stub PTCloseProvider @ stub BindPTProviderThunk diff --git a/include/Makefile.in b/include/Makefile.in index 1d4196e..3836af2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -514,6 +514,7 @@ SRCDIR_INCLUDES = \ pktdef.h \ poppack.h \ powrprof.h \ + prntvpt.h \ profinfo.h \ propkey.h \ propkeydef.h \ diff --git a/include/prntvpt.h b/include/prntvpt.h new file mode 100644 index 0000000..55ecbbe --- /dev/null +++ b/include/prntvpt.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2015 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#ifndef _PRNPTNTV_H_ +#define _PRNPTNTV_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(HPTPROVIDER); + +HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); + +#ifdef __cplusplus +} +#endif + +#endif /* _PRNPTNTV_H_ */

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
75
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 October 2015