September 2019 - Wine-Devel

[PATCH v2 1/3] winegstreamer: Move more common pin initialization into create_pin().
by Zebediah Figura Sept. 18, 2019

Sept. 18, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 40 +++++++++++++++-------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2ad4b08a13b..a0c8bf6102b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -104,7 +104,7 @@ static const IPinVtbl GST_InputPin_Vtbl; static const IBaseFilterVtbl GST_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; -static BOOL create_pin(struct gstdemux *filter, const WCHAR *name); +static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name); static HRESULT GST_RemoveOutputPins(struct gstdemux *This); static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); @@ -775,10 +775,8 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * char *name; GstCaps *caps; GstStructure *arg; - GstPad *mypad; struct gstdemux_source *pin; int ret; - gchar my_name[1024]; WCHAR nameW[128]; TRACE("%p %p %p\n", This, bin, pad); @@ -787,8 +785,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * MultiByteToWideChar(CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) - 1); nameW[ARRAY_SIZE(nameW) - 1] = 0; TRACE("Name: %s\n", name); - strcpy(my_name, "qz_sink_"); - strcat(my_name, name); g_free(name); caps = gst_pad_query_caps(pad, NULL); @@ -796,29 +792,18 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - mypad = gst_pad_new(my_name, GST_PAD_SINK); - gst_pad_set_chain_function(mypad, got_data_sink_wrapper); - gst_pad_set_event_function(mypad, event_sink_wrapper); - gst_pad_set_query_function(mypad, query_sink_wrapper); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) { FIXME("Unknown type \'%s\'\n", typename); return; } - if (!create_pin(This, nameW)) + if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); return; } - pin = This->ppPins[This->cStreams - 1]; - gst_pad_set_element_private(mypad, pin); - pin->my_sink = mypad; - - gst_segment_init(pin->segment, GST_FORMAT_TIME); - if (!strcmp(typename, "video/x-raw")) { GstElement *vconv; @@ -889,9 +874,9 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto exit; } } else - ret = gst_pad_link(pad, mypad); + ret = gst_pad_link(pad, pin->my_sink); - gst_pad_set_active(mypad, 1); + gst_pad_set_active(pin->my_sink, 1); exit: TRACE("Linking: %i\n", ret); @@ -1784,28 +1769,37 @@ static const struct strmbase_source_ops source_ops = GSTOutPin_DecideAllocator, }; -static BOOL create_pin(struct gstdemux *filter, const WCHAR *name) +static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name) { struct gstdemux_source *pin, **new_array; + char pad_name[19]; if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) - return FALSE; + return NULL; filter->ppPins = new_array; if (!(pin = heap_alloc_zero(sizeof(*pin)))) - return FALSE; + return NULL; strmbase_source_init(&pin->pin, &GST_OutputPin_Vtbl, &filter->filter, name, &source_ops); pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); pin->segment = gst_segment_new(); + gst_segment_init(pin->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &filter->filter.csFilter); BaseFilterImpl_IncrementPinVersion(&filter->filter); + sprintf(pad_name, "qz_sink_%u", filter->cStreams); + pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); + gst_pad_set_element_private(pin->my_sink, pin); + gst_pad_set_chain_function(pin->my_sink, got_data_sink_wrapper); + gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); + gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); + filter->ppPins[filter->cStreams++] = pin; - return TRUE; + return pin; } static HRESULT GST_RemoveOutputPins(struct gstdemux *This) -- 2.23.0

1 2

[PATCH] rpcrt4: Perform the INITOUT phase in NdrAsyncServerCall instead of RpcAsyncCompleteCall.
by Dmitry Timoshkov Sept. 18, 2019

Sept. 18, 2019

