January 2014 - Wine-Commits

Nikolay Sivov : scrrun: Implement Next() for file collection.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 308f1144ac6ffd64d08d2a72ce6b4090617d9082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308f1144ac6ffd64d08d2a72c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:02 2014 +0400 scrrun: Implement Next() for file collection. --- dlls/scrrun/filesystem.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 94d894f..eb75a1f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -50,6 +50,8 @@ struct enumdata { struct { IFileCollection *coll; + HANDLE find; + BSTR path; } filecoll; } u; }; @@ -70,6 +72,7 @@ struct foldercollection { struct filecollection { IFileCollection IFileCollection_iface; LONG ref; + BSTR path; }; struct folder { @@ -142,6 +145,7 @@ static inline HRESULT create_error(DWORD err) } static HRESULT create_folder(const WCHAR*, IFolder**); +static HRESULT create_file(BSTR, IFile**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -153,6 +157,11 @@ static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) strcmpW(data->cFileName, dotW); } +static inline BOOL is_file_data(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) { int len = SysStringLen(path); @@ -606,6 +615,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { IFileCollection_Release(This->data.u.filecoll.coll); + SysFreeString(This->data.u.filecoll.path); heap_free(This); } @@ -615,8 +625,74 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); - return E_NOTIMPL; + HANDLE handle = This->data.u.filecoll.find; + WIN32_FIND_DATAW data; + ULONG count = 0; + + TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + + if (fetched) + *fetched = 0; + + if (!handle) + { + static const WCHAR allW[] = {'*',0}; + WCHAR pathW[MAX_PATH]; + BSTR parent = This->data.u.filecoll.path; + int len; + + strcpyW(pathW, parent); + len = SysStringLen(parent); + if (parent[len-1] != '\\') + strcatW(pathW, bsW); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return S_FALSE; + + while (1) + { + if (is_file_data(&data)) + break; + else + if (!FindNextFileW(handle, &data)) + { + FindClose(handle); + return S_FALSE; + } + } + + This->data.u.filecoll.find = handle; + } + + do + { + if (count >= celt) break; + + if (is_file_data(&data)) + { + IFile *file; + HRESULT hr; + BSTR str; + + str = get_full_path(This->data.u.filecoll.path, &data); + hr = create_file(str, &file); + SysFreeString(str); + if (FAILED(hr)) return hr; + + V_VT(&var[count]) = VT_DISPATCH; + V_DISPATCH(&var[count]) = (IDispatch*)file; + count++; + } + } while (FindNextFileW(handle, &data)); + + if (count < celt) + return S_FALSE; + + if (fetched) + *fetched = count; + + return S_OK; } static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) @@ -661,6 +737,12 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; + This->data.u.filecoll.path = SysAllocString(collection->path); + if (!This->data.u.filecoll.path) + { + heap_free(This); + return E_OUTOFMEMORY; + } This->data.u.filecoll.coll = &collection->IFileCollection_iface; IFileCollection_AddRef(This->data.u.filecoll.coll); @@ -903,7 +985,10 @@ static ULONG WINAPI filecoll_Release(IFileCollection *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + SysFreeString(This->path); heap_free(This); + } return ref; } @@ -1006,7 +1091,7 @@ static const IFileCollectionVtbl filecollectionvtbl = { filecoll_get_Count }; -static HRESULT create_filecoll(IFileCollection **files) +static HRESULT create_filecoll(BSTR path, IFileCollection **files) { struct filecollection *This; @@ -1017,6 +1102,12 @@ static HRESULT create_filecoll(IFileCollection **files) This->IFileCollection_iface.lpVtbl = &filecollectionvtbl; This->ref = 1; + This->path = SysAllocString(path); + if (!This->path) + { + heap_free(This); + return E_OUTOFMEMORY; + } *files = &This->IFileCollection_iface; return S_OK; @@ -1290,7 +1381,7 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) if(!files) return E_POINTER; - return create_filecoll(files); + return create_filecoll(This->path, files); } static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite,

1 0

