wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Alexandre Julliard : winegcc: Fix handling of the --sysroot flag when not building inside the Wine tree.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 0c2cc9bb05815b88286422e714825929d40ec2ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2cc9bb05815b88286422e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 12:07:01 2019 +0200 winegcc: Fix handling of the --sysroot flag when not building inside the Wine tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a7476dd19d..db46cf6d5d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -213,6 +213,8 @@ struct options const char* output_name; const char* image_base; const char* section_align; + const char* sysroot; + const char* isysroot; const char* lib_suffix; const char* subsystem; const char* prelink; @@ -567,6 +569,7 @@ static char *get_lib_dir( struct options *opts ) static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; + const char *root = opts->sysroot ? opts->sysroot : ""; unsigned int i; size_t build_len, target_len; @@ -579,8 +582,10 @@ static char *get_lib_dir( struct options *opts ) for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); - strcpy( buffer, stdlibpath[i] ); + char *p, *buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); + strcpy( buffer, root ); + strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); @@ -598,7 +603,8 @@ static char *get_lib_dir( struct options *opts ) strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; - strcpy( buffer, stdlibpath[i] ); + strcpy( buffer, root ); + strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); @@ -646,7 +652,7 @@ static char *get_lib_dir( struct options *opts ) buffer[strlen(buffer) - strlen(libwine)] = 0; return buffer; } - return xstrdup( LIBDIR ); + return strmake( "%s%s", root, LIBDIR ); } static void compile(struct options* opts, const char* lang) @@ -798,13 +804,16 @@ no_compat_defines: /* standard includes come last in the include search path */ if (!opts->wine_objdir && !opts->nostdinc) { + const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; if (opts->use_msvcrt) { - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); + strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", + gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, "-I" INCLUDEDIR ); - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); + strarray_add(comp_args, strmake( "-I%s%s", root, INCLUDEDIR )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", + gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); } else if (opts->wine_objdir) strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) ); @@ -1418,8 +1427,9 @@ int main(int argc, char **argv) next_is_arg = 1; break; case '-': - if (strcmp("--param", argv[i]) == 0) - next_is_arg = 1; + next_is_arg = (strcmp("--param", argv[i]) == 0 || + strcmp("--sysroot", argv[i]) == 0 || + strcmp("--lib-suffix", argv[i]) == 0); break; } if (next_is_arg) @@ -1496,6 +1506,9 @@ int main(int argc, char **argv) else if (!strcmp("-fno-PIC", argv[i]) || !strcmp("-fno-pic", argv[i])) opts.pic = 0; break; + case 'i': + if (!strcmp( "-isysroot", argv[i] )) opts.isysroot = argv[i + 1]; + break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg)); break; @@ -1637,16 +1650,16 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", argv[i]+1) == 0) linking = -1; - else if (!strncmp("--sysroot", argv[i], 9) && opts.wine_objdir) + else if (!strncmp("--sysroot", argv[i], 9)) { - if (argv[i][9] == '=') opts.wine_objdir = argv[i] + 10; - else opts.wine_objdir = argv[++i]; - raw_compiler_arg = raw_linker_arg = 0; + if (argv[i][9] == '=') opts.sysroot = argv[i] + 10; + else opts.sysroot = argv[i + 1]; + if (opts.wine_objdir) raw_compiler_arg = raw_linker_arg = 0; } else if (!strncmp("--lib-suffix", argv[i], 12) && opts.wine_objdir) { if (argv[i][12] == '=') opts.lib_suffix = argv[i] + 13; - else opts.lib_suffix = argv[++i]; + else opts.lib_suffix = argv[i + 1]; raw_compiler_arg = raw_linker_arg = 0; } break; @@ -1675,6 +1688,7 @@ int main(int argc, char **argv) } } + if (opts.wine_objdir && opts.sysroot) opts.wine_objdir = opts.sysroot; if (opts.processor == proc_cpp) linking = 0; if (linking == -1) error("Static linking is not supported\n");

1 0

