November 2015 - Wine-Commits

Alexandre Julliard : makedep: Expand the rm command.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: eb15632eda366669631f78895b4726a62d8ddc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb15632eda366669631f78895… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:56:23 2015 +0900 makedep: Expand the rm command. configure also hardcodes it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 65178a6..f20a967 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1949,7 +1949,7 @@ static void output_install_rules( const struct makefile *make, struct strarray f install_sh, src_dir_path( make, file ), dest + 1 ); break; case 'y': /* symlink */ - output( "\t$(RM) $(DESTDIR)%s && $(LN_S) %s $(DESTDIR)%s\n", dest + 1, file, dest + 1 ); + output( "\trm -f $(DESTDIR)%s && $(LN_S) %s $(DESTDIR)%s\n", dest + 1, file, dest + 1 ); break; default: assert(0); @@ -1957,7 +1957,7 @@ static void output_install_rules( const struct makefile *make, struct strarray f } output( "uninstall::\n" ); - output( "\t$(RM)" ); + output( "\trm -f" ); for (i = 0; i < files.count; i += 2) output_filename( strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 )); output( "\n" ); @@ -2190,7 +2190,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar } strarray_add( &all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); + output( "\t$(SED_CMD) %s >$@ || (rm -f $@ && false)\n", source->filename ); output( "%s:", obj_dir_path( make, obj )); output_filenames( dependencies ); output( "\n" ); @@ -2431,7 +2431,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "%s.def.a:", importlib_path ); output_filenames_obj_dir( make, implib_objs ); output( "\n" ); - output( "\t$(RM) $@\n" ); + output( "\trm -f $@\n" ); output( "\t$(AR) $(ARFLAGS) $@" ); output_filenames_obj_dir( make, implib_objs ); output( "\n" ); @@ -2525,7 +2525,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar strarray_add( &all_targets, make->staticlib ); output( "%s:", obj_dir_path( make, make->staticlib )); output_filenames_obj_dir( make, object_files ); - output( "\n\t$(RM) $@\n" ); + output( "\n\trm -f $@\n" ); output( "\t$(AR) $(ARFLAGS) $@" ); output_filenames_obj_dir( make, object_files ); output( "\n\t$(RANLIB) $@\n" ); @@ -2536,7 +2536,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar strarray_add( &all_targets, name ); output( "%s:", obj_dir_path( make, name )); output_filenames_obj_dir( make, crossobj_files ); - output( "\n\t$(RM) $@\n" ); + output( "\n\trm -f $@\n" ); output( "\t%s-ar $(ARFLAGS) $@", crosstarget ); output_filenames_obj_dir( make, crossobj_files ); output( "\n\t%s-ranlib $@\n", crosstarget ); @@ -2622,7 +2622,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar output_filenames_obj_dir( make, ok_files ); output( "\n" ); output( "testclean::\n" ); - output( "\t$(RM)" ); + output( "\trm -f" ); output_filenames_obj_dir( make, ok_files ); output( "\n" ); strarray_addall( &clean_files, ok_files ); @@ -2683,7 +2683,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar { output_filenames_obj_dir( make, symlinks ); output( ": %s\n", obj_dir_path( make, program )); - output( "\t$(RM) $@ && $(LN_S) %s $@\n", obj_dir_path( make, program )); + output( "\trm -f $@ && $(LN_S) %s $@\n", obj_dir_path( make, program )); strarray_addall( &all_targets, symlinks ); } @@ -2717,7 +2717,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar if (clean_files.count) { output( "%s::\n", obj_dir_path( make, "clean" )); - output( "\t$(RM)" ); + output( "\trm -f" ); output_filenames_obj_dir( make, clean_files ); output( "\n" ); if (make->obj_dir) output( "__clean__: %s\n", obj_dir_path( make, "clean" ));

1 0

Alexandre Julliard : makedep: Store the include paths without the -I prefix.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: acd9c551b71f3cd4a41e8c68ccca026c26a3b5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd9c551b71f3cd4a41e8c68c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 15:02:57 2015 +0900 makedep: Store the include paths without the -I prefix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 83f7ede..65178a6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -149,7 +149,7 @@ static const char *icotool; struct makefile { struct strarray vars; - struct strarray include_args; + struct strarray include_paths; struct strarray define_args; struct strarray programs; struct strarray scripts; @@ -1397,9 +1397,9 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; /* now search in include paths */ - for (i = 0; i < make->include_args.count; i++) + for (i = 0; i < make->include_paths.count; i++) { - const char *dir = make->include_args.str[i] + 2; /* skip -I */ + const char *dir = make->include_paths.str[i]; const char *prefix = make->top_src_dir ? make->top_src_dir : make->top_obj_dir; if (prefix) @@ -2002,10 +2002,11 @@ static struct strarray output_sources( const struct makefile *make, struct strar strarray_add( &includes, strmake( "-I%s", obj_dir_path( make, "" ))); if (make->src_dir) strarray_add( &includes, strmake( "-I%s", make->src_dir )); if (make->parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( make, make->parent_dir ))); - if (make->top_obj_dir) strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( make, "include" ))); + strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( make, "include" ))); if (make->top_src_dir) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include" ))); if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include/msvcrt" ))); - strarray_addall( &includes, make->include_args ); + for (i = 0; i < make->include_paths.count; i++) + strarray_add( &includes, strmake( "-I%s", obj_dir_path( make, make->include_paths.str[i] ))); LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) { @@ -3004,14 +3005,14 @@ static void update_makefile( const char *path ) if (make->module && !make->install_lib.count) strarray_add( &make->install_lib, make->module ); - make->include_args = empty_strarray; + make->include_paths = empty_strarray; make->define_args = empty_strarray; strarray_add( &make->define_args, "-D__WINESRC__" ); value = get_expanded_make_var_array( make, "EXTRAINCL" ); for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) - strarray_add_uniq( &make->include_args, value.str[i] ); + strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); else strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));