This is required to correctly support out reference parameters, otherwise server method receives not initialized pointers during the CALLSERVER phase and crashes. This patch is the last bit for a fully functional asynchronous RPC. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/ndr_stubless.c | 17 +++++++++-------- dlls/rpcrt4/ndr_stubless.h | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 10de5a4f44..bceecdc827 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1632,6 +1632,8 @@ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_S pAsync->StubInfo = async_call_data; async_call_data->pHandleFormat = pFormat; + TRACE("pAsync %p, pAsync->StubInfo %p, NotificationType %d\n", pAsync, pAsync->StubInfo, pAsync->NotificationType); + pFormat += get_handle_desc_size(pProcHeader, pFormat); async_call_data->hBinding = client_get_handle(pStubMsg, pProcHeader, async_call_data->pHandleFormat); if (!async_call_data->hBinding) return; @@ -2075,7 +2077,11 @@ void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) TRACE("UNMARSHAL\n"); stub_do_args(async_call_data->pStubMsg, pFormat, STUBLESS_UNMARSHAL, async_call_data->number_of_params); - /* 2. CALLSERVER */ + /* 2. INITOUT */ + TRACE("INITOUT\n"); + async_call_data->retval_ptr = stub_do_args(async_call_data->pStubMsg, pFormat, STUBLESS_INITOUT, async_call_data->number_of_params); + + /* 3. CALLSERVER */ TRACE("CALLSERVER\n"); if (pServerInfo->ThunkTable && pServerInfo->ThunkTable[pRpcMsg->ProcNum]) pServerInfo->ThunkTable[pRpcMsg->ProcNum](async_call_data->pStubMsg); @@ -2090,8 +2096,6 @@ RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) struct async_call_data *async_call_data; /* the type of pass we are currently doing */ enum stubless_phase phase; - /* location to put retval into */ - LONG_PTR *retval_ptr; RPC_STATUS status = RPC_S_OK; if (!pAsync->StubInfo) @@ -2102,13 +2106,10 @@ RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) TRACE("pAsync %p, pAsync->StubInfo %p, pFormat %p\n", pAsync, pAsync->StubInfo, async_call_data->pHandleFormat); - /* 3. INITOUT */ - TRACE("INITOUT\n"); - retval_ptr = stub_do_args(async_call_data->pStubMsg, async_call_data->pHandleFormat, STUBLESS_INITOUT, async_call_data->number_of_params); - if (retval_ptr) + if (async_call_data->retval_ptr) { TRACE("stub implementation returned 0x%lx\n", *(LONG_PTR *)Reply); - *retval_ptr = *(LONG_PTR *)Reply; + *async_call_data->retval_ptr = *(LONG_PTR *)Reply; } else TRACE("void stub implementation\n"); diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 699a6bcfcf..63bc656990 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -235,6 +235,8 @@ struct async_call_data unsigned short stack_size; /* number of parameters. optional for client to give it to us */ unsigned int number_of_params; + /* location to put retval into */ + LONG_PTR *retval_ptr; /* correlation cache */ ULONG_PTR NdrCorrCache[256]; }; -- 2.20.1

1 0

[PATCH] wininet: Option INTERNET_OPTION_END_BROWSER_SESSION clears cached credentials
by Alistair Leslie-Hughes Sept. 18, 2019

