June 2020 - Wine-Commits - list.winehq.org

Paul Gofman : netio.sys: Add WSK provider stub interface.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 10331eb2b76c1b0220ac93a1be1d78771495c2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=10331eb2b76c1b0220ac93a1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 11 17:47:46 2020 +0300 netio.sys: Add WSK provider stub interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 118 ++++++++++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/driver4.c | 8 ++- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 839a06d30d..fac91736ab 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -32,32 +32,138 @@ #include "ddk/wsk.h" #include "wine/debug.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(netio); +struct _WSK_CLIENT +{ + WSK_REGISTRATION *registration; + WSK_CLIENT_NPI *client_npi; +}; + +static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_family, USHORT socket_type, + ULONG protocol, ULONG Flags, void *socket_context, const void *dispatch, PEPROCESS owning_process, + PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) +{ + FIXME("client %p, address_family %#x, socket_type %#x, protocol %#x, Flags %#x, socket_context %p, dispatch %p, " + "owning_process %p, owning_thread %p, security_descriptor %p, irp %p stub.\n", + client, address_family, socket_type, protocol, Flags, socket_context, dispatch, owning_process, + owning_thread, security_descriptor, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_socket_connect(WSK_CLIENT *client, USHORT socket_type, ULONG protocol, + SOCKADDR *local_address, SOCKADDR *remote_address, ULONG flags, void *socket_context, + const WSK_CLIENT_CONNECTION_DISPATCH *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, + SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) +{ + FIXME("client %p, socket_type %#x, protocol %#x, local_address %p, remote_address %p, " + "flags %#x, socket_context %p, dispatch %p, owning_process %p, owning_thread %p, " + "security_descriptor %p, irp %p stub.\n", + client, socket_type, protocol, local_address, remote_address, flags, socket_context, + dispatch, owning_process, owning_thread, security_descriptor, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_control_client(WSK_CLIENT *client, ULONG control_code, SIZE_T input_size, + void *input_buffer, SIZE_T output_size, void *output_buffer, SIZE_T *output_size_returned, + IRP *irp +) +{ + FIXME("client %p, control_code %#x, input_size %lu, input_buffer %p, output_size %lu, " + "output_buffer %p, output_size_returned %p, irp %p, stub.\n", + client, control_code, input_size, input_buffer, output_size, output_buffer, + output_size_returned, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING *node_name, + UNICODE_STRING *service_name, ULONG name_space, GUID *provider, ADDRINFOEXW *hints, + ADDRINFOEXW **result, PEPROCESS owning_process, PETHREAD owning_thread, IRP *irp) +{ + FIXME("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " + "result %p, owning_process %p, owning_thread %p, irp %p stub.\n", + client, node_name, service_name, name_space, provider, hints, result, + owning_process, owning_thread, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static void WINAPI wsk_free_address_info(WSK_CLIENT *client, ADDRINFOEXW *addr_info) +{ + FIXME("client %p, addr_info %p stub.\n", client, addr_info); +} + +static NTSTATUS WINAPI wsk_get_name_info(WSK_CLIENT *client, SOCKADDR *sock_addr, ULONG sock_addr_length, + UNICODE_STRING *node_name, UNICODE_STRING *service_name, ULONG flags, PEPROCESS owning_process, + PETHREAD owning_thread, IRP *irp) +{ + FIXME("client %p, sock_addr %p, sock_addr_length %u, node_name %p, service_name %p, " + "flags %#x, owning_process %p, owning_thread %p, irp %p stub.\n", + client, sock_addr, sock_addr_length, node_name, service_name, flags, + owning_process, owning_thread, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static const WSK_PROVIDER_DISPATCH wsk_dispatch = +{ + MAKE_WSK_VERSION(1, 0), 0, + wsk_socket, + wsk_socket_connect, + wsk_control_client, + wsk_get_address_info, + wsk_free_address_info, + wsk_get_name_info, +}; + NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, WSK_PROVIDER_NPI *wsk_provider_npi) { - FIXME("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p stub.\n", + WSK_CLIENT *client = wsk_registration->ReservedRegistrationContext; + + TRACE("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p.\n", wsk_registration, wait_timeout, wsk_provider_npi); - return STATUS_NOT_IMPLEMENTED; + wsk_provider_npi->Client = client; + wsk_provider_npi->Dispatch = &wsk_dispatch; + return STATUS_SUCCESS; } void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_registration %p stub.\n", wsk_registration); + TRACE("wsk_registration %p.\n", wsk_registration); + } NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); + WSK_CLIENT *client; - return STATUS_NOT_IMPLEMENTED; + TRACE("wsk_client_npi %p, wsk_registration %p.\n", wsk_client_npi, wsk_registration); + + if (!(client = heap_alloc(sizeof(*client)))) + { + ERR("No memory.\n"); + return STATUS_NO_MEMORY; + } + + client->registration = wsk_registration; + client->client_npi = wsk_client_npi; + wsk_registration->ReservedRegistrationContext = client; + + return STATUS_SUCCESS; } void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_registration %p stub.\n", wsk_registration); + TRACE("wsk_registration %p.\n", wsk_registration); + + heap_free(wsk_registration->ReservedRegistrationContext); } static void WINAPI driver_unload(DRIVER_OBJECT *driver) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 2fe6072ec5..d863d74836 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -66,10 +66,14 @@ static void netio_init(void) client_npi.Dispatch = &client_dispatch; status = WskRegister(&client_npi, &registration); - todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); status = WskCaptureProviderNPI(&registration, WSK_INFINITE_WAIT, &provider_npi); - todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + ok(provider_npi.Dispatch->Version >= MAKE_WSK_VERSION(1, 0), "Got unexpected version %#x.\n", + provider_npi.Dispatch->Version); + ok(!!provider_npi.Client, "Got null WSK_CLIENT.\n"); } static void netio_uninit(void)