Alexandre Julliard : winebuild: Add support for the -B option.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 6ba101b22965d9b9ef66d54c0d12c253db0f4569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba101b22965d9b9ef66d54c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 17:53:19 2019 +0200 winebuild: Add support for the -B option. Based on a patch by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 ++- tools/winebuild/utils.c | 123 ++++++++++++++++++++++----------------- tools/winebuild/winebuild.man.in | 4 ++ 4 files changed, 80 insertions(+), 55 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index bde322cef3..2b67d305e8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -369,6 +369,7 @@ extern FILE *output_file; extern const char *output_file_name; extern struct strarray lib_path; +extern struct strarray tools_path; extern struct strarray as_command; extern struct strarray cc_command; extern struct strarray ld_command; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 7d54395860..f4abb55081 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -83,6 +83,7 @@ const char *output_file_name = NULL; static int fake_module; struct strarray lib_path = { 0 }; +struct strarray tools_path = { 0 }; struct strarray as_command = { 0 }; struct strarray cc_command = { 0 }; struct strarray ld_command = { 0 }; @@ -257,6 +258,7 @@ static const char usage_str[] = "Options:\n" " --as-cmd=AS Command to use for assembling (default: as)\n" " -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" +" -B PREFIX Look for build tools in the PREFIX directory\n" " --cc-cmd=CC C compiler to use for assembling (default: fall back to --as-cmd)\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" @@ -316,7 +318,7 @@ enum long_options_values LONG_OPT_VERSION }; -static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; +static const char short_options[] = "B:C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; static const struct option long_options[] = { @@ -389,6 +391,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) { switch(optc) { + case 'B': + strarray_add( &tools_path, xstrdup( optarg ), NULL ); + break; case 'D': /* ignored */ break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index fe82ad75e9..a73f520ccc 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -281,11 +281,72 @@ int output( const char *format, ... ) return ret; } +static struct strarray get_tools_path(void) +{ + static int done; + static struct strarray dirs; + + if (!done) + { + dirs = strarray_copy( tools_path ); + + /* then append the PATH directories */ + if (getenv( "PATH" )) + { + char *p = xstrdup( getenv( "PATH" )); + while (*p) + { + strarray_add_one( &dirs, p ); + while (*p && *p != PATH_SEPARATOR) p++; + if (!*p) break; + *p++ = 0; + } + } + done = 1; + } + return dirs; +} + +/* find a binary in the path */ +static const char *find_binary( const char *prefix, const char *name ) +{ + struct strarray dirs = get_tools_path(); + unsigned int i, maxlen = 0; + struct stat st; + char *p, *file; + + if (strchr( name, '/' )) return name; + if (!prefix) prefix = ""; + for (i = 0; i < dirs.count; i++) maxlen = max( maxlen, strlen(dirs.str[i]) + 2 ); + file = xmalloc( maxlen + strlen(prefix) + strlen(name) + sizeof(EXEEXT) + 1 ); + + for (i = 0; i < dirs.count; i++) + { + strcpy( file, dirs.str[i] ); + p = file + strlen(file); + if (p == file) *p++ = '.'; + if (p[-1] != '/') *p++ = '/'; + if (*prefix) + { + strcpy( p, prefix ); + p += strlen(p); + *p++ = '-'; + } + strcpy( p, name ); + strcat( p, EXEEXT ); + if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) return file; + } + free( file ); + return NULL; +} + void spawn( struct strarray args ) { unsigned int i; int status; + const char *argv0 = find_binary( NULL, args.str[0] ); + if (argv0) args.str[0] = argv0; strarray_add_one( &args, NULL ); if (verbose) for (i = 0; args.str[i]; i++) @@ -302,35 +363,8 @@ void spawn( struct strarray args ) /* find a build tool in the path, trying the various names */ struct strarray find_tool( const char *name, const char * const *names ) { - static char **dirs; - static unsigned int count, maxlen; - - char *p, *file; + const char *file; const char *alt_names[2]; - unsigned int i, len; - struct stat st; - - if (!dirs) - { - char *path; - - /* split the path in directories */ - - if (!getenv( "PATH" )) fatal_error( "PATH not set, cannot find required tools\n" ); - path = xstrdup( getenv( "PATH" )); - for (p = path, count = 2; *p; p++) if (*p == PATH_SEPARATOR) count++; - dirs = xmalloc( count * sizeof(*dirs) ); - count = 0; - dirs[count++] = p = path; - while (*p) - { - while (*p && *p != PATH_SEPARATOR) p++; - if (!*p) break; - *p++ = 0; - dirs[count++] = p; - } - for (i = 0; i < count; i++) maxlen = max( maxlen, strlen(dirs[i])+2 ); - } if (!names) { @@ -341,34 +375,12 @@ struct strarray find_tool( const char *name, const char * const *names ) while (*names) { - len = strlen(*names) + sizeof(EXEEXT) + 1; - if (target_alias) - len += strlen(target_alias) + 1; - file = xmalloc( maxlen + len ); - - for (i = 0; i < count; i++) + if ((file = find_binary( target_alias, *names ))) { - strcpy( file, dirs[i] ); - p = file + strlen(file); - if (p == file) *p++ = '.'; - if (p[-1] != '/') *p++ = '/'; - if (target_alias) - { - strcpy( p, target_alias ); - p += strlen(p); - *p++ = '-'; - } - strcpy( p, *names ); - strcat( p, EXEEXT ); - - if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) - { - struct strarray ret = empty_strarray; - strarray_add_one( &ret, file ); - return ret; - } + struct strarray ret = empty_strarray; + strarray_add_one( &ret, file ); + return ret; } - free( file ); names++; } fatal_error( "cannot find the '%s' tool\n", name ); @@ -377,6 +389,7 @@ struct strarray find_tool( const char *name, const char * const *names ) struct strarray get_as_command(void) { struct strarray args; + unsigned int i; if (cc_command.count) { @@ -387,6 +400,8 @@ struct strarray get_as_command(void) if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); if (arch_option) strarray_add_one( &args, strmake("-march=%s", arch_option) ); + for (i = 0; i < tools_path.count; i++) + strarray_add_one( &args, strmake("-B%s", tools_path.str[i] )); return args; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 1b9b1b088b..12bafd72d3 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -68,6 +68,10 @@ Specify the target CPU and platform on which the generated code will be built. The target specification is in the standard autoconf format as returned by config.sub. .TP +.BI \-B\ directory +Add the directory to the search path for the various binutils tools +like \fBas\fR, \fBnm\fR and \fBld\fR. +.TP .BI \--cc-cmd= cc-command Specify the C compiler to use to compile assembly files; the default is to instead use the assembler specified with \fB--as-cmd\fR.

