November 2018 - Wine-Commits

Michael Stefaniuc : advapi32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: dc235ab4a7235cf15daf6f5c32d05b2a0c520097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc235ab4a7235cf15daf6f5c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 12 20:29:04 2018 +0100 advapi32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 8 ++++---- dlls/advapi32/service.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9989097..b537f69 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -108,7 +108,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e'}; return (name->Length == sizeof(wow6432nodeW) && - !memicmpW( name->Buffer, wow6432nodeW, sizeof(wow6432nodeW)/sizeof(WCHAR) )); + !memicmpW( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); } /* open the Wow6432Node subkey of the specified key */ @@ -148,9 +148,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES UNICODE_STRING str; /* don't try to create registry root */ - if (!attr->RootDirectory && len > sizeof(registry_root)/sizeof(WCHAR) && - !memicmpW( buffer, registry_root, sizeof(registry_root)/sizeof(WCHAR))) - i += sizeof(registry_root)/sizeof(WCHAR); + if (!attr->RootDirectory && len > ARRAY_SIZE( registry_root ) && + !memicmpW( buffer, registry_root, ARRAY_SIZE( registry_root ))) + i += ARRAY_SIZE( registry_root ); while (i < len && buffer[i] != '\\') i++; if (i == len && !force_wow32) return status; diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 718c964..231f026 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -299,7 +299,7 @@ static LPWSTR service_get_pipe_name(void) RegCloseKey(service_current_key); if (ret != ERROR_SUCCESS || type != REG_DWORD) return NULL; - len = sizeof(format)/sizeof(WCHAR) + 10 /* strlenW("4294967295") */; + len = ARRAY_SIZE(format) + 10 /* strlenW("4294967295") */; name = heap_alloc(len * sizeof(WCHAR)); if (!name) return NULL;

1 0

Daniel Lehman : msvcrt/tests: Remove unused todo field.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: ed712a96a45a912ffc5bca17ac0c8fc7106cf120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed712a96a45a912ffc5bca17… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Nov 11 16:43:14 2018 -0800 msvcrt/tests: Remove unused todo field. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d0988bf..0568bcf 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3493,7 +3493,6 @@ static void test__tcsnicoll(void) const char *str2; size_t count; int exp; - BOOL todo; }; static const struct test tests[] = { { "English", "abcd", "ABCD", 4, 0 },

1 0

Józef Kucia : ddraw/tests: Add more tests for viewports.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: b119d3c54b908773ffce4100de01c6a9cd9f8173 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b119d3c54b908773ffce4100… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 12 15:13:04 2018 +0100 ddraw/tests: Add more tests for viewports. 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/ddraw/tests/ddraw1.c | 78 +++++++++++++++++------- dlls/ddraw/tests/ddraw2.c | 135 +++++++++++++++++++++++++++++------------ dlls/ddraw/tests/ddraw4.c | 149 +++++++++++++++++++++++++++++++--------------- 3 files changed, 256 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b119d3c54b908773ffce…

1 0

Alex Henrie : d3dcompiler_43: Turn variable 'c' into a static constant.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: cbae62ba9e427216a45cfd88f113178684169d59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbae62ba9e427216a45cfd88… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 11 20:51:37 2018 -0700 d3dcompiler_43: Turn variable 'c' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 748501f..bda41c4 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2176,7 +2176,7 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } else { - char c[] = {'x', 'y', 'z', 'w'}; + static const char c[] = {'x', 'y', 'z', 'w'}; for (i = 0; i < swizzle->node.data_type->dimx; ++i) TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]);

1 0

Andre Heider : server: Fix keyboard hardware message regression.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: 27ff04e2ab9d50c42c4d4ab4bf12b9aeb1cdc990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ff04e2ab9d50c42c4d4ab4… Author: Andre Heider <a.heider(a)gmail.com> Date: Sat Nov 10 21:59:07 2018 +0100 server: Fix keyboard hardware message regression. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 9dfbd1e..545991b 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1775,11 +1775,11 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } - if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; - msg_data = msg->data; - if ((device = current->process->rawinput_kbd)) { + if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + msg_data = msg->data; + msg->win = device->target; msg->msg = WM_INPUT; msg->wparam = RIM_INPUT; @@ -1793,6 +1793,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c queue_hardware_message( desktop, msg, 0 ); } + if (!(msg = alloc_hardware_message( input->kbd.info, source, time ))) return 0; + msg_data = msg->data; + msg->win = get_user_full_handle( win ); msg->msg = message_code; msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */

1 0

Jacek Caban : widl: Don't make proxy vtbl const in interpreted mode.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: a514aa7653d96afd8c49f0d28c8e207b6707c800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a514aa7653d96afd8c49f0d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 11 20:42:55 2018 +0100 widl: Don't make proxy vtbl const in interpreted mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 4c7d85d..87c27be 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -664,7 +664,8 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) /* proxy vtable */ print_proxy( "static %sCINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", - need_delegation_indirect(iface) ? "" : "const ", count, iface->name); + (get_stub_mode() != MODE_Os || need_delegation_indirect(iface)) ? "" : "const ", + count, iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n");

1 0

