wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Alexandre Julliard : winegcc: Forward -marm and -mthumb options to winebuild.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 4a4006d4f08ccf61f994fce66813d06713c6b879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4006d4f08ccf61f994fce66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:57:48 2014 +0100 winegcc: Forward -marm and -mthumb options to winebuild. --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fe0f033..8afe5af 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1503,6 +1503,11 @@ int main(int argc, char **argv) opts.force_pointer_size = 8; raw_linker_arg = 1; } + else if (!strcmp("-marm", argv[i] ) || !strcmp("-mthumb", argv[i] )) + { + strarray_add(opts.winebuild_args, argv[i]); + raw_linker_arg = 1; + } else if (strncmp("-mcpu=", argv[i], 6) == 0) strarray_add(opts.winebuild_args, argv[i]); break;

1 0

Alexandre Julliard : winebuild: Add support for -marm and -mthumb target flags.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 6c807b74721831c06ae6ce76f833c42cf15ab64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c807b74721831c06ae6ce76f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:57:27 2014 +0100 winebuild: Add support for -marm and -mthumb target flags. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 10 +++++++++- tools/winebuild/winebuild.man.in | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index fa92764..41cec91 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -362,5 +362,6 @@ extern struct strarray *cc_command; extern struct strarray *ld_command; extern struct strarray *nm_command; extern char *cpu_option; +extern int thumb_mode; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index a848a0c..807cf61 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -90,6 +90,12 @@ struct strarray *ld_command = NULL; struct strarray *nm_command = NULL; char *cpu_option = NULL; +#ifdef __thumb__ +int thumb_mode = 1; +#else +int thumb_mode = 0; +#endif + static int nb_res_files; static char **res_files; @@ -396,8 +402,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) if (!strcmp( optarg, "16" )) spec->type = SPEC_WIN16; else if (!strcmp( optarg, "32" )) force_pointer_size = 4; else if (!strcmp( optarg, "64" )) force_pointer_size = 8; + else if (!strcmp( optarg, "arm" )) thumb_mode = 0; + else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); - else fatal_error( "Invalid -m option '%s', expected -m16, -m32, -m64 or -mcpu\n", optarg ); + else fatal_error( "Unknown -m option '%s'\n", optarg ); break; case 'M': spec->main_module = xstrdup( optarg ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index b0b2784..df91cb8 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -156,6 +156,9 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP +.BI \-marm,\ \-mthumb,\ \-mcpu= option +Set code generation options for the assembler. +.TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to \fImodule\fR. This is used to enforce that the load order for the

1 0

Alexandre Julliard : wrc: Ignore unknown -m target options.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: da066aeafc07ba0849a3048148c864592d0947b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da066aeafc07ba0849a304814… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:56:51 2014 +0100 wrc: Ignore unknown -m target options. --- tools/wrc/wrc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 8c376e0..577a6f4 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -457,7 +457,6 @@ int main(int argc,char *argv[]) if (!strcmp( optarg, "16" )) win32 = 0; else if (!strcmp( optarg, "32" )) { win32 = 1; pointer_size = 4; } else if (!strcmp( optarg, "64" )) { win32 = 1; pointer_size = 8; } - else error( "Invalid option: -m%s\n", optarg ); break; case 'f': if (*optarg != 'o') error("Unknown option: -f%s\n", optarg);

1 0

Alexandre Julliard : widl: Ignore unknown -m target options.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: a2683dca6403aafd3eef8f205dbcb47d329bb5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2683dca6403aafd3eef8f205… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:55:36 2014 +0100 widl: Ignore unknown -m target options. --- tools/widl/widl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 5fa67f4..eace69f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -635,7 +635,6 @@ int main(int argc,char *argv[]) case 'm': if (!strcmp( optarg, "32" )) typelib_kind = SYS_WIN32; else if (!strcmp( optarg, "64" )) typelib_kind = SYS_WIN64; - else error( "Invalid -m argument '%s'\n", optarg ); break; case 'N': no_preprocess = 1;

1 0

