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

Re: [2/2] ntdll: Store full line status register in the internal structure, not just the TIOCSER_TEMT bit.
by Dmitry Timoshkov Aug. 30, 2013

Aug. 30, 2013

Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > Printing complete lsr value in the log may help with diagnosing > test failures on Alexandre's machine. This patch is marked as 'Build failure' in the tracker, but I've checked it once again and compiles just fine here. What kind of build failure is that? -- Dmitry.

2 1

RFC: Mark dylib/mach-o on Mac OS X
by André Hentschel Aug. 29, 2013

Aug. 29, 2013

Hi, at [1] i noticed that dylibs are printed as PEs. This intents to fix that, but i have no Mac, could someone please review/test? [1] http://test.winehq.org/data/8ef3a142263e6db11f1514f77b3de84c8b08d7a0/mac_fg… diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6bea436..41fa7e6 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; +const WCHAR S_MachoW[] = {'<','m','a','c','h','o','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; @@ -94,6 +95,9 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) if (len > 3 && !strcmpiW(&out[len - 3], S_DotSoW) && (l = match_ext(out, len - 3))) strcpyW(&out[len - l - 3], S_ElfW); + else if (len > 6 && !strcmpiW(&out[len - 6], S_DotDylibW) && + (l = match_ext(out, len - 6))) + strcpyW(&out[len - l - 6], S_MachoW); } while ((*out = tolowerW(*out))) out++; } diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c0b86ba..c2c7c08 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -244,6 +244,11 @@ void info_win32_module(DWORD64 base) } } } + else if (strstr(im.mi[i].ModuleName, "<macho>")) + { + dbg_printf("MACH-O\t"); + module_print_info(&im.mi[i], FALSE); + } else { /* check module is not embedded in another module */ @@ -253,8 +258,11 @@ void info_win32_module(DWORD64 base) break; } if (j < im.num_used) continue; - if (strstr(im.mi[i].ModuleName, ".so") || strchr(im.mi[i].ModuleName, '<')) + if (strstr(im.mi[i].ModuleName, ".so") || strstr(im.mi[i].ModuleName, "<elf>") || + strstr(im.mi[i].ModuleName, "<wine-loader>")) dbg_printf("ELF\t"); + else if (strstr(im.mi[i].ModuleName, ".dylib") || strstr(im.mi[i].ModuleName, "<macho>")) + dbg_printf("MACH-O\t"); else dbg_printf("PE\t"); module_print_info(&im.mi[i], FALSE);

4 9

Re: patch:kernel32
by Charles Davis Aug. 29, 2013

Aug. 29, 2013

On Aug 29, 2013, at 8:15 AM, matyapiro31 wrote: > > <0001-kernel32-change-for-loop-to-optimize.patch><0002-kernel32-change-for-loop-to-optimize.patch> One patch per email, please. Also, the subject should be more descriptive. The first one doesn't look much better than the second one (which was already rejected). sizeof(array)/sizeof(array[0]) is a constant expression; any optimizing compiler worth its salt will optimize that for you. (And I would know, because I work on LLVM and Clang.) The first part of that patch (against dlls/kernel32/console.c) might be a bit more promising, though, since it hoists a computation that isn't constant at compile time but is constant for the duration of the loop; but again, any good optimizing compiler would be smart enough to do that, too. Oh, and you forgot to actually declare the variables that hold the hoisted values. Those assignments don't count, because: a) You never gave them a type. That's an error in any C compiler (C89, C99, etc.) I'm not even sure a K&R compiler would take that. b) Wine is written in C89 (with some GNU extensions scattered throughout, but generally we try to write portable code around here); that means (among other things) all variable declarations must come before other statements. Did you even try to compile Wine with these patches? Chip

1 0

Re: [PATCH 2/2] ddraw/tests: Test WM_ACTIVATEAPP messages generated by SetCooperativeLevel
by Henri Verbeet Aug. 29, 2013

Aug. 29, 2013

On 29 August 2013 11:14, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +BOOL activateapp_received; > +IDirectDraw *activateapp_ddraw; > +HWND activateapp_window; > +DWORD activateapp_coop_level; > + I think those should be static, and you'll probably want to put them in a structure.

1 0

my patch was wrong at dlls/kernel32/computernames.c
by matyapiro31 Aug. 29, 2013

Aug. 29, 2013

From if ( isalnumW ( wc ) ) return wc; for ( i = 0; i < 17; i++ ) To if ( isalnumW ( wc ) ) return wc; for ( i = 0; i < 16; i++ ) and the original version was wrong,too. It counts the NULL of the end.

2 1

Re: patch:kernel32
by Bruno Jesus Aug. 29, 2013

