September 2018 - Wine-Commits

Fabian Maurer : wineconsole: When loading settings for an application, respect a 0 in FontSize.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 7adf0d869c1b5abb2ef1dd3d8542c774ba97d99c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7adf0d869c1b5abb2ef1dd3d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Apr 22 23:34:38 2018 +0200 wineconsole: When loading settings for an application, respect a 0 in FontSize. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37654ceba8cf4bf2d654f94d51c7551f9f52af5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineconsole/registry.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 080431a..92c53a7 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -126,8 +126,17 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) count = sizeof(val); if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) { - cfg->cell_height = HIWORD(val); - cfg->cell_width = LOWORD(val); + int height = HIWORD(val); + int width = LOWORD(val); + /* A value of zero reflects the default settings */ + if (height != 0) + { + cfg->cell_height = height; + } + if (width != 0) + { + cfg->cell_width = width; + } } count = sizeof(val);

1 0

Louis Lenders : winmm: Return error in waveOutMessage if either dwParam1 or dwParam2 is null.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 511ac563ce8ba51ab35f0b8329233dd2c50f2994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=511ac563ce8ba51ab35f0b83… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Apr 24 11:52:18 2018 +0200 winmm: Return error in waveOutMessage if either dwParam1 or dwParam2 is null. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d7bd861ae6d3ec24ff69def9ab7115ebb13d554d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 10 ++++++++++ dlls/winmm/waveform.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a8a5e8d..284b624 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1437,6 +1437,16 @@ static void wave_out_tests(void) ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)-1 , 0); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + 0, (DWORD_PTR)&status); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveOutGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 7308519..26fed17 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3262,17 +3262,17 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: - if(dwParam1) { - if(g_outmmdevices_count > 0) - /* Device 0 is always the default device */ - *(DWORD *)dwParam1 = 0; - else - *(DWORD *)dwParam1 = -1; - } + if(!dwParam1 || !dwParam2) + return MMSYSERR_INVALPARAM; - if(dwParam2) - /* Status flags */ - *(DWORD *)dwParam2 = 0; + if(g_outmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + + /* Status flags */ + *(DWORD *)dwParam2 = 0; return MMSYSERR_NOERROR; }

1 0

Michael Müller : combase: Implement RoActivateInstance.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 74c2bc6a6658b483ad429a98112cc9abe6820801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c2bc6a6658b483ad429a98… Author: Michael Müller <michael(a)fds-team.de> Date: Wed May 2 03:42:49 2018 +0000 combase: Implement RoActivateInstance. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e5275c2f86bd6a1dea88ece3e636783c19c430ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 74c9d27..978c3dc 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub RoActivateInstance +@ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stub RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c238eb8..f42bdae 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -242,7 +242,7 @@ @ stdcall PropVariantClear(ptr) ole32.PropVariantClear @ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy @ stub ReleaseFuncDescs -@ stub RoActivateInstance +@ stdcall RoActivateInstance(ptr ptr) @ stub RoCaptureErrorContext @ stub RoClearError @ stub RoFailFastWithErrorContext diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index f7862fb..bfd07fb 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -198,3 +198,23 @@ HRESULT WINAPI RoGetParameterizedTypeInstanceIID(UINT32 name_element_count, cons if (hiid) *hiid = INVALID_HANDLE_VALUE; return E_NOTIMPL; } + +/*********************************************************************** + * RoActivateInstance (combase.@) + */ +HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance) +{ + IActivationFactory *factory; + HRESULT hr; + + FIXME("(%p, %p): semi-stub\n", classid, instance); + + hr = RoGetActivationFactory(classid, &IID_IActivationFactory, (void **)&factory); + if (SUCCEEDED(hr)) + { + hr = IActivationFactory_ActivateInstance(factory, instance); + IActivationFactory_Release(factory); + } + + return hr; +}

1 0

