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

Bug 24018 which appears to be a showstopper for running Cygwin on Wine
by Alan W. Irwin July 5, 2013

July 5, 2013

Andrey Turkin has stated at http://bugs.winehq.org/show_bug.cgi?id=24018 that this is really a Cygwin bug. I frankly don't understand the technical details but his current test (an infinite loop with Cygwin fork calls) may need some beefing up to convince the Cygwin developers they have introduced a regression. The reason why I mention a Cygwin regression is the winetricks script mentions bug 24018 and works around it by downloading an old version of the Cygwin installer. I haven't tried that myself yet, but if that workaround still works, then this is evidence that the issue is a Cygwin regression which is an important consideration when reporting this issue to the Cygwin developers. Andrey Turkin was asked at http://bugs.winehq.org/show_bug.cgi?id=24018 to report the issue to Cygwin, but my search of the Cygwin mailing list archive didn't find any post from him and only found one extremely casual (an aside to a completely different thread) mention (http://sourceware.org/ml/cygwin/2013-06/msg00471.html) from a different wine developer of bug 24018 with no response to that mention. I currently have no experience with Cygwin and my only real interest in Cygwin on Wine is it theoretically provides an alternative build platform to my present successful work with the combination of MinGW, MSYS, and Wine as a Windows build platform. But I haven't even been able to get started with Cygwin on Wine because of this showstopping bug. Therefore, I am mentioning the situation here in the hope that some wine developer on this list with some knowledge of Cygwin will take the responsibility of making a proper bug report to the Cygwin mailing list (which according to http://cygwin.com/problems.html is the correct place to report Cygwin bugs) including the evidence that the issue is a Cygwin regression (assuming investigation of older Cygwin versions with Turkin's test supports that conclusion). Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net) the Time Ephemerides project (timeephem.sf.net) PLplot scientific plotting software package (plplot.sf.net) the libLASi project (unifont.org/lasi) the Loads of Linux Links project (loll.sf.net) and the Linux Brochure Project (lbproject.sf.net) __________________________ Linux-powered Science __________________________

7 26

Re: po: Update Simplified Chinese translation. (newer)
by Qian Hong July 5, 2013

July 5, 2013

Hi Andrew, While discussing the translation of 'Voice output device' and 'Voice input device' in winecfg, Jactry and I have no idea what does 'voice' mean here. Voice could be translated to both '声音‘ and '语音' in Chinese, the former means all kinds of sound, the latter means human voice only, which one is more accurate? I know you've subscribed wine-devel, I CC'ed you because you are the original contributor to the 'voice input device' related code. Thanks a lot! On Fri, Jul 5, 2013 at 9:53 PM, Jactry Zeng <jactry92(a)gmail.com> wrote: > Please ignore the first patch, I modify some in this one. > Thanks advice from Qian Hong. > > > -- Regards, Qian Hong - http://www.winehq.org

3 3

Re: [PATCH] windowscodecs/tests: Fix a test failure [newwtb and other]
by Dmitry Timoshkov July 5, 2013

July 5, 2013

Detlef Riekenberg <wine.dev(a)web.de> wrote: > - /* global palette */ > + /* global palette. This succeed since win7sp1 with platform update / win8 */ This comment is not helpful. > hr = IWICBitmapDecoder_CopyPalette(decoder, palette); > - ok(hr == WINCODEC_ERR_FRAMEMISSING, > - "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr); > + ok((hr == S_OK) || (hr == WINCODEC_ERR_FRAMEMISSING), > + "expected S_OK or WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr); One of test results should be marked as broken, and in the S_OK case the resulting palette should be tested and released. I'd guess that newer version should be taken as a model to follow, and Wine implementation should be fixed appropriately. -- Dmitry.

1 0

po: Revert Japanese shell path name updates.
by Akihiro Sagawa July 4, 2013

July 4, 2013

Could you revert recent Japanese translation updates[1] or commit attached patch? As I mention in the last mail[2], patch 91758[3] has some issues, especially when retrieving shell path names. Although path names are not localized in Japanese Windows Vista (and its successors), they are (mistakenly?) included in the last commit. To prove this, I submitted a job to winetestbot [4]. However, new winetestbot seems to be stuck. Alternatively, I attach my Japanese Windows 7 result. The line which begins shellpath.c:443 is my additional output. You can see that all path names are not translated. [1] http://source.winehq.org/git/wine.git/commit/0fb9de61a5026ac6cf16bc3385c382… [2] http://www.winehq.org/pipermail/wine-devel/2013-June/100377.html [3] http://source.winehq.org/patches/data/97158 [4] https://newtestbot.winehq.org/JobDetails.pl?Key=1432 --- po/ja.po | 63 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 32 deletions(-)

3 3

RFC: Three dots or Unicode ellipsis character
by Francois Gouget July 4, 2013

July 4, 2013

Wine uses three dots (...) rather than the Unicode ellipsis character (…) except in the Czech and Taiwanese translations that use the Unicode ellipsis character. I think we should be consistent but the question is which to use. I looked at the Windows interface guidelines and they don't have anything to say on this. http://msdn.microsoft.com/en-us/library/windows/desktop/aa974176.aspx#punct… http://msdn.microsoft.com/en-us/library/windows/desktop/aa511453.aspx#ellip… Looking at what other platforms do, the Apple interface guidelines recommend using the Unicode ellipsis character saying assistive technologies need it. The GNOME and KDE guidelines don't have an official position but seem to use the Unicode character anyway: http://simos.info/blog/archives/17 So should we go with the flow and switch to using ellipsis characters or should we stick with three dots? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ 145 = 1! + 4! + 5!

3 3

Possible help or direction to build Win to Linux pass through device - resent
by Pavel Pisa July 4, 2013

July 4, 2013