Sept. 18, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 31 ++++++++++++++ dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 1 + dlls/wininet/tests/http.c | 87 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5844a7c7d6..60dab62441 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1019,6 +1019,37 @@ static void cache_authorization(LPWSTR host, LPWSTR scheme, LeaveCriticalSection(&authcache_cs); } +void free_authorization_cache(void) +{ + authorizationData *ad, *sa_safe; + basicAuthorizationData *basic, *basic_safe; + + EnterCriticalSection(&authcache_cs); + + LIST_FOR_EACH_ENTRY_SAFE(basic, basic_safe, &basicAuthorizationCache, basicAuthorizationData, entry) + { + heap_free(basic->host); + heap_free(basic->realm); + heap_free(basic->authorization); + + list_remove(&basic->entry); + heap_free(basic); + } + + LIST_FOR_EACH_ENTRY_SAFE(ad, sa_safe, &authorizationCache, authorizationData, entry) + { + heap_free(ad->host); + heap_free(ad->scheme); + heap_free(ad->user); + heap_free(ad->password); + heap_free(ad->domain); + list_remove(&ad->entry); + heap_free(ad); + } + + LeaveCriticalSection(&authcache_cs); +} + static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, struct HttpAuthInfo **ppAuthInfo, LPWSTR domain_and_username, LPWSTR password, diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b7aa5fe330..266100861d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2821,6 +2821,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_END_BROWSER_SESSION: FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: semi-stub\n"); free_cookie(); + free_authorization_cache(); break; case INTERNET_OPTION_CONNECTED_STATE: FIXME("Option INTERNET_OPTION_CONNECTED_STATE: STUB\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 40e51bec32..8954d071f9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -456,6 +456,7 @@ static inline req_file_t *req_file_addref(req_file_t *req_file) BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN; void free_cookie(void) DECLSPEC_HIDDEN; +void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b61d5c7030..f1a647346e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4502,6 +4502,92 @@ static void test_basic_auth_credentials_reuse(int port) InternetCloseHandle( ses ); } +static void test_basic_auth_credentials_end_session(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + char buffer[0x40]; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + /* Clear the cached credentials */ + ret = InternetSetOptionA(ses, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "unexpected failure %u\n", GetLastError()); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "PUT", "/upload2.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, ""), "got %s\n", buffer); + ok(size == 0, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, ""), "got %s\n", buffer); + ok(size == 0, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + static void test_async_read(int port) { HINTERNET ses, con, req; @@ -5696,6 +5782,7 @@ static void test_http_connection(void) test_request_content_length(si.port); test_accept_encoding(si.port); test_basic_auth_credentials_reuse(si.port); + test_basic_auth_credentials_end_session(si.port); test_async_read(si.port); test_http_read(si.port); test_connection_break(si.port); -- 2.17.1

2 1

[PATCH 1/3] makefiles: Allow make-time silent build output
by Jeff Smith Sept. 18, 2019

Sept. 18, 2019

At make time, setting V=0 will cause the output to be much quieter. While details about the commands being called is suppressed, this can make following the progress of the build easier. It also has the effect of causing warning messages to be more prominent. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- libs/wine/Makefile.in | 2 +- programs/winetest/Makefile.in | 4 +- tools/makedep.c | 90 ++++++++++++++++++++--------------- 3 files changed, 55 insertions(+), 41 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index f7dd34b058..def6da4a31 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -25,7 +25,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) version.c: dummy - version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) + $(QUIET_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) dummy: .PHONY: dummy diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 0322e773c5..689adad46a 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -22,10 +22,10 @@ EXTRA_TARGETS = build.nfo INSTALL_LIB = none build.rc: dummy - build="STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1) + $(QUIET_GEN)build="STRINGTABLE { 1 \"`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1) build.nfo: - -$(CC) -v 2>$@ + -$(QUIET_GEN)$(CC) -v 2>$@ dummy: .PHONY: dummy diff --git a/tools/makedep.c b/tools/makedep.c index e37bd8d63a..4bdef79a78 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2320,7 +2320,7 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi */ static void output_winegcc_command( struct makefile *make ) { - output( "\t%s -o $@", tools_path( make, "winegcc" )); + output( "\t$(QUIET_CCLD)%s -o $@", tools_path( make, "winegcc" )); output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); if (make->is_cross) @@ -2346,7 +2346,7 @@ static void output_symlink_rule( const char *src_name, const char *link_name ) { const char *name; - output( "\trm -f %s && ", link_name ); + output( "\t$(QUIET_LN)rm -f %s && ", link_name ); /* dest path with a directory needs special handling if ln -s isn't supported */ if (strcmp( ln_s, "ln -s" ) && ((name = strrchr( link_name, '/' )))) @@ -2592,7 +2592,7 @@ static void output_po_files( const struct makefile *make ) for (i = 0; i < linguas.count; i++) output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); output( ": %s/wine.pot\n", po_dir ); - output( "\tmsgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", + output( "\t$(QUIET_GEN)msgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", po_dir ); output( "po:" ); for (i = 0; i < linguas.count; i++) @@ -2602,7 +2602,7 @@ static void output_po_files( const struct makefile *make ) output( "%s/wine.pot:", po_dir ); output_filenames( pot_files ); output( "\n" ); - output( "\tmsgcat -o $@" ); + output( "\t$(QUIET_GEN)msgcat -o $@" ); output_filenames( pot_files ); output( "\n" ); } @@ -2619,7 +2619,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); - output( "\t%s -p %s_ -o %s.tab.c -d %s\n", + output( "\t$(QUIET_BISON)%s -p %s_ -o %s.tab.c -d %s\n", bison, obj, obj_dir_path( make, obj ), source->filename ); output( "%s.tab.c: %s %s\n", obj_dir_path( make, obj ), source->filename, obj_dir_path( make, header )); @@ -2627,7 +2627,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co } else output( "%s.tab.c: %s\n", obj, source->filename ); - output( "\t%s -p %s_ -o $@ %s\n", bison, obj, source->filename ); + output( "\t$(QUIET_BISON)%s -p %s_ -o $@ %s\n", bison, obj, source->filename ); } @@ -2637,7 +2637,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co static void output_source_l( struct makefile *make, struct incl_file *source, const char *obj ) { output( "%s.yy.c: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -o$@ %s\n", flex, source->filename ); + output( "\t$(QUIET_FLEX)%s -o $@ %s\n", flex, source->filename ); } @@ -2665,7 +2665,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -o $@", tools_path( make, "wrc" ) ); + output( "\t$(QUIET_GEN)%s -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -2690,7 +2690,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c { strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -O pot -o $@", tools_path( make, "wrc" ) ); + output( "\t$(QUIET_GEN)%s -O pot -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -2716,7 +2716,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c strarray_add( &make->res_files, strmake( "%s.res", obj )); strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -U -O res -o $@ %s", tools_path( make, "wmc" ), source->filename ); + output( "\t$(QUIET_GEN)%s -U -O res -o $@ %s", tools_path( make, "wmc" ), source->filename ); if (linguas.count) { char *po_dir = top_obj_dir_path( make, "po" ); @@ -2728,7 +2728,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c } output( "\n" ); output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -O pot -o $@ %s", tools_path( make, "wmc" ), source->filename ); + output( "\t$(QUIET_GEN)%s -O pot -o $@ %s", tools_path( make, "wmc" ), source->filename ); output( "\n" ); output( "%s.pot %s.res:", obj_dir_path( make, obj ), obj_dir_path( make, obj )); output_filename( tools_path( make, "wmc" )); @@ -2779,7 +2779,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); - output( "\t%s -o $@", tools_path( make, "widl" ) ); + output( "\t$(QUIET_GEN)%s -o $@", tools_path( make, "widl" ) ); output_filenames( target_flags ); output_filenames( defines ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); @@ -2809,7 +2809,7 @@ static void output_source_x( struct makefile *make, struct incl_file *source, co { output( "%s.h: %s%s %s\n", obj_dir_path( make, obj ), tools_dir_path( make, "make_xftmpl" ), tools_ext, source->filename ); - output( "\t%s%s -H -o $@ %s\n", + output( "\t$(QUIET_GEN)%s%s -H -o $@ %s\n", tools_dir_path( make, "make_xftmpl" ), tools_ext, source->filename ); if (source->file->flags & FLAG_INSTALL) { @@ -2833,7 +2833,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, if (fontforge && !make->src_dir) { output( "%s: %s\n", ttf_file, source->filename ); - output( "\t%s -script %s %s $@\n", + output( "\t$(QUIET_GEN)%s -script %s %s $@\n", fontforge, top_src_dir_path( make, "fonts/genttf.ff" ), source->filename ); if (!(source->file->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file ); } @@ -2852,7 +2852,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, strarray_add( &make->all_targets, xstrdup( font )); output( "%s: %s %s\n", obj_dir_path( make, font ), tools_path( make, "sfnt2fon" ), ttf_file ); - output( "\t%s -q -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); + output( "\t$(QUIET_GEN)%s -q -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); add_install_rule( make, source->name, xstrdup(font), strmake( "d$(fontdir)/%s", font )); } } @@ -2875,7 +2875,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, if (images[i]) { output( "%s.%s: %s\n", src_dir_path( make, obj ), images[i], source->filename ); - output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, + output( "\t$(QUIET_GEN)CONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, top_src_dir_path( make, "tools/buildimage" ), source->filename ); } } @@ -2908,7 +2908,7 @@ static void output_source_desktop( struct makefile *make, struct incl_file *sour static void output_source_po( struct makefile *make, struct incl_file *source, const char *obj ) { output( "%s.mo: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -o $@ %s\n", msgfmt, source->filename ); + output( "\t$(QUIET_GEN)%s -o $@ %s\n", msgfmt, source->filename ); strarray_add( &make->all_targets, strmake( "%s.mo", obj )); } @@ -2943,7 +2943,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c strarray_add( &make->in_files, xstrdup(obj) ); strarray_add( &make->all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s %s >$@ || (rm -f $@ && false)\n", sed_cmd, source->filename ); + output( "\t$(QUIET_GEN)%s %s >$@ || (rm -f $@ && false)\n", sed_cmd, source->filename ); output( "%s:", obj_dir_path( make, obj )); output_filenames( source->dependencies ); output( "\n" ); @@ -2972,7 +2972,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, strarray_add( &make->clean_files, dll_name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); - output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, + output( "\t$(QUIET_GEN)echo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, obj_dir_path( make, dll_name ), tools_path( make, "wrc" )); output( "%s:", obj_dir_path( make, dll_name )); @@ -3028,7 +3028,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour else strarray_add( &make->clean_files, strmake( "%s.o", obj )); output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(CC) -c -o $@ %s", source->filename ); + output( "\t$(QUIET_CC)$(CC) -c -o $@ %s", source->filename ); output_filenames( defines ); if (make->module || make->staticlib || make->sharedlib || make->testdll) { @@ -3044,7 +3044,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { strarray_add( is_dll_src ? &make->clean_files : &make->crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); + output( "\t$(QUIET_CC)$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( defines ); output_filenames( extra_cross_cflags ); output_filenames( cpp_flags ); @@ -3058,7 +3058,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { strarray_add( &make->ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); - output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", + output( "\t$(QUIET_TEST)%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", top_src_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), make->testdll, replace_extension( make->testdll, ".dll", "_test.exe" ), make->is_cross ? "" : dll_ext, obj ); @@ -3251,7 +3251,7 @@ static void output_module( struct makefile *make ) { strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output( "\t%s -w --def -o $@", tools_path( make, "winebuild" ) ); + output( "\t$(QUIET_BUILD)%s -w --def -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); @@ -3272,7 +3272,7 @@ static void output_module( struct makefile *make ) output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, make->implib_objs ); output( "\n" ); - output( "\t%s -w --implib -o $@", tools_path( make, "winebuild" ) ); + output( "\t$(QUIET_BUILD)%s -w --implib -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); @@ -3299,7 +3299,7 @@ static void output_module( struct makefile *make ) output( ": %s %s", tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); - output( "\t%s -b %s -w --implib -o $@", tools_path( make, "winebuild" ), crosstarget ); + output( "\t$(QUIET_BUILD)%s -b %s -w --implib -o $@", tools_path( make, "winebuild" ), crosstarget ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); output_filename( spec_file ); @@ -3327,11 +3327,11 @@ static void output_static_lib( struct makefile *make ) output( "%s:", obj_dir_path( make, make->staticlib )); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); - output( "\n\trm -f $@\n" ); - output( "\t%s rc $@", ar ); + output( "\n\t$(QUIET)rm -f $@\n" ); + output( "\t$(QUIET_AR)%s rc $@", ar ); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); - output( "\n\t%s $@\n", ranlib ); + output( "\n\t$(QUIET_RANLIB)%s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); if (needs_cross_lib( make )) @@ -3341,10 +3341,10 @@ static void output_static_lib( struct makefile *make ) strarray_add( &make->all_targets, name ); output( "%s:", obj_dir_path( make, name )); output_filenames_obj_dir( make, make->crossobj_files ); - output( "\n\trm -f $@\n" ); - output( "\t%s-ar rc $@", crosstarget ); + output( "\n\t$(QUIET)rm -f $@\n" ); + output( "\t$(QUIET_AR)%s-ar rc $@", crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); - output( "\n\t%s-ranlib $@\n", crosstarget ); + output( "\n\t$(QUIET_RANLIB)%s-ranlib $@\n", crosstarget ); } } @@ -3371,7 +3371,7 @@ static void output_shared_lib( struct makefile *make ) output_filenames_obj_dir( make, make->object_files ); output_filenames( dep_libs ); output( "\n" ); - output( "\t$(CC) -o $@" ); + output( "\t$(QUIET_CCLD)$(CC) -o $@" ); output_filenames_obj_dir( make, make->object_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); @@ -3437,7 +3437,7 @@ static void output_test_module( struct makefile *make ) output( "all: %s/%s\n", top_obj_dir_path( make, "programs/winetest" ), testres ); output( "%s/%s: %s%s\n", top_obj_dir_path( make, "programs/winetest" ), testres, obj_dir_path( make, stripped ), ext ); - output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | %s -o $@\n", + output( "\t$(QUIET_GEN)echo \"%s TESTRES \\\"%s%s\\\"\" | %s -o $@\n", testmodule, obj_dir_path( make, stripped ), ext, tools_path( make, "wrc" )); output_filenames_obj_dir( make, make->ok_files ); @@ -3481,7 +3481,7 @@ static void output_programs( struct makefile *make ) output_filenames_obj_dir( make, objs ); output_filenames( deps ); output( "\n" ); - output( "\t$(CC) -o $@" ); + output( "\t$(QUIET_CCLD)$(CC) -o $@" ); output_filenames_obj_dir( make, objs ); if (strarray_exists( &all_libs, "-lwine" )) @@ -3498,7 +3498,7 @@ static void output_programs( struct makefile *make ) output_filenames_obj_dir( make, objs ); output_filenames( deps ); output( "\n" ); - output( "\t$(CC) -o $@" ); + output( "\t$(QUIET_CCLD)$(CC) -o $@" ); output_filenames_obj_dir( make, objs ); output_filename( ldrpath_install ); strarray_add( &make->all_targets, program_installed ); @@ -3602,7 +3602,7 @@ static void output_subdirs( struct makefile *make ) } output_filename( tools_path( make, "winebuild" )); output( "\n" ); - output( "\t%s -w -o $@", tools_path( make, "winebuild" )); + output( "\t$(QUIET_BUILD)%s -w -o $@", tools_path( make, "winebuild" )); output_filename( *dll_ext ? "--def" : "--implib" ); output_filenames( target_flags ); if (submake->is_win16) output_filename( "-m16" ); @@ -3624,7 +3624,7 @@ static void output_subdirs( struct makefile *make ) output( ": %s", spec_file ); output_filename( tools_path( make, "winebuild" )); output( "\n" ); - output( "\t%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); + output( "\t$(QUIET_BUILD)%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); if (submake->is_win16) output_filename( "-m16" ); output_filename( "--implib" ); output_filename( "--export" ); @@ -3773,6 +3773,20 @@ static void output_sources( struct makefile *make ) strarray_add( &make->phony_targets, "all" ); + output("ifeq ($(V),0)\n"); + output(" QUIET = @\n"); + output(" QUIET_AR = @echo ' ' AR $@;\n"); + output(" QUIET_BISON = @echo ' ' BISON $@;\n"); + output(" QUIET_BUILD = @echo ' ' BUILD $@;\n"); + output(" QUIET_CC = @echo ' ' CC $@;\n"); + output(" QUIET_CCLD = @echo ' ' CCLD $@;\n"); + output(" QUIET_GEN = @echo ' ' GEN $@;\n"); + output(" QUIET_FLEX = @echo ' ' FLEX $@;\n"); + output(" QUIET_LN = @echo ' ' LN $@;\n"); + output(" QUIET_RANLIB = @echo ' ' RANLIB $@;\n"); + output(" QUIET_TEST = @echo ' ' TEST $@;\n"); + output("endif\n\n"); + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) { char *obj = xstrdup( source->name ); @@ -3804,7 +3818,7 @@ static void output_sources( struct makefile *make ) { output( "%s: %s %s\n", obj_dir_path( make, "dlldata.c" ), tools_path( make, "widl" ), src_dir_path( make, "Makefile.in" )); - output( "\t%s --dlldata-only -o $@", tools_path( make, "widl" )); + output( "\t$(QUIET_GEN)%s --dlldata-only -o $@", tools_path( make, "widl" )); output_filenames( make->dlldata_files ); output( "\n" ); } -- 2.21.0

3 5

[RFC PATCH 0/1] Add emulation for UMIP instructions
by Brendan Shanks Sept. 18, 2019

Sept. 18, 2019

This patch adds emulation for instructions protected by User-Mode Instruction Prevention (currently only implemented by Ryzen 3000 CPUs). I'm still working on tests but wanted to get some feedback, especially on these topics: - I'm currently adding the exception handler in signal_init_process() but this doesn't feel like the right place to do it. Is there a better place for this to go? - the instruction emulation helper functions are copied from ntoskrnl.exe/instr.c, would it be better to move them somewhere so they can be shared? Brendan Shanks (1): ntdll: Add emulation for UMIP instructions dlls/ntdll/Makefile.in | 1 + dlls/ntdll/signal_i386.c | 2 + dlls/ntdll/signal_x86_64.c | 3 + dlls/ntdll/umip.c | 787 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/umip.h | 21 + 5 files changed, 814 insertions(+) create mode 100644 dlls/ntdll/umip.c create mode 100644 dlls/ntdll/umip.h -- 2.17.1

2 2

[PATCH] winebus.sys: Fix build without Linux event support
by Andrew Eikum Sept. 18, 2019

Sept. 18, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 926c755a85f..b72e6bf47d1 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1495,7 +1495,9 @@ void udev_driver_unload( void ) CloseHandle(deviceloop_handle); bus_enumerate_hid_devices(&hidraw_vtbl, device_unload, NULL); +#ifdef HAS_PROPER_INPUT_HEADER bus_enumerate_hid_devices(&lnxev_vtbl, device_unload, NULL); +#endif } NTSTATUS udev_driver_init(void) -- 2.23.0

1 0

[PATCH] kernelbase: Comment out DECLSPEC_HOTPATCH for GetThreadLocale.
by Zhiyi Zhang Sept. 18, 2019

Sept. 18, 2019

Similar to winehq bug 47633 and 47649 but triggered by i686-w64-mingw32-gcc 8.3 with -Og. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 000006d6 <_GetThreadLocale(a)0>: 6d6: 8b ff mov %edi,%edi 6d8: 55 push %ebp 6d9: 8b ec mov %esp,%ebp 6db: 64 a1 18 00 00 00 mov %fs:0x18,%eax 6e1: 8b 80 c4 00 00 00 mov 0xc4(%eax),%eax 6e7: 85 c0 test %eax,%eax 6e9: 74 01 je 6ec <_GetThreadLocale(a)0+0x16> > missing 'add $0x4, %esp' or similar here 6eb: c3 ret 6ec: 83 ec 08 sub $0x8,%esp 6ef: e8 00 00 00 00 call 6f4 <_GetThreadLocale(a)0+0x1e> 6f4: 64 8b 15 18 00 00 00 mov %fs:0x18,%edx 6fb: 89 82 c4 00 00 00 mov %eax,0xc4(%edx) 701: c9 leave 702: c3 ret dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index e16062016a..83aa8dc8cc 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -253,7 +253,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetThreadId( HANDLE thread ) /*********************************************************************** * GetThreadLocale (kernelbase.@) */ -LCID WINAPI DECLSPEC_HOTPATCH GetThreadLocale(void) +LCID WINAPI /* DECLSPEC_HOTPATCH */ GetThreadLocale(void) { LCID ret = NtCurrentTeb()->CurrentLocale; if (!ret) NtCurrentTeb()->CurrentLocale = ret = GetUserDefaultLCID(); -- 2.23.0

1 0

[PATCH 2/2] scrobj/tests: Add scriptlet tests.
by Jacek Caban Sept. 18, 2019

Sept. 18, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/tests/Makefile.in | 8 + dlls/scrobj/tests/rsrc.rc | 20 + dlls/scrobj/tests/scrobj.c | 1012 +++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.wsc | 28 + 4 files changed, 1068 insertions(+) create mode 100644 dlls/scrobj/tests/Makefile.in create mode 100644 dlls/scrobj/tests/rsrc.rc create mode 100644 dlls/scrobj/tests/scrobj.c create mode 100644 dlls/scrobj/tests/scrobj.wsc

1 0

[PATCH 1/2] scrobj: Add partial DllInstall implementation.
by Jacek Caban Sept. 18, 2019

Sept. 18, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 19 +++++++++++++++++++ dlls/scrobj/scrobj.spec | 1 + 2 files changed, 20 insertions(+)

1 0

[PATCH] winex11.drv: Add a delay on FocusIn/NotifyUngrab before grabbing the cursor.
by Rémi Bernon Sept. 18, 2019

Sept. 18, 2019

Since 92177b0b161e91f1d609615d89d8e3199feea33f we retry grabbing the cursor with the last clipping rectangle as soon as the WM releases the keyboard. However it sometimes messes up with the Shell that expects to be able to grab the cursor before opening activity view. Without this, it can be hard to trigger the GNOME Shell activity view by pressing the Super key while a Wine window is active. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/event.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f79f40c2323..9c6bf5c10bf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -787,6 +787,11 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) keyboard_grabbed = FALSE; break; case NotifyUngrab: + /* hack: wait a bit before trying to grab the cursor, the wm might have released the grab + * for the Shell - gnome-shell or similar - to take it, and we shouldn't get in their way. + */ + Sleep(100); + keyboard_grabbed = FALSE; retry_grab_clipping_window(); return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */ -- 2.23.0

1 0