Frédéric Delanoy : ole32/tests: Use wine_dbgstr_guid for printing GUIDs.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: a0c258460bccf99b07e1cc003911491fe9889caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c258460bccf99b07e1cc003… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 12 12:10:46 2014 +0100 ole32/tests: Use wine_dbgstr_guid for printing GUIDs. --- dlls/ole32/tests/marshal.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 680b831..5ff6ab2 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2428,10 +2428,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * } if (size >= 3*sizeof(DWORD) + sizeof(GUID)) { - trace("got guid data: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - ((GUID *)marshal_data)->Data1, ((GUID *)marshal_data)->Data2, ((GUID *)marshal_data)->Data3, - ((GUID *)marshal_data)->Data4[0], ((GUID *)marshal_data)->Data4[1], ((GUID *)marshal_data)->Data4[2], ((GUID *)marshal_data)->Data4[3], - ((GUID *)marshal_data)->Data4[4], ((GUID *)marshal_data)->Data4[5], ((GUID *)marshal_data)->Data4[6], ((GUID *)marshal_data)->Data4[7]); + trace("got guid data: %s\n", wine_dbgstr_guid((GUID *)marshal_data)); } } else

1 0

Frédéric Delanoy : dsound/tests: Use wine_dbgstr_guid for printing GUIDs.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 86e2f37ebc6f2cdff3722198fdfc33e5811eeecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e2f37ebc6f2cdff3722198f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 12 12:10:45 2014 +0100 dsound/tests: Use wine_dbgstr_guid for printing GUIDs. --- dlls/dsound/tests/propset.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 454c707..49e6f51 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -75,12 +75,7 @@ static BOOL CALLBACK callback(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA dat data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); @@ -104,12 +99,7 @@ static BOOL CALLBACK callback1(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" DescriptionA: %s\n", data->DescriptionA); WideCharToMultiByte(CP_ACP, 0, data->DescriptionW, -1, descriptionA, sizeof(descriptionA), NULL, NULL); trace(" DescriptionW: %s\n", descriptionA); @@ -133,12 +123,7 @@ static BOOL CALLBACK callbackA(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); @@ -163,12 +148,7 @@ static BOOL CALLBACK callbackW(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace("\tDeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace("\tDeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); WideCharToMultiByte(CP_ACP, 0, data->Description, -1, descriptionA, sizeof(descriptionA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data->Module, -1, moduleA, sizeof(moduleA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data->Interface, -1, interfaceA, sizeof(interfaceA), NULL, NULL);

1 0

Henri Verbeet : d3d10core: Implement ID3D10Multithread.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 28510c73c23f5336c13d070d657172ac7a25d718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28510c73c23f5336c13d070d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 12 12:10:31 2014 +0100 d3d10core: Implement ID3D10Multithread. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 78 +++++++++++++++++++++++++++++++++++- dlls/dxgi/tests/device.c | 4 ++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ab014ac..62392e5 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -290,6 +290,7 @@ struct d3d10_device { IUnknown IUnknown_inner; ID3D10Device1 ID3D10Device1_iface; + ID3D10Multithread ID3D10Multithread_iface; IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; IUnknown *outer_unk; LONG refcount; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0606af9..9c1467f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -50,6 +50,10 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa { *out = &device->ID3D10Device1_iface; } + else if (IsEqualGUID(riid, &IID_ID3D10Multithread)) + { + *out = &device->ID3D10Multithread_iface; + } else if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) { *out = &device->IWineDXGIDeviceParent_iface; @@ -1791,6 +1795,77 @@ static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = d3d10_device_inner_Release, }; +static inline struct d3d10_device *impl_from_ID3D10Multithread(ID3D10Multithread *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_device, ID3D10Multithread_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_multithread_QueryInterface(ID3D10Multithread *iface, REFIID iid, void **out) +{ + struct d3d10_device *device = impl_from_ID3D10Multithread(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return IUnknown_QueryInterface(device->outer_unk, iid, out); +} + +static ULONG STDMETHODCALLTYPE d3d10_multithread_AddRef(ID3D10Multithread *iface) +{ + struct d3d10_device *device = impl_from_ID3D10Multithread(iface); + + TRACE("iface %p.\n", iface); + + return IUnknown_AddRef(device->outer_unk); +} + +static ULONG STDMETHODCALLTYPE d3d10_multithread_Release(ID3D10Multithread *iface) +{ + struct d3d10_device *device = impl_from_ID3D10Multithread(iface); + + TRACE("iface %p.\n", iface); + + return IUnknown_Release(device->outer_unk); +} + +static void STDMETHODCALLTYPE d3d10_multithread_Enter(ID3D10Multithread *iface) +{ + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); +} + +static void STDMETHODCALLTYPE d3d10_multithread_Leave(ID3D10Multithread *iface) +{ + TRACE("iface %p.\n", iface); + + wined3d_mutex_unlock(); +} + +static BOOL STDMETHODCALLTYPE d3d10_multithread_SetMultithreadProtected(ID3D10Multithread *iface, BOOL protect) +{ + FIXME("iface %p, protect %#x stub!\n", iface, protect); + + return TRUE; +} + +static BOOL STDMETHODCALLTYPE d3d10_multithread_GetMultithreadProtected(ID3D10Multithread *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + +static const struct ID3D10MultithreadVtbl d3d10_multithread_vtbl = +{ + d3d10_multithread_QueryInterface, + d3d10_multithread_AddRef, + d3d10_multithread_Release, + d3d10_multithread_Enter, + d3d10_multithread_Leave, + d3d10_multithread_SetMultithreadProtected, + d3d10_multithread_GetMultithreadProtected, +}; + static void STDMETHODCALLTYPE d3d10_subresource_destroyed(void *parent) {} static const struct wined3d_parent_ops d3d10_subresource_parent_ops = @@ -2048,8 +2123,9 @@ static const struct wine_rb_functions d3d10_rasterizer_state_rb_ops = HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { - device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; + device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; + device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl; device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d10_dxgi_device_parent_vtbl; device->device_parent.ops = &d3d10_wined3d_device_parent_ops; device->refcount = 1; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7200d64..84567a1 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -75,6 +75,10 @@ static void test_device_interfaces(void) ok(SUCCEEDED(hr), "Failed to query ID3D10Device interface, hr %#x.\n", hr); IUnknown_Release(iface); + hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to query ID3D10Multithread interface, hr %#x.\n", hr); + IUnknown_Release(iface); + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface))) IUnknown_Release(iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,

1 0

Jacek Caban : wmp: Added IConnectionPointContainer stub implementation.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 8b7c4e3b24c3d0e6fb344f4062ebba396c2072b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7c4e3b24c3d0e6fb344f406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 12 11:33:07 2014 +0100 wmp: Added IConnectionPointContainer stub implementation. --- dlls/wmp/oleobj.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 4 ++++ 2 files changed, 59 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 773b0b0..26f338a 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -17,6 +17,7 @@ */ #include "wmp_private.h" +#include "olectl.h" #include "wine/debug.h" @@ -27,6 +28,7 @@ struct WindowsMediaPlayer { IProvideClassInfo2 IProvideClassInfo2_iface; IPersistStreamInit IPersistStreamInit_iface; IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; @@ -78,6 +80,9 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IOleInPlaceObjectWindowless)) { TRACE("(%p)->(IID_IOleInPlaceObjectWindowless %p)\n", This, ppv); *ppv = &This->IOleInPlaceObjectWindowless_iface; + }else if(IsEqualGUID(riid, &IID_IConnectionPointContainer)) { + TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); + *ppv = &This->IConnectionPointContainer_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -559,6 +564,55 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static inline WindowsMediaPlayer *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IConnectionPointContainer_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, LPVOID *ppv) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + WindowsMediaPlayer *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + return CONNECT_E_NOCONNECTION; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { @@ -575,6 +629,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; wmp->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; + wmp->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; wmp->ref = 1; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 8f2eed2..fba35e5 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -626,6 +626,10 @@ static void test_QI(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, (void**)&tmp); ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08x\n", hres); IUnknown_Release(tmp); + + hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&tmp); + ok(hres == S_OK, "Could not get IConnectionPointContainer iface: %08x\n", hres); + IUnknown_Release(tmp); } static void test_wmp(void)

1 0

Alistair Leslie-Hughes : dpnet: Add DirectPlay8 registry keys.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 2c6ce9a02fc988bc74a0ae03bca4b0f431be0c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6ce9a02fc988bc74a0ae03b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 15 12:51:22 2014 +1100 dpnet: Add DirectPlay8 registry keys. --- dlls/dpnet/dpnet.rgs | 20 ++++++++++++++++++++ dlls/dpnet/version.rc | 3 +++ 2 files changed, 23 insertions(+) diff --git a/dlls/dpnet/dpnet.rgs b/dlls/dpnet/dpnet.rgs new file mode 100644 index 0000000..22717a0 --- /dev/null +++ b/dlls/dpnet/dpnet.rgs @@ -0,0 +1,20 @@ +HKLM +{ + NoRemove 'Software' + { + NoRemove 'Microsoft' + { + 'DirectPlay8' + { + 'Service Providers' + { + 'DPNSPWinsockTCP' + { + val 'Friendly Name' = s 'Internet TCP/IP Connection For DirectPlay' + val 'GUID' = s '{EBFE7BA0-628D-11D2-AE0F-006097B01411}' + } + } + } + } + } +} diff --git a/dlls/dpnet/version.rc b/dlls/dpnet/version.rc index b6a8488..3291ed7 100644 --- a/dlls/dpnet/version.rc +++ b/dlls/dpnet/version.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: dpnet.rgs */ +2 WINE_REGISTRY dpnet.rgs + #define WINE_FILEDESCRIPTION_STR "Wine DirectPlay 8" #define WINE_FILENAME_STR "dpnet.dll" #define WINE_FILEVERSION 5,3,0,900

1 0

Jactry Zeng : riched20/tests: Add tests to check the content open by ITextDocument_fnOpen.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 1841426616d97356c725a79fd9cce90231082f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1841426616d97356c725a79fd… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Feb 11 19:05:33 2014 +0800 riched20/tests: Add tests to check the content open by ITextDocument_fnOpen. --- dlls/riched20/tests/richole.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 63208ee..3781e68 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -159,6 +159,16 @@ static void test_ITextDocument_Open(void) HANDLE hFile; VARIANT testfile; WCHAR filename[] = {'t', 'e', 's', 't','.','t','x','t', 0}; + int result; + DWORD dw; + static const CHAR chACP[] = "TestSomeText"; + static const CHAR chUTF8[] = "\xef\xbb\xbfTextWithUTF8BOM"; + static const WCHAR chUTF16[] = {0xfeff, 'T', 'e', 's', 't', 'S', 'o', 'm', + 'e', 'T', 'e', 'x', 't', 0}; + +#define MAX_BUF_LEN 1024 + CHAR bufACP[MAX_BUF_LEN]; + WCHAR bufUnicode[MAX_BUF_LEN]; static const int tomConstantsSingle[] = { @@ -328,6 +338,46 @@ static void test_ITextDocument_Open(void) CloseHandle(hFile); release_interfaces(&w, &reOle, &txtDoc, &txtSel); DeleteFileW(filename); + + /* tests to check the content */ + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hFile, chACP, sizeof(chACP)-sizeof(CHAR), &dw, NULL); + CloseHandle(hFile); + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_ACP); + result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 12, "ITextDocument_Open: Test ASCII returned %d, expected 12\n", result); + result = strcmp(bufACP, chACP); + todo_wine ok(result == 0, "ITextDocument_Open: Test ASCII set wrong text: Result: %s\n", bufACP); + release_interfaces(&w, &reOle, &txtDoc, &txtSel); + DeleteFileW(filename); + + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hFile, chUTF8, sizeof(chUTF8)-sizeof(CHAR), &dw, NULL); + CloseHandle(hFile); + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + ITextDocument_Open(txtDoc, &testfile, tomReadOnly, CP_UTF8); + result = SendMessageA(w, WM_GETTEXT, 1024, (LPARAM)bufACP); + todo_wine ok(result == 15, "ITextDocument_Open: Test UTF-8 returned %d, expected 15\n", result); + result = strcmp(bufACP, &chUTF8[3]); + todo_wine ok(result == 0, "ITextDocument_Open: Test UTF-8 set wrong text: Result: %s\n", bufACP); + release_interfaces(&w, &reOle, &txtDoc, &txtSel); + DeleteFileW(filename); + + hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(hFile, chUTF16, sizeof(chUTF16)-sizeof(WCHAR), &dw, NULL); + CloseHandle(hFile); + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + ITextDocument_Open(txtDoc, &testfile, tomReadOnly, 1200); + result = SendMessageW(w, WM_GETTEXT, 1024, (LPARAM)bufUnicode); + todo_wine ok(result == 12, "ITextDocument_Open: Test UTF-16 returned %d, expected 12\n", result); + result = lstrcmpW(bufUnicode, &chUTF16[1]); + todo_wine ok(result == 0, "ITextDocument_Open: Test UTF-16 set wrong text: Result: %s\n", wine_dbgstr_w(bufUnicode)); + release_interfaces(&w, &reOle, &txtDoc, &txtSel); + DeleteFileW(filename); } START_TEST(richole)

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
51
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 February 2014