wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Józef Kucia : wined3d: Add missing formats to debug_d3dformat().
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: e1c59f12c56bdc1c319e6c7cf77089a910c78393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1c59f12c56bdc1c319e6c7c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:23 2018 +0200 wined3d: Add missing formats to debug_d3dformat(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b4a3c1d..904baef 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4142,6 +4142,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R5G5_SNORM_L6_UNORM); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); FMT_TO_STR(WINED3DFMT_R10G11B11_SNORM); + FMT_TO_STR(WINED3DFMT_R10G10B10X2_TYPELESS); FMT_TO_STR(WINED3DFMT_R10G10B10X2_UINT); FMT_TO_STR(WINED3DFMT_R10G10B10X2_SNORM); FMT_TO_STR(WINED3DFMT_R10G10B10_SNORM_A2_UNORM); @@ -4167,6 +4168,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); FMT_TO_STR(WINED3DFMT_ATI1N); FMT_TO_STR(WINED3DFMT_ATI2N); + FMT_TO_STR(WINED3DFMT_INST); FMT_TO_STR(WINED3DFMT_NVDB); FMT_TO_STR(WINED3DFMT_NVHU); FMT_TO_STR(WINED3DFMT_NVHS);

1 0

Józef Kucia : wined3d: Use get_format_internal() to get WINED3DFMT_UNKNOWN.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 62d1b643335aa83d248b73d3e08ea7753f6fb143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d1b643335aa83d248b73d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:22 2018 +0200 wined3d: Use get_format_internal() to get WINED3DFMT_UNKNOWN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0f8ee71..b4a3c1d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3982,7 +3982,7 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *ad { FIXME("Can't find format %s (%#x) in the format lookup table.\n", debug_d3dformat(format_id), format_id); - return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return get_format_internal(adapter, WINED3DFMT_UNKNOWN); } format = &adapter->formats[idx]; @@ -3997,7 +3997,7 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *ad FIXME("Cannot find depth/stencil typeless format %s (%#x).\n", debug_d3dformat(format_id), format_id); - return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return get_format_internal(adapter, WINED3DFMT_UNKNOWN); } return format;

1 0

Nikolay Sivov : include: Add ID2D1BitmapBrush1 definition.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 86f0fe98891292889c075038ac58bb1baf3317ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f0fe98891292889c075038… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 16 18:51:20 2018 +0300 include: Add ID2D1BitmapBrush1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ff283f8..284bd60 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -288,6 +288,19 @@ interface ID2D1Bitmap1 : ID2D1Bitmap [ object, + uuid(41343a53-e41a-49a2-91cd-21793bbb62e5), + local, +] +interface ID2D1BitmapBrush1 : ID2D1BitmapBrush +{ + void SetInterpolationMode1( + [in] D2D1_INTERPOLATION_MODE mode + ); + D2D1_INTERPOLATION_MODE GetInterpolationMode1(); +} + +[ + object, uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), local, ]

1 0

Nikolay Sivov : d2d1: Implement GetSurface() for bitmaps.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: ef6a8dc16d186112da665def9a32bd54662b7764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef6a8dc16d186112da665def… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 16 18:51:19 2018 +0300 d2d1: Implement GetSurface() for bitmaps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 64 +++++++++++++++++++++++++-------------------- dlls/d2d1/d2d1_private.h | 12 ++++++--- dlls/d2d1/device.c | 9 +++---- dlls/d2d1/tests/d2d1.c | 67 +++++++++++++++++++++++++++++------------------- 4 files changed, 88 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef6a8dc16d186112da66…

1 0

Fabian Maurer : opcservices: Add missing break (coverity).
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 6c770836903a3292393419817da4d10e8524a94d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c770836903a329239341981… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Sep 16 14:13:48 2018 +0200 opcservices: Add missing break (coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index eb9c1c9..f350394 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -607,6 +607,7 @@ static HRESULT WINAPI opc_content_stream_Seek(IStream *iface, LARGE_INTEGER move break; case STREAM_SEEK_END: pos.QuadPart = stream->content->size.QuadPart + move.QuadPart; + break; default: WARN("Unknown origin mode %d.\n", origin); return E_INVALIDARG;

1 0

Fabian Maurer : comctl32/taskdialog: Use parentheses around & operator.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 9a94f55958c66c08d86bdcb3d6d837ffec9362f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a94f55958c66c08d86bdcb3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 15 16:32:44 2018 +0200 comctl32/taskdialog: Use parentheses around & operator. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index f69fa6a..1d91e1d 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -118,7 +118,7 @@ static unsigned int taskdialog_get_reference_rect(const TASKDIALOGCONFIG *taskco info.cbSize = sizeof(info); GetMonitorInfoW(monitor, &info); - if (taskconfig->dwFlags & TDF_POSITION_RELATIVE_TO_WINDOW && taskconfig->hwndParent) + if ((taskconfig->dwFlags & TDF_POSITION_RELATIVE_TO_WINDOW) && taskconfig->hwndParent) GetWindowRect(taskconfig->hwndParent, ret); else *ret = info.rcWork;

1 0

Francois Gouget : winhttp: Make winsock_init() static.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 8c0225ef75e2575325fc9137e94a566b8153b478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c0225ef75e2575325fc9137… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:48:18 2018 +0200 winhttp: Make winsock_init() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c141185..020ec5b 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -167,7 +167,7 @@ static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) return TRUE; } -void winsock_init(void) +static void winsock_init(void) { static INIT_ONCE once = INIT_ONCE_STATIC_INIT; InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL );

1 0

Francois Gouget : mshtml: Make HTMLStyle_init_dispex_info() static.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 0d5ee7c50738271e79b840f03fc318d5d1033007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5ee7c50738271e79b840f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:48:04 2018 +0200 mshtml: Make HTMLStyle_init_dispex_info() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b61641d..20930aa 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10070,7 +10070,7 @@ static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, return DISP_E_UNKNOWNNAME; } -void HTMLStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +static void HTMLStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLCSSStyleDeclaration_tid, NULL);

