August 2013 - Wine-devel - list.winehq.org

Re: patch:kernel32
by Bruno Jesus 29 Aug '13

29 Aug '13

On Thu, Aug 29, 2013 at 11:15 AM, matyapiro31 <matyapiro31(a)gmail.com> wrote: The patch could have a better subject =) > + unix_len=sizeof(unix_vars)/sizeof(unix_vars[0]; Missing the closing ) ? Will this compile? > - for ( i = 0; i < sizeof (special) / sizeof (WCHAR); i++ ) > + for ( i = 0; i < 17; i++ ) I guess the compiler does this for you. And for the other cases too. Also you should send only one patch per email. Regards, Bruno

1 0

Re: patch:try 2 of adding wine ja mannual
by Akihiro Sagawa 29 Aug '13

29 Aug '13

On Wed, 28 Aug 2013 20:29:43 +0900, �� wrote: > diff --git a/loader/Makefile.in b/loader/Makefile.in > index a7ab893..bc11378 100644 > --- a/loader/Makefile.in > +++ b/loader/Makefile.in > @@ -20,14 +20,16 @@ MANPAGE = wine.man > EXTRA_MANPAGES = \ > wine.de.man \ > wine.fr.man \ > - wine.pl.man > + wine.pl.man \ > + wine.ja.man The line was indented spaces, use tabs instead here, please. The list should be in alphabetical order, i.e. de, fr, ja, pl. > INSTALLDIRS = \ > $(DESTDIR)$(bindir) \ > $(DESTDIR)$(mandir)/man$(prog_manext) \ > $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ > $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) \ > - $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext) > + $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext) \ > + $(DESTDIR)$(mandir)/ja/man$(prog_manext) Use tabs and insert the line between fr and pl, please. Why don't you use ja.UTF-8? > diff --git a/loader/wine.ja.man.in b/loader/wine.ja.man.in > new file mode 100644 > index 0000000..e2e1cba > --- /dev/null > +++ b/loader/wine.ja.man.in The document still looks like wine 1.4 age text. Some sentences deleted before 1.6 release, e.g. git url, still remain. Updated texts, e.g. DESCRIPTION section, aren't reflected in the translated one. Please refer the diff page [1] to figure out what was changed between wine-1.4 and wine-1.6. [1] http://source.winehq.org/git/wine.git/blobdiff/wine-1.4..wine-1.6:/loader/w… I noticed that you added Japanese specific section -- 文字化けについて -- to the man page. I'm not sure about this because other translators didn't do like this and it is difficult to keep up-to-date language specific information. Regards, Akihiro Sagawa

1 0

Re: wininet: Replacing a header with an empty value deletes it.
by testbot＠winehq.org 29 Aug '13

29 Aug '13

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://newtestbot.winehq.org/JobDetails.pl?Key=1918 Your paranoid android. === w7pro64 (32 bit http) === http.c:4279: Test failed: HttpSendRequest failed: 12057 http.c:4284: Test failed: expected secure flag to be set === w7pro64 (64 bit http) === http.c:3445: Test failed: HttpQueryInfo failed 0

1 0

Re: [4/4] ntdll: Properly set flag which indicates buffer empty state.
by Alexandre Julliard 29 Aug '13

29 Aug '13

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > --- > dlls/kernel32/tests/comm.c | 5 +---- > dlls/ntdll/serial.c | 13 +++++-------- > 2 files changed, 6 insertions(+), 12 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so comm.c && touch comm.ok comm.c:835: Test failed: WriteFile took 1 ms to write 17 Bytes at 150 Baud comm.c:848: Test failed: WaitCommEvent failed with a timeout comm.c:859: Test failed: WaitCommEvent error 997 comm.c:860: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:865: Test failed: WaitCommEvent used 1000 ms for waiting comm.c:1895: Tests skipped: interactive tests (set WINETEST_INTERACTIVE=1) make: *** [comm.ok] Error 5 -- Alexandre Julliard julliard(a)winehq.org

3 10

Re: [1/2] server: Use tcdrain() instead of tcflush() to implement FlushFileBuffers() for a COM port. Take 2.
by Dmitry Timoshkov 29 Aug '13

29 Aug '13

Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > Based on a patch of Wolfgang Walter. Is there anything wrong with this patch? -- Dmitry.

1 0

Re: ntdll: Store all 'comClass' attributes (try3)
by Michael Stefaniuc 28 Aug '13

28 Aug '13

Hello Nikolay, On 08/27/2013 12:16 PM, Nikolay Sivov wrote: > +static OLEMISC get_olemisc_value(const WCHAR *str, int len) > +{ > + int min, max; > + > + min = 0; > + max = sizeof(olemisc_values)/sizeof(struct olemisc_entry) - 1; > + > + while (min <= max) > + { > + int n, c; > + > + n = (min+max)/2; > + > + c = strncmpW(olemisc_values[n].name, str, len); why don't you just compare the length first? If the length matches you can do a simple strcmpW between the strings to verify the match. Something like the below code: if (olemisc_values[n].len == len) { if (!strcmpW(olemisc_values[n].name, str) return olemisc_values[n].value; else ... } else if (olemisc_values[n].len > len) max = n-1; else min = n+1; > + if (!c) > + { > + if (olemisc_values[n].len < len) > + c = -1; > + else if (olemisc_values[n].len > len) > + c = 1; > + } > + > + if (!c) > + return olemisc_values[n].value; > + > + if (c > 0) > + max = n-1; > + else > + min = n+1; > + } > + > + WARN("unknown flag %s\n", debugstr_wn(str, len)); > + return 0; > +} bye michael

1 0

Re: [PATCH] iphlpapi: Add AllocateAndGetTcpExTableFromStack().
by Hans Leidekker 28 Aug '13

28 Aug '13

On Wed, 2013-08-28 at 12:21 +0200, Ralf Habacker wrote: > diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec > index 36ba13f..1eed5ae 100644 > --- a/dlls/iphlpapi/iphlpapi.spec > +++ b/dlls/iphlpapi/iphlpapi.spec > @@ -6,6 +6,7 @@ > @ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long ) > @ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) > @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) > +@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long long ) AllocateAndGetTcpExTableFromStack sorts before AllocateAndGetTcpTableFromStack. > diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h > index bf5bb92..efdb1cc 100644 > --- a/dlls/iphlpapi/ipstats.h > +++ b/dlls/iphlpapi/ipstats.h > @@ -33,6 +33,7 @@ > DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; > > DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; > +DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) DECLSPEC_HIDDEN; Again, you don't need this part.