Hello all Wine developers, [the second attempt to send, is the list subscribers only?] the firs I would like to express my respect to the work done. Now to one of our application, we maintain open-source chromatographic software CHROMuLAN https://sourceforge.net/projects/chromulan/ Unfortunately, it is written in Delphi (version 6 used) and we have not resources to port it to run native on Linux even that Linux is for last 18 years our main development platform for embedded hardware design and development. Our long term is to port application to Lazarus/FPC or even rewrite in in Qt but that is not option now. Fortunately, the CHROMuLAN application runs quite well under latest Wine version. But we have problem with access to the data acquisition hardware. The devices are connected to computer through special protocol (uLAN) RS-485 network. We have drivers for Linux (the firs platform), Windows (even 64-bit tested) and other targets. All for PCI, RS-232/485 converters and PCI RS-485 addon cards. Whole stack even runs under ReactOS in QEMU now. But Wine is more pleasant solution when someone uses Linux as his/her main desktop system. https://sourceforge.net/projects/ulan/ Problem is that I loke to provide driver API to the Wine application. The real windows driver is KMD/WMD "ul_wdm.sys" which is registered as "\\\\.\\UL_DRV" by IoCreateDevice and IoCreateSymbolicLink. Driver provides some context per each open and then read, write and iocts are used. We have exactly the same drive for Linux (x86, 64-bit, MIPS, ARM, PowerPC) with same functionality but Linux IOCTLs numbers are built different way and there are some slight differences caused by differences in Win API IOCTLs processing and Windows does not support poll equivalent for devices too. I have studied Wine and wineserver more times and have not found how to achieve provision of the Linux driver to the Wine application. Or more or less found that there would be problem because wineserver seems to deliver only IOCTLs events. But I was not sure so I have finally proven that by trial. I have written DLL/SYS as a driver supporting all required IRP_MJ_xxx and IOCTLs in the style of KMD/WMD driver and implemented functions as calling to the Linux "/dev/ulan" operation equivalents. But it really does not work. Only IOCTLs are delivered to the ul_drv.sys and even that fails because open context is not setup. Pointer irpStack->FileObject is filled with 0x66666666. You can find my attempt at http://cmp.felk.cvut.cz/~pisa/ulan/wine/ Now to the questions, Is there some mechanism in Wine which I could use? Is there chance to do that as little intrusive (i.e. DLL) that it can be acceptable for Wine mainline? It seems that serial port device somehow solves similar problem but is seems to be hardwired to wineserv. As for my case, it is possible that read and write to the open /dev/ulan file are done directly from context of application if it receives Linux filehandle into wine/dlls/ntdll/file.c . If the new FD_TYPE_ (FD_TYPE_SERIAL) is defined then all processing can be done in Linux native NTDLL. Even IOCTLs translation because they are really straightforward (like wine-git/dlls/ntdll/serial.c does in COMM_DeviceIoControl). But such solution seems intrusive to me. On the other hand the structure struct object_ops in wine/wine/server/object.h seems to provide all operations. Can I use some registration in the server to solve access? I am missing something? Is there some suggestion which approach to take? Some reasonable simple solution is preferred because if projects takes too much time it would even more postpone possibility to start real application porting. Thanks for each possible advice, Pavel -- Pavel Pisa e-mail: pisa(a)cmp.felk.cvut.cz www: http://cmp.felk.cvut.cz/~pisa university: http://dce.fel.cvut.cz/ company: http://www.pikron.com/

3 5

Re: kernel/tests: Test behaviour of TPIDRURW register with threads on ARMv7
by Dmitry Timoshkov July 3, 2013

July 3, 2013

André Hentschel <nerv(a)dawncrow.de> wrote: > +#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) > +static inline void set_tpidrurw(DWORD tpidrurw) > +{ > + __asm__ volatile ("mcr p15, 0, %0, c13, c0, 2" : : "r" (tpidrurw)); > +} > + > +static inline DWORD get_tpidrurw(void) > +{ > + DWORD tpidrurw = 0; > + __asm__ volatile ("mrc p15, 0, %0, c13, c0, 2" : "=r" (tpidrurw)); > + return tpidrurw; > +} This code is gcc specific and for instance won't compile with PSDK compiler. It either needs to be protected or replaced with hex/binary form. -- Dmitry.

1 0

Re: msxml3/tests: Add additional conformance tests to the xpath tests (try 2)
by Alexandre Julliard July 3, 2013

July 3, 2013