Frédéric Delanoy : xmllite/tests: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: e5b689b71e73b7774438df1786e23aff80262055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b689b71e73b7774438df178… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 7 00:14:38 2014 +0100 xmllite/tests: Use BOOL type where appropriate. --- dlls/xmllite/tests/reader.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 658bb10..0888a7e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -89,11 +89,11 @@ static IStream *create_stream_on_data(const char *data, int size) } static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, - int pos_broken, int todo, int _line_) + int pos_broken, BOOL todo, int _line_) { UINT l, p; HRESULT hr; - int broken_state; + BOOL broken_state; hr = IXmlReader_GetLineNumber(reader, &l); ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -101,7 +101,7 @@ static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); if (line_broken == -1 && pos_broken == -1) - broken_state = 0; + broken_state = FALSE; else broken_state = broken((line_broken == -1 ? line : line_broken) == l && (pos_broken == -1 ? pos : pos_broken) == p); @@ -151,7 +151,7 @@ static const IID *empty_seq[] = { static input_iids_t input_iids; -static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID **exp_broken, int todo, int line) +static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID **exp_broken, BOOL todo, int line) { int i = 0, size = 0; @@ -242,18 +242,18 @@ static const char *type_to_str(XmlNodeType type) } static void test_read_state_(IXmlReader *reader, XmlReadState expected, - XmlReadState exp_broken, int todo, int line) + XmlReadState exp_broken, BOOL todo, int line) { XmlReadState state; HRESULT hr; - int broken_state; + BOOL broken_state; state = -1; /* invalid value */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, (LONG_PTR*)&state); ok_(__FILE__, line)(hr == S_OK, "Expected S_OK, got %08x\n", hr); if (exp_broken == -1) - broken_state = 0; + broken_state = FALSE; else broken_state = broken(exp_broken == state); @@ -642,7 +642,7 @@ static void test_reader_state(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* attempt to read on closed reader */ - test_read_state(reader, XmlReadState_Closed, -1, 0); + test_read_state(reader, XmlReadState_Closed, -1, FALSE); if (0) { /* newer versions crash here, probably cause no input was set */ @@ -699,7 +699,7 @@ static void test_read_xmldeclaration(void) "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); - test_read_state(reader, XmlReadState_Interactive, -1, 0); + test_read_state(reader, XmlReadState_Interactive, -1, FALSE); hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "got %08x\n", hr); @@ -770,7 +770,7 @@ struct test_entry { const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ - int todo : 1; + BOOL todo; }; static struct test_entry comment_tests[] = { @@ -1338,8 +1338,8 @@ static void test_readvaluechunk(void) static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, - { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, 1 }, - { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, TRUE }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, TRUE }, { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } };

1 0

Michael Stefaniuc : dmime: Don' t use an IDirectMusicSegment8 method implementation directly.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 770feca7ac05a1189dfdeb64b702790d18a5076e URL: http://source.winehq.org/git/wine.git/?a=commit;h=770feca7ac05a1189dfdeb64b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:33:21 2014 +0100 dmime: Don't use an IDirectMusicSegment8 method implementation directly. --- dlls/dmime/segment.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 36766db..22218b5 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -813,7 +813,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadTrack (LPPERSISTSTREA /* release all loading-related stuff */ IPersistStream_Release (pPersistStream); - hr = IDirectMusicSegment8Impl_IDirectMusicSegment8_InsertTrack ((LPDIRECTMUSICSEGMENT8)&This->SegmentVtbl, *ppTrack, pTrack_hdr->dwGroup); /* at dsPosition */ + hr = IDirectMusicSegment8_InsertTrack((LPDIRECTMUSICSEGMENT8)&This->SegmentVtbl, *ppTrack, + pTrack_hdr->dwGroup); /* at dsPosition */ if (FAILED(hr)) { ERR(": could not insert track\n"); return hr;

1 0

Alexandre Julliard : makefiles: Expand define arguments directly into the generated rules.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 1a74fdbcee3530f4b66590e5f0eebf947ebc9e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74fdbcee3530f4b66590e5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 10:56:15 2014 +0100 makefiles: Expand define arguments directly into the generated rules. --- Make.rules.in | 9 ++++----- tools/makedep.c | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 6966144..7e6a09d 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -11,15 +11,14 @@ # First some useful definitions -DEFS = -D__WINESRC__ $(EXTRADEFS) -ALLCFLAGS = $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) -RCFLAGS = --nostdinc $(PORCFLAGS) $(DEFS) +ALLCFLAGS = $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) +IDLFLAGS = $(EXTRAIDLFLAGS) +RCFLAGS = --nostdinc $(PORCFLAGS) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(OBJC_SRCS:.m=.o) \ $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) -ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) +ALLCROSSCFLAGS = $(CPPFLAGS) $(CFLAGS) # Rules for dependencies diff --git a/tools/makedep.c b/tools/makedep.c index 28f60fd..4d38613 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -92,6 +92,7 @@ struct strarray static const struct strarray empty_strarray; static struct strarray include_args; +static struct strarray define_args; static struct strarray make_vars; static struct strarray cmdline_vars; @@ -1475,9 +1476,10 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res rsrc.pot:", obj ); @@ -1487,9 +1489,10 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res:", obj ); @@ -1524,8 +1527,9 @@ static struct strarray output_sources(void) output_filenames( targets ); output( ": $(WIDL)\n" ); output( "\t$(WIDL) -o $@ %s", source->filename ); - output_filenames( includes ); output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(IDLFLAGS)" ); output( "\n" ); output_filenames( targets ); @@ -1602,6 +1606,7 @@ static struct strarray output_sources(void) output( "%s.o: %s\n", obj, sourcedep ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); + output_filenames( define_args ); if (module || staticlib || testdll) output_filenames( dllflags ); output_filename( "$(ALLCFLAGS)" ); output( "\n" ); @@ -1611,6 +1616,8 @@ static struct strarray output_sources(void) output( "%s.cross.o: %s\n", obj, sourcedep ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); + output_filenames( define_args ); + output_filename( "-DWINE_CROSSTEST" ); output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } @@ -1642,9 +1649,10 @@ static struct strarray output_sources(void) output_filenames( po_files ); output( "\n" ); output( "\t$(WRC) -O pot -o $@" ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output_filenames( po_files ); output( "\n" ); @@ -2090,10 +2098,16 @@ static void update_makefile( const char *path ) parent_dir = get_expanded_make_variable( "PARENTSRC" ); include_args = empty_strarray; + define_args = empty_strarray; + strarray_add( &define_args, "-D__WINESRC__" ); + value = get_expanded_make_var_array( "EXTRAINCL" ); for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) strarray_add_uniq( &include_args, value.str[i] ); + else + strarray_add_uniq( &define_args, value.str[i] ); + strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" )); init_paths();

1 0

Bruno Jesus : ws2_32/tests: Show that the last WSACleanup must destroy sockets.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: a1e22940069b050e376944c66d4a1030184c67e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e22940069b050e376944c66… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 6 20:58:56 2014 -0200 ws2_32/tests: Show that the last WSACleanup must destroy sockets. --- dlls/ws2_32/tests/sock.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9a90454..86a829e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1027,6 +1027,8 @@ static void test_WithWSAStartup(void) WORD version = MAKEWORD( 2, 2 ); INT res; LPVOID ptr; + SOCKET src, dst; + DWORD error; res = WSAStartup( version, &data ); ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); @@ -1034,6 +1036,31 @@ static void test_WithWSAStartup(void) ptr = gethostbyname("localhost"); ok(ptr != NULL, "gethostbyname() failed unexpectedly: %d\n", WSAGetLastError()); + ok(!tcp_socketpair(&src, &dst), "creating socket pair failed\n"); + + res = send(src, "TEST", 4, 0); + ok(res == 4, "send failed with error %d\n", WSAGetLastError()); + + WSACleanup(); + + res = WSAStartup( version, &data ); + ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); + + /* show that sockets are destroyed automatically after WSACleanup */ + todo_wine { + SetLastError(0xdeadbeef); + res = send(src, "TEST", 4, 0); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "send should have failed\n"); + ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + + SetLastError(0xdeadbeef); + res = closesocket(dst); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "closesocket should have failed\n"); + ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + } + WSACleanup(); }