Michael Müller : include: Add activation.idl with IActivationFactory interface.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 000c780176535b4853c0c10a1966f0b5c0f0d1f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000c780176535b4853c0c10a… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jan 30 11:41:03 2018 +0300 include: Add activation.idl with IActivationFactory interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 40a1dcd591b971ed3fb11b00e65050f59fe76f98) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/activation.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 430c473..304452e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,5 +1,6 @@ IDL_SRCS = \ access.idl \ + activation.idl \ activaut.idl \ activdbg.idl \ activscp.idl \ diff --git a/include/activation.idl b/include/activation.idl new file mode 100644 index 0000000..b86c9f6 --- /dev/null +++ b/include/activation.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Michael Müller + * + * 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 DO_NO_IMPORTS +import "inspectable.idl"; +#endif + +[ + object, + uuid(00000035-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IActivationFactory : IInspectable +{ + HRESULT ActivateInstance([out] IInspectable **instance); +}

1 0

Zebediah Figura : devenum/tests: Test all registered categories.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: ecaa4f7385a98d82ee447e8a37271407e0545e45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecaa4f7385a98d82ee447e8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:06 2018 -0600 devenum/tests: Test all registered categories. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d34637f597bcd9172ed2d47aaf70a30d4395523b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/tests/devenum.c | 109 +++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 61 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index d9a799c..0437b6b 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,57 +30,56 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static const WCHAR clsidW[] = {'C','L','S','I','D',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; -struct category -{ - const char * name; - const GUID * clsid; -}; - -static struct category am_categories[] = -{ - { "Legacy AM Filter category", &CLSID_LegacyAmFilterCategory }, - { "Audio renderer category", &CLSID_AudioRendererCategory }, - { "Midi renderer category", &CLSID_MidiRendererCategory }, - { "Audio input device category", &CLSID_AudioInputDeviceCategory }, - { "Video input device category", &CLSID_VideoInputDeviceCategory }, - { "Audio compressor category", &CLSID_AudioCompressorCategory }, - { "Video compressor category", &CLSID_VideoCompressorCategory } -}; - static void test_devenum(IBindCtx *bind_ctx) { - HRESULT res; + IEnumMoniker *enum_cat, *enum_moniker; ICreateDevEnum* create_devenum; - IEnumMoniker* enum_moniker = NULL; + IPropertyBag *prop_bag; + IMoniker *moniker; BOOL have_mrle = FALSE; - int i; + GUID cat_guid, clsid; + VARIANT var; + HRESULT hr; - res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); - if (res != S_OK) { - skip("Cannot create SystemDeviceEnum object (%x)\n", res); - return; - } + ok(hr == S_OK, "Failed to create devenum: %#x\n", hr); + + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_ActiveMovieCategories, &enum_cat, 0); + ok(hr == S_OK, "Failed to enum categories: %#x\n", hr); - for (i = 0; i < (sizeof(am_categories) / sizeof(struct category)); i++) + while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { + hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); + if (winetest_debug > 1) - trace("%s:\n", am_categories[i].name); + trace("%s:\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Failed to read CLSID: %#x\n", hr); + + hr = CLSIDFromString(V_BSTR(&var), &cat_guid); + ok(hr == S_OK, "got %#x\n", hr); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(moniker); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, am_categories[i].clsid, &enum_moniker, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (res == S_OK) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &cat_guid, &enum_moniker, 0); + ok(SUCCEEDED(hr), "Failed to enum devices: %#x\n", hr); + + if (hr == S_OK) { - IMoniker* moniker; while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { - IPropertyBag* prop_bag = NULL; - VARIANT var; - HRESULT hr; - CLSID clsid = {0}; - hr = IMoniker_GetClassID(moniker, NULL); ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); @@ -93,36 +92,24 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); - ok((hr == S_OK) || broken(hr == 0x80070002), "IPropertyBag_Read failed with error %x\n", hr); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr); - if (SUCCEEDED(hr)) - { - if (winetest_debug > 1) - trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); - VariantClear(&var); - } - else - { - trace(" ???\n"); - } + if (winetest_debug > 1) + trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); - if (IsEqualGUID(&CLSID_VideoCompressorCategory, am_categories[i].clsid)) { - /* Test well known compressor to ensure that we really enumerate codecs */ - hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); - if (SUCCEEDED(hr)) { - ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); - if(!lstrcmpW(V_BSTR(&var), mrleW)) - have_mrle = TRUE; - VariantClear(&var); - } + if (IsEqualGUID(&CLSID_VideoCompressorCategory, &cat_guid)) { + /* Test well known compressor to ensure that we really enumerate codecs */ + hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); + if (SUCCEEDED(hr)) { + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + if(!lstrcmpW(V_BSTR(&var), mrleW)) + have_mrle = TRUE; + VariantClear(&var); } } - if (prop_bag) - IPropertyBag_Release(prop_bag); + IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); } IEnumMoniker_Release(enum_moniker);