John Chadwick <johnwchadwick(a)gmail.com> writes: > This patch adds additional xpath tests to the msxml3 tests. Following > Nikolay Sivov's advice, these provide a wide range of new tests, two > of which currently fail in Wine (for reasons previously described.) > These are now marked 'todo' in a much cleaner way. It doesn't work here: ../../../tools/runtest -q -P wine -M msxml3.dll -T ../../.. -p msxml3_test.exe.so domdoc.c && touch domdoc.ok domdoc.c:4468: Test succeeded inside todo block: query=ancestor-or-self::node(), invalid node list: D1 E2.D1, expected D1 E2.D1 domdoc.c:4468: Test succeeded inside todo block: query=(//a[1])[last()], invalid node list: E1.E4.E2.D1, expected E1.E4.E2.D1 make: *** [domdoc.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Fwd: Re: RFC: Three dots or Unicode ellipsis character
by Michael Stefaniuc July 3, 2013

July 3, 2013

-------- Original Message -------- Subject: Re: RFC: Three dots or Unicode ellipsis character Date: Wed, 03 Jul 2013 19:32:15 +0200 From: Michael Stefaniuc <mstefani(a)redhat.com> To: Francois Gouget <fgouget(a)free.fr> On 07/03/2013 04:45 PM, Francois Gouget wrote: > > Wine uses three dots (...) rather than the Unicode ellipsis character > (…) except in the Czech and Taiwanese translations that use the Unicode > ellipsis character. > > I think we should be consistent but the question is which to use. > > > I looked at the Windows interface guidelines and they don't have > anything to say on this. > > http://msdn.microsoft.com/en-us/library/windows/desktop/aa974176.aspx#punct… > http://msdn.microsoft.com/en-us/library/windows/desktop/aa511453.aspx#ellip… > > Looking at what other platforms do, the Apple interface guidelines > recommend using the Unicode ellipsis character saying assistive > technologies need it. The GNOME and KDE guidelines don't have an > official position but seem to use the Unicode character anyway: > > http://simos.info/blog/archives/17 > > > So should we go with the flow and switch to using ellipsis characters or > should we stick with three dots? How will the substitution work in the W2A case? bye michael

1 0

Windows RT Applications finally can run in Wine/ARM with upcoming Linux releases
by André Hentschel July 3, 2013

July 3, 2013

Hi, Wanted to let you know that the patch that allows that just got committed in Linus tree: [1] This means that Kernel 3.11 will have everything to run applications ported to Windows RT. A good list of such applications and libraries can be found at [2]. See [3] & [4] for more information on the Wine side. [1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a… [2] http://forum.xda-developers.com/showthread.php?p=36534446 [3] http://bugs.winehq.org/show_bug.cgi?id=31322 [4] http://bugs.winehq.org/show_bug.cgi?id=31308

1 0

Re: gdiplus: Added support for UTF16 encoded strings in load_ttf_name_id
by Alexandre Julliard July 3, 2013

July 3, 2013

Piotr Caban <piotr(a)codeweavers.com> writes: > This patch fixes bug 33880. It's reported as regression but I think > that it stopped working because of game update. I would guess that it's because gdi32 is properly loading localized names now. Gdiplus should most likely replicate that method. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: wininet/tests: Statically initialize and name the notification_cs critical section.
by Marvin July 3, 2013

July 3, 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=26207 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: [wbemprox] Patches for adding currentclockspeed in record_processor
by Hans Leidekker July 3, 2013

July 3, 2013

On Mon, 2013-07-01 at 08:56 +0900, Rosen Diankov wrote: > diff -ru wine-1.6-rc3-old/dlls/wbemprox/builtin.c wine-1.6-rc3/dlls/wbemprox/builtin.c > --- wine-1.6-rc3-old/dlls/wbemprox/builtin.c 2013-06-22 03:24:01.000000000 +0900 > +++ wine-1.6-rc3/dlls/wbemprox/builtin.c 2013-06-27 23:04:20.170154454 +0900 Please use git to generate patches. > @@ -168,6 +168,8 @@ > {'M','a','n','u','f','a','c','t','u','r','e','r',0}; > static const WCHAR prop_maxclockspeedW[] = > {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; > +static const WCHAR prop_currentclockspeedW[] = > + {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; Please keep properties sorted here and below. > static const WCHAR prop_memberW[] = > {'M','e','m','b','e','r',0}; > static const WCHAR prop_methodW[] = > @@ -381,6 +383,7 @@ > { prop_familyW, CIM_UINT16, VT_I4 }, > { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, > { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, > + { prop_currentclockspeedW, CIM_UINT32, VT_I4 }, > { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, > { prop_numcoresW, CIM_UINT32, VT_I4 }, > { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, > @@ -633,6 +636,7 @@ > UINT16 family; > const WCHAR *manufacturer; > UINT32 maxclockspeed; > + UINT32 currentclockspeed; > const WCHAR *name; > UINT32 num_cores; > UINT32 num_logical_processors; > @@ -1690,7 +1694,33 @@ > regs_to_str( regs, 16, name + 32 ); > } > } > -static UINT get_processor_maxclockspeed( void ) > +static void get_processor_clockspeeds( UINT* maxclockspeed, UINT* currentclockspeed ) > +{ > + PROCESSOR_POWER_INFORMATION *info; > + UINT size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); > + NTSTATUS status; > + > + if ((info = heap_alloc( size ))) > + { > + status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); > + if (!status) > + { > + *maxclockspeed = info[0].MaxMhz; > + *currentclockspeed = info[0].CurrentMhz; > + } > + heap_free( info ); > + } > + if( !!maxclockspeed ) > + { > + *maxclockspeed = 1000; > + } > + if( !!currentclockspeed ) > + { > + *currentclockspeed = 1000; > + } > +} You probably didn't mean to query the clock speeds and then overwrite them with static values. NULL checks are not needed in helpers like this. > +/*static UINT get_processor_maxclockspeed( void ) > { > PROCESSOR_POWER_INFORMATION *info; > UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); > @@ -1703,7 +1733,8 @@ > heap_free( info ); > } > return ret; > -} > +}*/ Don't comment out code. Remove it. > static const WCHAR *get_osarchitecture(void) > { > SYSTEM_INFO info; > @@ -1717,7 +1748,7 @@ > static const WCHAR fmtW[] = {'C','P','U','%','u',0}; > WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; > struct record_processor *rec; > - UINT i, offset = 0, maxclockspeed, num_cores, num_logical_processors, count = get_processor_count(); > + UINT i, offset = 0, maxclockspeed = 0, currentclockspeed = 0, num_cores, num_logical_processors, count = get_processor_count(); > enum fill_status status = FILL_STATUS_UNFILTERED; > > if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; > @@ -1726,7 +1757,7 @@ > get_processor_manufacturer( manufacturer ); > get_processor_name( name ); > > - maxclockspeed = get_processor_maxclockspeed(); > + get_processor_clockspeeds(&maxclockspeed, &currentclockspeed); > num_logical_processors = get_logical_processor_count( &num_cores ) / count; > num_cores /= count; You're not using currentclockspeed.

2 4

Re: [docs] winedev: Update backtrace and relay examples
by Frédéric Delanoy July 2, 2013

July 2, 2013

On Tue, Jul 2, 2013 at 11:39 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > --- > en/winedev-debugger.sgml | 269 ++++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 222 insertions(+), 47 deletions(-) > > diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml > index b877063..31046c0 100644 > --- a/en/winedev-debugger.sgml > +++ b/en/winedev-debugger.sgml > @@ -280,31 +280,208 @@ winedbg hl.exe -windowed > These usually show up like this: > </para> > <screen> > -|Unexpected Windows program segfault - opcode = 8b > -|Segmentation fault in Windows program 1b7:c41. > -|Loading symbols from ELF file /root/wine/wine... > -|....more Loading symbols from ... > -|In 16 bit mode. > ... Maybe you can leave the 16 bit stuff there and have the 32 bit as an addition, not a replacement? Frédéric

2 1

Mayhem analysis of Wine
by André Hentschel July 2, 2013

July 2, 2013

Hi, wanted to let you know that i've seen "Reporting 1.2K crashes" [1] and searched for Wine results [2] and it seems we raised no issues with that "testsuite". Though it's not designed to test Wine, i felt happy not to see Wine on a list of faulty applications ;) [1] http://lists.debian.org/debian-devel/2013/06/msg00720.html [2] http://forallsecure.com/programs/search?search=wine

1 0

Re: [PATCH 3/3] user32: Deactivate popup menu if accelerator key not found when tracking top level menu.
by Qian Hong July 2, 2013

July 2, 2013

Update: The commit message is a bit misleading, should be 'user32: Deactivate menu if accelerator key not found when tracking top level menu.', removed the word 'popup'. Sorry for the trouble. On Wed, Jul 3, 2013 at 2:45 AM, Qian Hong <qhong(a)codeweavers.com> wrote: > --- > dlls/user32/menu.c | 6 +++++- > dlls/user32/tests/menu.c | 6 +++--- > 2 files changed, 8 insertions(+), 4 deletions(-) > > > > > -- Regards, Qian Hong - http://www.codeweavers.com

1 0

Re: [PATCH 2/3] user32/tests: Added tests for non-existent accelerator key.
by Qian Hong July 2, 2013

July 2, 2013

Hello, On Wed, Jul 3, 2013 at 2:41 AM, Qian Hong <qhong(a)codeweavers.com> wrote: > Current menu test code may hide some failure tests [1], with the attached > patch, all failure tests could be detected [2]. > > > [1] https://testbot.winehq.org/JobDetails.pl?Key=26191 > [2] https://testbot.winehq.org/JobDetails.pl?Key=26190 Please ignore the above comments, they should be in [Patch 1/3], sorry for the mistake. They attached patch itself is OK. Thanks. -- Regards, Qian Hong - http://www.codeweavers.com

1 0

Re: Wine release 1.6-rc4
by Neumann, A. D. July 2, 2013

July 2, 2013

Hello, I changed my email address. Please send this information to: info.adneumann(a)t-online.de Thank you! D. Neumann Am 28.06.2013 22:02, schrieb Alexandre Julliard: > The Wine development release 1.6-rc4 is now available. > > What's new in this release (see below for details): > - Bug fixes only, we are in code freeze. > > The source is available from the following locations: > > http://prdownloads.sourceforge.net/wine/wine-1.6-rc4.tar.bz2 > http://mirrors.ibiblio.org/wine/source/1.6/wine-1.6-rc4.tar.bz2 > > Binary packages for various distributions will be available from: > > http://www.winehq.org/download > > You will find documentation on http://www.winehq.org/documentation > > You can also get the current source directly from the git > repository. Check http://www.winehq.org/git for details. > > Wine is available thanks to the work of many people. See the file > AUTHORS in the distribution for the complete list. > > ---------------------------------------------------------------- > > Bugs fixed in 1.6-rc4 (total 38): > > 7597 No sound with OSS driver in C&C3 > 11224 Throw In (Blitz Basic game) has a memory access violation > 11675 Flatout 2 demo, Battlefield 2 demo, many others need native d3dx9_36.D3DXCreateEffect* > 12771 Multiple graphic problems in "The Witcher" > 13314 Winevdm displays a window when running Civilization I > 13662 dogfood: xchat-2.6.2 is very slow, while updating the window > 14318 Michisoft Reader Studio v1.5a fails to produce LIT file from HTML > 16325 incorrect font rendering for CJK programs > 16784 Babylon 7: Trial mode expires after installation > 18930 IDA Pro: Failing to allocate an enormous image > 20769 crash when exiting Microsoft Flight Simulator 98 > 20771 the menu bar doesn't work in M. Flight Simulator 98 > 21103 Presentation 14.2 (Neurobehavioral Systems): crashes when displaying video output > 21827 Photoshop 7, Slider disapear > 22291 DC++ hangs on exit > 23504 Subpixel Font rendering wrong for font MS Sans Serif > 23687 err:seh:setup_exception_record stack overflow when start Proteus7 Ares > 23945 Textures are not properly rendered in Deus-Ex:Invisible War > 24230 "Psalmen - Lieder des Lebens" crashes when clicking Next in settings pane > 24796 DIY Kyoto's Holmes fails to start > 25125 Can only print to the default CUPS printer from Visio 5 Professional > 25605 The Settlers 3: Save as bitmap crashes world editor > 26646 Worms Reloaded: sound choppy without hardware sound = emulation > 27658 3dvia plugin installer crashes > 28495 Runes of Magic: sometimes mouse cursor freezes > 29897 Lord Of the Rings Online Slow/Freezes > 29959 Zed: 3D Preview window is blank or doesn't open. > 30578 Disassembly not in fixed-width font in IDA Pro 6.2 demo > 30897 Europa Universalis III demo crashes while 'Loading Map-Sprites...' without native d3dxof > 31729 cl.exe: stack overflow with certain long command lines > 31772 NtQuerySystemInformation doesn't fill ReturnLength properly with SystemProcessInformation > 31812 Silverlight 4.x/5.x windows have repainting problems > 31908 Garena Blackshot does login > 32820 Offline rekening overzicht, orov doesn't work > 33283 Configuration of WM_NAME is delayed for virtual desktop > 33753 Titan Quest : Multiplayer not working > 33865 Regression in a specialized program > 33883 Scirra httpapi.dll error trying to Run a game > > ---------------------------------------------------------------- > > Changes since 1.6-rc3: > > Alexandre Julliard (22): > gdi32: Cache the font smoothing parameters. > kernel32: FormatMessage precision arguments are integers. > comdlg32: Add support for the CF_NOVERTFONTS flag. > clock: Don't offer vertical fonts in the font dialog. > notepad: Don't offer vertical fonts in the font dialog. > winecfg: Don't offer vertical fonts in the font dialog. > wineconsole: Don't offer vertical fonts in the font dialog. > winefile: Don't offer vertical fonts in the font dialog. > wordpad: Don't offer vertical fonts in the font dialog. > make_unicode: Move codepage file output code to a common routine and make default characters configurable. > libwine: Add support for codepage 10001 (Mac Japanese). > libwine: Add support for codepage 10002 (Mac Traditional Chinese). > libwine: Add support for codepage 10003 (Mac Korean). > libwine: Add support for codepage 10008 (Mac Simplified Chinese). > libwine: Add support for codepage 10010 (Mac Romanian). > libwine: Add support for codepage 10017 (Mac Ukrainian). > libwine: Add support for codepage 10021 (Mac Thai). > libwine: Add support for codepage 10082 (Mac Croatian). > krnl386: Create a new console for DOS binaries. > winevdm: Make it a GUI application to avoid a spurious console. > user32: Fetch the window menu again after sending initialization messages. > advapi32: Fix ReportEvent parameter types in the spec file. > > Andrew Eikum (4): > winbase.h: Add GetFileInformationByHandleEx. > oleaut32: Register the typelib's path without WOW64 redirection. > oleaut32: Load referenced typelibs in the same architecture. > oleaut32: Use typelib's pointer size, not system's. > > André Hentschel (15): > oleaut32/tests: Get rid of IS_ANCIENT in vartest. > oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartest. > oleaut32/tests: Don't use autoheader styled define in vartest. > oleaut32/tests: Get rid of IS_ANCIENT in vartype. > oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartype. > oleaut32/tests: Get rid of HAVE_OLEAUT32_DECIMAL in vartype. > oleaut32/tests: Get rid of HAVE_OLEAUT32_CY in vartype. > oleaut32/tests: Don't use autoheader styled defines in vartype. > oleaut32/tests: Don't use autoheader styled defines in varformat. > oleaut32/tests: Get rid of IS_ANCIENT in safearray. > oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in safearray. > oleaut32/tests: Get rid of HAVE_OLEAUT32_DECIMAL in safearray. > oleaut32/tests: Get rid of HAVE_OLEAUT32_R8 in safearray. > oleaut32/tests: Don't use autoheader styled defines in safearray. > oleaut32/tests: Use BOOL instead of int when appropriate. > > Austin English (1): > winex11.drv: Print the architecture when showing driver problems. > > Bruno Jesus (2): > po: Update Brazilian Portuguese translation. > po: Update Brazilian Portuguese translation. > > Caibin Chen (1): > po: Update Simplified Chinese Translation. > > Christian Costa (1): > d3dxof: Add support for case sensitive legacy type indexColor. > > Dmitry Timoshkov (4): > kernel32/tests: Add a test for VirtualAlloc called on a mapped PE section. > kernel32/tests: Add more VirtualAlloc and VirtualProtect tests. > kernel32: Correct HeapFree .spec parameter type. > ntdll: Correct RtlFreeHeap .spec parameter type. > > Erich Hoover (1): > ws2_32: Fix interface-bound filter to accept locally generated targeted packets. > > Frédéric Delanoy (1): > tools: Update winemaker manpage French translation. > > Hans Leidekker (3): > ws2_32/tests: Avoid races. > dssenh/tests: Fix test failures on 64-bit Vista. > winhttp/tests: Add some tests for WinHttpDetectAutoProxyConfigUrl. > > Huw Davies (1): > comdlg32: Don't call the callback if it's not set. > > Jacek Caban (5): > ole32: Don't call AddConnection for weak references. > ole32/tests: Added tests for external connections stored in ROT. > oleaut32/tests: Added external connections tests for MSHLFLAGS_TABLEWEAK marshaling. > mshtml: Don't declare empty interface for nsCycleCollectionISupports. > secur32: Don't use deprecated gnutls_certificate_credentials. > > Julian Rüger (1): > server: Update German translation of manpage. > > Ken Thomases (2): > winemac: Dispatch key events directly to window to be sure to get key-up events. > winemac: Fix ordering of windows owned by same owner when on inactive desktop space. > > Marcus Meissner (8): > dbghelp: Free root in error case (Coverity). > dbghelp: Free srcpath in stabs handling (Coverity). > gdi32: Close handle in error path (Coverity). > gdi32: Close handle in mfdrv (Coverity). > msvf32: Fixed incorrect sizeof (Coverity). > ole32: LeaveCriticalSection in one exit case (Coverity). > ole32: Fixed bad sizeof()s in composite moniker (Coverity). > winmm: Fix incorrect parameter for test debug (Coverity). > > Matteo Bruni (2): > wined3d: Fix handling of cnd instruction with coissue flag. > d3d9/tests: Improve cnd instruction test. > > Michael Stefaniuc (1): > po: Update the Romanian translation. > > Mykola Zadorozhnyy (1): > po: Update Ukrainian translation. > > Petr Kočandrle (1): > po: Fix some Czech spelling errors. > > Piotr Caban (1): > msvcrt: Added _wcsicmp_l implementation. > > Qian Hong (2): > msctf: Added stub TF_CreateLangBarItemMgr. > include: Added missing declaration for some msctf APIs. > > Roger Koot (1): > po: Updated Dutch translation. > > Stefan Leichter (1): > msvcp100/tests: Fix dynamically loaded functions for platform arm. > > Volkan Gezer (1): > po: Updated Turkish Translation. > > -- > Alexandre Julliard > julliard(a)winehq.org >

2 1

Mac OS X releases
by Wolf Kappesser July 2, 2013

July 2, 2013

Hello, my name is Wolf I am from germany and use OSX 10.8 to develop my apps, play games etc. I have read that there is no one, who compile the OSX version of WINE. I would do this. I have tried the osxwinebuilder script from http://code.google.com/p/osxwinebuilder and it did the job. I have download the old 1.5.30 wine for Mac and it has some additional features. They doesn't exist in the pure osxwinebuilder build. Where I can get them? I would give the OSX wine to the community, what I need to to? I have read that I should post to this list to get additional advices. Greets Wolf

2 1

Duplicate UUID in oleaut32:tmarshal test
by Thomas Faber July 2, 2013

July 2, 2013

I just tried running midl on dlls/oleaut32/tests/tmarshal.idl and it complained: tmarshal.idl(83) : error MIDL2270 : duplicate UUID. Same as : ItestDual [ Interface 'ITestSecondDisp' ] This doesn't seem like it's intentional. But just giving ITestSecondDisp a new uuid causes the following test failures on Windows: tmarshal.c:1861: Test failed: external_connections = 2 tmarshal.c:1864: Test failed: external_connections = 2 tmarshal.c:192: Test failed: fLastReleaseCloses = 1 I could try to figure this out, but it's probably better if someone familiar with the subject could have a look instead. (also, assuming this is a bug in the test, we might want to add that check to widl, it seems pretty useful ;]) Thanks, Thomas

2 1

Re: msxml3/tests: add additional conformance tests that show incorrect xpath behavior in wine
by Nikolay Sivov July 2, 2013

July 2, 2013

On 6/29/2013 20:26, John Chadwick wrote: > On Sat, Jun 29, 2013 at 4:48 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: >> On 6/27/2013 11:46, John Chadwick wrote: >> >>> + /* msxml's selectNodes returns a document ordered nodelist, >>> regardless of >>> + * whether or not the xpath nodelist was document ordered... */ >>> + >>> ole_check(IXMLDOMNode_selectNodes(rootNode,_bstr_("ancestor-or-self::node()"), >>> &list)); >>> + todo_expect_list_and_release(list, "D1 E2.D1"); >> Please use explicit check for return value, like ok(hr == S_OK, "...");, > Which return value am I missing? FWIW, I'm doing what the other tests > are doing, as far as I can tell. What I mean is that use of macros like ole_check() is discouraged, it's better to have explicit check for return value. > >> also you probably don't need another macro for list checking, >> isn't it enough to wrap expect_list_and_release() in todo_wine {} ? > Could it be that simple? I tried to do >> todo_wine expect_list_and_release(list, "D1 E2.D1"); > But it fails before the actual test occurs, because another test > inside the macro succeeds, apparently. Are you saying if I wrap the > expect_list_and_release macro call in a scope, it will work? I will > try. Yes, I see what you mean. In order to improve situation I'd suggest to move to using table of test queries and results. This way you have less code and no duplication, todo flag should just be stored in test data. We already have some tests done this way, it's much easier to maintain. > > I figured creating a new macro would be a better solution than > duplicating the code separately in two locations, but if it'd be > better to just not use the macro, then that's simple enough to fix. >

1 0

Re: [patch] full translation update for 16 rc4
by Frédéric Delanoy July 2, 2013

July 2, 2013

On Sun, Jun 30, 2013 at 6:08 AM, 中川祥 <matyapiro31(a)gmail.com> wrote: > Hi, please resubmit this patch with your full name transliterated in English.

2 1

Re: widl: Do not generate C structure for empty interfaces. (try 2)
by Jacek Caban July 2, 2013

July 2, 2013

Hi Thomas, I tested what midl does in this case and I think the solution should be different. When I tried to compile an empty interface, I got an error saying that '[object] interface must derive from another [object] interface'. That requirement is mostly enough to avoid empty vtbl. I was wondering how IUnknown is handled by midl (since it doesn't derive from any other iface). It seems like it's a simple name-based special case. When I renamed the interface to IUnknown, it compiled fine and generated vtbl the same as current widl (that is an empty struct). That said, if such interfaces are just obscure special case, I would say we shouldn't care. We may easily avoid them (I just sent a patch avoiding it in mshtml). If you want a better solution to avoid such problems in the future, I would suggest adding an error, like midl does. This will, however, require some more changes in Wine. At least MSHTML already has an interface identical to IUnknown (nsISupports), which would cause the error. This should be solvable with some tricks. Thanks, Jacek

2 2

Patch 96895
by Fabian Ebner July 2, 2013

July 2, 2013

Is something wrong with this patch? It's just a translation update and Matteo Bruni said it looks good to him: http://www.winehq.org/pipermail/wine-devel/2013-June/100264.html ~Fabian

1 0

Re: Fix to support input of characters with diacritic symbols using AltGr
by Ken Thomases July 1, 2013

July 1, 2013

On Jul 1, 2013, at 3:29 PM, Юрий Воротилов wrote: > Fix to support input of characters with diacritic symbols using AltGr (e.g. Latvian - AltGr+a=ā). > Tested on Ubuntu 12.04 and Centos 6. > I also have a bug opened in Crossover tracker: > http://www.codeweavers.com/support/tickets/browse/?ticket_id=935141 > > --- > dlls/winex11.drv/keyboard.c | 45 +++++++++++++++++++++++++------------------ > include/winuser.h | 1 + > server/queue.c | 5 ++++- > 3 files changed, 31 insertions(+), 20 deletions(-) > <0001-Support-input-of-characters-with-diacritic-symbols-usi.txt> I don't believe this is the correct approach. You don't want to be modifying the server and you can't arbitrarily add a new KEYEVENTF_* value. You can't assume that applications won't leave junk in the non-standard bits of the flags when they call SendInput() or keybd_event(). This needs to be implemented entirely within the X11 driver. It needs to properly translate your X11 keyboard layout into Win32 behavior. If the problem is that AltGr is mapping to VK_MENU, and thus causing key events to generate WM_SYSKEYDOWN/UP and not go through translation, then you need to make AltGr not map to VK_MENU. Although you really need to test that on Windows. My understanding is that AltGr appears to Windows apps as Alt+Control. In any case, I know that, on Mac OS X, the Option key is used similarly to AltGr. It accesses additional characters from the keyboard layout. This works when Option is configured in the X keymap to generate XK_Mode_switch. It requires no changes to Wine. So perhaps the right approach is to make XK_ISO_Level3_Shift and XK_ISO_Group_Shift behave the same way as XK_Mode_switch. (You could also just change your X keymap to actually map the key to XK_Mode_switch.) -Ken

1 1

[PATCH v7 0/7] Add O_DENY* support for VFS and CIFS/NFS
by Pavel Shilovsky July 1, 2013

July 1, 2013

Main changes from v6: 1) Fix LOCK_DELETE mandatory lock detection for O_DENYDELETE opens. 2) Add ESHAREDENIED error code definition for alpha, mips, parisc and sparc arches. 3) Remove code changes in do_last function if sharelocks are disabled. Main changes from v5: 1) O_DENYDELETE is now supported by VFS. 2) ESHAREDENIED erro code is introduced to be returned on sharelock conflicts. 3) forcemand dependancy is removed. CIFS module detects if it should use NTCreateAndX command according to existence of O_DENY flags. 4) Term 'deny lock' is replaced by 'sharelock' (function names, code comments, patch descriptions). Main changes from v4: 1) deny_lock_file uses FS_DOES_SHARELOCK flag from fs_flags to determine whether to use VFS locks or not. 2) Make nfs code return -EBUSY for share conflicts (was -EACCESS). Main changes from v3 1) O_DENYMAND is removed, sharelock mount option is introduced. 2) Patch fcntl.h and VFS patches are united into one. 3) flock/LOCK_MAND is disabled for sharelock mounts. This patchset adds support of O_DENY* flags for Linux fs layer. These flags can be used by any application that needs share reservations to organize a file access. VFS already has some sort of this capability - now it's done through flock/LOCK_MAND mechanism, but that approach is non-atomic. This patchset builds new capabilities on top of the existing one but doesn't bring any changes into the flock call semantic. These flags can be used by NFS (built-in-kernel) and CIFS (Samba) servers and Wine applications through VFS (for local filesystems) or CIFS/NFS modules. This will help when e.g. Samba and NFS server share the same directory for Windows and Linux users or Wine applications use Samba/NFS share to access the same data from different clients. According to the previous discussions the most problematic question is how to prevent situations like DoS attacks where e.g /lib/liba.so file can be open with DENYREAD, or smth like this. That's why extra mount option 'sharelock' is added for switching on/off O_DENY* flags processing. It allows us to avoid use of these flags on critical places (like /, /lib) and turn them on if we really want it proccessed that way. The patchset introduces 3 new flags: O_DENYREAD - to prevent other opens with read access, O_DENYWRITE - to prevent other opens with write access, O_DENYDELETE - to prevent delete operations (this flag can't be implemented for NFS due to the protocol restrictions). The patchset avoids data races problem on newely created files: open with O_CREAT can return new -ESHAREDENIED error code for a successfully created file if this files was locked with a sharelock by another task. Also, it turns off flock/LOCK_MAND capability for mounts with 'sharelock' option. This lets us not mix one share reservation approach with another. The #1 and #2 patches add flags to fcntl and implements VFS part. The patches #3 and #4 are related to CIFS-specific changes, #5 and #6 describe NFS and NFSD parts, #7 turns off flock/LOCK_MAND for mounts with 'sharelock' option. The preliminary patch for Samba that replaces the existing use of flock/LOCK_MAND mechanism with O_DENY* flags: http://git.etersoft.ru/people/piastry/packages/?p=samba.git;a=commitdiff;h=… The future part of open man page patch: ----- O_DENYREAD, O_DENYWRIYE, O_DENYDELETE - used to inforce a mandatory share reservation scheme of the file access. If these flag is passed, the open fails with -ESHAREDENIED in following cases: 1) if O_DENYREAD flag is specified and there is another open with READ access to the file; 2) if O_DENYWRITE flag is specified and there is another open with WRITE access to the file; 3) if READ access is requested and there is another open with O_DENYREAD flags; 4) if WRITE access is requested and there is another open with O_DENYWRITE flags. If O_DENYDELETE flag is specified and the open succeded, any further unlink operation will fail with -ESHAREDENIED untill this open is closed. Now this flag is processed by VFS and CIFS filesystem. This mechanism is done through flocks. If O_DENY* flags are specified, flock syscall is processed after the open. The share modes are translated into flock according the following rules: 1) !O_DENYREAD -> LOCK_READ | LOCK_MAND 2) !O_DENYWRITE -> LOCK_WRITE | LOCK_MAND 3) !O_DENYDELETE -> LOCK_DELETE | LOCK_MAND --- Pavel Shilovsky (7): VFS: Introduce new O_DENY* open flags VFS: Add O_DENYDELETE support for VFS CIFS: Add share_access parm to open request CIFS: Add O_DENY* open flags support NFSv4: Add O_DENY* open flags support NFSD: Pass share reservations flags to VFS locks: Disable LOCK_MAND support for MS_SHARELOCK mounts arch/alpha/include/uapi/asm/errno.h | 2 + arch/mips/include/uapi/asm/errno.h | 2 + arch/parisc/include/uapi/asm/errno.h | 2 + arch/sparc/include/uapi/asm/errno.h | 2 + fs/cifs/cifsacl.c | 8 +- fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsglob.h | 18 +++- fs/cifs/cifsproto.h | 8 +- fs/cifs/cifssmb.c | 50 ++++++----- fs/cifs/dir.c | 16 ++-- fs/cifs/file.c | 25 ++++-- fs/cifs/inode.c | 21 ++--- fs/cifs/link.c | 25 ++---- fs/cifs/netmisc.c | 2 +- fs/cifs/readdir.c | 5 +- fs/cifs/smb1ops.c | 16 ++-- fs/cifs/smb2file.c | 10 +-- fs/cifs/smb2inode.c | 4 +- fs/cifs/smb2maperror.c | 2 +- fs/cifs/smb2ops.c | 10 ++- fs/cifs/smb2pdu.c | 6 +- fs/cifs/smb2proto.h | 14 +-- fs/fcntl.c | 5 +- fs/locks.c | 160 ++++++++++++++++++++++++++++++++--- fs/namei.c | 56 +++++++++++- fs/nfs/dir.c | 4 + fs/nfs/internal.h | 3 +- fs/nfs/nfs4file.c | 4 + fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4super.c | 9 +- fs/nfs/nfs4xdr.c | 21 ++++- fs/nfs/super.c | 6 +- fs/nfsd/nfs4state.c | 46 +++++++++- fs/nfsd/nfsproc.c | 1 + fs/proc_namespace.c | 1 + include/linux/fs.h | 14 +++ include/uapi/asm-generic/errno.h | 2 + include/uapi/asm-generic/fcntl.h | 12 +++ include/uapi/linux/fs.h | 1 + 39 files changed, 464 insertions(+), 135 deletions(-) -- 1.8.1.5