1 0

Zebediah Figura : winegstreamer: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: d9f218a33827a5b837e4bce1bd8f2888d96b7242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9f218a33827a5b837e4bce1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 9 20:36:15 2019 -0500 winegstreamer: Use the global HeapAlloc() wrappers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 727ffff8a6..22eedfd426 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -131,7 +131,7 @@ static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) if (!gst_audio_info_from_caps (&ainfo, caps)) return FALSE; - wfe = CoTaskMemAlloc(sizeof(*wfe)); + wfe = heap_alloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; amt->majortype = MEDIATYPE_Audio; amt->subtype = MEDIASUBTYPE_PCM; @@ -196,7 +196,7 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) nom = vinfo.fps_n; denom = vinfo.fps_d; - vih = CoTaskMemAlloc(sizeof(*vih)); + vih = heap_alloc(sizeof(*vih)); bih = &vih->bmiHeader; amt->formattype = FORMAT_VideoInfo; @@ -215,14 +215,14 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) case 32: amt->subtype = MEDIASUBTYPE_RGB32; break; default: FIXME("Unknown bpp %u\n", bih->biBitCount); - CoTaskMemFree(vih); + heap_free(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { - CoTaskMemFree(vih); + heap_free(vih); return FALSE; } switch (amt->subtype.Data1) { @@ -1202,7 +1202,7 @@ static void gstdemux_destroy(struct strmbase_filter *iface) gst_object_unref(filter->bus); } strmbase_filter_cleanup(&filter->filter); - CoTaskMemFree(filter); + heap_free(filter); } static const struct strmbase_filter_ops filter_ops = @@ -1213,7 +1213,7 @@ static const struct strmbase_filter_ops filter_ops = IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) { - GSTImpl *This; + GSTImpl *object; if (!init_gstreamer()) { @@ -1223,30 +1223,23 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) mark_wine_thread(); - This = CoTaskMemAlloc(sizeof(*This)); - if (!This) + if (!(object = heap_alloc_zero(sizeof(*object)))) { *phr = E_OUTOFMEMORY; return NULL; } - memset(This, 0, sizeof(*This)); - strmbase_filter_init(&This->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter, &filter_ops); + strmbase_filter_init(&object->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter, &filter_ops); - This->cStreams = 0; - This->ppPins = NULL; - This->push_thread = NULL; - This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL); - This->bus = NULL; - - This->sink.dir = PINDIR_INPUT; - This->sink.filter = &This->filter; - lstrcpynW(This->sink.name, wcsInputPinName, ARRAY_SIZE(This->sink.name)); - This->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; + object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->sink.dir = PINDIR_INPUT; + object->sink.filter = &object->filter; + lstrcpynW(object->sink.name, wcsInputPinName, ARRAY_SIZE(object->sink.name)); + object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; *phr = S_OK; - TRACE("Created GStreamer demuxer %p.\n", This); - return &This->filter.IUnknown_inner; + TRACE("Created GStreamer demuxer %p.\n", object); + return &object->filter.IUnknown_inner; } static HRESULT WINAPI GST_Stop(IBaseFilter *iface) @@ -1764,7 +1757,7 @@ static BOOL create_pin(GSTImpl *filter, const WCHAR *name, const AM_MEDIA_TYPE * { GSTOutPin *pin, **new_array; - if (!(new_array = CoTaskMemRealloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) return FALSE; filter->ppPins = new_array; @@ -1773,7 +1766,7 @@ static BOOL create_pin(GSTImpl *filter, const WCHAR *name, const AM_MEDIA_TYPE * strmbase_source_init(&pin->pin, &GST_OutputPin_Vtbl, &filter->filter, name, &output_BaseOutputFuncTable); - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + pin->pmt = heap_alloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, mt); pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); pin->segment = gst_segment_new(); @@ -1805,7 +1798,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) free_source_pin(This->ppPins[i]); This->cStreams = 0; - CoTaskMemFree(This->ppPins); + heap_free(This->ppPins); This->ppPins = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container);