1 0

Alexandre Julliard : makedep: Fix a typo in the usage message.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 029c56d75f6a7dbbff4ec0c80e73d01d69d18582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029c56d75f6a7dbbff4ec0c80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 12:05:56 2015 +0900 makedep: Fix a typo in the usage message. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index f51cd2f..79b2426 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3124,7 +3124,7 @@ int main( int argc, char *argv[] ) if (argc != 3) { - fprintf( stderr, "Option -r needs two directories\n%s", Usage ); + fprintf( stderr, "Option -R needs two directories\n%s", Usage ); exit( 1 ); } relpath = get_relative_path( argv[1], argv[2] );

1 0

Alexandre Julliard : makedep: Add a helper function to open a file from the include path.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 54c37238a1ab526680ef0d452f3bc58bfb16eec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c37238a1ab526680ef0d452… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 15:01:43 2015 +0900 makedep: Add a helper function to open a file from the include path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index edfb3c7..83f7ede 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1208,13 +1208,17 @@ static struct file *load_file( const char *name ) /******************************************************************* - * open_file + * open_include_path_file + * + * Open a file from a directory on the include path. */ -static struct file *open_file( const struct makefile *make, const char *path, char **filename ) +static struct file *open_include_path_file( const struct makefile *make, const char *dir, + const char *name, char **filename ) { - struct file *ret = load_file( base_dir_path( make, path )); + char *src_path = base_dir_path( make, concat_paths( dir, name )); + struct file *ret = load_file( src_path ); - if (ret) *filename = xstrdup( path ); + if (ret) *filename = src_dir_path( make, concat_paths( dir, name )); return ret; } @@ -1411,7 +1415,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ } if (*dir != '/') { - if ((file = open_file( make, concat_paths( dir, pFile->name ), &pFile->filename ))) + if ((file = open_include_path_file( make, dir, pFile->name, &pFile->filename ))) return file; } }

1 0