2 2

[AppDB] How to deal with hardware/driver dependent test result?
by Felix Yan 28 Aug '13

28 Aug '13

Hi, I'm maintaining Spore 1.0, and it works correctly in wine for over a year on Nvidia video card with closed-source nvidia driver - but I do noticed with Intel cards with open source drivers, the game is nearly not playable - missing texture and more problems. Today comes in a new test result that mark the game as "Garbage", while the description is exactly what happened on my laptop with Intel chip. What should I do about this? To proceed with the test result and change the game to "Garbage" stage, or reject with "Nvidia cards works fine"? I don't think either is fine, so I come to the list for help. Thanks! Regards, Felix Yan

3 2

Re: [PATCH] iphlpapi: Add AllocateAndGetTcpExTableFromStack().
by Hans Leidekker 28 Aug '13

28 Aug '13

On Wed, 2013-08-28 at 11:41 +0200, Ralf Habacker wrote: > diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec > index 36ba13f..cad2ca9 100644 > --- a/dlls/iphlpapi/iphlpapi.spec > +++ b/dlls/iphlpapi/iphlpapi.spec > @@ -6,6 +6,7 @@ > @ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long ) > @ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) > @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) > +@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long ) These should be sorted. > diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c > index 809dbc6..bcb3021 100644 > --- a/dlls/iphlpapi/ipstats.c > +++ b/dlls/iphlpapi/ipstats.c > @@ -2327,6 +2327,32 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO > return build_tcp_table( TCP_TABLE_BASIC_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL ); > } > > +/****************************************************************** > + * AllocateAndGetTcpExTableFromStack (IPHLPAPI.@) > + * > + * Get the TCP connection table. > + * Like GetTcpTable(), but allocate the returned table from heap. > + * > + * PARAMS > + * ppTcpTable [Out] pointer into which the MIB_TCPTABLE_EX is > + * allocated and returned. > + * bOrder [In] whether to sort the table > + * heap [In] heap from which the table is allocated > + * flags [In] flags to HeapAlloc > + * > + * RETURNS > + * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable() > + * returns otherwise. > + */ > +DWORD WINAPI AllocateAndGetTcpExTableFromStack( PMIB_TCPTABLE_EX *ppTcpTable, BOOL bOrder, > + HANDLE heap, DWORD flags ) > +{ > + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppTcpTable, bOrder, heap, flags); > + > + if (!ppTcpTable) return ERROR_INVALID_PARAMETER; > + return build_tcp_table( TCP_TABLE_OWNER_PID_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL ); > +} > + > static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) > { > DWORD table_size; > diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h > index bf5bb92..823fadb 100644 > --- a/dlls/iphlpapi/ipstats.h > +++ b/dlls/iphlpapi/ipstats.h > @@ -34,6 +34,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDE > > DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; > DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; > +DWORD WINAPI AllocateAndGetTcpExTableFromStack(PMIB_TCPTABLE_EX *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; > DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; > DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; You don't need this, AllocateAndGetTcpExTableFromStack can be made static. The first parameter should be a void ** like in recent versions of iphlpapi.h. > diff --git a/include/tcpmib.h b/include/tcpmib.h > index 477500c..bc63c3f 100644 > --- a/include/tcpmib.h > +++ b/include/tcpmib.h > @@ -150,6 +150,9 @@ typedef struct _MIB_TCPTABLE2 > MIB_TCPROW2 table[1]; > } MIB_TCPTABLE2, *PMIB_TCPTABLE2; > > +typedef MIB_TCPROW_OWNER_PID _MIB_TCPROW_EX; > +typedef MIB_TCPTABLE_OWNER_PID MIB_TCPTABLE_EX; > +typedef PMIB_TCPTABLE_OWNER_PID PMIB_TCPTABLE_EX; Recent headers don't define these so we shouldn't either.

1 0

Re: [PATCH] iphlpapi: Add AllocateAndGetTcpExTableFromStack().
by Nikolay Sivov 28 Aug '13

28 Aug '13

On 8/28/2013 13:41, Ralf Habacker wrote: > > Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> > --- > dlls/iphlpapi/iphlpapi.spec | 1 + > dlls/iphlpapi/ipstats.c | 26 ++++++++++++++++++++++++++ > dlls/iphlpapi/ipstats.h | 1 + > include/tcpmib.h | 3 +++ > 4 Dateien geändert, 31 Zeilen hinzugefügt(+) > > > > +DWORD WINAPI AllocateAndGetTcpExTableFromStack( PMIB_TCPTABLE_EX *ppTcpTable, BOOL bOrder, > + HANDLE heap, DWORD flags ) Are you sure about this? It doesn't match a prototype from MSDN.

1 0