1 0

Zebediah Figura : winegstreamer: Don't activate our source pad immediately after connecting.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 9e015a2ad17b98a2bedf076bd31c863e3e8a8d06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e015a2ad17b98a2bedf076b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 9 20:36:14 2019 -0500 winegstreamer: Don't activate our source pad immediately after connecting. There's not any reason to do this here; this should be handled with state change transitions. Since the pipeline is in the ready state, the only effect this will have is push_data() trying to run and failing since the decodebin sink pad isn't active. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 61e75b0923..727ffff8a6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -66,7 +66,7 @@ typedef struct GSTImpl { GstBus *bus; guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; - HANDLE no_more_pads_event, push_event; + HANDLE no_more_pads_event; HANDLE push_thread; } GSTImpl; @@ -507,10 +507,6 @@ static DWORD CALLBACK push_data(LPVOID iface) else maxlen = This->stop; - TRACE("Waiting..\n"); - - WaitForSingleObject(This->push_event, INFINITE); - TRACE("Starting..\n"); for (;;) { REFERENCE_TIME tStart, tStop; @@ -1155,10 +1151,6 @@ static HRESULT GST_Connect(GSTImpl *This, IPin *pConnectPin, ALLOCATOR_PROPERTIE This->initial = FALSE; - /* don't set active during test-play, as we don't want to push/pull data - * from the source yet */ - gst_pad_set_active(This->my_src, 1); - This->nextofs = This->nextpullofs = 0; return S_OK; } @@ -1185,7 +1177,6 @@ static void gstdemux_destroy(struct strmbase_filter *iface) HRESULT hr; CloseHandle(filter->no_more_pads_event); - CloseHandle(filter->push_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ if (filter->sink.pConnectedTo) @@ -1246,7 +1237,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) This->ppPins = NULL; This->push_thread = NULL; This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL); - This->push_event = CreateEventW(NULL, 0, 0, NULL); This->bus = NULL; This->sink.dir = PINDIR_INPUT; @@ -1864,7 +1854,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, filter->reader = NULL; filter->alloc = NULL; - ResetEvent(filter->push_event); if (SUCCEEDED(hr)) hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&filter->reader); if (SUCCEEDED(hr)) @@ -1887,7 +1876,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, filter->sink.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); hr = IMemAllocator_Commit(filter->alloc); - SetEvent(filter->push_event); } else { GST_RemoveOutputPins(filter); if (filter->reader)

1 0

Alexandre Julliard : kernel32: Move console functions to kernelbase.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 55e9b666a0f8918c2456f44856398f51c64d76bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e9b666a0f8918c2456f448… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 22:17:58 2019 +0200 kernel32: Move console functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 1759 +-------------------------------------- dlls/kernel32/kernel32.spec | 98 +-- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/console.c | 1533 ++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 100 +-- include/wincon.h | 2 +- 6 files changed, 1665 insertions(+), 1828 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55e9b666a0f8918c2456…

1 0

Alexandre Julliard : kernel32: Move ioctl functions to kernelbase.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: f3960c32f18f97a7bf444c145089536135f7004e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3960c32f18f97a7bf444c14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 21:05:07 2019 +0200 kernel32: Move ioctl functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 702 ---------------------------------------- dlls/kernel32/kernel32.spec | 36 +-- dlls/kernelbase/file.c | 416 ++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 38 +-- 4 files changed, 453 insertions(+), 739 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3960c32f18f97a7bf44…

1 0

Alexandre Julliard : ntdll: Add partial implementation for IOCTL_SERIAL_GET_PROPERTIES.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 0617b490b339e7bcf7a17daa91c750bc601ee7a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0617b490b339e7bcf7a17daa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 21:04:49 2019 +0200 ntdll: Add partial implementation for IOCTL_SERIAL_GET_PROPERTIES. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/serial.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 66081d2865..66fb840167 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -338,6 +338,31 @@ static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) return status; } +static NTSTATUS get_properties(int fd, SERIAL_COMMPROP *prop) +{ + /* FIXME: get actual properties from the device */ + memset( prop, 0, sizeof(*prop) ); + prop->PacketLength = 1; + prop->PacketVersion = 1; + prop->ServiceMask = SP_SERIALCOMM; + prop->MaxTxQueue = 4096; + prop->MaxRxQueue = 4096; + prop->MaxBaud = BAUD_115200; + prop->ProvSubType = PST_RS232; + prop->ProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS | PCF_INTTIMEOUTS; + prop->SettableParams = SP_BAUD | SP_DATABITS | SP_HANDSHAKING | + SP_PARITY | SP_PARITY_CHECK | SP_STOPBITS ; + prop->SettableBaud = BAUD_075 | BAUD_110 | BAUD_134_5 | BAUD_150 | + BAUD_300 | BAUD_600 | BAUD_1200 | BAUD_1800 | BAUD_2400 | BAUD_4800 | + BAUD_9600 | BAUD_19200 | BAUD_38400 | BAUD_57600 | BAUD_115200 ; + prop->SettableData = DATABITS_5 | DATABITS_6 | DATABITS_7 | DATABITS_8 ; + prop->SettableStopParity = STOPBITS_10 | STOPBITS_15 | STOPBITS_20 | + PARITY_NONE | PARITY_ODD |PARITY_EVEN | PARITY_MARK | PARITY_SPACE; + prop->CurrentTxQueue = prop->MaxTxQueue; + prop->CurrentRxQueue = prop->MaxRxQueue; + return STATUS_SUCCESS; +} + static NTSTATUS get_special_chars(int fd, SERIAL_CHARS* sc) { struct termios port; @@ -1193,6 +1218,14 @@ static inline NTSTATUS io_control(HANDLE hDevice, } else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_GET_PROPERTIES: + if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_COMMPROP)) + { + if (!(status = get_properties(fd, lpOutBuffer))) + sz = sizeof(SERIAL_COMMPROP); + } + else status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_IMMEDIATE_CHAR: if (lpInBuffer && nInBufferSize == sizeof(CHAR)) status = xmit_immediate(hDevice, fd, lpInBuffer);