Aug. 29, 2013

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 Aug. 29, 2013

Aug. 29, 2013

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 Aug. 29, 2013

Aug. 29, 2013

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 Aug. 29, 2013

Aug. 29, 2013

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 Aug. 29, 2013

Aug. 29, 2013

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 Aug. 28, 2013

Aug. 28, 2013

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 Aug. 28, 2013

Aug. 28, 2013

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 Aug. 28, 2013

Aug. 28, 2013

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 Aug. 28, 2013

Aug. 28, 2013

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 Aug. 28, 2013

Aug. 28, 2013

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

Re: kernel32/tests: Remove a useless trace.
by Marvin Aug. 28, 2013

Aug. 28, 2013

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://testbot.winehq.org/JobDetails.pl?Key=26897 Your paranoid android. === WVISTAX64 (64 bit comm) === comm.c:835: Test failed: WriteFile took 16 ms to write 0 Bytes at 150 Baud comm.c:1445: test_AbortWaitCts timeout 500 handle 000000000000003C comm.c:1412: Changing CommMask on the fly for handle 000000000000003C after timeout 500

1 0

Re: msvcr90/tests: Add more ARM forwards and use them in tests
by Marvin Aug. 27, 2013

Aug. 27, 2013

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://testbot.winehq.org/JobDetails.pl?Key=26894 Your paranoid android. === WXPX64 (32 bit msvcr90) === No test summary line found

1 0

Re: [1/4] ntdll: Ignore ioctl(TIOCGICOUNT) failures.
by Wolfgang Walter Aug. 27, 2013

Aug. 27, 2013

Am Dienstag, 27. August 2013, 22:00:59 schrieben Sie: > Wolfgang Walter <wine(a)stwm.de> wrote: > > > Wolfgang Walter <wine(a)stwm.de> wrote: > > > > I made similar changes so that several applications we use work. I > > > > tested > > > > your patches, all but one do work. I don't know why one does not, > > > > though. > > > > > > What patch doesn't work for you? > > > > I tested all your patches together (indivually they will not really work > > here). > > Yeah, the patches need to be tested after applying all of them. They were > broken into smaller parts in order to make regression test easier in case of > a regression. If I don't know what doesn't work I can't make any > improvement. Yes, that's clear. I'll have a closer look what's the main difference. The problematic application uses asynchronous IO. I wrote my patch 2009 (and earlier version 2008) so I have to rethink about it. I remember that TX_TXEMPTY detection was a problem, then. It could get lost. The reason I moved the output buffer empty detection from get_irq_info() into check_events() was simply because I thought handling input queue in check_events() but ouput queue in get_irq_info() seems odd. I also think that it's better to detect that get_irq_info() basicly does not work with drivers not supporting TIOCGICOUNT and it is good to have that information in the callers of get_irq_info(). So I return STATUS_NOT_IMPLEMENTED and handle the situation in the caller. And then it is better to move empty sending queue handling out of get_irq_info(). I handle the TIOCSERGETLSR wrong, as I see now (I should & with TIOCSER_TEMT). Regards, -- Wolfgang Walter Studentenwerk München Anstalt des öffentlichen Rechts Abteilungsleiter IT Leopoldstraße 15 80802 München

1 0

Retiring winetestbot
by Jeremy White Aug. 27, 2013

Aug. 27, 2013

Folks, I am writing to announce that we will be retiring the original Wine Test Bot, written by the late Ge van Geldorp, as of August 31, 2013. We will switch over to the new test bot that Francois has been working on at that time. On September 1, we'll panic and fix everything that is broken <grin>). I want to thank Ge's family, notably his brother Arno, for keeping the servers running these years since Ge passed away. It's also important to note how incredible a contribution the Wine Test Bot has proven to be for the Wine project; Wine owes an incredible debt to Ge, and I hope we can all collectively work to remember the great gift he gave us and the world. Cheers, Jeremy

1 0

Re: Does auto-apt work to get wine dependencies in source code?
by Susan Cragin Aug. 27, 2013

Aug. 27, 2013

--Sorry about the HTML in the earlier message. >> Was thinking of running some tests but the list of dependencies on the website seems outdated, apt-get build-dep does not work. >Is that with the ubuntu-wine ppa enabled? There are two answers to that question, surprisingly. (1) bitbox In the instructions it looks like the wine ppa repository can be installed the Debian way. But I did that and here's the result. ---------------- E: You must put some 'source' URIs in your sources.list ---------------- So, I had to add the wine-ppa by manually adding to the sources.list. (2) non bitbox This morning a new version of the i386 photo function was added, and now the depencencies install. Conclusion: This afternoon I was able to update all dependencies and compile without a problem using (with modifications above) the bitbox instructions. Compiled only. Did not install because I needed symlinks, but at least I know where I am and what I have to do. Susan