1 0

Francois Gouget : msxml3/tests: Make test_namespaces_as_attributes() static.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: ed42959693496d53c0423837b38e10c946d994c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed42959693496d53c0423837… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:47:51 2018 +0200 msxml3/tests: Make test_namespaces_as_attributes() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b602e03..b7b29e3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12847,7 +12847,7 @@ static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { { 0 } }; -void test_namespaces_as_attributes(void) +static void test_namespaces_as_attributes(void) { const namespace_as_attribute_t *entry = namespace_as_attribute_test_data; static const char ns_as_attr_doc[] = {

1 0

Zebediah Figura : ole32: Use the real proxy IID in ClientRpcChannelBuffer_GetBuffer().
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 904d1688a37197fe7f0c7c23f4491bc8320a79c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=904d1688a37197fe7f0c7c23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 13 11:01:13 2018 -0500 ole32: Use the real proxy IID in ClientRpcChannelBuffer_GetBuffer(). Delegated proxies pass the IID of the parent interface to NdrProxyGetBuffer(). However, this interface was never registered with ole32 on the server side, so calls to delegated methods will return RPC_S_UNKNOWN_IF. Therefore we have ole32 ignore the passed-in parameter and use the real proxy ID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45673 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/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 2 +- dlls/ole32/rpc.c | 6 ++++-- dlls/rpcrt4/tests/cstub.c | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 212d328..1e564a3 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -210,7 +210,7 @@ struct dispatch_params; void RPC_StartRemoting(struct apartment *apt) DECLSPEC_HIDDEN; HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, - const OXID_INFO *oxid_info, + const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, APARTMENT *apt) DECLSPEC_HIDDEN; HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 7c0f541..6bfd47e 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1290,7 +1290,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, { IRpcChannelBuffer *chanbuf; hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, - &proxy_manager->oxid_info, + &proxy_manager->oxid_info, riid, proxy_manager->dest_context, proxy_manager->dest_context_data, &chanbuf, apt); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9aa945b..bd4611d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -109,6 +109,7 @@ typedef struct OXID oxid; /* apartment in which the channel is valid */ DWORD server_pid; /* id of server process */ HANDLE event; /* cached event handle */ + IID iid; /* IID of the proxy this belongs to */ } ClientRpcChannelBuffer; struct dispatch_params @@ -650,7 +651,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, cif->Length = sizeof(RPC_CLIENT_INTERFACE); /* RPC interface ID = COM interface ID */ - cif->InterfaceId.SyntaxGUID = *riid; + cif->InterfaceId.SyntaxGUID = This->iid; /* COM objects always have a version of 0.0 */ cif->InterfaceId.SyntaxVersion.MajorVersion = 0; cif->InterfaceId.SyntaxVersion.MinorVersion = 0; @@ -1096,7 +1097,7 @@ static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl = /* returns a channel buffer for proxies */ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, - const OXID_INFO *oxid_info, + const OXID_INFO *oxid_info, const IID *iid, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan, APARTMENT *apt) { @@ -1155,6 +1156,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, apartment_getoxid(apt, &This->oxid); This->server_pid = oxid_info->dwPid; This->event = NULL; + This->iid = *iid; *chan = &This->super.IRpcChannelBuffer_iface; diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 22d4569..6b99e82 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1403,10 +1403,8 @@ static void test_delegated_methods(void) ok(ret == 9, "got %d\n", ret); hr = ITest1_GetClassID(test_obj, &clsid); -todo_wine { ok(hr == S_OK, "got %#x\n", hr); ok(IsEqualGUID(&clsid, &CLSID_test1), "got %s\n", wine_dbgstr_guid(&clsid)); -} ITest1_Release(test_obj);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
67
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 September 2018