1 0

Francois Gouget : testbot/CheckWineTestBot: Use NotifyAdministrator() to send admin notifications.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: tools Branch: master Commit: db373eba1c6407bd9607a0c15b4cdba80d0a5ce2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=db373eba1c6407bd9607a0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:08:03 2019 +0200 testbot/CheckWineTestBot: Use NotifyAdministrator() to send admin notifications. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/CheckWineTestBot.pl | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 3ca4fde..aa271db 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -36,6 +36,7 @@ sub BEGIN } use WineTestBot::Config; +use WineTestBot::Utils; use WineTestBot::Engine::Notify; my $rc = 0; @@ -47,27 +48,21 @@ if (! PingEngine()) sleep 5; } - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; -From: $RobotEMail -To: $AdminEMail -Subject: WineTestBot engine died - -EOF + my $Body; if ($> != 0) { - print SENDMAIL "Insufficient permissions to restart the engine\n"; + $Body = "Insufficient permissions to restart the engine\n"; $rc = 1; } elsif (PingEngine()) { - print SENDMAIL "The engine was restarted successfully\n"; + $Body = "The engine was restarted successfully\n"; } else { - print SENDMAIL "Unable to restart the engine\n"; + $Body = "Unable to restart the engine\n"; $rc = 1; } - close(SENDMAIL); + NotifyAdministrator("WineTestBot engine died", $Body); } exit($rc);