1 7

Re: po: Update Czech translation - 2nd attempt
by Nikolay Sivov June 30, 2013

June 30, 2013

On 6/28/2013 18:21, Pavel Borecki wrote: Hi, Pavel. Looks like you're using poedit or something with similar habit of touching lines location headers: --- > -#: appwiz.rc:66 appwiz.rc:42 cryptui.rc:343 msacm32.rc:37 winecfg.rc:191 > -#: winecfg.rc:228 wordpad.rc:245 > +#: appwiz.rc:66 > +#: appwiz.rc:42 > +#: cryptui.rc:343 > +#: msacm32.rc:37 > +#: winecfg.rc:191 > +#: winecfg.rc:228 > +#: wordpad.rc:245 > msgid "&Remove" > msgstr "Odeb&rat" --- This adds a lot of diff lines that you don't really want.

1 0

Re: [PATCH] advapi32: RegDeleteKey tests for merged view of HKCR
by wine.dev＠web.de June 30, 2013

June 30, 2013

Hi George. > [PATCH] advapi32: RegDeleteKey tests for merged view of HKCR > http://newtestbot.winehq.org/JobDetails.pl?Key=1403 > --- > dlls/advapi32/tests/registry.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) I can't test atm, but it looks good while reading. Please add a [try 2] to the subject and send it to wine-patches. -- Detlef