Alexandre Julliard : makedep: Add a helper function to open a file in the parent's source directory.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: ec7664d4dbd047f40d22bf265ebddc9383e7b0dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7664d4dbd047f40d22bf265… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:54:46 2015 +0900 makedep: Add a helper function to open a file in the parent's source directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d8cf2f5..edfb3c7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -489,6 +489,25 @@ static char *replace_extension( const char *name, const char *old_ext, const cha /******************************************************************* + * replace_filename + */ +static char *replace_filename( const char *path, const char *name ) +{ + const char *p; + char *ret; + size_t len; + + if (!path) return xstrdup( name ); + if (!(p = strrchr( path, '/' ))) return xstrdup( name ); + len = p - path + 1; + ret = xmalloc( len + strlen( name ) + 1 ); + memcpy( ret, path, len ); + strcpy( ret + len, name ); + return ret; +} + + +/******************************************************************* * strarray_replace_extension */ static struct strarray strarray_replace_extension( const struct strarray *array, @@ -1201,6 +1220,22 @@ static struct file *open_file( const struct makefile *make, const char *path, ch /******************************************************************* + * open_file_same_dir + * + * Open a file in the same directory as the parent. + */ +static struct file *open_file_same_dir( const struct incl_file *parent, const char *name, char **filename ) +{ + char *src_path = replace_filename( parent->file->name, name ); + struct file *ret = load_file( src_path ); + + if (ret) *filename = replace_filename( parent->filename, name ); + free( src_path ); + return ret; +} + + +/******************************************************************* * open_local_file * * Open a file in the source directory of the makefile. @@ -1270,7 +1305,7 @@ static struct file *open_src_file( const struct makefile *make, struct incl_file static struct file *open_include_file( const struct makefile *make, struct incl_file *pFile ) { struct file *file = NULL; - char *filename, *p; + char *filename; unsigned int i, len; errno = ENOENT; @@ -1383,15 +1418,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ - if ((p = strrchr(pFile->included_by->filename, '/'))) - { - size_t l = p - pFile->included_by->filename + 1; - filename = xmalloc(l + strlen(pFile->name) + 1); - memcpy( filename, pFile->included_by->filename, l ); - strcpy( filename + l, pFile->name ); - if ((file = open_file( make, filename, &pFile->filename ))) return file; - free( filename ); - } + if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) return file; fprintf( stderr, "%s:%d: error: ", pFile->included_by->file->name, pFile->included_line ); perror( pFile->name );

1 0

Stefan Leichter : wimgapi: Add stub for WIMRegisterMessageCallback.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 391364e0ba2bca77a798eeba8fee02ac234751be URL: http://source.winehq.org/git/wine.git/?a=commit;h=391364e0ba2bca77a798eeba8… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Tue Nov 10 23:33:17 2015 +0100 wimgapi: Add stub for WIMRegisterMessageCallback. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wimgapi/main.c | 6 ++++++ dlls/wimgapi/wimgapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c index 5ac8a66..d7c3bab 100644 --- a/dlls/wimgapi/main.c +++ b/dlls/wimgapi/main.c @@ -44,3 +44,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +DWORD WINAPI WIMRegisterMessageCallback(HANDLE wim, FARPROC callback, PVOID data) +{ + FIXME("(%p %p %p) stub\n", wim, callback, data); + return 0; +} diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec index b467989..7464a5a 100644 --- a/dlls/wimgapi/wimgapi.spec +++ b/dlls/wimgapi/wimgapi.spec @@ -28,7 +28,7 @@ @ stub WIMMountImageHandle @ stub WIMReadImageFile @ stub WIMRegisterLogFile -@ stub WIMRegisterMessageCallback +@ stdcall WIMRegisterMessageCallback(long ptr ptr) @ stub WIMRemountImage @ stub WIMSetBootImage @ stub WIMSetFileIOCallbackTemporaryPath

1 0

Austin English : ntoskrnl.exe: Add ExDeleteResourceLite stub.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 1db28d439eb53e329ea563dfb6d4cec4c84edfe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db28d439eb53e329ea563dfb… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 8 23:30:11 2015 -0600 ntoskrnl.exe: Add ExDeleteResourceLite stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c6df4df..87abc21 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2289,6 +2289,15 @@ BOOLEAN WINAPI ExAcquireResourceExclusiveLite( PERESOURCE resource, BOOLEAN wait return TRUE; } +/*********************************************************************** + * ExDeleteResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) +{ + FIXME("(%p): stub\n", resource); + return STATUS_NOT_IMPLEMENTED; +} + /***************************************************** * ExInterlockedRemoveHeadList (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0131bb0..6d22c8f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -125,7 +125,7 @@ @ stdcall ExCreateCallback(ptr ptr long long) @ stub ExDeleteNPagedLookasideList @ stub ExDeletePagedLookasideList -@ stub ExDeleteResourceLite +@ stdcall ExDeleteResourceLite(ptr) @ stub ExDesktopObjectType @ stub ExDisableResourceBoostLite @ stub ExEnumHandleTable

1 0

Hans Leidekker : webservices: Avoid writing redundant namespace attributes.
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: e9435db25ff7e95c9a97bf7ce643f8c010d06a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9435db25ff7e95c9a97bf7ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:03 2015 +0100 webservices: Avoid writing redundant namespace attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f55f56e..feb858f 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -73,6 +73,7 @@ struct writer enum writer_state state; struct node *root; struct node *current; + WS_XML_STRING *current_ns; WS_XML_WRITER_OUTPUT_TYPE output_type; struct xmlbuf *output_buf; WS_HEAP *output_heap; @@ -123,6 +124,7 @@ static HRESULT get_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID static void free_writer( struct writer *writer ) { destroy_nodes( writer->root ); + heap_free( writer->current_ns ); WsFreeHeap( writer->output_heap ); heap_free( writer ); } @@ -161,8 +163,11 @@ static HRESULT write_init_state( struct writer *writer ) { struct node *node; + heap_free( writer->current_ns ); + writer->current_ns = NULL; destroy_nodes( writer->root ); writer->root = NULL; + if (!(node = alloc_node( WS_XML_NODE_TYPE_EOF ))) return E_OUTOFMEMORY; write_insert_eof( writer, node ); writer->state = WRITER_STATE_INITIAL; @@ -476,6 +481,20 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) return S_OK; } +static inline BOOL is_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) +{ + return (WsXmlStringEquals( writer->current_ns, ns, NULL ) == S_OK); +} + +static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) +{ + WS_XML_STRING *str; + if (!(str = alloc_xml_string( (const char *)ns->bytes, ns->length ))) return E_OUTOFMEMORY; + heap_free( writer->current_ns ); + writer->current_ns = str; + return S_OK; +} + static HRESULT write_startelement( struct writer *writer ) { WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)writer->current; @@ -486,7 +505,7 @@ static HRESULT write_startelement( struct writer *writer ) size = elem->localName->length + 1 /* '<' */; if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; - if (elem->ns->length) + if (elem->ns->length && !is_current_namespace( writer, elem->ns )) { size += strlen(" xmlns") + elem->ns->length + 3 /* '=""' */; if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; @@ -504,8 +523,10 @@ static HRESULT write_startelement( struct writer *writer ) { if ((hr = write_attribute( writer, elem->attributes[i] )) != S_OK) return hr; } - if (elem->ns->length) + if (elem->ns->length && !is_current_namespace( writer, elem->ns )) { + if ((hr = set_current_namespace( writer, elem->ns )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)" xmlns", 6 ); if (elem->prefix) {

1 0

Alistair Leslie-Hughes : gameux: Fix memory leaks (Valgrind).
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 5e3d9616e43da5c9fda62365738032c9df606468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3d9616e43da5c9fda623657… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 14:44:03 2015 +1100 gameux: Fix memory leaks (Valgrind). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/gamestatistics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index e6e33bb..b9e913e 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -264,7 +264,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) } if(SUCCEEDED(hr)) - hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, &statisticsNode); + hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, NULL); IXMLDOMElement_Release(statisticsElement); IXMLDOMNode_Release(statisticsNode); @@ -578,6 +578,8 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) } } + IXMLDOMNodeList_Release(categoryChildren); + if(SUCCEEDED(hr)) hr = S_OK; }

1 0

Alistair Leslie-Hughes : wininet: Free critical section (Valgrind).
by Alexandre Julliard Nov. 11, 2015

Nov. 11, 2015

Module: wine Branch: master Commit: 7e7519d1f529be51aef1b6b548961d9468eaa690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7519d1f529be51aef1b6b54… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 11 14:44:04 2015 +1100 wininet: Free critical section (Valgrind). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 410865d..5db930b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5646,6 +5646,7 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) WaitForSingleObject( info.wait, 10000 ); Sleep(100); CloseHandle( info.wait ); + DeleteCriticalSection( &notification_cs ); } static HINTERNET closetest_session, closetest_req, closetest_conn;

1 0