1 0

Francois Gouget : testbot/web: Use NotifyAdministrator() to send admin notifications.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: tools Branch: master Commit: 26b4a620dd65cce2e635acab1a1ff4bad274f094 URL: https://source.winehq.org/git/tools.git/?a=commit;h=26b4a620dd65cce2e635aca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:08:00 2019 +0200 testbot/web: Use NotifyAdministrator() to send admin notifications. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Feedback.pl | 17 ++++++----------- testbot/web/Register.pl | 11 +---------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 2adc4cd..36f0a2b 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -26,6 +26,7 @@ our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; +use WineTestBot::Utils; sub _initialize($$$) @@ -83,17 +84,11 @@ sub OnSend($) return !1; } - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; -From: $RobotEMail -To: $AdminEMail -Subject: winetestbot feedback - -EOF - print SENDMAIL "Name: ", $self->GetParam("Name"), "\n"; - print SENDMAIL "EMail: ", $self->GetParam("EMail"), "\n\n"; - print SENDMAIL "Remarks:\n", $self->GetParam("Remarks"), "\n"; - close(SENDMAIL); + NotifyAdministrator("winetestbot feedback", + "Name: ". $self->GetParam("Name") ."\n". + "EMail: ". $self->GetParam("EMail") ."\n\n". + "Remarks:\n". + $self->GetParam("Remarks")); return 1; } diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 207728e..23f57a9 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -142,16 +142,7 @@ sub OnSendRequest($) my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); $Msg .= "\nTo approve or deny the request, please go to " . $URL; - - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; -From: $RobotEMail -To: $AdminEMail -Subject: winetestbot account request - -$Msg -EOF - close(SENDMAIL); + NotifyAdministrator("winetestbot account request", $Msg); return 1; }

1 0