1 0

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

Sept. 12, 2018

Module: wine Branch: master Commit: 9d52b5f8479ae375cbee8e03f4d8b34740e6724f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d52b5f8479ae375cbee8e03… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 11 22:08:08 2018 +0200 webservices: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 4 ++-- dlls/webservices/error.c | 4 ++-- dlls/webservices/heap.c | 4 ++-- dlls/webservices/listener.c | 4 ++-- dlls/webservices/msg.c | 6 +++--- dlls/webservices/proxy.c | 4 ++-- dlls/webservices/reader.c | 4 ++-- dlls/webservices/string.c | 2 +- dlls/webservices/url.c | 20 ++++++++++---------- dlls/webservices/writer.c | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5963faf..0cd8b91 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -236,14 +236,14 @@ struct channel ULONG read_buflen; ULONG read_size; ULONG prop_count; - struct prop prop[sizeof(channel_props)/sizeof(channel_props[0])]; + struct prop prop[ARRAY_SIZE( channel_props )]; }; #define CHANNEL_MAGIC (('C' << 24) | ('H' << 16) | ('A' << 8) | 'N') static struct channel *alloc_channel(void) { - static const ULONG count = sizeof(channel_props)/sizeof(channel_props[0]); + static const ULONG count = ARRAY_SIZE( channel_props ); struct channel *ret; ULONG size = sizeof(*ret) + prop_size( channel_props, count ); diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index e4292db..780040e 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -42,14 +42,14 @@ struct error ULONG magic; CRITICAL_SECTION cs; ULONG prop_count; - struct prop prop[sizeof(error_props)/sizeof(error_props[0])]; + struct prop prop[ARRAY_SIZE( error_props )]; }; #define ERROR_MAGIC (('E' << 24) | ('R' << 16) | ('R' << 8) | 'O') static struct error *alloc_error(void) { - static const ULONG count = sizeof(error_props)/sizeof(error_props[0]); + static const ULONG count = ARRAY_SIZE( error_props ); struct error *ret; ULONG size = sizeof(*ret) + prop_size( error_props, count ); diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index e44cf72..93e647a 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -46,7 +46,7 @@ struct heap SIZE_T max_size; SIZE_T allocated; ULONG prop_count; - struct prop prop[sizeof(heap_props)/sizeof(heap_props[0])]; + struct prop prop[ARRAY_SIZE( heap_props )]; }; #define HEAP_MAGIC (('H' << 24) | ('E' << 16) | ('A' << 8) | 'P') @@ -177,7 +177,7 @@ HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *erro static struct heap *alloc_heap(void) { - static const ULONG count = sizeof(heap_props)/sizeof(heap_props[0]); + static const ULONG count = ARRAY_SIZE( heap_props ); struct heap *ret; ULONG size = sizeof(*ret) + prop_size( heap_props, count ); diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 357a1c6..0189059 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -113,14 +113,14 @@ struct listener } udp; } u; ULONG prop_count; - struct prop prop[sizeof(listener_props)/sizeof(listener_props[0])]; + struct prop prop[ARRAY_SIZE( listener_props )]; }; #define LISTENER_MAGIC (('L' << 24) | ('I' << 16) | ('S' << 8) | 'T') static struct listener *alloc_listener(void) { - static const ULONG count = sizeof(listener_props)/sizeof(listener_props[0]); + static const ULONG count = ARRAY_SIZE( listener_props ); struct listener *ret; ULONG size = sizeof(*ret) + prop_size( listener_props, count ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 19a1076..0706346 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -83,7 +83,7 @@ struct msg WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_send; WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_receive; ULONG prop_count; - struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; + struct prop prop[ARRAY_SIZE( msg_props )]; }; #define MSG_MAGIC (('M' << 24) | ('E' << 16) | ('S' << 8) | 'S') @@ -91,7 +91,7 @@ struct msg static struct msg *alloc_msg(void) { - static const ULONG count = sizeof(msg_props)/sizeof(msg_props[0]); + static const ULONG count = ARRAY_SIZE( msg_props ); struct msg *ret; ULONG size = sizeof(*ret) + prop_size( msg_props, count ); @@ -1785,7 +1785,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) case WS_ENVELOPE_VERSION_SOAP_1_2: { static const WCHAR actionW[] = {'a','c','t','i','o','n','=','"'}; - ULONG len_action = sizeof(actionW)/sizeof(actionW[0]); + ULONG len_action = ARRAY_SIZE( actionW ); if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) break; diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index da30cb0..5122892 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -48,14 +48,14 @@ struct proxy WS_SERVICE_PROXY_STATE state; WS_CHANNEL *channel; ULONG prop_count; - struct prop prop[sizeof(proxy_props)/sizeof(proxy_props[0])]; + struct prop prop[ARRAY_SIZE( proxy_props )]; }; #define PROXY_MAGIC (('P' << 24) | ('R' << 16) | ('O' << 8) | 'X') static struct proxy *alloc_proxy(void) { - static const ULONG count = sizeof(proxy_props)/sizeof(proxy_props[0]); + static const ULONG count = ARRAY_SIZE( proxy_props ); struct proxy *ret; ULONG size = sizeof(*ret) + prop_size( proxy_props, count ); diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 087ad0a..296043f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -397,14 +397,14 @@ struct reader const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; ULONG prop_count; - struct prop prop[sizeof(reader_props)/sizeof(reader_props[0])]; + struct prop prop[ARRAY_SIZE( reader_props )]; }; #define READER_MAGIC (('R' << 24) | ('E' << 16) | ('A' << 8) | 'D') static struct reader *alloc_reader(void) { - static const ULONG count = sizeof(reader_props)/sizeof(reader_props[0]); + static const ULONG count = ARRAY_SIZE( reader_props ); struct reader *ret; ULONG size = sizeof(*ret) + prop_size( reader_props, count ); diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 0bb77df..42af8fd 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -791,7 +791,7 @@ static const ULONG dict_sorted[] = const struct dictionary dict_builtin_static = { {{0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}, - (WS_XML_STRING *)dict_strings, sizeof(dict_strings)/sizeof(dict_strings[0]), TRUE}, + (WS_XML_STRING *)dict_strings, ARRAY_SIZE( dict_strings ), TRUE}, (ULONG *)dict_sorted }; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 465857a..731b74e 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -39,19 +39,19 @@ static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; static WS_URL_SCHEME_TYPE scheme_type( const WCHAR *str, ULONG len ) { - if (len == sizeof(http)/sizeof(http[0]) && !memicmpW( str, http, sizeof(http)/sizeof(http[0]) )) + if (len == ARRAY_SIZE( http ) && !memicmpW( str, http, ARRAY_SIZE( http ))) return WS_URL_HTTP_SCHEME_TYPE; - if (len == sizeof(https)/sizeof(https[0]) && !memicmpW( str, https, sizeof(https)/sizeof(https[0]) )) + if (len == ARRAY_SIZE( https ) && !memicmpW( str, https, ARRAY_SIZE( https ))) return WS_URL_HTTPS_SCHEME_TYPE; - if (len == sizeof(nettcp)/sizeof(nettcp[0]) && !memicmpW( str, nettcp, sizeof(nettcp)/sizeof(nettcp[0]) )) + if (len == ARRAY_SIZE( nettcp ) && !memicmpW( str, nettcp, ARRAY_SIZE( nettcp ))) return WS_URL_NETTCP_SCHEME_TYPE; - if (len == sizeof(soapudp)/sizeof(soapudp[0]) && !memicmpW( str, soapudp, sizeof(soapudp)/sizeof(soapudp[0]) )) + if (len == ARRAY_SIZE( soapudp ) && !memicmpW( str, soapudp, ARRAY_SIZE( soapudp ))) return WS_URL_SOAPUDP_SCHEME_TYPE; - if (len == sizeof(netpipe)/sizeof(netpipe[0]) && !memicmpW( str, netpipe, sizeof(netpipe)/sizeof(netpipe[0]) )) + if (len == ARRAY_SIZE( netpipe ) && !memicmpW( str, netpipe, ARRAY_SIZE( netpipe ))) return WS_URL_NETPIPE_SCHEME_TYPE; return ~0u; @@ -271,23 +271,23 @@ static const WCHAR *scheme_str( WS_URL_SCHEME_TYPE scheme, ULONG *len ) switch (scheme) { case WS_URL_HTTP_SCHEME_TYPE: - *len = sizeof(http)/sizeof(http[0]); + *len = ARRAY_SIZE( http ); return http; case WS_URL_HTTPS_SCHEME_TYPE: - *len = sizeof(https)/sizeof(https[0]); + *len = ARRAY_SIZE( https ); return https; case WS_URL_NETTCP_SCHEME_TYPE: - *len = sizeof(nettcp)/sizeof(nettcp[0]); + *len = ARRAY_SIZE( nettcp ); return nettcp; case WS_URL_SOAPUDP_SCHEME_TYPE: - *len = sizeof(soapudp)/sizeof(soapudp[0]); + *len = ARRAY_SIZE( soapudp ); return soapudp; case WS_URL_NETPIPE_SCHEME_TYPE: - *len = sizeof(netpipe)/sizeof(netpipe[0]); + *len = ARRAY_SIZE( netpipe ); return netpipe; default: diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 95d4cad..ef8f919 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -92,14 +92,14 @@ struct writer WS_DYNAMIC_STRING_CALLBACK dict_cb; void *dict_cb_state; ULONG prop_count; - struct prop prop[sizeof(writer_props)/sizeof(writer_props[0])]; + struct prop prop[ARRAY_SIZE( writer_props )]; }; #define WRITER_MAGIC (('W' << 24) | ('R' << 16) | ('I' << 8) | 'T') static struct writer *alloc_writer(void) { - static const ULONG count = sizeof(writer_props)/sizeof(writer_props[0]); + static const ULONG count = ARRAY_SIZE( writer_props ); struct writer *ret; ULONG size = sizeof(*ret) + prop_size( writer_props, count );