1 0

Alexandre Julliard : makefiles: Also build import libs for extra test modules.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: c873db8c1d089ad5c8d87acbbe74b2024a537b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c873db8c1d089ad5c8d87acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 19:40:25 2020 +0200 makefiles: Also build import libs for extra test modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 536d2263e3..743eaf6e35 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -183,6 +183,7 @@ struct makefile struct strarray install_lib; struct strarray install_dev; struct strarray extra_targets; + struct strarray extra_imports; struct list sources; struct list includes; const char *base_dir; @@ -1958,6 +1959,12 @@ static void add_generated_sources( struct makefile *make ) if (!make->disabled) strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" )); } + if (strendswith( source->name, ".spec" )) + { + char *obj = replace_extension( source->name, ".spec", "" ); + strarray_addall_uniq( &make->extra_imports, + get_expanded_file_local_var( make, obj, "IMPORTS" )); + } } if (make->testdll) { @@ -4361,8 +4368,8 @@ static void load_sources( struct makefile *make ) if (make->is_cross) { - for (i = 0; i < make->imports.count; i++) - strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); + strarray_addall_uniq( &cross_import_libs, make->imports ); + strarray_addall_uniq( &cross_import_libs, make->extra_imports ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" );

1 0

Jacek Caban : msscript/tests: Add more script state tests.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 60114e157c16f403cd93a2900d5bbde59b6a84db URL: https://source.winehq.org/git/wine.git/?a=commit;h=60114e157c16f403cd93a290… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 17:11:37 2020 +0200 msscript/tests: Add more script state tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 189 +++++++++++++++++++++++++++++++++++-- 1 file changed, 180 insertions(+), 9 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 92fd833026..6a0730368c 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -99,8 +99,10 @@ DEFINE_EXPECT(Invoke); DEFINE_EXPECT(InvokeEx); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); +DEFINE_EXPECT(GetScriptState); DEFINE_EXPECT(SetScriptState_INITIALIZED); DEFINE_EXPECT(SetScriptState_STARTED); +DEFINE_EXPECT(SetScriptState_CONNECTED); DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(AddNamedItem); DEFINE_EXPECT(GetScriptDispatch); @@ -498,24 +500,30 @@ static HRESULT WINAPI ActiveScript_GetScriptSite(IActiveScript *iface, REFIID ri static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) { - if (ss == SCRIPTSTATE_INITIALIZED) { + switch(ss) + { + case SCRIPTSTATE_INITIALIZED: CHECK_EXPECT(SetScriptState_INITIALIZED); return S_OK; - } - else if (ss == SCRIPTSTATE_STARTED) { + case SCRIPTSTATE_STARTED: CHECK_EXPECT(SetScriptState_STARTED); return S_OK; - } - else + case SCRIPTSTATE_CONNECTED: + CHECK_EXPECT(SetScriptState_CONNECTED); + return S_OK; + default: ok(0, "unexpected call, state %u\n", ss); - - return E_NOTIMPL; + return E_NOTIMPL; + } } +static SCRIPTSTATE emulated_script_state; + static HRESULT WINAPI ActiveScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetScriptState); + *pssState = emulated_script_state; + return S_OK; } static HRESULT WINAPI ActiveScript_Close(IActiveScript *iface) @@ -1553,6 +1561,169 @@ static void test_State(void) ok(state == Connected, "got %d\n", state); IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + BSTR language, code_str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_CONNECTED); + hr = IScriptControl_put_State(sc, Connected); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_CONNECTED); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_item_name = NULL; + parse_flags = SCRIPTTEXT_ISVISIBLE; + code_str = SysAllocString(L"1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + emulated_script_state = SCRIPTSTATE_INITIALIZED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Initialized, "got %d\n", state); + CHECK_CALLED(GetScriptState); + + emulated_script_state = SCRIPTSTATE_STARTED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Initialized, "got %d\n", state); + CHECK_CALLED(GetScriptState); + + emulated_script_state = SCRIPTSTATE_CONNECTED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Connected, "got %d\n", state); + CHECK_CALLED(GetScriptState); + + emulated_script_state = SCRIPTSTATE_UNINITIALIZED; + SET_EXPECT(GetScriptState); + hr = IScriptControl_get_State(sc, &state); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + CHECK_CALLED(GetScriptState); + + SET_EXPECT(ParseScriptText); + code_str = SysAllocString(L"0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_STARTED); + hr = IScriptControl_put_State(sc, Initialized); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_STARTED); + + SET_EXPECT(SetScriptState_CONNECTED); + hr = IScriptControl_put_State(sc, Connected); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_CONNECTED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_item_name = NULL; + parse_flags = SCRIPTTEXT_ISVISIBLE; + code_str = SysAllocString(L"1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(SetScriptState_CONNECTED); + hr = IScriptControl_put_State(sc, Connected); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetScriptState_CONNECTED); + + SET_EXPECT(ParseScriptText); + code_str = SysAllocString(L"0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + } } #define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, __LINE__)