Francois Gouget : testbot: Always notify the administrator when putting a VM offline.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: tools Branch: master Commit: 48a24be93225a51f8caa4df6b10bf89096560e99 URL: https://source.winehq.org/git/tools.git/?a=commit;h=48a24be93225a51f8caa4df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:07:57 2019 +0200 testbot: Always notify the administrator when putting a VM offline. Include the reason why the VM was put offline in the notification email. Add NotifyAdministrator() to the Utils module to simplify sending the notification. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 25 +-------------------- testbot/bin/WineRunBuild.pl | 6 ++++- testbot/bin/WineRunReconfig.pl | 6 ++++- testbot/bin/WineRunTask.pl | 6 ++++- testbot/bin/WineRunWineTest.pl | 6 ++++- testbot/lib/WineTestBot/Engine/Scheduler.pm | 5 +++++ testbot/lib/WineTestBot/Utils.pm | 34 ++++++++++++++++++++++++++++- testbot/lib/WineTestBot/VMs.pm | 5 +++++ 8 files changed, 64 insertions(+), 29 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4000c14..e348834 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -43,6 +43,7 @@ $Name0 =~ s+^.*/++; use WineTestBot::Config; use WineTestBot::Log; +use WineTestBot::Utils; use WineTestBot::VMs; my $Debug; @@ -58,30 +59,6 @@ sub Error(@) LogMsg @_; } -sub NotifyAdministrator($$) -{ - my ($Subject, $Body) = @_; - - if (open(my $fh, "|/usr/sbin/sendmail -oi -t -odq")) - { - LogMsg "Notifying administrator: $Subject\n"; - print $fh <<"EOF"; -From: $RobotEMail -To: $AdminEMail -Subject: $Subject - -$Body -EOF - close($fh); - } - else - { - LogMsg "Could not send administrator notification: $!\n"; - LogMsg " Subject: $Subject\n"; - LogMsg " Body: $Body\n"; - } -} - # # Setup and command line processing diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index fdcf770..1d57c44 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -280,10 +280,14 @@ sub FatalTAError($$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 493ab10..bad5f76 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -282,10 +282,14 @@ sub FatalTAError($$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 6a71849..53e9e50 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -332,10 +332,14 @@ sub FatalTAError($$;$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 74b974a..508605b 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -332,10 +332,14 @@ sub FatalTAError($$;$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 1b42ea9..39d2342 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -37,6 +37,7 @@ use WineTestBot::Engine::Events; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::RecordGroups; +use WineTestBot::Utils; use WineTestBot::VMs; @@ -277,6 +278,10 @@ sub _CheckAndClassifyVMs() if ($Errors >= $MaxVMErrors) { $NewStatus = "maintenance"; + NotifyAdministrator("Putting the $VMKey VM in maintenance mode", + "The last $Errors revert operations timed out.\n\n". + "No further operation will be attempted until an administrator has put\n". + "the VM back online."); $Sched->{busyvms}->{$VMKey} = 1; } } diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index e28a34b..83f60fa 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -30,7 +30,8 @@ use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName - BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); + BuildTag SanitizeTag LocaleName NotifyAdministrator + ShQuote ShArgv2Cmd); use Fcntl; @@ -276,6 +277,37 @@ sub BuildTag($;$) } +# +# EMail helper +# + +sub NotifyAdministrator($$) +{ + my ($Subject, $Body) = @_; + + if (open(my $fh, "|/usr/sbin/sendmail -oi -t -odq")) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Notifying administrator: $Subject\n"); + print $fh <<"EOF"; +From: $RobotEMail +To: $AdminEMail +Subject: $Subject + +$Body +EOF + close($fh); + } + else + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Could not send administrator notification: $!\n"); + WineTestBot::Log::LogMsg(" Subject: $Subject\n"); + WineTestBot::Log::LogMsg(" Body: $Body\n"); + } +} + + # # Shell helpers # diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 5d738e2..78e066f 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -452,6 +452,11 @@ sub Run($$$$$$) # Reset the Status and ChildPid since the exec failed $self->Status("offline"); + NotifyAdministrator("Putting the ". $self->Name ." VM offline", + "Could not run $Tool on the ". $self->Name ." VM. The failed command is:\n\n". + ShArgv2Cmd(@$Args) ."\n\n". + "An administrator should investigate why the command failed but the\n". + "TestBot will still try to continue using the VM.\n"); $self->ChildDeadline(undef); $self->ChildPid(undef); my ($ErrProperty, $ErrMessage) = $self->Save();

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019