1 0

Re: ntdll: Implement job objects
by Dmitry Timoshkov Aug. 27, 2013

Aug. 27, 2013

Andrew Cook <ariscop(a)gmail.com> wrote: > +typedef struct _JOBOBJECT_ASSOCIATE_COMPLETION_PORT { > + PVOID CompletionKey; > + HANDLE CompletionPort; > +} JOBOBJECT_ASSOCIATE_COMPLETION_PORT, *PJOBOBJECT_ASSOCIATE_COMPLETION_PORT; This needs to go into its owm header. > +static DWORD getProcess(PHANDLE handle) { > + STARTUPINFO startup = {}; > + PROCESS_INFORMATION info = {}; > + > + if(!CreateProcessA(NULL, GetCommandLine(), NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info)) { > + ok(FALSE, "CreateProcess: %x\n", GetLastError()); > + return 0; > + } > + > + CloseHandle(info.hThread); > + *handle = info.hProcess; > + > + return info.dwProcessId; > +}; Indentation is completely messed up in the tests, please set tab size to 8 and even better avoid tabs at all. ';' at the end of function looks funny. > +typedef struct _JOBOBJECT_ASSOCIATE_COMPLETION_PORT { > + PVOID CompletionKey; > + HANDLE CompletionPort; > +} JOBOBJECT_ASSOCIATE_COMPLETION_PORT, *PJOBOBJECT_ASSOCIATE_COMPLETION_PORT; Same as above. > +static NTSTATUS (WINAPI *pNtCreateJobObject)( PHANDLE handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); > +static NTSTATUS (WINAPI *pNtSetInformationJobObject)( HANDLE handle, JOBOBJECTINFOCLASS klass, PVOID info, ULONG len ); > +static NTSTATUS (WINAPI *pNtAssignProcessToJobObject)( HANDLE job, HANDLE process ); > +static NTSTATUS (WINAPI *pNtIsProcessInJob)( HANDLE process, HANDLE job ); > +static NTSTATUS (WINAPI *pNtTerminateJobObject)( HANDLE job, NTSTATUS status ); Please move it to the beginning of the file. > --- a/include/wine/server_protocol.h > +++ b/include/wine/server_protocol.h And don't include autogenerated stuff in the patch. -- Dmitry.

2 2

Re: ntdll: Implement job objects
by Marvin Aug. 27, 2013

Aug. 27, 2013

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://testbot.winehq.org/JobDetails.pl?Key=26885 Your paranoid android. === W2KPROSP4 (32 bit job) === job: unhandled exception c0000005 at 00000000

1 0

Re: [1/4] ntdll: Ignore ioctl(TIOCGICOUNT) failures.
by Wolfgang Walter Aug. 27, 2013

Aug. 27, 2013

Hello, I made similar changes so that several applications we use work. I tested your patches, all but one do work. I don't know why one does not, though. I attached my patch, maybe it is usefull to you. Regards, -- Wolfgang Walter Studentenwerk München Anstalt des öffentlichen Rechts Abteilungsleiter IT Leopoldstraße 15 80802 München

2 1

Re: ntdll: Store all 'comClass' attributes (try2)
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > +static OLEMISC get_olemisc_value(const WCHAR *str, int len) > +{ > + int min, max; > + > + min = 0; > + max = ARRAY_SIZE(olemisc_values) - 1; > + > + while (min <= max) > + { > + int n, c; > + > + n = (min+max)/2; > + > + c = memcmp(olemisc_values[n].name, str, min(len, olemisc_values[n].len)*sizeof(WCHAR)); > + if (!c) > + { > + if (olemisc_values[n].len < len) > + c = -1; > + else if (olemisc_values[n].len > len) > + c = 1; > + } Actually, memcmp is not a good choice for comparing Unicode strings. It doesn't make a difference for ASCII-only strings, but it would still be cleaner to do it right. strncmpW is preferable (as long as you use it correctly...) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [4/4] ntdll: Properly set flag which indicates buffer empty state.
by Marvin Aug. 27, 2013

Aug. 27, 2013

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://testbot.winehq.org/JobDetails.pl?Key=26878 Your paranoid android. === WVISTAX64 (32 bit comm) === comm.c:835: Test failed: WriteFile took 16 ms to write 0 Bytes at 150 Baud comm.c:1443: test_AbortWaitCts timeout 500 handle 000000B4 comm.c:1410: Changing CommMask on the fly for handle 000000B4 after timeout 500

2 1