1 0

Gabriel Ivăncescu : msscript.ocx/tests: Add initial tests for Script Modules.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 14b4a561b2a293b224e349faf57f7d5a46cb8a10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14b4a561b2a293b224e349fa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jun 12 17:11:12 2020 +0200 msscript.ocx/tests: Add initial tests for Script Modules. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 195 ++++++++++++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14b4a561b2a293b224e3…

1 0

Nikolay Sivov : dwrite: Keep current lookup feature mask in context.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: b2d9d552c08ab39f5edf3ca4a89a320e7b2e0cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d9d552c08ab39f5edf3ca4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 12 14:22:28 2020 +0300 dwrite: Keep current lookup feature mask in context. Lookups referenced from context-based lookups need to have access to original feature mask, set it once instead of propagating it on every recursive call. It's used for input matching and parametrized cases like alternate substitutions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 661e01123c..be3f4b719e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -585,6 +585,7 @@ struct scriptshaping_context unsigned int range_count; } user_features; unsigned int global_mask; + unsigned int lookup_mask; /* Currently processed feature mask, set in main loop. */ struct shaping_glyph_info *glyph_infos; unsigned int cur; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index cb79a68d59..22159e2988 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4802,6 +4802,8 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, const struct lookup *lookup = &lookups.lookups[i]; context->cur = 0; + context->lookup_mask = lookup->mask; + while (context->cur < context->glyph_count) { ret = FALSE; @@ -5037,8 +5039,8 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (!count) return FALSE; - BitScanForward(&shift, lookup->mask); - alt_index = (lookup->mask & context->glyph_infos[idx].mask) >> shift; + BitScanForward(&shift, context->lookup_mask); + alt_index = (context->lookup_mask & context->glyph_infos[idx].mask) >> shift; if (alt_index > count || !alt_index) return FALSE; @@ -5071,7 +5073,7 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, match_positions[0] = context->cur; glyph_iterator_init(context, mc->lookup->flags, context->cur, count - 1, &iter); - iter.mask = mc->lookup->mask; + iter.mask = context->lookup_mask; iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = input; @@ -5933,6 +5935,8 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, { const struct lookup *lookup = &lookups.lookups[i]; + context->lookup_mask = lookup->mask; + if (!opentype_is_gsub_lookup_reversed(context, lookup)) { context->cur = 0;