1 0

Alistair Leslie-Hughes : mfplat: Forward IMFMediaType to IMFAttributes.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: 71dec0996070bda9b9562e67e7a46ac8f4c59604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71dec0996070bda9b9562e67… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 00:19:07 2018 +0000 mfplat: Forward IMFMediaType to IMFAttributes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 170 ++++++++++++++--------------------------------------- 1 file changed, 43 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71dec0996070bda9b956…

1 0

Nikolay Sivov : d2d1: Properly aggregate render target implementations.
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: a7d847163838d500144f11d1a73000fe4231cebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d847163838d500144f11d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 12 20:47:51 2018 +0430 d2d1: Properly aggregate render target implementations. In order to expose the ID2D1DeviceContext interface for them. 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_render_target.c | 23 ++++--- dlls/d2d1/d2d1_private.h | 14 ++++- dlls/d2d1/dc_render_target.c | 57 +++++++++-------- dlls/d2d1/device.c | 129 +++++++++++++++++++++++++++------------ dlls/d2d1/factory.c | 2 +- dlls/d2d1/hwnd_render_target.c | 51 +++++++++------- dlls/d2d1/wic_render_target.c | 61 ++++++++++-------- 7 files changed, 218 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7d847163838d500144f…

1 0

Nikolay Sivov : xmllite/writer: Improve namespace support in WriteAttributeString().
by Alexandre Julliard Sept. 12, 2018

