November 2015 - Wine-commits

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

11 Nov '15

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: Store the include paths without the -I prefix.
by Alexandre Julliard 11 Nov '15

11 Nov '15

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: Expand the rm command.
by Alexandre Julliard 11 Nov '15

11 Nov '15

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: Always open Makefile.in files from the source directory.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 6f8e5d4e10130de3a3d5e61aa9dc643dfa69cc61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8e5d4e10130de3a3d5e61aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 12:05:12 2015 +0900 makedep: Always open Makefile.in files from the source directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f20a967..f51cd2f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1556,16 +1556,14 @@ static FILE *open_input_makefile( const struct makefile *make ) FILE *ret; if (make->base_dir) + { input_file_name = base_dir_path( make, input_makefile_name ); - else - input_file_name = output_makefile_name; /* always use output name for main Makefile */ + if (strendswith( input_makefile_name, ".in" )) input_file_name = root_dir_path( input_file_name ); + } + else input_file_name = output_makefile_name; /* always use output name for main Makefile */ input_line = 0; - if (!(ret = fopen( input_file_name, "r" ))) - { - input_file_name = root_dir_path( input_file_name ); - if (!(ret = fopen( input_file_name, "r" ))) fatal_perror( "open" ); - } + if (!(ret = fopen( input_file_name, "r" ))) fatal_perror( "open" ); return ret; }

1 0

Alexandre Julliard : makedep: Fix a typo in the usage message.
by Alexandre Julliard 11 Nov '15

11 Nov '15

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

Sebastian Lackner : ntdll/tests: Add tests for multiple registry notifications per key.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 163b3f1e38b6de99ebe8339034ffe39f53b79592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163b3f1e38b6de99ebe833903… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 11 03:17:59 2015 +0100 ntdll/tests: Add tests for multiple registry notifications per key. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 51 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9ab2f35..149910a 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1515,21 +1515,27 @@ static void test_notify(void) LARGE_INTEGER timeout; IO_STATUS_BLOCK iosb; UNICODE_STRING str; - HANDLE key, event, subkey; + HANDLE key, events[2], subkey; NTSTATUS status; InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - event = CreateEventW(NULL, FALSE, TRUE, NULL); - ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); + events[0] = CreateEventW(NULL, FALSE, TRUE, NULL); + ok(events[0] != NULL, "CreateEvent failed: %u\n", GetLastError()); + events[1] = CreateEventW(NULL, FALSE, TRUE, NULL); + ok(events[1] != NULL, "CreateEvent failed: %u\n", GetLastError()); - status = pNtNotifyChangeKey(key, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); timeout.QuadPart = 0; - status = pNtWaitForSingleObject(event, FALSE, &timeout); + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); + status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); attr.RootDirectory = key; @@ -1539,25 +1545,49 @@ static void test_notify(void) status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); - status = pNtWaitForSingleObject(event, FALSE, &timeout); + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); + todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtDeleteKey(subkey); ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); + + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); + todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + status = pNtWaitForSingleObject(events[1], FALSE, &timeout); + ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + pNtClose(subkey); + + status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + pNtClose(key); + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); + todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + status = pNtWaitForSingleObject(events[1], FALSE, &timeout); + ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + if (pNtNotifyChangeMultipleKeys) { InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - status = pNtNotifyChangeMultipleKeys(key, 0, NULL, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + status = pNtNotifyChangeMultipleKeys(key, 0, NULL, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); timeout.QuadPart = 0; - status = pNtWaitForSingleObject(event, FALSE, &timeout); + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); attr.RootDirectory = key; @@ -1566,7 +1596,7 @@ static void test_notify(void) status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); - status = pNtWaitForSingleObject(event, FALSE, &timeout); + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); status = pNtDeleteKey(subkey); @@ -1579,7 +1609,8 @@ static void test_notify(void) win_skip("NtNotifyChangeMultipleKeys not available\n"); } - pNtClose(event); + pNtClose(events[0]); + pNtClose(events[1]); } START_TEST(reg)

1 0

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

11 Nov '15

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

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

11 Nov '15

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