Zebediah Figura : rpcrt4: Retrieve the underlying interface for dual interfaces.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: f6b1341aa2b505f1a1c516ec675f6667381db7c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6b1341aa2b505f1a1c516ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 9 18:01:57 2018 -0600 rpcrt4: Retrieve the underlying interface for dual interfaces. 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 | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index f819026..31d9d40 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -792,15 +792,40 @@ err: } /* Common helper for Create{Proxy,Stub}FromTypeInfo(). */ -static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfuncs) +static HRESULT get_iface_info(ITypeInfo **typeinfo, WORD *funcs, WORD *parentfuncs) { + ITypeInfo *real_typeinfo; TYPEATTR *typeattr; ITypeLib *typelib; TLIBATTR *libattr; + TYPEKIND typekind; + HREFTYPE reftype; SYSKIND syskind; HRESULT hr; - hr = ITypeInfo_GetContainingTypeLib(typeinfo, &typelib, NULL); + /* Dual interfaces report their size to be sizeof(IDispatchVtbl) and their + * implemented type to be IDispatch. We need to retrieve the underlying + * interface to get that information. */ + hr = ITypeInfo_GetTypeAttr(*typeinfo, &typeattr); + if (FAILED(hr)) + return hr; + typekind = typeattr->typekind; + ITypeInfo_ReleaseTypeAttr(*typeinfo, typeattr); + if (typekind == TKIND_DISPATCH) + { + hr = ITypeInfo_GetRefTypeOfImplType(*typeinfo, -1, &reftype); + if (FAILED(hr)) + return hr; + + hr = ITypeInfo_GetRefTypeInfo(*typeinfo, reftype, &real_typeinfo); + if (FAILED(hr)) + return hr; + + ITypeInfo_Release(*typeinfo); + *typeinfo = real_typeinfo; + } + + hr = ITypeInfo_GetContainingTypeLib(*typeinfo, &typelib, NULL); if (FAILED(hr)) return hr; @@ -814,12 +839,12 @@ static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfunc ITypeLib_ReleaseTLibAttr(typelib, libattr); ITypeLib_Release(typelib); - hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); + 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); + ITypeInfo_ReleaseTypeAttr(*typeinfo, typeattr); return S_OK; } @@ -903,7 +928,7 @@ HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, 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); + hr = get_iface_info(&typeinfo, &funcs, &parentfuncs); if (FAILED(hr)) return hr; @@ -1016,7 +1041,7 @@ HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *typeinfo, REFIID iid, 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); + hr = get_iface_info(&typeinfo, &funcs, &parentfuncs); if (FAILED(hr)) return hr;

1 0

Henri Verbeet : d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d8_device_CreateDepthStencilSurface ().
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: 838960035888bb33e07e3830ae360c29a4159789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=838960035888bb33e07e3830… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 12 13:31:20 2018 +0330 d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d8_device_CreateDepthStencilSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1d7e3df..b91a383 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1230,7 +1230,7 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if *surface = NULL; /* TODO: Verify that Discard is false */ - return d3d8_device_create_surface(device, width, height, format, WINED3D_TEXTURE_CREATE_MAPPABLE, + return d3d8_device_create_surface(device, width, height, format, 0, surface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, 0); }

1 0

Henri Verbeet : d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d8_device_CreateImageSurface ().
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: bb214c385b31e828a84d5ce40466718630bf7eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb214c385b31e828a84d5ce4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 12 13:31:21 2018 +0330 d3d8: Do not specify WINED3D_TEXTURE_CREATE_MAPPABLE in d3d8_device_CreateImageSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b91a383..885849f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1245,7 +1245,7 @@ static HRESULT WINAPI d3d8_device_CreateImageSurface(IDirect3DDevice8 *iface, UI *surface = NULL; - return d3d8_device_create_surface(device, width, height, format, WINED3D_TEXTURE_CREATE_MAPPABLE, + return d3d8_device_create_surface(device, width, height, format, 0, surface, 0, D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0); }

1 0

Wolfgang Walter : wineps: Cope correctly with a missing table.
by Alexandre Julliard Nov. 12, 2018

Nov. 12, 2018

Module: wine Branch: master Commit: 2b23eb2e9a4532b2c8e3d096d0c10740baa0aac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b23eb2e9a4532b2c8e3d096… Author: Wolfgang Walter <wine(a)stwm.de> Date: Mon Nov 12 10:56:10 2018 +0000 wineps: Cope correctly with a missing table. Signed-off-by: Wolfgang Walter <wine(a)stwm.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/type42.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 8a56cc6..c808ddb 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -100,10 +100,15 @@ struct tagTYPE42 { static BOOL LoadTable(HDC hdc, OTTable *table) { unsigned int i; + DWORD len; if(table->MS_tag == MS_MAKE_TAG('g','d','i','r')) return TRUE; - table->len = GetFontData(hdc, table->MS_tag, 0, NULL, 0); - table->data = HeapAlloc(GetProcessHeap(), 0, (table->len + 3) & ~3 ); + table->len = 0; + len = GetFontData(hdc, table->MS_tag, 0, NULL, 0); + if(len == GDI_ERROR) return FALSE; + table->data = HeapAlloc(GetProcessHeap(), 0, (len + 3) & ~3); + if(!table->data) return FALSE; + table->len = len; memset(table->data + ((table->len - 1) & ~3), 0, sizeof(DWORD)); GetFontData(hdc, table->MS_tag, 0, table->data, table->len); table->check = 0;

1 0