Sept. 12, 2018

Module: wine Branch: master Commit: 1517695f78d40b56d0e30ec899504e288e00e3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1517695f78d40b56d0e30ec8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 12 16:25:52 2018 +0300 xmllite/writer: Improve namespace support in WriteAttributeString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 67 +++++++++--- dlls/xmllite/writer.c | 251 ++++++++++++++++++++++++++++++-------------- 2 files changed, 224 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1517695f78d40b56d0e3…

1 0

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

Sept. 12, 2018

Module: wine Branch: master Commit: 3f4f96e088c5c42d932be3d65253480d3484ffec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4f96e088c5c42d932be3d6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 11 22:08:07 2018 +0200 wbemprox: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 20 ++++++++++---------- dlls/wbemprox/class.c | 4 ++-- dlls/wbemprox/query.c | 2 +- dlls/wbemprox/reg.c | 2 +- dlls/wbemprox/wbemlocator.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9fe22d0..a695e7c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1782,7 +1782,7 @@ static WCHAR *get_file_version( const WCHAR *filename ) void *block; WCHAR *ret; - if (!(ret = heap_alloc( (4 * 5 + sizeof(fmtW) / sizeof(fmtW[0])) * sizeof(WCHAR) ))) return NULL; + if (!(ret = heap_alloc( (4 * 5 + ARRAY_SIZE( fmtW )) * sizeof(WCHAR) ))) return NULL; if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = heap_alloc( size ))) { heap_free( ret ); @@ -2041,7 +2041,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * { static const WCHAR fmtW[] = {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','%','u',0}; - WCHAR device_id[sizeof(fmtW)/sizeof(fmtW[0]) + 10], root[] = {'A',':','\\',0}; + WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = {'A',':','\\',0}; struct record_diskdrive *rec; UINT i, row = 0, offset = 0, index = 0, type; UINT64 size = 1024 * 1024 * 1024; @@ -2208,7 +2208,7 @@ static enum fill_status fill_ip4routetable( struct table *table, const struct ex static WCHAR *get_volumename( const WCHAR *root ) { WCHAR buf[MAX_PATH + 1] = {0}; - GetVolumeInformationW( root, buf, sizeof(buf)/sizeof(buf[0]), NULL, NULL, NULL, NULL, 0 ); + GetVolumeInformationW( root, buf, ARRAY_SIZE( buf ), NULL, NULL, NULL, NULL, 0 ); return heap_strdupW( buf ); } static WCHAR *get_volumeserialnumber( const WCHAR *root ) @@ -2378,7 +2378,7 @@ static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) WCHAR buf[WS_NI_MAXHOST]; if (!addr) return NULL; - if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, + if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, ARRAY_SIZE( buf ), NULL, 0, WS_NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } @@ -2400,7 +2400,7 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) } for (gateway = list; gateway; gateway = gateway->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( gateway->Address.lpSockaddr, gateway->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2432,7 +2432,7 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li } for (server = list; server; server = server->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( server->Address.lpSockaddr, server->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2465,7 +2465,7 @@ static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } for (address = list; address; address = address->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( address->Address.lpSockaddr, address->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2501,7 +2501,7 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) { WCHAR buf[INET_ADDRSTRLEN]; SOCKADDR_IN addr; - ULONG buflen = sizeof(buf)/sizeof(buf[0]); + ULONG buflen = ARRAY_SIZE( buf ); memset( &addr, 0, sizeof(addr) ); addr.sin_family = WS_AF_INET; @@ -3058,7 +3058,7 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) {'8','.','1',' ','P','r','o',0}; static const WCHAR win10W[] = {'1','0',' ','P','r','o',0}; - int len = sizeof(windowsW)/sizeof(windowsW[0]); + int len = ARRAY_SIZE( windowsW ); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; @@ -3240,7 +3240,7 @@ static enum fill_status fill_service( struct table *table, const struct expr *co ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; SERVICE_STATUS_PROCESS *status; WCHAR sysnameW[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(sysnameW) / sizeof(sysnameW[0]); + DWORD len = ARRAY_SIZE( sysnameW ); UINT i, row = 0, offset = 0, size = 256, needed, count; enum fill_status fill_status = FILL_STATUS_FAILED; BOOL ret; diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 27229bd..92c110f 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -582,7 +582,7 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) { if ((value = get_value_bstr( table, row, i ))) { - *len += sizeof(fmtW) / sizeof(fmtW[0]); + *len += ARRAY_SIZE( fmtW ); *len += strlenW( table->columns[i].name ); *len += SysStringLen( value ); SysFreeString( value ); @@ -608,7 +608,7 @@ static BSTR get_object_text( const struct view *view, UINT index ) UINT len, len_body, row = view->result[index]; BSTR ret, body; - len = sizeof(fmtW) / sizeof(fmtW[0]); + len = ARRAY_SIZE( fmtW ); len += strlenW( view->table->name ); if (!(body = get_body_text( view->table, row, &len_body ))) return NULL; len += len_body; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 76f5caa..8a51266 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -507,7 +507,7 @@ static BOOL is_system_prop( const WCHAR *name ) static BSTR build_servername( const struct view *view ) { WCHAR server[MAX_COMPUTERNAME_LENGTH + 1], *p; - DWORD len = sizeof(server)/sizeof(server[0]); + DWORD len = ARRAY_SIZE( server ); if (view->proplist) return NULL; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 9232db7..79440da 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -82,7 +82,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT HRESULT hr = S_OK; WCHAR buf[256]; BSTR *strings, *tmp; - DWORD count = 2, len = sizeof(buf)/sizeof(buf[0]); + DWORD count = 2, len = ARRAY_SIZE( buf ); LONG res, i = 0; TRACE("%p, %s\n", root, debugstr_w(subkey)); diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 6ed0aed..fe26a87 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -91,7 +91,7 @@ static BOOL is_local_machine( const WCHAR *server ) static const WCHAR dotW[] = {'.',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(buffer) / sizeof(buffer[0]); + DWORD len = ARRAY_SIZE( buffer ); if (!server || !strcmpW( server, dotW ) || !strcmpiW( server, localhostW )) return TRUE; if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; @@ -133,7 +133,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= sizeof(rootW) / sizeof(rootW[0]) && memicmpW( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) && memicmpW( rootW, p, len )) goto done; if (!*q) { hr = S_OK; @@ -141,8 +141,8 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na } q++; len = strlenW( q ); - if ((len != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) && - (len != sizeof(defaultW) / sizeof(defaultW[0]) || memicmpW( q, defaultW, len ))) + if ((len != ARRAY_SIZE( cimv2W ) || memicmpW( q, cimv2W, len )) && + (len != ARRAY_SIZE( defaultW ) || memicmpW( q, defaultW, len ))) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else

1 0