Hans Leidekker : webservices: Add support for retrieving the output buffer.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: 349641575ca7b0db510911e40ab9d705c8632377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349641575ca7b0db510911e40… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:01 2015 +0100 webservices: Add support for retrieving the output buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 10 +++++----- dlls/webservices/writer.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 26b8c78..9f0ae2b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -120,13 +120,13 @@ static void test_WsCreateWriter(void) ok( hr == S_OK, "got %08x\n", hr ); ok( max_size == 65536, "got %u\n", max_size ); - buffers.bufferCount = 0xdeadbeef; - buffers.buffers = (WS_BYTES *)0xdeadbeef; + bytes.length = 0xdeadbeef; + bytes.bytes = (BYTE *)0xdeadbeef; size = sizeof(buffers); - hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &buffers, size, NULL ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !buffers.bufferCount, "got %u\n", buffers.bufferCount ); - todo_wine ok( buffers.buffers != NULL, "got %p\n", buffers.buffers ); + ok( !bytes.length, "got %u\n", bytes.length ); + ok( bytes.bytes != NULL, "got %p\n", bytes.bytes ); max_size = 0xdeadbeef; size = sizeof(max_size); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e8b5fad..b56c718 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -293,7 +293,20 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT if (error) FIXME( "ignoring error parameter\n" ); if (!writer->output_type) return WS_E_INVALID_OPERATION; - return get_writer_prop( writer, id, buf, size ); + + switch (id) + { + case WS_XML_WRITER_PROPERTY_BYTES: + { + WS_BYTES *bytes = buf; + if (size != sizeof(*bytes)) return E_INVALIDARG; + bytes->bytes = writer->output_buf->ptr; + bytes->length = writer->output_buf->size; + return S_OK; + } + default: + return get_writer_prop( writer, id, buf, size ); + } } static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf )

1 0

Hans Leidekker : webservices: Implement WsWriteEndElement.
by Alexandre Julliard 11 Nov '15

11 Nov '15

Module: wine Branch: master Commit: c08fb1a21123a15d98d140ef042018a20d2a71a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08fb1a21123a15d98d140ef0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 11 11:02:02 2015 +0100 webservices: Implement WsWriteEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 69 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index f0516d1..1d811ae 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -173,7 +173,7 @@ @ stub WsWriteElement @ stub WsWriteEndAttribute @ stub WsWriteEndCData -@ stub WsWriteEndElement +@ stdcall WsWriteEndElement(ptr ptr) @ stub WsWriteEndStartElement @ stub WsWriteEnvelopeEnd @ stub WsWriteEnvelopeStart diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b56c718..f55f56e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -520,6 +520,75 @@ static HRESULT write_startelement( struct writer *writer ) return S_OK; } +static HRESULT write_endelement( struct writer *writer ) +{ + WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)writer->current; + ULONG size; + HRESULT hr; + + /* '</prefix:localname>' */ + + size = elem->localName->length + 3 /* '</>' */; + if (elem->prefix) size += elem->prefix->length + 1 /* ':' */; + if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; + + write_char( writer, '<' ); + write_char( writer, '/' ); + if (elem->prefix) + { + write_bytes( writer, elem->prefix->bytes, elem->prefix->length ); + write_char( writer, ':' ); + } + write_bytes( writer, elem->localName->bytes, elem->localName->length ); + write_char( writer, '>' ); + return S_OK; +} + +/************************************************************************** + * WsWriteEndElement [webservices.@] + */ +HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + if (writer->state == WRITER_STATE_STARTELEMENT) + { + /* '/>' */ + if ((hr = write_startelement( writer )) != S_OK) return hr; + if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; + write_char( writer, '/' ); + write_char( writer, '>' ); + + writer->current = writer->current->parent; + writer->state = WRITER_STATE_STARTENDELEMENT; + return S_OK; + } + else + { + struct node *node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ); + if (!node) return E_OUTOFMEMORY; + + /* '</prefix:localname>' */ + if ((hr = write_endelement( writer )) != S_OK) + { + free_node( node ); + return hr; + } + + write_insert_node( writer, node ); + writer->current = node->parent; + writer->state = WRITER_STATE_ENDELEMENT; + return S_OK; + } + return WS_E_INVALID_OPERATION; +} + /************************************************************************** * WsWriteStartElement [webservices.@] */

1 0