1 0

Alexandre Julliard : mountmgr.sys: Use the correct variable for the include paths.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 15b40f62cc7027495bcccf7429fcdcc6076b6de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b40f62cc7027495bcccf742… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 11:33:57 2014 +0100 mountmgr.sys: Use the correct variable for the include paths. --- dlls/mountmgr.sys/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index e1c4bbb..36895e3 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = mountmgr.sys IMPORTS = uuid advapi32 ntoskrnl.exe DELAYIMPORTS = user32 EXTRADLLFLAGS = -Wb,--subsystem,native -EXTRADEFS = @DBUS_CFLAGS@ @HAL_CFLAGS@ +EXTRAINCL = @DBUS_CFLAGS@ @HAL_CFLAGS@ EXTRALIBS = @DISKARBITRATIONLIB@ C_SRCS = \

1 0

Alexandre Julliard : makefiles: Always create dependencies from the top-level directory.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 3dfcec768d93d3b332ff2402066e808c52f08c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dfcec768d93d3b332ff24020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 11:36:12 2014 +0100 makefiles: Always create dependencies from the top-level directory. --- Make.rules.in | 7 ------- tools/makedep.c | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7e6a09d..947419e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -20,13 +20,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(OBJC_SRCS: ALLCROSSCFLAGS = $(CPPFLAGS) $(CFLAGS) -# Rules for dependencies - -depend: dummy - $(MAKEDEP) -M . - -.PHONY: depend - # Rules for cleaning clean:: diff --git a/tools/makedep.c b/tools/makedep.c index 7f8e518..20b1064 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1944,6 +1944,7 @@ static struct strarray output_sources(void) output( "\t$(RM)" ); output_filenames( clean_files ); output( "\n" ); + strarray_add( &phony_targets, "clean" ); } if (subdirs.count) @@ -1953,6 +1954,13 @@ static struct strarray output_sources(void) output( "\t$(MKDIR_P) -m 755 $@\n" ); } + if (top_obj_dir) + { + output( "depend:\n" ); + output( "\t(a)cd %s && $(MAKE) %s/depend\n", top_obj_dir, base_dir ); + strarray_add( &phony_targets, "depend" ); + } + if (phony_targets.count) { output( ".PHONY:" );

1 0

Alexandre Julliard : makefiles: Allow define arguments to be specific to a single file.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 0d533cf0bd566310e3906b7b93e155999bfc5c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d533cf0bd566310e3906b7b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 12:20:25 2014 +0100 makefiles: Allow define arguments to be specific to a single file. --- dlls/actxprxy/Makefile.in | 3 ++- dlls/appwiz.cpl/Makefile.in | 3 ++- dlls/dispex/Makefile.in | 3 ++- dlls/msdaps/Makefile.in | 3 ++- dlls/ole32/Makefile.in | 4 +++- dlls/oleaut32/Makefile.in | 4 +++- dlls/qmgrprxy/Makefile.in | 3 ++- dlls/quartz/Makefile.in | 3 ++- dlls/sti/Makefile.in | 3 ++- dlls/urlmon/Makefile.in | 6 ++++-- dlls/windowscodecs/Makefile.in | 3 ++- libs/wine/Makefile.in | 18 ++++++++++-------- tools/makedep.c | 8 ++++++++ tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 18 +++++++++--------- tools/wrc/Makefile.in | 3 ++- 16 files changed, 56 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d533cf0bd566310e3906…

1 0

Bruno Jesus : ws2_32/tests: Add some FIONREAD tests.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 7e4d075ec1859f5fadcad4a39a261237f1d8eb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4d075ec1859f5fadcad4a39… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 6 20:58:54 2014 -0200 ws2_32/tests: Add some FIONREAD tests. --- dlls/ws2_32/tests/sock.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 54b0840..9a90454 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3859,7 +3859,7 @@ static void test_addr_to_print(void) static void test_ioctlsocket(void) { - SOCKET sock; + SOCKET sock, src, dst; struct tcp_keepalive kalive; int ret, optval; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; @@ -3943,6 +3943,32 @@ static void test_ioctlsocket(void) ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); closesocket(sock); + + if (tcp_socketpair(&src, &dst) != 0) + { + ok(0, "creating socket pair failed, skipping test\n"); + return; + } + + /* test FIONREAD on TCP sockets */ + optval = 0xdeadbeef; + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == 0, "WSAIoctl failed unexpectedly with error %d\n", WSAGetLastError()); + ok(optval == 0, "FIONREAD should have returned 0 bytes, got %d instead\n", optval); + + optval = 0xdeadbeef; + ok(send(src, "TEST", 4, 0) == 4, "failed to send test data\n"); + Sleep(100); + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == 0, "WSAIoctl failed unexpectedly with error %d\n", WSAGetLastError()); + ok(optval == 4, "FIONREAD should have returned 4 bytes, got %d instead\n", optval); + + closesocket(dst); + optval = 0xdeadbeef; + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ok(optval == 0xdeadbeef, "FIONREAD should not have changed last error, got %d instead\n", optval); + closesocket(src); } static BOOL drain_pause = FALSE;

1 0

André Hentschel : kernel32/tests: Add missing last errors for win8.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 29907a28629d1b67afc5b97288aa926a0b56011e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29907a28629d1b67afc5b9728… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 7 00:36:15 2014 +0100 kernel32/tests: Add missing last errors for win8. --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 7c43663..b38bb30 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1401,7 +1401,7 @@ static void test_WriteConsoleInputA(HANDLE input_handle) {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_HANDLE, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, @@ -1645,7 +1645,7 @@ static void test_WriteConsoleInputW(HANDLE input_handle) {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_HANDLE, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1},

1 0