1 0

Re: [RFC PATCH] loader: allow overriding pthread_create correctly on linux
by Austin English June 30, 2013

June 30, 2013

On Fri, Jun 28, 2013 at 3:53 AM, Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > This should be enough to fix bug #30557 in the most thorough possible way. > Only tested on ubuntu precise 32-bits atm, but I believe it should work on 64-bits too. > > TODO: pthread_create_2_0 is not handled correctly right now, so it will fail on ancient glibc's < 2.2. > But because NPTL requires a slightly newer glibc than that I do not believe it will be a real issue. > > Comments welcome :-) > --- > diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c > index 01a8026..e9775c3 100644 > --- a/dlls/ntdll/thread.c > +++ b/dlls/ntdll/thread.c > @@ -33,6 +33,7 @@ > #ifdef HAVE_SYS_SYSCALL_H > #include <sys/syscall.h> > #endif > +#include <errno.h> > > #define NONAMELESSUNION > #include "ntstatus.h" > @@ -58,6 +59,7 @@ struct startup_info > TEB *teb; > PRTL_THREAD_START_ROUTINE entry_point; > void *entry_arg; > + BOOL native_thread; > }; > > static PEB *peb; > @@ -186,6 +188,20 @@ done: > return status; > } > > +#ifdef __linux__ > +extern typeof(pthread_create) *__glob_pthread_create, *call_pthread_create; > +static typeof(pthread_create) __hook_pthread_create; > + > +static void thread_wrap_init(void) > +{ > + call_pthread_create = __hook_pthread_create; > +} > + > +#else > +#define __glob_pthread_create pthread_create > +#define thread_wrap_init() > +#endif > + > /*********************************************************************** > * thread_init > * > @@ -204,6 +220,7 @@ HANDLE thread_init(void) > struct ntdll_thread_data *thread_data; > static struct debug_info debug_info; /* debug info for initial thread */ > > + thread_wrap_init(); > virtual_init(); > > /* reserve space for shared user data */ > @@ -327,11 +344,7 @@ void terminate_thread( int status ) > pthread_exit( UIntToPtr(status) ); > } > > - > -/*********************************************************************** > - * exit_thread > - */ > -void exit_thread( int status ) > +static void exit_thread_common( int status ) > { > static void *prev_teb; > TEB *teb; > @@ -377,9 +390,60 @@ void exit_thread( int status ) > close( ntdll_get_thread_data()->wait_fd[1] ); > close( ntdll_get_thread_data()->reply_fd ); > close( ntdll_get_thread_data()->request_fd ); > +} > + > +void exit_thread( int status ) > +{ > + exit_thread_common(status); > pthread_exit( UIntToPtr(status) ); > } > > +#ifdef __linux__ > + > +struct unix_arg { > + void *(*start)(void *); > + void *arg; > +}; > + > +/* dummy used for comparison */ > +static DWORD native_unix_start; > + > +static void call_native_cleanup(void *arg) > +{ > + RtlFreeThreadActivationContextStack(); > + exit_thread_common(0); > +} > + > +static int > +__hook_pthread_create(pthread_t *thread, const pthread_attr_t *attr, > + void *(*start_routine) (void *), void *parm) > +{ > + NTSTATUS ret; > + struct unix_arg arg; > + arg.start = start_routine; > + arg.arg = parm; > + > + TRACE("Overriding thread creation!\n"); > + if (attr) > + FIXME("thread attributes ignored!\n"); > + > + ret = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, 0, 0, (void*)&native_unix_start, &arg, NULL, (void*)thread ); > + if (ret != STATUS_SUCCESS) > + FIXME("ret: %08x\n", ret); > + switch (ret) { > + case STATUS_SUCCESS: > + return 0; > + case STATUS_NO_MEMORY: > + return ENOMEM; > + case STATUS_TOO_MANY_OPENED_FILES: > + return EMFILE; > + default: > + ERR("Unhandled ntstatus %08x\n", ret); > + return ENOMEM; > + } > +} > + > +#endif > > /*********************************************************************** > * start_thread > @@ -412,9 +476,18 @@ static void start_thread( struct startup_info *info ) > if (TRACE_ON(relay)) > DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); > > - call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); > -} > +#ifdef __linux__ > + if (info->native_thread) { > + void *(*start)(void*) = (void*)func; > > + FIXME("Started native thread %08x\n", GetCurrentThreadId()); > + pthread_cleanup_push(call_native_cleanup, NULL); > + pthread_exit(start(arg)); > + pthread_cleanup_pop(1); > + } else > +#endif > + call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); > +} > > /*********************************************************************** > * RtlCreateUserThread (NTDLL.@) > @@ -497,8 +570,18 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * > > info = (struct startup_info *)(teb + 1); > info->teb = teb; > - info->entry_point = start; > - info->entry_arg = param; > +#ifdef __linux__ > + info->native_thread = (void*)start == (void*)&native_unix_start; > + if (info->native_thread) { > + struct unix_arg *arg = param; > + info->entry_point = (void*)arg->start; > + info->entry_arg = arg->arg; > + } else > +#endif > + { > + info->entry_point = start; > + info->entry_arg = param; > + } > > thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; > thread_data->request_fd = request_pipe[1]; > @@ -513,7 +596,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * > (char *)teb->Tib.StackBase - (char *)teb->DeallocationStack ); > pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ > interlocked_xchg_add( &nb_threads, 1 ); > - if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info )) > + if (__glob_pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info )) > { > interlocked_xchg_add( &nb_threads, -1 ); > pthread_attr_destroy( &attr ); > @@ -523,6 +606,11 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * > pthread_attr_destroy( &attr ); > pthread_sigmask( SIG_SETMASK, &sigset, NULL ); > > +#ifdef __linux__ > + if (native_thread && id) > + *(pthread_t*)id = pthread_id; > + else > +#endif > if (id) id->UniqueThread = ULongToHandle(tid); > if (handle_ptr) *handle_ptr = handle; > else NtClose( handle ); > diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c > index 25eceb8..7417941 100644 > --- a/dlls/winegstreamer/glibthread.c > +++ b/dlls/winegstreamer/glibthread.c > @@ -43,6 +43,7 @@ > #include <stdlib.h> > #include <stdio.h> > > +#if 0 > #include "windef.h" > #include "winbase.h" > #include "winnls.h" > @@ -388,3 +389,15 @@ void g_thread_impl_init (void) > g_thread_self_tls = TlsAlloc (); > g_thread_init(&g_thread_functions_for_glib_use_default); > } > + > +#else > + > +void g_thread_impl_init (void) > +{ > + static gboolean beenhere = FALSE; > + > + if (!beenhere++) > + g_thread_init(NULL); > +} > + > +#endif > diff --git a/libs/wine/loader.c b/libs/wine/loader.c > index 094e5e1..69f4a38 100644 > --- a/libs/wine/loader.c > +++ b/libs/wine/loader.c > @@ -69,6 +69,11 @@ char **__wine_main_argv = NULL; > WCHAR **__wine_main_wargv = NULL; > char **__wine_main_environ = NULL; > > +#ifdef __linux__ > +#include <pthread.h> > +typeof(pthread_create) *call_pthread_create, *__glob_pthread_create; > +#endif > + > struct dll_path_context > { > unsigned int index; /* current index in the dll path list */ > diff --git a/libs/wine/wine.map b/libs/wine/wine.map > index 2159fac..694869a 100644 > --- a/libs/wine/wine.map > +++ b/libs/wine/wine.map > @@ -117,6 +117,8 @@ WINE_1.0 > wine_utf8_mbstowcs; > wine_utf8_wcstombs; > wine_wctype_table; > + __glob_pthread_create; > + call_pthread_create; > > local: *; > }; > diff --git a/loader/main.c b/loader/main.c > index ac67290..14b2428 100644 > --- a/loader/main.c > +++ b/loader/main.c > @@ -202,6 +202,27 @@ static int pre_exec(void) > > #endif > > +#ifdef __linux__ > + > +extern typeof(pthread_create) *call_pthread_create, *__glob_pthread_create; > + > +int pthread_create(pthread_t *thread, const pthread_attr_t *attr, > + void *(*start_routine) (void *), void *arg) > +{ > + return call_pthread_create(thread, attr, start_routine, arg); > +} > + > +static void init_thread_hook(void) { > + call_pthread_create = __glob_pthread_create = dlvsym(RTLD_NEXT, "pthread_create", "GLIBC_2.2"); > + if (!__glob_pthread_create) > + call_pthread_create = __glob_pthread_create = dlvsym(RTLD_NEXT, "pthread_create", "GLIBC_2.1"); > +} > + > +#else > + > +#define init_thread_hook() > + > +#endif > > /********************************************************************** > * main > @@ -211,6 +232,8 @@ int main( int argc, char *argv[] ) > char error[1024]; > int i; > > + init_thread_hook(); > + > if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ > { > static char noexec[] = "WINELOADERNOEXEC=1"; Fails to compile here (as mentioned on bug 30557): gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_NTSYSTEM_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -o thread.o thread.c thread.c: In function ‘RtlCreateUserThread’: thread.c:610:9: error: ‘native_thread’ undeclared (first use in this function) thread.c:610:9: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [thread.o] Error 1 make[1]: Leaving directory `/home/austin/wine-git/dlls/ntdll' make: *** [dlls/ntdll] Error 2 I tried Ruslan's fixed patch, which failed as well: gcc -m32 -c -I. -I. -I../include -I../include -D__WINESRC__ -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -fno-builtin -o main.o main.c gcc -m32 -o wine -Wl,--export-dynamic -Wl,--section-start,.interp=0x7bf00400 main.o -L../libs/wine -lwine ../libs/port/libwine_port.a -lpthread -Wl,--rpath,\$ORIGIN/../libs/wine /usr/bin/ld: main.o: undefined reference to symbol 'dlvsym@@GLIBC_2.1' /usr/bin/ld: note: 'dlvsym@@GLIBC_2.1' is defined in DSO /lib/libdl.so.2 so try adding it to the linker command line /lib/libdl.so.2: could not read symbols: Invalid operation collect2: error: ld returned 1 exit status make[1]: *** [wine] Error 1 make[1]: Leaving directory `/home/austin/wine-git/loader' make: *** [loader] Error 2 this is 32-bit wine on fedora 64 (against 1.6-rc4). -- -Austin

1 0