1 0

Vijay Kiran Kamuju : oleaut32: Merge four DWORDs into a GUID.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 45f0a15edc8e9a42ff317fab8677d9c107c8d48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f0a15edc8e9a42ff317fab… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jun 12 10:07:19 2020 +0100 oleaut32: Merge four DWORDs into a GUID. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 9c700b11a7..521d176bfe 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -309,10 +309,7 @@ typedef struct { /*08*/ WORD res08; /* some kind of len/offset ?? */ /*0a*/ WORD first_blk; /* 1 based index into blk entries that corresponds to first block in file */ -/*0c*/ DWORD res0c; /* always 0x000204ff */ -/*10*/ DWORD res10; /* always 0x00000000 */ -/*14*/ DWORD res14; /* always 0x000000c0 */ -/*18*/ DWORD res18; /* always 0x46000000 */ +/*0c*/ GUID guid; /* always 000204ff-0000-0000-c000-000000000046 */ /*1c*/ DWORD res1c; /* always 0x00000044 */ /*20*/ DWORD res20; /* always 0xffff0000 */ } SLTG_Header;

1 0

Zhiyi Zhang : winemac.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: ca1d31fc3b153a38c38b27b873052ce6f04cb5d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1d31fc3b153a38c38b27b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 12 15:30:02 2020 +0800 winemac.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1. 0 or 1 in dmDisplayFrequency means to use the default frequency. Fix Disgaea PC and Ostriv failing to launch in exclusive fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1a3cc349b5..001906efdf 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -893,7 +893,9 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmPelsHeight != height) continue; } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency != 0) + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && + devmode->dmDisplayFrequency != 0 && + devmode->dmDisplayFrequency != 1) { double refresh_rate = CGDisplayModeGetRefreshRate(display_mode); if (!refresh_rate)

1 0

Gabriel Ivăncescu : msscript.ocx: Add IScriptModuleCollection stub implementation.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: df05973ca6cdaf32b07060cd5780b733f27a3cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df05973ca6cdaf32b07060cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jun 12 17:10:34 2020 +0200 msscript.ocx: Add IScriptModuleCollection stub implementation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 166 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485980..57200da21f 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -106,6 +106,9 @@ struct ScriptControl { IAdviseSink *view_sink; DWORD view_sink_flags; + /* modules */ + IScriptModuleCollection IScriptModuleCollection_iface; + ScriptHost *host; }; @@ -113,6 +116,7 @@ static HINSTANCE msscript_instance; typedef enum tid_t { IScriptControl_tid, + IScriptModuleCollection_tid, LAST_tid } tid_t; @@ -120,7 +124,8 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { - &IID_IScriptControl + &IID_IScriptControl, + &IID_IScriptModuleCollection, }; static HRESULT load_typelib(void) @@ -277,6 +282,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleCollection *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -551,6 +561,151 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static HRESULT WINAPI ScriptModuleCollection_QueryInterface(IScriptModuleCollection *iface, REFIID riid, void **ppv) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptModuleCollection, riid)) + { + *ppv = &This->IScriptModuleCollection_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptModuleCollection_AddRef(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI ScriptModuleCollection_Release(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfoCount(IScriptModuleCollection *iface, UINT *pctinfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfo(IScriptModuleCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptModuleCollection_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptModuleCollection_GetIDsOfNames(IScriptModuleCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_Invoke(IScriptModuleCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_get__NewEnum(IScriptModuleCollection *iface, IUnknown **ppenumContexts) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, ppenumContexts); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Item(IScriptModuleCollection *iface, VARIANT index, + IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection *iface, LONG *plCount) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, plCount); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name, + VARIANT *object, IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %s %p)\n", This, wine_dbgstr_w(name), wine_dbgstr_variant(object), ppmod); + + return E_NOTIMPL; +} + +static const IScriptModuleCollectionVtbl ScriptModuleCollectionVtbl = { + ScriptModuleCollection_QueryInterface, + ScriptModuleCollection_AddRef, + ScriptModuleCollection_Release, + ScriptModuleCollection_GetTypeInfoCount, + ScriptModuleCollection_GetTypeInfo, + ScriptModuleCollection_GetIDsOfNames, + ScriptModuleCollection_Invoke, + ScriptModuleCollection_get__NewEnum, + ScriptModuleCollection_get_Item, + ScriptModuleCollection_get_Count, + ScriptModuleCollection_Add +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -922,8 +1077,12 @@ static HRESULT WINAPI ScriptControl_put_UseSafeSubset(IScriptControl *iface, VAR static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptModuleCollection **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = &This->IScriptModuleCollection_iface; + IScriptControl_AddRef(iface); + return S_OK; } static HRESULT WINAPI ScriptControl_get_Error(IScriptControl *iface, IScriptError **p) @@ -2031,6 +2190,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IViewObjectEx_iface.lpVtbl = &ViewObjectExVtbl; script_control->IPointerInactive_iface.lpVtbl = &PointerInactiveVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; + script_control->IScriptModuleCollection_iface.lpVtbl = &ScriptModuleCollectionVtbl; script_control->ref = 1; script_control->site = NULL; script_control->cp_list = NULL;

1 0

Anton Baskanov : quartz/filtergraph: Always sort filter list before use.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: ff38669c1adb127aebfe2dea640d720790cd2436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff38669c1adb127aebfe2dea… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Jun 12 14:57:09 2020 +0700 quartz/filtergraph: Always sort filter list before use. Some applications (e.g. Earth 2150) call IPin::Connect directly instead of IFilterGraph::ConnectDirect. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 48 ++++++++++++++++------------------------- dlls/quartz/tests/filtergraph.c | 11 +++++++--- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0d0ccc2b62..fa20d98981 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -151,7 +151,7 @@ typedef struct _ITF_CACHE_ENTRY { struct filter { - struct list entry, sorted_entry; + struct list entry; IBaseFilter *filter; IMediaSeeking *seeking; WCHAR *name; @@ -187,17 +187,7 @@ typedef struct _IFilterGraphImpl { LONG ref; IUnknown *punkFilterMapper2; - /* We keep two lists of filters, one unsorted and one topologically sorted. - * The former is necessary for functions like IGraphBuilder::Connect() and - * IGraphBuilder::Render() that iterate through the filter list but may - * add to it while doing so; the latter is for functions like - * IMediaControl::Run() that should propagate messages to all filters - * (including unconnected ones) but must do so in topological order from - * sinks to sources. We can easily guarantee that the loop in Connect() will - * touch each filter exactly once so long as we aren't reordering it, but - * using the sorted filters list there would be hard. This seems to be the - * easiest and clearest solution. */ - struct list filters, sorted_filters; + struct list filters; unsigned int name_index; IReferenceClock *refClock; @@ -686,7 +676,6 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter_AddRef(entry->filter = filter); list_add_head(&graph->filters, &entry->entry); - list_add_head(&graph->sorted_filters, &entry->sorted_entry); entry->sorting = FALSE; entry->seeking = NULL; ++graph->version; @@ -768,7 +757,6 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte if (entry->seeking) IMediaSeeking_Release(entry->seeking); list_remove(&entry->entry); - list_remove(&entry->sorted_entry); CoTaskMemFree(entry->name); heap_free(entry); This->version++; @@ -897,7 +885,7 @@ static struct filter *find_sorted_filter(IFilterGraphImpl *graph, IBaseFilter *i { struct filter *filter; - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { if (filter->filter == iface) return filter; @@ -941,21 +929,21 @@ static void sort_filter_recurse(IFilterGraphImpl *graph, struct filter *filter, filter->sorting = FALSE; - list_remove(&filter->sorted_entry); - list_add_head(sorted, &filter->sorted_entry); + list_remove(&filter->entry); + list_add_head(sorted, &filter->entry); } static void sort_filters(IFilterGraphImpl *graph) { struct list sorted = LIST_INIT(sorted), *cursor; - while ((cursor = list_head(&graph->sorted_filters))) + while ((cursor = list_head(&graph->filters))) { - struct filter *filter = LIST_ENTRY(cursor, struct filter, sorted_entry); + struct filter *filter = LIST_ENTRY(cursor, struct filter, entry); sort_filter_recurse(graph, filter, &sorted); } - list_move_tail(&graph->sorted_filters, &sorted); + list_move_tail(&graph->filters, &sorted); } /* NOTE: despite the implication, it doesn't matter which @@ -1008,9 +996,6 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi } } - if (SUCCEEDED(hr)) - sort_filters(This); - return hr; } @@ -5138,9 +5123,11 @@ static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) return S_OK; } + sort_filters(graph); + if (graph->state == State_Running) { - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Pause(filter->filter); if (hr == S_OK) @@ -5148,7 +5135,7 @@ static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) } } - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Stop(filter->filter); if (hr == S_OK) @@ -5194,6 +5181,7 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) return S_OK; } + sort_filters(graph); update_render_count(graph); if (graph->defaultclock && !graph->refClock) @@ -5207,7 +5195,7 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) graph->current_pos += graph->stream_elapsed; } - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Pause(filter->filter); if (hr == S_OK) @@ -5238,6 +5226,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) } graph->EcCompleteCount = 0; + sort_filters(graph); update_render_count(graph); if (graph->defaultclock && !graph->refClock) @@ -5251,7 +5240,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) stream_start += 500000; } - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Run(filter->filter, stream_start); if (hr == S_OK) @@ -5278,9 +5267,11 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F EnterCriticalSection(&graph->cs); + sort_filters(graph); + *state = graph->state; - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { FILTER_STATE filter_state; int wait; @@ -5753,7 +5744,6 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; fimpl->ref = 1; list_init(&fimpl->filters); - list_init(&fimpl->sorted_filters); fimpl->name_index = 1; fimpl->refClock = NULL; fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 50c2402c32..4f4abeac9b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3166,7 +3166,9 @@ static void test_filter_state(void) IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + /* Using IPin::Connect instead of IFilterGraph2::ConnectDirect to show that */ + /* FilterGraph does not rely on ::ConnectDirect to track filter connections. */ + IPin_Connect(&source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); check_filter_state(graph, State_Stopped); @@ -3241,9 +3243,12 @@ static void test_filter_state(void) IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + /* Add the filters in reverse order this time. */ IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + /* Using IPin::Connect instead of IFilterGraph2::ConnectDirect to show that */ + /* FilterGraph does not rely on ::ConnectDirect to track filter connections. */ + IPin_Connect(&source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); hr = IMediaFilter_Pause(filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Martin Storsjo : widl: Make decl_needs_parens static.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: d51c5723c3cef9ed42ae6e6b8fdab34330bc7a27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d51c5723c3cef9ed42ae6e6b… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Jun 12 15:08:42 2020 +0300 widl: Make decl_needs_parens static. This function lacks a declaration in header.h and isn't used outside of this source file. This fixes warnings about missing a prototype, when built as part of mingw-w64-tools (where it is built with -Wmissing-prototypes). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c00a3e1bb3..a319f2425e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -283,7 +283,7 @@ int needs_space_after(type_t *t) (!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name))); } -int decl_needs_parens(const type_t *t) +static int decl_needs_parens(const type_t *t) { if (type_is_alias(t)) return FALSE;

1 0