November 2012 - Wine-Devel - list.winehq.org

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

ntoskrnl.exe: unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces
by Qian Hong Sept. 28, 2018

Sept. 28, 2018

Dear all, While test another online bank with wine ActiveX, I got an unimplemented fuction of ntoskrnl: IoGetDeviceInterfaces, I found it listed in http://source.winehq.org/WineAPI/ntoskrnl.html as a stup, so I can't understand this log: wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 0022), starting debugger... Grateful for any explain! env: wine1.3.12 on Ubuntu 10.04 Here are the steps: 1. install an ActiveX from https://e.bank.ecitic.com/perbank5/plugs/CNCBSecPkg_EN.exe $ rm -rf ~/.wine $ winetricks -q mfc42 $ wine CNCBSecPkg_EN.exe fixme:ole:DllRegisterServer stub fixme:win:DisableProcessWindowsGhosting : stub fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:ole:CoCreateInstance no instance created for interface {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf} of class {56fdf344-fd6d-11d0-958a-006097c9a090}, hres is 0x80004002 fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\\4e2d\4fe1\94f6\884c\7f51\94f6\5b89\5168\63a7\4ef6\\unins000.exe") stub fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 -1: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 002b), starting debugger... wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting 2. open the online bank entry with wine builtin IE, then IE will crash: $ wine iexplore https://e.bank.ecitic.com/perbank5/signIn.do Please checkout the full log here: http://pastebin.com/rbAg7gwj Should I file a singel bug in ntoskrnl component , or separate bugs, one for ntoskrnl and one for the IE crashing? Generalliy what component should I switch while file a bug about IE crashing? Many thanks! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

5 6

ODBC Databases: Jet/Access success
by Barry Bird June 14, 2018

June 14, 2018

Good Afternoon. In section 3.3.6.2 of your User Guide you ask readers to report successes with databases other than MS SQL. Well here's one (I know Access 2000 can work with Wine, but this doesn't require Access): How to set up Wine to enable Windows programs that read and write to Jet (Access) databases using ODBC. I write such programs in C and use the API defined in ODBC API Reference http://msdn.microsoft.com/en-us/library/ms714562%28VS.85%29.aspx They work fine on Windows and only require Mingw to be installed to compile and link them, both for console programs and those using Windows SDK. You then can write interactive programs in C which use a full-featured SQL database which comes bundled with Windows. No need to purchase Access. With the set-up below they will also run on Linux (Kubuntu 9.04) and Wine 1.1.26. You need to update the registry to install the Access drivers. Under Windows, export from the Registry to *.reg files the registry entries - HKLM\Software\ODBC - HKLM\Software\Microsoft\Jet all subsidiary keys and values come with them. You can carefully edit these files to remove drivers and DSNs you don't need. Import these files using the registry editor in wine: wine regedit.exe. You need to bring across from Windows to Windows\System32 under wine: clbcatq.dll comres.dll expsrv.dll msjet40.dll mswstr10.dll msjter40.dll msjint40.dll msjtes40.dll msrd3x40.dll odbc32.dll odbccp32.dll odbcji32.dll odbcjt32.dll odbcad32.exe odbcint.dll odbctrac.dll vbajet32.dll Register this server in wine: wine regsvr32.exe msjtes40.dll No need to install MDAC. To use Windows ODBC drivers, you have to override Wine's odbccp32.dll and odbc32.dll with the native versions because the Wine versions are currently wired directly to Linux's unixodbc. This can be done by setting up the ODBC Data Source Administrator odbcad32.exe using winecfg: - Add the program to the Applications tab - then in the libraries tab, pick from 'New override for library' drop-down odbc32.dll and odbccp32.dll add them and edit them to be Native for Windows. Then if you do wine odbcad32.exe this brings up the ODBC Data Source Administrator window as in the Windows Control Panel If needed, set up (System) DSNs using this program. Bring across the programs and *.mdb database files from Windows. Using winecfg, you need to set up each program you want to run with overrides for odbc32.dll and odbccp32.dll (Applications and Libraries tabs) as above. The programs should then run as they did in Windows but perhaps a bit slower with: wine Odbc-prog.exe This has been tested twice on a clean .wine install. I cannot vouch for support of all API and SQL facilities however. I hope someone finds this useful. Barry Bird

5 4

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

Hello all, I know this will only interest a small portion of you but thought i would give a quick update on the state of IMM32 since I have brought it to a major milestone. All the main patches are in which now separate IMM32 and IMEs. There is still more work to do but the major framework is in place. X11 XIM processing should be unchanged. However wine can now begin to load native windows IMEs as well. I have tested with windows ATOK20 (a popular Japanese IME) and successfully had text processing in a fully IME aware application. There are still clear issues to resolve in many aspects of this processing but we have forward progress. ImmInstallIME does not work yet, nor does switching keyboards. So to get the native IME to work you need to add this registry key. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\<keyboard layout>] "Ime File"=<IME filename> so for example for ATOK20 in Japanese i used. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\e0010411] "Ime File"="ATOK20W.IME" I would love to hear how well things work. I am sure using native IMEs will quickly show us many places where IMM32 needs to be improved. One issues I am going to investigate next is that sometimes non x11drv ime initialization, if occurring too early, causes x11drv to fail to create windows. I have not investigated with the latest changes to xim.c (which may already correct this problem) but if you see this problem this patch may help and i believe the IME_UpdateAssociation(NULL) is already unneeded. diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..0c98136 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XP XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, wine_tsx11_unlock(); IME_XIMPresent(TRUE); - IME_UpdateAssociation(NULL); } thanks, -aric

5 7

Re: XInput [1/4]: Implement XInputGetState
by Stefan Dösinger July 5, 2015

July 5, 2015

Am 09.07.2009 um 02:58 schrieb Michael Gruber: > This patch series implements parts of the XInput library. You can use > this to play games that support Xbox 360 Controllers. To be able to > use this you will need to have your Controller working on Linux via > the xpad kernel driver and the event interface. It will not work on > any OS other than Linux. It supports gamepads, should work with > guitars and wheels, but will not work with dance-mats. > <1-XInputGetState.patch> Is it possible to implement XInput on top of DirectInput? DirectInput already has some internal abstraction layers for differnet joystick APIs, and has basic support for OSX joysticks. Does DInput have enough capabilities to access all the Xbox controller's features? My gut says no, otherwise MS wouldn't have created a new lib. I guess its worth checking though.

5 6

Re: configure: Add -linotify when present, for non-Linux platforms.
by Alexandre Julliard Aug. 23, 2014

Aug. 23, 2014

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > A FreeBSD user ran into this when sys/inotify.h was present via an > extra package and Wine went ahead using that, only to fail at link- > time. We'd want to use kqueue instead on FreeBSD. -- Alexandre Julliard julliard(a)winehq.org

2 1

What happened to the Fedora packages?
by Neal Gompa Aug. 2, 2014

Aug. 2, 2014

What happened to the Fedora packages? They have not been updated since 0.9.2!!!! Right now it is at 0.9.10!!! Nearly every other Linux distro supported has the up to date packages!!! And why does the Red Hat packages site not go to the SourceForge site as it does for SUSE packages and the others?? I have not really had the guts to ask until now, because I thought that maybe there was a slump, but now, its getting annoying!! And Fedora just released Fedora Core 5 yesterday!!! Please tell me new packages will be ready soon!!! Compiling WINE always crashes my computer, so I prefer to use the RPMs...

10 18

winspool: ERROR_INVALID_NAME in GetDefaultPrinter() ?
by Detlef Riekenberg Oct. 9, 2013

Oct. 9, 2013

Hi. >From which configuration does the "ERROR_INVALID_NAME" came from, when calling GetDefaultPrinter(NULL, &size) and no Printer is installed? This Test is Present in the current "dlls/winspool/tests/info.c". MSDN told us, that we receive an "ERROR_FILE_NOT_FOUND", if no Printer is installed: http://msdn.microsoft.com/library/en-us/gdi/prntspol_0hma.asp I get the "ERROR_FILE_NOT_FOUND" on win98se, winme, w2k and win2003 in this Situation. -- By By ... ... Detlef

3 3

Re: Web based translation tool
by Michal Čihař June 18, 2013

June 18, 2013

Hi Dne Mon, 12 Mar 2012 12:02:49 +0200 Yaron Shahrabani <sh.yaron(a)gmail.com> napsal(a): > The Wine project is thinking about using Weblate in order to translate > Wine, you can look at the following discussion and see for yourself. That sounds great! > Looking good although a litle immature, not sure about authentication as > wel... For authentication you can basically use anything what can be used in Django. Any specific concerns on this topic? > I'll talk to Michal Cihar and ask him for a roadmap for this project. Well I don't have any real roadmap right now. I urgently needed replacement for Pootle because we got hit by too many bugs there and did not manage to understand the code there to be able to fix them myself. So far I think it is in pretty good shape for day to day work (with today's 0.5 release fixing few annoying bugs). Of course there are some features missing, you can check what I plan for 1.0 release here: https://github.com/nijel/weblate/issues?state=open&milestone=1 I currently hope to have 1.0 in a month or so, but I really don't want to commit to any specific date. PS: I'm not subscribed to mailing list so please CC me on reply. -- Michal Čihař | http://cihar.com | http://blog.cihar.com

7 16

Re: xbox 360 emulation with logitech cordless and dinput joy disable
by Stefan Dösinger Jan. 1, 2013

Jan. 1, 2013

Hi, The patch needs a few improvements before it can be accepted into Wine. I can't comment on the dinput / xinput specifics of the patch, so this is a non- exhaustive list of general suggestions. Concerning the big picture, this patch needs a few discussions about xinput.dll design. There have been some discussions about that in the past, and I hope that some dinput devs can help out. Am Dienstag, 12. Juni 2012, 23:48:53 schrieb Giovanni Ongaro: > From: root <root(a)joe.(none)> Please configure git correctly, see http://wiki.winehq.org/GitWine section 3.3. Also consider using a non-root user, but that's your personal setup, so not really my business. > + if (getenv("LINIXFORCENOJOY") != NULL) return FALSE; /*JoeFix disable joystick*/ The problem with dinput vs xinput conflicts should probably be solved in a different manner. That aside, such configurations are usually done via registry keys. Also comments like /* I changed this here */ are useless, the git history stores this information anyway. > + <...> //JoeFix DEAD ZONE This is a C++ comment and not allowed in Wine. See http://wiki.winehq.org/SubmittingPatches > + fdJoy=open("/dev/input/js0",O_RDONLY | O_NONBLOCK); Xinput.dll should not open joystick devices directy, and definitely not a hardcoded one. I don't know if there's consensus about how xinput should be implemented, but basing it on top of dinput might be a start. A good start would be to write a few tests to test how Windows announces(or doesn't announce) Xbox gamepads and other gamepads/joysticks to games. My understanding is that xinput.dll only works for Xbox gamepads. Do those show up in dinput on Windows? > +#define DEAD_ZONE 4096 > ... > + if (e.number == 4) { > + if (e.value == 1) { > + FIXME("TRIGGER LEFT PRESSED\n"); > + pState->Gamepad.bLeftTrigger=32767; > + } > + else { > + pState->Gamepad.bLeftTrigger=0; > + } > ... > +#define JOYMAX 30000 > +#define JOYMIN -30000 The hardcoded numbers look questionable. The 4 and 1 are probably specific to the joystick, the 32767 might have a symbolic name like XINPUT_MAX or something. A part of this seems to be needed due to the attempt to emulate an xbox gamepad with a different device. Personally I'm not opposed to doing that, and you might need some device specific tricks to pull this off. However, this needs a more structured approach than hardcoding the values needed for one specific Logitech device in the code. Best regards, Stefan

3 2

Call for papers - FOSDEM 2013
by Jeremy White Dec. 17, 2012

Dec. 17, 2012

Alright folks, We need to put together a schedule for our room at FOSDEM. So I would like to formally 'call for papers' for FOSDEM. Please email suggested topics to wineconf(a)winehq.org, where I'll collate them and piece them into a schedule. A 'paper' can be a talk you wish to give, or a topic you think we should discuss. As always, they should be relatively brief, and should emphasize discussion and collaboration. This year it probably makes sense to imagine a few talks aimed at developers outside the Wine community. After all, the hope is that a few bored non Wine developers may wander by from time to time. Perhaps we can suck them in <grin>. Cheers, Jeremy

5 7

We're in at FOSDEM!
by Jeremy White Dec. 14, 2012

Dec. 14, 2012

I'm stoked - we've been approved for a dev room at FOSDEM on Saturday, February 2nd, in Brussels. It is just the one day, but I figure we can find ways to gather on Friday night and/or Sunday as well. I really think this will be a fun change of pace for us. If it doesn't work out, we'll just go camp out in Marcus's back yard instead <evil grin>. One thing they require from us is a pre set schedule, so I'll be asking people to suggest topics, and then we'll have to weed through them to figure out what makes the most sense. Cheers, Jeremy

4 5

Re: DSound/winepulse review
by Maarten Lankhorst Dec. 4, 2012

Dec. 4, 2012

Added wine-devel to cc Op 26-10-12 13:12, Joerg-Cyril.Hoehle(a)t-systems.com schreef: > Maarten, > > I'll try and come up with a review of your winepulse patches yet I'm not familiar with the PA API. > > Regarding your dsound ones, I'm sorry I've not enough experience > with the DSound API to be really useful. I was happy that Alexey Loukianov and A.Eikum > worked on DSound. > > One issue that struck me is the 5ms period downgrade in winepulse. > I advise you keep that as a separate patch. Halving the externally visible SetEVentHandle rate > is certainly not something that should be in the one big core patch introducing winepulse. Yeah this was explicitly to make skyrim work better, I return the updated latency in GetStreamLatency, and with the fixes wine dsound uses that value for calculating mixing fraglen. > Even if it causes no test failure, that trick would certainly be visible in the log lines. Native shows: > render.c:2084: Should play 1000ms continuous tone with fragment size 480. > render.c:2136: Released 48000=100x480 -960 frames at 48000 worth 980ms in 1008ms Yeah I seem to fire more events, so less data gets played. This requires some rethinking though, winepulse doesn't attempt to hide latency at all, and so far the mmdevapi tests have failed on my usb headphones because it didn't always have a smooth buffer increment. The tests don't fail, but because of the extra firing processing sometimes gets skipped.. Woops, some more digging revealed I also seemed to have done a SetEvent in pulse_started_callback, which is entirely bogus, presumably a leftover from before I hooked up the latency callback for when in underrun mode. With that SetEvent part of the latency hack disabled and the bogus SetEvent removed, I get: render.c:2127: Released 44541=101x441 -441 frames at 44100 worth 1000ms in 1003ms Can't get better than that. :-) I disabled the exclusive mode on winepulse because I felt that mode was sufficiently different in behavior, and I don't think the mmdevapi tests cover it properly. I'll do some more digging if the SetEvent is still needed for the hack, or if the period lowering is enough. I would suspect lowering the period is sufficient now. Quick testing of skyrim seems to indicate I can leave the SetEvent part out, so I pass all tests properly again. :-) > BTW, I'd still be pleased if you could upload somewhere to bugzilla results from > runtest -v -i mmdevapi/render and capture > from your winepulse driver. I think I asked you that favour already but found nothing. My tree removes todo_wine from the tests, but anyway: capture.c:501: Returned periods: 10.0000 ms 0.4988 ms capture.c:513: pwfx: 0xdccb0 capture.c:514: Tag: fffe capture.c:515: bits: 32 capture.c:516: chan: 2 capture.c:517: rate: 44100 capture.c:518: align: 8 capture.c:519: extra: 22 capture.c:524: Res: 32 capture.c:525: Mask: 3 capture.c:526: Alg: FLOAT capture.c:585: Returned latency: 10.0000 ms capture.c:185: Wait'ed position 0 pad 0 flags 0, amount of frames locked: 441 capture.c:247: Sleep.1 position 441 pad 15435 flags 0, amount of frames locked: 441 capture.c:291: GetBufferSize 22050 period size 441 capture.c:301: Overrun position 1323 pad 22050 flags 1, amount of frames locked: 441 capture.c:328: Cont'ed position 1764 pad 21609 flags 0, amount of frames locked: 441 capture.c:352: Restart position 2205 pad 21168 flags 0, amount of frames locked: 441 capture.c:383: Reset position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:409: Running position 23373 pad 7938 flags 0, amount of frames locked: 441 capture: 255 tests executed (0 marked as todo, 0 failures), 0 skipped. render.c:185: Returned periods: 10.0000 ms 2.0000 ms render.c:197: pwfx: 0xdccb0 render.c:198: Tag: fffe render.c:199: bits: 32 render.c:200: chan: 6 render.c:201: rate: 48000 render.c:202: align: 24 render.c:203: extra: 22 render.c:208: Res: 32 render.c:209: Mask: 3f render.c:210: Alg: FLOAT render.c:268: Initialize(duration=0) GetBufferSize is 192 render.c:333: Returned latency: 10.0000 ms render.c:411: IsSupported(shared , 8000x 8x1) render.c:411: IsSupported(shared , 8000x 8x2) render.c:411: IsSupported(shared , 8000x16x1) render.c:411: IsSupported(shared , 8000x16x2) render.c:411: IsSupported(shared , 11025x 8x1) render.c:411: IsSupported(shared , 11025x 8x2) render.c:411: IsSupported(shared , 11025x16x1) render.c:411: IsSupported(shared , 11025x16x2) render.c:411: IsSupported(shared , 12000x 8x1) render.c:411: IsSupported(shared , 12000x 8x2) render.c:411: IsSupported(shared , 12000x16x1) render.c:411: IsSupported(shared , 12000x16x2) render.c:411: IsSupported(shared , 16000x 8x1) render.c:411: IsSupported(shared , 16000x 8x2) render.c:411: IsSupported(shared , 16000x16x1) render.c:411: IsSupported(shared , 16000x16x2) render.c:411: IsSupported(shared , 22050x 8x1) render.c:411: IsSupported(shared , 22050x 8x2) render.c:411: IsSupported(shared , 22050x16x1) render.c:411: IsSupported(shared , 22050x16x2) render.c:411: IsSupported(shared , 44100x 8x1) render.c:411: IsSupported(shared , 44100x 8x2) render.c:411: IsSupported(shared , 44100x16x1) render.c:411: IsSupported(shared , 44100x16x2) render.c:411: IsSupported(shared , 48000x 8x1) render.c:411: IsSupported(shared , 48000x 8x2) render.c:411: IsSupported(shared , 48000x16x1) render.c:411: IsSupported(shared , 48000x16x2) render.c:411: IsSupported(shared , 96000x 8x1) render.c:411: IsSupported(shared , 96000x 8x2) render.c:411: IsSupported(shared , 96000x16x1) render.c:411: IsSupported(shared , 96000x16x2) render.c:2174: Output to a MS-DOS console is particularly slow and disturbs timing. render.c:2175: Please redirect output to a file. render.c:870: Testing shared mode render.c:902: Latency: 10.0000 ms render.c:921: BufferSize 24000 estimated fragment 480 x 50 = 24000 render.c:945: Clock Frequency 1152000 render.c:974: data at 0x530030 render.c:1023: padding 14302 past sleep #2 render.c:1042: padding 14302 position 232752 past stop #2 render.c:1076: data at 0x530030 render.c:1100: position 115416 past 100ms sleep #3 render.c:1117: padding 18711 position 126936 past stop #3 render.c:1145: data at 0x530030 for prefill 22500 render.c:1175: hpctime 381 after 370ms render.c:1194: hpctime 481 pcpos 492 render.c:1199: padding 1250 position 510000/21250 slept 470ms iteration 0 render.c:1227: data at 0x530030 render.c:1194: hpctime 589 pcpos 599 render.c:1199: padding 18551 position 634776/26449 slept 570ms iteration 1 render.c:1232: data at 0x530030 (small 5449) render.c:1194: hpctime 691 pcpos 701 render.c:1199: padding 19321 position 747072/31128 slept 670ms iteration 2 render.c:1232: data at 0x530030 (small 4679) render.c:1194: hpctime 793 pcpos 803 render.c:1199: padding 18727 position 873624/36401 slept 770ms iteration 3 render.c:1232: data at 0x530030 (small 5273) render.c:1194: hpctime 895 pcpos 905 render.c:1199: padding 19089 position 991488/41312 slept 870ms iteration 4 render.c:1232: data at 0x530030 (small 4911) render.c:1194: hpctime 996 pcpos 1007 render.c:1199: padding 19279 position 1104792/46033 slept 970ms iteration 5 render.c:1232: data at 0x530030 (small 4721) render.c:1194: hpctime 1098 pcpos 1109 render.c:1199: padding 18961 position 1225728/51072 slept 1070ms iteration 6 render.c:1232: data at 0x530030 (small 5039) render.c:1194: hpctime 1200 pcpos 1211 render.c:1199: padding 19326 position 1337904/55746 slept 1170ms iteration 7 render.c:1232: data at 0x530030 (small 4674) render.c:1194: hpctime 1302 pcpos 1312 render.c:1199: padding 18970 position 1458624/60776 slept 1270ms iteration 8 render.c:1232: data at 0x530030 (small 5030) render.c:1248: position 1458624 render.c:1257: position 2034624 past underrun, 0 padding left, 84776 frames written render.c:1279: hpctime 2304 after underrun render.c:882: Testing exclusive mode at 48000 render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1002ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1004ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 1003ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1007ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1002ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1005ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 997ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 999ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -330 frames at 48000 worth 1003ms in 1009ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 1003ms render: 4996 tests executed (0 marked as todo, 0 failures), 0 skipped. Sometimes up to 2 tests fail due to position updates not being regular, as you can see from this line: render.c:2127: Released 48480=101x480 -330 frames at 48000 worth 1003ms in 1009ms I suspect this is because it's nearly done playing though, but it can get worse when you use usb headphones, not much I can do about that though, except if I started lying, but it's so far been much simpler when I don't.. Exclusive mode tests aren't done, I disabled exclusive mode because I felt tests were insufficient. If you can point me to an application using it I'll work on it though, but I didn't feel mmdevapi tests were complete enough for handling this. *BONUS* My favorite capture results (a2dp phone as "microphone"): capture.c:501: Returned periods: 135.2834 ms 135.2834 ms capture.c:513: pwfx: 0xdccb0 capture.c:514: Tag: fffe capture.c:515: bits: 32 capture.c:516: chan: 2 capture.c:517: rate: 44100 capture.c:518: align: 8 capture.c:519: extra: 22 capture.c:524: Res: 32 capture.c:525: Mask: 3 capture.c:526: Alg: FLOAT capture.c:585: Returned latency: 135.2834 ms capture.c:168: Test failed: Waiting on event handle failed! capture.c:185: Wait'ed position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:217: Test failed: GetNextPacketSize 0 vs. GCP 0 capture.c:220: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:247: Sleep.1 position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:286: Test failed: GetNextPacketSize 0 vs. GetDevicePeriod 5966 capture.c:291: GetBufferSize 23864 period size 5966 capture.c:299: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:301: Overrun position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:326: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:328: Cont'ed position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:347: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:352: Restart position -559038737 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:354: Test failed: restarted GCP 0 capture.c:383: Reset position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:408: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:409: Running position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:426: Test failed: Wait(event) after Stop gave 102 capture.c:434: Test failed: Wait(event) after Reset gave 102 capture.c:440: Test failed: Wait(NULL event) gave 102 capture: 224 tests executed (0 marked as todo, 12 failures), 0 skipped. I love this one because it shows that when you have a source that's not capturing, winepulse still gets the correct results. Even though obviously the tests completely fail because there's no data. ;-) ~Maarten

2 3

Re: [PATCH] cabarc: Display message when extracting cab like in native.
by Alexandre Julliard Dec. 1, 2012

Dec. 1, 2012

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -713,9 +716,16 @@ int wmain( int argc, WCHAR *argv[] ) > argv[--argc] = NULL; > } > } > - return extract_cabinet( buffer ); > + WINE_MESSAGE("Extracting file(s) from cabinet %s\n", wine_dbgstr_a(cab_file)); > + ret = extract_cabinet( buffer ); > + break; > default: > usage(); > - return 1; > + ret = 1; > + break; > } > + > + cab_free(cab_file); > + > + return ret; I don't think that's very useful. And freeing memory on process exit is even less useful. -- Alexandre Julliard julliard(a)winehq.org

2 5

Re: kernel32: Implement SetFileValidData.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Hans Leidekker <hans(a)codeweavers.com> writes: > --- > configure.ac | 1 + > dlls/kernel32/file.c | 12 +++- > dlls/kernel32/tests/file.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/ntdll/file.c | 27 +++++++++ > include/ddk/ntddk.h | 5 ++ > include/winbase.h | 1 + > 6 files changed, 180 insertions(+), 2 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so file.c && touch file.ok file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\users\julliard\Temp\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\users\julliard\Temp\removeme\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for \\?\C:\ err=5 should be 3 file.c:3528: Test succeeded inside todo block: SetFileValidData succeeded file.c:3532: Test failed: SetFileValidData failed 50 file.c:3548: Test succeeded inside todo block: SetFileValidData succeeded file.c:3552: Test failed: SetFileValidData failed 50 file.c:3555: Test failed: SetFileValidData failed 50 file.c:3559: Test succeeded inside todo block: SetFileValidData succeeded file.c:3563: Test failed: SetFileValidData failed 50 make: *** [file.ok] Error 7 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] dsound: Use event based threads
by Maarten Lankhorst Nov. 30, 2012

Nov. 30, 2012

Op 21-11-12 19:16, Maarten Lankhorst schreef: > Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)ubuntu.com> > Bump, anything wrong with this patch?

2 1

Re: [PATCH 6/6] jscript: Added support for indexed string access
by Marvin Nov. 30, 2012

Nov. 30, 2012

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=23169 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/6] jscript: Added support for DontDelete attribute and use it for arguments object
by Marvin Nov. 30, 2012

Nov. 30, 2012

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=23168 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6 try2] jscript: Alias arguments properties to real values
by Marvin Nov. 30, 2012

Nov. 30, 2012

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=23167 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 0/3] Add O_DENY* flags to fcntl and cifs
by Pavel Shilovsky Nov. 30, 2012

Nov. 30, 2012

2012/11/30 Pavel Shilovsky <piastry(a)etersoft.ru>: > Network filesystems CIFS, SMB2.0, SMB3.0 and NFSv4 have such flags - this change can benefit cifs and nfs modules. While this change is ok for network filesystems, itsn't not targeted for local filesystems due security problems (e.g. when a user process can deny root to delete a file). > > Share flags are used by Windows applications and WINE have to deal with them too. While WINE can process open share flags itself on local filesystems, it can't do it if a file stored on a network share and is used by several clients. This patchset makes it possible for CIFS/SMB2.0/SMB3.0. > > Pavel Shilovsky (3): > fcntl: Introduce new O_DENY* open flags for network filesystems > CIFS: Add O_DENY* open flags support > CIFS: Use NT_CREATE_ANDX command for forcemand mounts > > fs/cifs/cifsacl.c | 10 ++++---- > fs/cifs/cifsglob.h | 11 ++++++++- > fs/cifs/cifsproto.h | 9 ++++---- > fs/cifs/cifssmb.c | 47 ++++++++++++++++++++------------------ > fs/cifs/dir.c | 14 ++++++++---- > fs/cifs/file.c | 18 ++++++++++----- > fs/cifs/inode.c | 11 +++++---- > fs/cifs/link.c | 10 ++++---- > fs/cifs/readdir.c | 2 +- > fs/cifs/smb1ops.c | 15 ++++++------ > fs/cifs/smb2file.c | 10 ++++---- > fs/cifs/smb2inode.c | 4 ++-- > fs/cifs/smb2ops.c | 10 ++++---- > fs/cifs/smb2pdu.c | 6 ++--- > fs/cifs/smb2proto.h | 14 +++++++----- > fs/fcntl.c | 5 ++-- > include/uapi/asm-generic/fcntl.h | 11 +++++++++ > 17 files changed, 125 insertions(+), 82 deletions(-) > > -- > 1.7.10.4 > CC'ing wine-devel(a). -- Best regards, Pavel Shilovsky.

1 0

Re: wined3d: Add some 'fall through' comments (coverity)
by Henri Verbeet Nov. 30, 2012

Nov. 30, 2012

On 29 November 2012 17:04, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > case WINED3D_TOP_BUMPENVMAP_LUMINANCE: > lum_map |= 1 << stage; > + /* fall through */ > case WINED3D_TOP_BUMPENVMAP: > bump_map |= 1 << stage; > + /* fall through */ > case WINED3D_TOP_BLEND_TEXTURE_ALPHA: > case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: > tex_map |= 1 << stage; I'm not opposed to these if they make it easier to find real bugs inside the noise with Coverity, but I would also note that it should be pretty obvious to anyone actually touching this code that the fall through is intentional.

2 1

Re: [PATCH] ntdll: Fix existing conftests for nanosecond precision time fields.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Charles Davis <cdavis5x(a)gmail.com> writes: > From: Charles Davis <cdavis(a)mymail.mines.edu> > > Autoconf checks for a field of a struct by using it in an if() > expression. Of course, you can't do this for an aggregate field, so you > must instead check a field of that aggregate instead. Up until now, the > conftests for the st_?tim fields were all failing, even on systems that > had them, because of this. It does a sizeof, which should work just fine. On what system do you see a problem? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 1/6] jscript: Alias arguments properties to real values
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/jscript/dispex.c | 36 ++++++++++++++-- > dlls/jscript/function.c | 98 > ++++++++++++++++++++++++++++++++----------- > dlls/jscript/jscript.h | 3 + > dlls/jscript/tests/lang.js | 8 ++++ > 4 files changed, 116 insertions(+), 29 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M ieframe.dll -T ../../.. -p ieframe_test.exe.so webbrowser.c && touch webbrowser.ok wine: Unhandled page fault on read access to 0x06c238cc at address 0x564c09e3 (thread 003a), starting debugger... Unhandled exception: page fault on read access to 0x06c238cc in 32-bit code (0x564c09e3). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:564c09e3 ESP:0032d1d0 EBP:0032d218 EFLAGS:00210246( R- -- I Z- -P- ) EAX:0214bdec EBX:564f89dc ECX:02a7d2f0 EDX:02a7d2f0 ESI:02c8ef58 EDI:012b5eb8 Stack dump: 0x0032d1d0: 00000008 00000000 00000000 00000004 0x0032d1e0: 00000000 02c8ef58 4d430003 020cf1b0 0x0032d1f0: 00000000 00000001 00000030 00000060 0x0032d200: 00000000 00000003 0000006c 564f89dc 0x0032d210: 020cf210 02c8ef58 0032d278 564b3397 0x0032d220: 02c8ef58 012b5eb8 02a7d2f0 02a7d2f0 Backtrace: =>0 0x564c09e3 Arguments_idx_get+0x73(jsdisp=0x2c8ef58, idx=0x12b5eb8, res=0x2a7d2f0) [/home/julliard/wine/wine/dlls/jscript/function.c:108] in jscript (0x0032d218) 1 0x564b3397 prop_get+0xd6(This=0x2c8ef58, prop=0x20cf210, dp=0x32d2a8, r=0x2a7d2f0, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:450] in jscript (0x0032d278) 2 0x564b72aa jsdisp_get_idx+0xc9(obj=0x2c8ef58, idx=0, r=0x2a7d2f0) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1399] in jscript (0x0032d2e8) 3 0x564c1c48 Function_apply+0x2e7(ctx=0x1fe13f0, jsthis=0x32d388, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568) [/home/julliard/wine/wine/dlls/jscript/function.c:411] in jscript (0x0032d348) 4 0x564b5f1c invoke_prop_func+0x1ab(This=0x1fd66f8, jsthis=<is not available>, prop=0x1fdbeb8, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:384] in jscript (0x0032d3a8) 5 0x564b5f78 invoke_prop_func+0x207(This=<is not available>, jsthis=<is not available>, prop=0x2d7cce0, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:393] in jscript (0x0032d408) 6 0x564b63a7 disp_call+0xe6(ctx=0x1fe13f0, disp=0x2a7d2a8, id=0x4, flags=0x1, argc=0x2, argv=0x2ab0f00, ret=0x32d568) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1103] in jscript (0x0032d518) 7 0x564b8a48 interp_call_member+0x117(ctx=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:1032] in jscript (0x0032d588) 8 0x564beee9 exec_source+0x1d8(ctx=<is not available>, code=<is not available>, func=<is not available>, from_eval=<is not available>, ret=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:2485] in jscript (0x0032d628) 9 0x564c12d0 invoke_source+0x3cf() in jscript (0x0032d6c8) 10 0x564c1a0c Function_apply+0xab(ctx=0x1fe13f0, jsthis=0x32d768, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948) [/home/julliard/wine/wine/dlls/jscript/function.c:470] in jscript (0x0032d728) 11 0x564b5f1c invoke_prop_func+0x1ab(This=0x1fd66f8, jsthis=<is not available>, prop=0x1fdbeb8, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:384] in jscript (0x0032d788) 12 0x564b5f78 invoke_prop_func+0x207(This=<is not available>, jsthis=<is not available>, prop=0x2a96888, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:393] in jscript (0x0032d7e8) 13 0x564b63a7 disp_call+0xe6(ctx=0x1fe13f0, disp=0x2a96800, id=0x2, flags=0x1, argc=0x2, argv=0x2ab1c78, ret=0x32d948) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1103] in jscript (0x0032d8f8) 14 0x564b8a48 interp_call_member+0x117(ctx=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:1032] in jscript (0x0032d968) 15 0x564beee9 exec_source+0x1d8(ctx=<is not available>, code=<is not available>, func=<is not available>, from_eval=<is not available>, ret=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:2485] in jscript (0x0032da08) 16 0x564c12d0 invoke_source+0x3cf() in jscript (0x0032daa8) 17 0x564c1f3a Function_invoke+0xb9(func_this=0x2aa4268, jsthis=(nil), flags=0x1, argc=0x1, argv=0x32dbd0, r=0x32dbc8) [/home/julliard/wine/wine/dlls/jscript/function.c:346] in jscript (0x0032db08) 18 0x564b60f5 invoke_prop_func+0x384(This=0x2aa4268, jsthis=<is not available>, prop=0x2aa42b0, flags=0x1, argc=0x1, argv=0x32dbd0, r=0x32dbc8, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:388] in jscript (0x0032db68) 19 0x564b6b69 DispatchEx_InvokeEx+0x398(iface=0x2aa4268, id=0, lcid=0x409, wFlags=0x1, pdp=0x32dd30, pvarRes=0x32dd10, pei=0x32dc60, pspCaller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:693] in jscript (0x0032dc18) 20 0x55bb08d6 call_disp_func+0xf5(disp=<is not available>, dp=0x32dd30, retv=0x32dd10) [/home/julliard/wine/wine/dlls/mshtml/../../include/dispex.h:299] in mshtml (0x0032dc98) 21 0x55bb0cd3 call_event_handlers.isra+0x1d2() in mshtml (0x0032dd68) 22 0x55bb165b fire_event_obj+0x35a(doc=0x1fdb738, eid=EVENTID_LOAD, event_obj=0x1f51d28, target=0x2bc32fc, script_this=0x1fd2700) [/home/julliard/wine/wine/dlls/mshtml/htmlevent.c:1073] in mshtml (0x0032ddf8) 23 0x55bb1c8d fire_event+0x8c(doc=0x1fdb738, eid=EVENTID_LOAD, set_event=0x1, target=0x2bc32fc, nsevent=0x2c6ef48, script_this=0x1fd2700) [/home/julliard/wine/wine/dlls/mshtml/htmlevent.c:1188] in mshtml (0x0032de28) 24 0x55bfe7cb handle_load+0xda(iface=0x1fdb958, event=0x2c6ef48) [/home/julliard/wine/wine/dlls/mshtml/nsevents.c:274] in mshtml (0x0032de98) 25 0x6a6184f8 in xul (+0x9d84f7) (0x01fdb978) 26 0x00000002 (0x6af902f8) 27 0x6a61a05c in xul (+0x9da05b) (0x6a61a078) 0x564c09e3 Arguments_idx_get+0x73 [/home/julliard/wine/wine/dlls/jscript/function.c:108] in jscript: movl 0x0(%eax,%edi,4),%eax 108 return jsdisp_propget_name(arguments->var_obj, arguments->function->func_code->params[idx], res); -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] jscript: Added support for indexed string access
by Marvin Nov. 29, 2012

Nov. 29, 2012

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=23153 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/6] jscript: Added support for DontDelete attribute and use it for arguments object
by Marvin Nov. 29, 2012

Nov. 29, 2012

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=23152 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6] jscript: Alias arguments properties to real values
by Marvin Nov. 29, 2012

Nov. 29, 2012

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=23151 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: wshom.ocx: Properly update typeinfo refcount
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -137,8 +137,13 @@ static HRESULT WINAPI WshCollection_GetTypeInfoCount(IWshCollection *iface, UINT > static HRESULT WINAPI WshCollection_GetTypeInfo(IWshCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) > { > WshCollection *This = impl_from_IWshCollection(iface); > + HRESULT hr; > + > TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); > - return get_typeinfo(IWshCollection_tid, ppTInfo); > + > + hr = get_typeinfo(IWshCollection_tid, ppTInfo); > + ITypeInfo_AddRef(*ppTInfo); > + return hr; You'd need to check for error first, but the AddRef should really be in get_typeinfo(). -- Alexandre Julliard julliard(a)winehq.org

2 4

Wine Gecko versioning
by Jacek Caban Nov. 27, 2012

Nov. 27, 2012

Hi all, Since Wine Gecko 1.9 branching, the tip should bump to 1.10, but I think it's time to clean up the situation a bit. Such things usually don't bring much attention, but it should be decided in public. Right now we have three versioning schemes involved in Wine Gecko: - Wine version that applies to Gecko - Gecko version (since Firefox 5 and Mozilla's rapid releases it's the same as Firefox version) - Wine Gecko version, which is just a growing number, not really connected with any of above. These numbers currently have no meaning other that being different for different Wine Gecko releases. The idea is that Wine Gecko version could be just something based on other versions, that are more informative. It's not really possible to use Wine version, because the first version of Wine that will use new Gecko is not ultimately when Wine Gecko branches. Also multiple Wine versions use the same Wine Gecko. That leaves us with Gecko (Firefox version). We don't release on every Firefox release (every 6 weeks), so if we just used Firefox version, that would look strange (like Wine Gecko 18 followed by Wine Gecko 20). That can be mitigated by using it as a minor version. So the next few release would look like: - 1.9 (that's already in beta and will be the last release using old scheme) - 2.20 (assuming the next update will be 3 months from 1.9, which means Firefox 20) - 2.22 (assuming another 3 moths for the update). Any suggestions/comments welcomed. Cheers, Jacek

4 6

Re: [PATCH] d3dx9_36/tests: Fix broken line test
by Matteo Bruni Nov. 27, 2012

Nov. 27, 2012

2012/11/27 Detlef Riekenberg <wine.dev(a)web.de>: > While inspecting a test failure, i found only > 3 possible results for the line test: > - d3dx9_36.dll not present > - all tests skipped > line.c:146: Tests skipped: Failed to create IDirect3DDevice9 object 0x8876086c > - refcount test failed > line.c:113: Test failed: Got 5 references to device 0023EA60, expected 2 > (of course with different device pointer) > > See: http://test.winehq.org/data/tests/d3dx9_36:line.html > > I prefer to mark the refcount as implementation detail and remove the refcount test. > > My second way to fix the test failure is the attached patch. > Since the test was accepted to wine, there must be a machine somewhere > with a refcount of 2, so i marked that result as broken. > I think the test was accepted simply because it passed on Wine while it wasn't actually executed on WineTestBot. So yeah, removing the refcount test or adding a todo_wine is probably the way to go, adding a broken(ref == 2) doesn't seem to make much sense. Thanks for bringing this up. > d3d is not my area, so please comment. > > -- > By by ... Detlef > --- > dlls/d3dx9_36/tests/line.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c > index dc0c747..6ed508b 100644 > --- a/dlls/d3dx9_36/tests/line.c > +++ b/dlls/d3dx9_36/tests/line.c > @@ -110,7 +110,9 @@ static void test_create_line(IDirect3DDevice9* device) > expect_mat(&world, &result); > > ref = IDirect3DDevice9_Release(return_device); > - ok(ref == 2, "Got %x references to device %p, expected 2\n", ref, return_device); > + todo_wine > + ok(broken(ref == 2) || ref == 5, > + "Got %x references to device %p, expected 5\n", ref, return_device); > > ref = ID3DXLine_Release(line); > ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); > -- > 1.7.5.4 > > >

1 0

Re: [PATCH] cabinet: Turn some ERR into WARN and improved or fix messages.
by Nikolay Sivov Nov. 27, 2012

Nov. 27, 2012

On 11/27/2012 11:14, Christian Costa wrote: > --- > dlls/cabinet/fdi.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c > index 0690b38..809a5c0 100644 > --- a/dlls/cabinet/fdi.c > +++ b/dlls/cabinet/fdi.c > @@ -710,7 +710,7 @@ static BOOL FDI_read_entries( > } > > /*********************************************************************** > - * FDIIsCabinet (CABINET.21) > + * FDIIsCabinet (CABINET.21) > * > * Informs the caller as to whether or not the provided file handle is > * really a cabinet or not, filling out the provided PFDICABINETINFO > @@ -725,7 +725,7 @@ static BOOL FDI_read_entries( > * be filled out with information about the cabinet > * file indicated by hf if, indeed, it is determined > * to be a cabinet. > - * > + * > * RETURNS > * TRUE if the file is a cabinet. The info pointed to by pfdici will > * be provided. > @@ -736,10 +736,7 @@ static BOOL FDI_read_entries( > * INCLUDES > * fdi.c > */ > -BOOL __cdecl FDIIsCabinet( > - HFDI hfdi, > - INT_PTR hf, > - PFDICABINETINFO pfdici) > +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) > { > BOOL rv; > FDI_Int *fdi = get_fdi_ptr( hfdi ); > @@ -749,13 +746,13 @@ BOOL __cdecl FDIIsCabinet( > if (!fdi) return FALSE; > > if (!hf) { > - ERR("(!hf)!\n"); > + WARN("No file handle\n"); > SetLastError(ERROR_INVALID_HANDLE); > return FALSE; > } > > if (!pfdici) { > - ERR("(!pfdici)!\n"); > + WARN("No cab info pointer\n"); > SetLastError(ERROR_BAD_ARGUMENTS); > return FALSE; > } This call already has a TRACE earlier, I don't see a point in tracing input parameters multiple times. > @@ -2532,7 +2529,7 @@ BOOL __cdecl FDICopy( > > /* check if it's really a cabfile. Note that this doesn't implement the bug */ > if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { > - ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); > + WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper); > fdi->free(decomp_state); > fdi->close(cabhf); > return FALSE; > > > >

2 1

Re: msvcp60: Remove superfluous semicolons
by Jacek Caban Nov. 27, 2012

Nov. 27, 2012

On 11/26/12 8:42 PM, Andrew Talbot wrote: > Changelog: > msvcp60: Remove superfluous semicolons. > > diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c > index 761075e..b8c6921 100644 > --- a/dlls/msvcp60/exception.c > +++ b/dlls/msvcp60/exception.c > @@ -137,7 +137,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag > } > > DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@"); > -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); > +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) It's probably better to change the macro to require the semicolon. Jacek

2 2

Re: winex11: Add a few 'fall through' comments.
by Dmitry Timoshkov Nov. 27, 2012

Nov. 27, 2012

Huw Davies <huw(a)codeweavers.com> wrote: > case DirectColor: > X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; > - case GrayScale: > + case GrayScale: /* fall through */ case DirectColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; /* fall through */ case GrayScale: would be more clear IMHO. Right now it's not obvious to which case statement 'fall through' belongs to. Same for other changes. -- Dmitry.

2 1

Explicit fall-through in switch statements?
by Frédéric Delanoy Nov. 27, 2012

Nov. 27, 2012

For every wine version, static checkers (like coverity) detect cases where a switch case automatically falls-through to the next case. Shouldn't be there a rule that such cases are always marked with a "fall-through comment"? With the possible exception of case with no statement? like 'case FOO: case BAR: do_something();...'? This would probably help IMHO, especially when people refactor old code. Frédéric

4 5

Re: ntdll/tests: Mark win8 behaviour as broken
by Dmitry Timoshkov Nov. 27, 2012

Nov. 27, 2012

André Hentschel <nerv(a)dawncrow.de> wrote: > diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c > index c670731..f66d858 100644 > --- a/dlls/ntdll/tests/info.c > +++ b/dlls/ntdll/tests/info.c > @@ -1336,7 +1336,8 @@ static void test_mapprotection(void) > status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); > ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); > ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); > - ok(info.Protect == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); > + ok(info.Protect == PAGE_READWRITE || broken(info.Protect == PAGE_NOCACHE | PAGE_READWRITE /* win8 */), > + "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); This is not broken. You should either mask PAGE_NOCACHE out before the comparison, or accept both values. Same applies to other your patches. -- Dmitry.

1 0

Re: [PATCH 1/5] advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo (try 2).
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > This particular patch implements SetNamedSecurityInfoW by layering it > on top of SetSecurityInfo, which permits the creation of tests for > part 2 (GetNamedSecurityInfoW). This version has been updated to fix > a bad return value and includes a test indicating the correct value > (ERROR_FILE_NOT_FOUND). That doesn't mean you can hardcode that specific error. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] ole32: Add helper for string table memory freeing
by Nikolay Sivov Nov. 26, 2012

Nov. 26, 2012

On 11/26/2012 01:01, Frédéric Delanoy wrote: > --- > dlls/ole32/filemoniker.c | 44 ++++++++++++++++++-------------------------- > 1 file changed, 18 insertions(+), 26 deletions(-) > > diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c > index b3a5cc2..688f6b8 100644 > --- a/dlls/ole32/filemoniker.c > +++ b/dlls/ole32/filemoniker.c > @@ -657,6 +657,16 @@ FileMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, > return MK_S_REDUCED_TO_SELF; > } > > +static void > +FileMonikerImpl_FreeStringTable(LPOLESTR* stringTable) > +{ > + int i; > + > + for (i=0; stringTable[i]!=NULL; i++) > + CoTaskMemFree(stringTable[i]); > + CoTaskMemFree(stringTable); > +} > + Could you please adjust a naming for that to something like free_stringtable() cause it doesn't really access file moniker in this helper. Also stringTable[i]!=NULL could be shortened to stringTable[i]. > > > CoTaskMemFree(str1); > CoTaskMemFree(str2); > @@ -1004,17 +1010,9 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p > { > for(i=0;i<sameIdx;i++) > strcatW(commonPath,stringTable1[i]); > - > - for(i=0;i<nb1;i++) > - CoTaskMemFree(stringTable1[i]); > - > - CoTaskMemFree(stringTable1); > - > - for(i=0;i<nb2;i++) > - CoTaskMemFree(stringTable2[i]); > - > - CoTaskMemFree(stringTable2); > - > + > + FileMonikerImpl_FreeStringTable(stringTable1); > + FileMonikerImpl_FreeStringTable(stringTable2); You sure it's an equivalent change? I mean regarding index boundaries above. Also while you're at it FileMonikerImpl_DecomposePath() needs to be properly fixed - it returns HRESULT, not it. And surrounding code relies on FAILED() mask to get this index boundary from return value, this is really broken.

2 1

re: [PATCH 5/5] winex11: Detect broken NVIDIA RandR setups.
by Dan Kegel Nov. 24, 2012

Nov. 24, 2012

Henri wrote: >+ /* Recent (304.64, possibly earlier) versions of the nvidia driver only >+ * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes >+ * are only listed through RandR 1.0 / 1.1. This is completely useless, >+ * but NVIDIA considers this a feature, so it's unlikely to change Do you happen to have a link to discussion about this, or an nvidia bug number? Thanks!

2 1

Re: [1/2] widl: Fix enum entries output based on previous entry value
by Alexandre Julliard Nov. 23, 2012

Nov. 23, 2012

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Apparently this is how midl works I'm not sure that's an improvement, it makes it harder to figure out the actual value. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [02/10] windowscodecs: Reimplement QueryCapability of the BMP decoder.
by Vincent Povirk Nov. 23, 2012

Nov. 23, 2012

Does QueryCapability really initialize the decoder? Can you get a frame out of it? I guess it never occurred to me to try. I was OK with this for the other implementations because I figured it'd be easy enough to invalidate the decoder after successfully calling Initialize, if that turned out to be a problem.

2 1

Wine Gecko 1.9-beta1
by Jacek Caban Nov. 22, 2012

Nov. 22, 2012

Hi all, Firefox 17 was released lately, meaning that Firefox 18 goes to beta channel and it's the next target for out Gecko package update. I've uploaded new Gecko builds to SourceForge [1]. To test them, you need recent Wine Git version with the attached patch. As usually, grab the build from SourceForge, put it in the right place [2] and run patched Wine. All help with testing is appreciated! Thanks, Jacek [1] http://sourceforge.net/projects/wine/files/Wine%20Gecko/1.9-beta1/ [2] http://wiki.winehq.org/Gecko

1 0

Why is services.exe crashing like this?
by Roger Cruz Nov. 22, 2012

Nov. 22, 2012

I finally was able to figure out how to attach the debugger to determine why services.exe did not start and I can clearly see now that the oem_table is NULL. It should have been set by LOCALE_Init() when called from kernel32's init function. However, if you look at the stack trace here, Wine hasn't even gotten to that point. As part of NTDLL's init, it is setting the DLL callback function which causes it to invoke the callback right away..as seen in the stack trace, it is making a function call which requires the oem_table to be set. Does anyone have any ideas why this is happening? Why doesn't it happen when other programs such as wineboot and explorer.exe are started? It only happens with services.exe. I am using Wine 1.4.2 Roger R. Cruz Program received signal SIGSEGV, Segmentation fault. 0x4003c304 in wine_cp_wcstombs (table=0x0, flags=0x0, src=0xbecc5648, srclen=0xc, dst=0x0, dstlen=0x0, defchar=0x0, used=0x0) at /home/rcruz/sandbox/wine.git/libs/wine/wctomb.c:447 447 if (table->info.char_size == 1) #0 0x4003c304 in wine_cp_wcstombs (table=0x0, flags=0x0, src=0xbecc5648, srclen=0xc, dst=0x0, dstlen=0x0, defchar=0x0, used=0x0) at /home/rcruz/sandbox/wine.git/libs/wine/wctomb.c:447 #1 0x7bc76f94 in RtlUnicodeStringToOemSize (str=0xbecc5688) at /home/rcruz/sandbox/wine.git/dlls/ntdll/rtlstr.c:1356 #2 0x7bc76a18 in RtlUpcaseUnicodeStringToCountedOemString (oem=0xbecc56b0, uni=0xbecc5784, doalloc=0x0) at /home/rcruz/sandbox/wine.git/dlls/ntdll/rtlstr.c:1161 #3 0x7bc65604 in RtlIsNameLegalDOS8Dot3 (unicode=0xbecc5784, oem=0xbecc56b0, spaces=0xbecc5783 "{\030") at /home/rcruz/sandbox/wine.git/dlls/ntdll/path.c:888 #4 0x7bc361bc in find_file_in_dir ( unix_name=0x42952ae0 "/data/winehome/dosdevices/c:/windows/system32", pos=0x36, name=0x42952aa8, length=0xc, check_case=0x0, is_win_dir=0x0) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2125 #5 0x7bc3856c in lookup_unix_name (name=0x42952aa8, name_len=0x0, buffer=0xbecc5cac, unix_len=0x145, pos=0x35, disposition=0x1, check_case=0x0) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2753 #6 0x7bc393b4 in wine_nt_to_unix_file_name (nameW=0xbecc5ed4, unix_name_ret=0xbecc5e5c, disposition=0x1, check_case=0x0) ---Type <return> to continue, or q <return> to quit--- at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2978 #7 0x7bc3888c in nt_to_unix_file_name_attr (attr=0xbecc5e90, unix_name_ret=0xbecc5e5c, disposition=0x1) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2817 #8 0x7bc43120 in NtQueryAttributesFile (attr=0xbecc5e90, info=0xbecc5ea8) at /home/rcruz/sandbox/wine.git/dlls/ntdll/file.c:2250 #9 0x7bc397b8 in RtlDoesFileExists_U (file_name=0x42952a20) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:3040 #10 0x7bc6412c in RtlDosSearchPath_U (paths=0x42a704ba, search=0xbecc62e4, ext=0x0, buffer_size=0x40, buffer=0xbecc60c0, file_part=0xbecc5fc4) at /home/rcruz/sandbox/wine.git/dlls/ntdll/path.c:490 #11 0x7bc54848 in find_dll_file (load_path=0x42a704ba, libname=0xbecc62e4, filename=0xbecc60c0, size=0xbecc60bc, pwm=0xbecc6330, handle=0xbecc60b8) at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:2251 #12 0x7bc550c8 in load_dll (load_path=0x42a704ba, libname=0xbecc62e4, flags=0x0, pwm=0xbecc6330) at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:2354 #13 0x7bc4f1c0 in import_dll (module=0x7bc10000, descr=0x7bcca5dc, load_path=0x42a704ba) at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:807 #14 0x7bc502d0 in fixup_imports (wm=0x42952970, load_path=0x42a704ba) ---Type <return> to continue, or q <return> to quit--- at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:1057 #15 0x7bc52c34 in load_builtin_callback (module=0x7bc10000, filename=0x7bca58b0 "ntdll.dll") at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:1836 #16 0x40034008 in wine_dll_set_callback ( load=0x7bc527e8 <load_builtin_callback>) at /home/rcruz/sandbox/wine.git/libs/wine/loader.c:537 #17 0x7bc5874c in __wine_process_init () at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:3353 #18 0x40034694 in wine_init (argc=0x2, argv=0xbecc6b84, error=0xbecc6620 "", error_size=0x400) at /home/rcruz/sandbox/wine.git/libs/wine/loader.c:831 #19 0x00008870 in main (argc=0x2, argv=0xbecc6b84) at /home/rcruz/sandbox/wine.git/loader/main.c:230

1 1

Re: [PATCH v4] dsound: create a primary_pwfx separately from pwfx
by Andrew Eikum Nov. 21, 2012

Nov. 21, 2012

Yeah, that fixes the problem. This patch looks good to me now. Andrew On Fri, Nov 16, 2012 at 08:35:51PM +0100, Maarten Lankhorst wrote: > I promised I would never touch it, but then I wanted to play skyrim > > V2: Limit channels to 2 in primary if not in writeprimary mode > V3: Split off DSOUND_WaveFormat to its own function sooner. > V4: Fix accidental revert of device->buflen increase. It was supposed to wait until rework in patch 3. > --- > diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c > index e5b0e3c..ac85ba2 100644 > --- a/dlls/dsound/dsound.c > +++ b/dlls/dsound/dsound.c > @@ -305,21 +305,36 @@ static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface > DWORD level) > { > IDirectSoundImpl *This = impl_from_IDirectSound8(iface); > + DirectSoundDevice *device = This->device; > + DWORD oldlevel; > + HRESULT hr = S_OK; > > TRACE("(%p,%p,%s)\n", This, hwnd, dumpCooperativeLevel(level)); > > - if (!This->device) { > + if (!device) { > WARN("not initialized\n"); > return DSERR_UNINITIALIZED; > } > > if (level == DSSCL_PRIORITY || level == DSSCL_EXCLUSIVE) { > WARN("level=%s not fully supported\n", > - level == DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); > + level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); > } > > - This->device->priolevel = level; > - return DS_OK; > + RtlAcquireResourceExclusive(&device->buffer_list_lock, TRUE); > + EnterCriticalSection(&device->mixlock); > + oldlevel = device->priolevel; > + device->priolevel = level; > + if ((level == DSSCL_WRITEPRIMARY) != (oldlevel == DSSCL_WRITEPRIMARY)) { > + hr = DSOUND_ReopenDevice(device, level == DSSCL_WRITEPRIMARY); > + if (FAILED(hr)) > + device->priolevel = oldlevel; > + else > + DSOUND_PrimaryOpen(device); > + } > + LeaveCriticalSection(&device->mixlock); > + RtlReleaseResource(&device->buffer_list_lock); > + return hr; > } > > static HRESULT WINAPI IDirectSound8Impl_Compact(IDirectSound8 *iface) > @@ -612,20 +627,24 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) > device->guid = GUID_NULL; > > /* Set default wave format (may need it for waveOutOpen) */ > - device->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEFORMATEX)); > - if (device->pwfx == NULL) { > + device->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEFORMATEXTENSIBLE)); > + device->primary_pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEFORMATEXTENSIBLE)); > + if (!device->pwfx || !device->primary_pwfx) { > WARN("out of memory\n"); > + HeapFree(GetProcessHeap(),0,device->primary_pwfx); > + HeapFree(GetProcessHeap(),0,device->pwfx); > HeapFree(GetProcessHeap(),0,device); > return DSERR_OUTOFMEMORY; > } > > device->pwfx->wFormatTag = WAVE_FORMAT_PCM; > - device->pwfx->nSamplesPerSec = ds_default_sample_rate; > - device->pwfx->wBitsPerSample = ds_default_bits_per_sample; > + device->pwfx->nSamplesPerSec = 22050; > + device->pwfx->wBitsPerSample = 8; > device->pwfx->nChannels = 2; > device->pwfx->nBlockAlign = device->pwfx->wBitsPerSample * device->pwfx->nChannels / 8; > device->pwfx->nAvgBytesPerSec = device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign; > device->pwfx->cbSize = 0; > + memcpy(device->primary_pwfx, device->pwfx, sizeof(*device->pwfx)); > > InitializeCriticalSection(&(device->mixlock)); > device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 3fded64..3c47423 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -93,8 +93,6 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; > /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ > int ds_hel_buflen = 32768 * 2; > int ds_snd_queue_max = 10; > -int ds_default_sample_rate = 44100; > -int ds_default_bits_per_sample = 16; > static HINSTANCE instance; > > /* > @@ -151,19 +149,11 @@ void setup_dsound_options(void) > ds_snd_queue_max = atoi(buffer); > > > - if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH )) > - ds_default_sample_rate = atoi(buffer); > - > - if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, MAX_PATH )) > - ds_default_bits_per_sample = atoi(buffer); > - > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > > TRACE("ds_hel_buflen = %d\n", ds_hel_buflen); > TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max); > - TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate); > - TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample); > } > > static const char * get_device_id(LPCGUID pGuid) > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 247f229..62656a5 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -32,9 +32,6 @@ > > extern int ds_hel_buflen DECLSPEC_HIDDEN; > extern int ds_snd_queue_max DECLSPEC_HIDDEN; > -extern int ds_snd_shadow_maxsize DECLSPEC_HIDDEN; > -extern int ds_default_sample_rate DECLSPEC_HIDDEN; > -extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; > > /***************************************************************************** > * Predeclare the interface implementation structures > @@ -72,8 +69,8 @@ struct DirectSoundDevice > GUID guid; > DSCAPS drvcaps; > DWORD priolevel; > - PWAVEFORMATEX pwfx; > - UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf, helfrags; > + PWAVEFORMATEX pwfx, primary_pwfx; > + UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf; > DWORD fraglen; > LPBYTE buffer; > DWORD writelead, buflen, state, playpos, mixpos; > @@ -211,6 +208,7 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos) DECLSPEC_HIDDEN; > LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; > HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; > +HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, > const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; > void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; > diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c > index 264d64d..84e029b 100644 > --- a/dlls/dsound/mixer.c > +++ b/dlls/dsound/mixer.c > @@ -112,6 +112,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) > TRACE("(%p)\n",dsb); > > pwfxe = (WAVEFORMATEXTENSIBLE *) dsb->pwfx; > + dsb->freqAdjust = (float)dsb->freq / dsb->device->pwfx->nSamplesPerSec; > > if ((pwfxe->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) || ((pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) > && (IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))) > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 8da12e2..bf76dec 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -58,10 +58,99 @@ static DWORD DSOUND_fraglen(DirectSoundDevice *device) > return ret; > } > > +static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client, > + BOOL forcewave, WAVEFORMATEX **wfx) > +{ > + WAVEFORMATEXTENSIBLE *retwfe = NULL; > + WAVEFORMATEX *w; > + HRESULT hr; > + > + if (!forcewave) { > + WAVEFORMATEXTENSIBLE *mixwfe; > + hr = IAudioClient_GetMixFormat(client, (WAVEFORMATEX**)&mixwfe); > + > + if (FAILED(hr)) > + return hr; > + > + if (mixwfe->Format.nChannels > 2) { > + static int once; > + if (!once++) > + FIXME("Limiting channels to 2 due to lack of multichannel support\n"); > + > + mixwfe->Format.nChannels = 2; > + mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; > + mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; > + } > + > + if (!IsEqualGUID(&mixwfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { > + WAVEFORMATEXTENSIBLE testwfe = *mixwfe; > + > + testwfe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > + testwfe.Format.wBitsPerSample = 32; > + testwfe.Format.nBlockAlign = testwfe.Format.nChannels * testwfe.Format.wBitsPerSample / 8; > + testwfe.Format.nAvgBytesPerSec = testwfe.Format.nSamplesPerSec * testwfe.Format.nBlockAlign; > + testwfe.Samples.wValidBitsPerSample = 0; > + > + if (FAILED(IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, &testwfe.Format, (WAVEFORMATEX**)&retwfe))) > + w = DSOUND_CopyFormat(&mixwfe->Format); > + else if (retwfe) > + w = DSOUND_CopyFormat(&retwfe->Format); > + else > + w = DSOUND_CopyFormat(&testwfe.Format); > + CoTaskMemFree(retwfe); > + retwfe = NULL; > + } else > + w = DSOUND_CopyFormat(&mixwfe->Format); > + CoTaskMemFree(mixwfe); > + } else if (device->primary_pwfx->wFormatTag == WAVE_FORMAT_PCM || > + device->primary_pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + WAVEFORMATEX *wi = device->primary_pwfx; > + WAVEFORMATEXTENSIBLE *wfe; > + > + /* Convert to WAVEFORMATEXTENSIBLE */ > + w = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); > + wfe = (WAVEFORMATEXTENSIBLE*)w; > + if (!wfe) > + return DSERR_OUTOFMEMORY; > + > + wfe->Format = *wi; > + w->wFormatTag = WAVE_FORMAT_EXTENSIBLE; > + w->cbSize = sizeof(*wfe) - sizeof(*w); > + w->nBlockAlign = w->nChannels * w->wBitsPerSample / 8; > + w->nAvgBytesPerSec = w->nSamplesPerSec * w->nBlockAlign; > + > + wfe->dwChannelMask = 0; > + wfe->Samples.wValidBitsPerSample = 0; > + if (wi->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + w->wBitsPerSample = 32; > + wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > + } else > + wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > + } else > + w = DSOUND_CopyFormat(device->primary_pwfx); > + > + if (!w) > + return DSERR_OUTOFMEMORY; > + > + hr = IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, w, (WAVEFORMATEX**)&retwfe); > + if (retwfe) { > + memcpy(w, retwfe, sizeof(WAVEFORMATEX) + retwfe->Format.cbSize); > + CoTaskMemFree(retwfe); > + } > + if (FAILED(hr)) { > + WARN("IsFormatSupported failed: %08x\n", hr); > + HeapFree(GetProcessHeap(), 0, w); > + return hr; > + } > + *wfx = w; > + return S_OK; > +} > + > HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > { > UINT prebuf_frames; > REFERENCE_TIME prebuf_rt; > + WAVEFORMATEX *wfx = NULL; > HRESULT hres; > > TRACE("(%p, %d)\n", device, forcewave); > @@ -85,11 +174,20 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > > hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, > CLSCTX_INPROC_SERVER, NULL, (void **)&device->client); > - if(FAILED(hres)){ > + if(FAILED(hres)) { > WARN("Activate failed: %08x\n", hres); > return hres; > } > > + hres = DSOUND_WaveFormat(device, device->client, forcewave, &wfx); > + if (FAILED(hres)) { > + IAudioClient_Release(device->client); > + device->client = NULL; > + return hres; > + } > + HeapFree(GetProcessHeap(), 0, device->pwfx); > + device->pwfx = wfx; > + > prebuf_frames = device->prebuf * DSOUND_fraglen(device) / device->pwfx->nBlockAlign; > prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; > > @@ -139,9 +237,11 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > return S_OK; > } > > -static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > +HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > { > + IDirectSoundBufferImpl** dsb = device->buffers; > LPBYTE newbuf; > + DWORD i; > > TRACE("(%p)\n", device); > > @@ -157,9 +257,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > device->buflen -= device->buflen % device->pwfx->nBlockAlign; > } > > - device->helfrags = device->buflen / device->fraglen; > - > - device->mix_buffer_len = ((device->prebuf * device->fraglen) / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); > + HeapFree(GetProcessHeap(), 0, device->mix_buffer); > + device->mix_buffer_len = (device->buflen / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); > device->mix_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device->mix_buffer_len); > if (!device->mix_buffer) > return DSERR_OUTOFMEMORY; > @@ -183,8 +282,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > > device->buffer = newbuf; > > - TRACE("buflen: %u, fraglen: %u, helfrags: %u, mix_buffer_len: %u\n", > - device->buflen, device->fraglen, device->helfrags, device->mix_buffer_len); > + TRACE("buflen: %u, fraglen: %u, mix_buffer_len: %u\n", > + device->buflen, device->fraglen, device->mix_buffer_len); > > if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > @@ -196,8 +295,22 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > > FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); > FillMemory(device->mix_buffer, device->mix_buffer_len, 0); > - device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; > - return DS_OK; > + device->playpos = 0; > + > + if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > + (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > + IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) > + device->normfunction = normfunctions[4]; > + else > + device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; > + > + for (i = 0; i < device->nrofbuffers; i++) { > + RtlAcquireResourceExclusive(&dsb[i]->lock, TRUE); > + DSOUND_RecalcFormat(dsb[i]); > + RtlReleaseResource(&dsb[i]->lock); > + } > + > + return DS_OK; > } > > > @@ -249,6 +362,7 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) > HeapFree(GetProcessHeap(), 0, device->primary); > device->primary = NULL; > > + HeapFree(GetProcessHeap(),0,device->primary_pwfx); > HeapFree(GetProcessHeap(),0,device->pwfx); > device->pwfx=NULL; > > @@ -338,8 +452,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) > > HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passed_fmt) > { > - HRESULT err = DSERR_BUFFERLOST; > - int i; > + HRESULT err = S_OK; > WAVEFORMATEX *old_fmt; > WAVEFORMATEXTENSIBLE *fmtex, *passed_fmtex = (WAVEFORMATEXTENSIBLE*)passed_fmt; > BOOL forced = (device->priolevel == DSSCL_WRITEPRIMARY); > @@ -377,169 +490,68 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe > RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); > EnterCriticalSection(&(device->mixlock)); > > - old_fmt = device->pwfx; > - device->pwfx = DSOUND_CopyFormat(passed_fmt); > - fmtex = (WAVEFORMATEXTENSIBLE *)device->pwfx; > - if (device->pwfx == NULL) { > - device->pwfx = old_fmt; > - old_fmt = NULL; > - err = DSERR_OUTOFMEMORY; > - goto done; > - } > + if (device->priolevel == DSSCL_WRITEPRIMARY) { > + old_fmt = device->primary_pwfx; > + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); > + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; > + if (device->primary_pwfx == NULL) { > + err = DSERR_OUTOFMEMORY; > + goto out; > + } > > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ > - if(fmtex->Samples.wValidBitsPerSample == 0){ > + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && > + fmtex->Samples.wValidBitsPerSample == 0) { > TRACE("Correcting 0 valid bits per sample\n"); > fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; > } > - } > - > - DSOUND_PrimaryClose(device); > - > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - /* requested format failed, so try others */ > - if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT){ > - device->pwfx->wFormatTag = WAVE_FORMAT_PCM; > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - } > - > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){ > - fmtex->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - } > > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 16; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 8; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->nChannels = (passed_fmt->nChannels == 2) ? 1 : 2; > - device->pwfx->wBitsPerSample = passed_fmt->wBitsPerSample; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 16; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 8; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - WARN("No formats could be opened\n"); > - goto done; > - > -opened: > - err = DSOUND_PrimaryOpen(device); > - if (err != DS_OK) { > - WARN("DSOUND_PrimaryOpen failed\n"); > - goto done; > - } > - > - if (passed_fmt->nSamplesPerSec/100 != device->pwfx->nSamplesPerSec/100 && forced && device->buffer) > - { > DSOUND_PrimaryClose(device); > - device->pwfx->nSamplesPerSec = passed_fmt->nSamplesPerSec; > - err = DSOUND_ReopenDevice(device, TRUE); > - if (FAILED(err)) > - WARN("DSOUND_ReopenDevice(2) failed: %08x\n", err); > - else if (FAILED((err = DSOUND_PrimaryOpen(device)))) > - WARN("DSOUND_PrimaryOpen(2) failed: %08x\n", err); > - } > - > > - if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > - (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > - IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat, > - &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) > - device->normfunction = normfunctions[4]; > - else > - device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; > - > - if (old_fmt->nSamplesPerSec != device->pwfx->nSamplesPerSec || > - old_fmt->wBitsPerSample != device->pwfx->wBitsPerSample || > - old_fmt->nChannels != device->pwfx->nChannels) { > - IDirectSoundBufferImpl** dsb = device->buffers; > - for (i = 0; i < device->nrofbuffers; i++, dsb++) { > - /* **** */ > - RtlAcquireResourceExclusive(&(*dsb)->lock, TRUE); > + err = DSOUND_ReopenDevice(device, forced); > + if (FAILED(err)) { > + ERR("No formats could be opened\n"); > + goto done; > + } > > - (*dsb)->freqAdjust = (*dsb)->freq / (float)device->pwfx->nSamplesPerSec; > - DSOUND_RecalcFormat((*dsb)); > + err = DSOUND_PrimaryOpen(device); > + if (err != DS_OK) { > + ERR("DSOUND_PrimaryOpen failed\n"); > + goto done; > + } > > - RtlReleaseResource(&(*dsb)->lock); > - /* **** */ > +done: > + if (err != DS_OK) > + device->primary_pwfx = old_fmt; > + else > + HeapFree(GetProcessHeap(), 0, old_fmt); > + } else if (passed_fmt->wFormatTag == WAVE_FORMAT_PCM || > + passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + /* Fill in "real" values to primary_pwfx */ > + WAVEFORMATEX *fmt = device->primary_pwfx; > + > + *fmt = *device->pwfx; > + fmtex = (void*)device->pwfx; > + > + if (IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) && > + passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + fmt->wFormatTag = WAVE_FORMAT_IEEE_FLOAT; > + } else { > + fmt->wFormatTag = WAVE_FORMAT_PCM; > + fmt->wBitsPerSample = 16; > } > + fmt->nBlockAlign = fmt->nChannels * fmt->wBitsPerSample / 8; > + fmt->nAvgBytesPerSec = fmt->nBlockAlign * fmt->nSamplesPerSec; > + fmt->cbSize = 0; > + } else { > + device->primary_pwfx = HeapReAlloc(GetProcessHeap(), 0, device->primary_pwfx, sizeof(*fmtex)); > + memcpy(device->primary_pwfx, device->pwfx, sizeof(*fmtex)); > } > > -done: > +out: > LeaveCriticalSection(&(device->mixlock)); > RtlReleaseResource(&(device->buffer_list_lock)); > /* **** */ > > - HeapFree(GetProcessHeap(), 0, old_fmt); > return err; > } > > @@ -834,11 +846,11 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAV > DirectSoundDevice *device = This->device; > TRACE("(%p,%p,%d,%p)\n", iface, lpwf, wfsize, wfwritten); > > - size = sizeof(WAVEFORMATEX) + device->pwfx->cbSize; > + size = sizeof(WAVEFORMATEX) + device->primary_pwfx->cbSize; > > if (lpwf) { /* NULL is valid */ > if (wfsize >= size) { > - CopyMemory(lpwf,device->pwfx,size); > + CopyMemory(lpwf,device->primary_pwfx,size); > if (wfwritten) > *wfwritten = size; > } else { > @@ -849,7 +861,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAV > } > } else { > if (wfwritten) > - *wfwritten = sizeof(WAVEFORMATEX) + device->pwfx->cbSize; > + *wfwritten = sizeof(WAVEFORMATEX) + device->primary_pwfx->cbSize; > else { > WARN("invalid parameter: wfwritten == NULL\n"); > return DSERR_INVALIDPARAM; > > >

1 0

Re: [1/2] windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream.
by Vincent Povirk Nov. 21, 2012

Nov. 21, 2012

Series looks good to me.

1 0

Re: [PATCH 4/5] [kernel] Support opening of console for read (try 2)
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Ann and Jason Edmeades <jason(a)edmeades.me.uk> writes: > +BOOL WINAPI write_console_input( HANDLE handle, const INPUT_RECORD *buffer, > + DWORD count, LPDWORD written ) > +{ > + BOOL result = WriteConsoleInputW(handle, buffer, count, written); > + > + /* If this fails with access denied */ > + if (!result && GetLastError() == ERROR_ACCESS_DENIED) > + { > + HANDLE hConRW = CreateFileW(coninW, GENERIC_READ | GENERIC_WRITE, > + FILE_SHARE_READ, NULL, OPEN_EXISTING, > + FILE_ATTRIBUTE_NORMAL, 0); > + if (hConRW != INVALID_HANDLE_VALUE) > + { > + result = WriteConsoleInputW(hConRW, buffer, count, written); > + CloseHandle(hConRW); > + } That doesn't look right. There's no guarantee that the handle is for the current process console. -- Alexandre Julliard julliard(a)winehq.org

3 5

Re: imm32: use SendMessage not PostMessage for the Default IME winproc
by Henri Verbeet Nov. 20, 2012

Nov. 20, 2012

On 6 November 2012 15:41, Aric Stewart <aric(a)codeweavers.com> wrote: > > This allows the calling program to properly get the return codes from the messages when they need them. > Also prevent all of the calls for IME messages in that windproc from falling back through to DefWindowProc. > > for bug 32101 Can we have some tests for this, please? We already have a couple of known deadlocks involving imm32 message processing, and based on the amount of tests I'm not sure most of it is based on anything other than "It seemed like a good idea at the time.".

2 1

Re: [PATCH 2/2] usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Qian Hong <fracting(a)gmail.com> writes: > - No change from try 4. > > --- > dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 156 insertions(+) Still no luck I'm afraid: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f etc. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail
by Frédéric Delanoy Nov. 20, 2012

Nov. 20, 2012

On Mon, Nov 19, 2012 at 10:03 PM, Ann and Jason Edmeades <jason(a)edmeades.me.uk> wrote: > Existance of external environment variables should not cause > make test to fail, but it can cause extra lines in some of the > set commands if the test does not first clear them out. > > [Fixes bug 32087] > diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd > index a1a3c4a..3efcd2a 100644 > --- a/programs/cmd/tests/test_builtins.cmd > +++ b/programs/cmd/tests/test_builtins.cmd > @@ -239,6 +239,9 @@ set FOO= > > echo ------------ Testing 'set' ------------ > call :setError 0 > +rem Remove any FOO* BA* environment variables from shell before proceeding > +for /f "delims==" %%i in ('set ba') do set %%i= > +for /f "delims==" %%i in ('set foo') do set %%i= > set FOOBAR 2> nul > nul > echo %ErrorLevel% > set FOOBAR = baz IMHO it might be better to use variable names like WINE_xxx for tests involving "enumerations" to avoid needlessly altering the environment. (not that BAR, FOO or FOOBAR are likely to be already used environment variables) Frédéric

4 5

Re: wineqtdecoder: properly clean up splitter and loader threads on QTSplitter destruction
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -495,9 +518,14 @@ static DWORD WINAPI QTSplitter_loading_thread(LPVOID data) > to try to minimize that. > */ > > - while(GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) > + while(This->pQTMovie && GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) > { > EnterCriticalSection(&This->csReceive); > + if (!This || !This->pQTMovie) > + { > + LeaveCriticalSection(&This->csReceive); > + return 0; > + } This doesn't make sense. The this pointer cannot become NULL, and the whole thing should most likely be inside the critical section. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] winmm: Fix handling of mmio file buffers.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > This fix bug 19566 and 32013. > --- > dlls/winmm/mmio.c | 31 +++++++++++++------------------ > dlls/winmm/tests/mmio.c | 16 ++++++++-------- > 2 files changed, 21 insertions(+), 26 deletions(-) It doesn't work on 64-bit: ../../../../wine/tools/runtest -q -P wine -M avifil32.dll -T ../../.. -p avifil32_test.exe.so ../../../../wine/dlls/avifil32/tests/api.c && touch api.ok wine: Unhandled page fault on read access to 0x00040000 at address 0x2b088aa9b1cb (thread 0022), starting debugger... Unhandled exception: page fault on read access to 0x00040000 in 64-bit code (0x00002b088aa9b1cb). Register dump: rip:00002b088aa9b1cb rsp:000000000022ef58 rbp:0000000000000000 eflags:00010216 ( R- -- I -A-P- ) rax:0000000000340270 rbx:000000000003c100 rcx:0000000000000d04 rdx:0000000045455246 rsi:0000000000040000 rdi:0000000000341a50 r8:0000000045455246 r9:0000000000000000 r10:0000000000340030 r11:0000000000008000 r12:0000000045455246 r13:00000000457954b6 r14:0000000045455246 r15:000000000003bfe0 Stack dump: 0x000000000022ef58: 00002b088c7d1cfb 0000000000000000 0x000000000022ef68: 0000000000000001 0000000000000005 0x000000000022ef78: 00002b088c7d19bd 5b5b5b5b5b5b5b5b 0x000000000022ef88: 5b5b5b5b5b5b5b5b 2020202020202020 0x000000000022ef98: 2020202020202020 0000000000202020 0x000000000022efa8: 0000000000000000 ffffffffffffffff 0x000000000022efb8: ffffffffffffffff 0000000000202020 0x000000000022efc8: 0000000020000000 000000ffffffffff 0x000000000022efd8: ff000000ffffff00 0000000000000000 0x000000000022efe8: 0000000000000000 0000000000000000 0x000000000022eff8: 0000000000000000 0000000000000000 0x000000000022f008: 0000000000000000 0000000000000000 Backtrace: =>0 0x00002b088aa9b1cb in libc.so.6 (+0x881cb) (0x0000000000000000) 1 0x00002b088c7d1cfb mmioRead+0x11a(hmmio=0x1, pch="", cch=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/winmm/../../../wine/dlls/winmm/mmio.c:779] in winmm (0x0000000000000000) 2 0x00002b088c35d774 ReadChunkIntoExtra+0xf3(extra=<is not available>, hmmio=0x1, lpck=0x22f1f0) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/extrachunk.c:134] in avifil32 (0x0000000000000000) 3 0x00002b088c35d8ce FindChunkAndKeepExtras+0xcd(extra=0x3bfe0, hmmio=0x1, lpck=0x22f1f0, lpckParent=0x22f190, flags=0x10) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/extrachunk.c:197] in avifil32 (0x0000000000000001) 4 0x00002b088c356037 IPersistFile_fnLoad+0xee6(iface=<is not available>, pszFileName=<is not available>, dwMode=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/avifile.c:1871] in avifil32 (0x000000000003bfe0) 5 0x00002b088c34a597 AVIFileOpenW+0x156(ppfile=0x22f6c8, szFile="C:\users\julliard\Temp\wine_avifil32_test.avi", uMode=0x20, lpHandler=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../include/objidl.h:5274] in avifil32 (0x000000000022f6c8) 6 0x00002b088c34a942 AVIFileOpenA+0x131(ppfile=0x22f6c8, szFile="C:\users\julliard\Temp\wine_avifil32_test.avi", uMode=0x20, lpHandler=(nil)) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/api.c:218] in avifil32 (0x0000000000000000) 7 0x00002b088c12ea01 test_default_data+0xd0() [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/dlls/avifil32/tests/api.c:374] in avifil32_test (0x0000000000000000) 8 0x00002b088c12fd2e func_api+0x29d() [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/dlls/avifil32/tests/api.c:552] in avifil32_test (0x0000000000000000) 9 0x00002b088c130055 run_test+0x114(name=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/include/wine/test.h:557] in avifil32_test (0x00002b088c3320e0) 10 0x00002b088c12d101 main+0x110(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/include/wine/test.h:627] in avifil32_test (0x00002b088ad94d90) 11 0x00002b088c130ae2 __wine_spec_exe_entry+0xa1(peb=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/winecrt0/../../../wine/dlls/winecrt0/exe_entry.c:36] in avifil32_test (0x00002b088a7c78f0) 12 0x000000007b874171 start_process+0xb0(peb=0x7fffffbef000) [/home/julliard/wine/build/obj-elf64/dlls/kernel32/../../../wine/dlls/kernel32/process.c:1052] in kernel32 (0x00002b088c130a40) 13 0x00002b088b02d9ae call_thread_func+0x6d(entry=0x7b8740c0, arg=0x7fffffbef000, frame=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/signal_x86_64.c:3230] in ntdll (0x00007fff7d40bed0) 14 0x00002b088b02709a call_thread_entry_point+0x29() in ntdll (0x00007fff7d40bed0) 15 0x00002b088aff8a66 start_process+0x15(kernel_start=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/loader.c:2653] in ntdll (0x00007fff7d40bed0) 16 0x00002b088a4a1283 wine_call_on_stack+0x12() in libwine.so.1 (0x00007fff7d40bed0) 17 0x00002b088a4a12d9 wine_switch_to_stack+0x8(func=<is not available>, arg=<is not available>, stack=<is not available>) [/home/julliard/wine/build/obj-elf64/libs/wine/../../../wine/libs/wine/port.c:59] in libwine.so.1 (0x00007fffffbef000) 18 0x00002b088affe510 LdrInitializeThunk+0x45f(kernel_start=0x7b8740c0, unknown2=<is not available>, unknown3=<is not available>, unknown4=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/loader.c:2709] in ntdll (0x00007fffffbef000) 19 0x000000007b87a5fd __wine_kernel_init+0x90c() [/home/julliard/wine/build/obj-elf64/dlls/kernel32/../../../wine/dlls/kernel32/process.c:1255] in kernel32 (0x00002b088b28f980) 20 0x00002b088affed84 __wine_process_init+0x143() [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/loader.c:2918] in ntdll (0x00007fff7d40d180) 21 0x00002b088a49f488 wine_init+0x297(argc=0x3, argv=0x7fff7d40d678, error="", error_size=0x400) [/home/julliard/wine/build/obj-elf64/libs/wine/../../../wine/libs/wine/loader.c:831] in libwine.so.1 (0x00007fff7d40d180) 22 0x000000007bf00da2 main+0x71(argc=0x3, argv=0x7fff7d40d678) [/home/julliard/wine/build/obj-elf64/loader/../../wine/loader/main.c:237] in <wine-loader> (0x00007fff7d40d678) 23 0x00002b088aa31ead __libc_start_main+0xfc(main=<is not available>, argc=<is not available>, ubp_av=<is not available>, init=<is not available>, fini=<is not available>, rtld_fini=<is not available>, stack_end=0x7fff7d40d668) [/home/aurel32/eglibc-sid/eglibc-2.13/csu/libc-start.c:228] in libc.so.6 (0x0000000000000000) 24 0x000000007bf00e9d _start+0x28() in <wine-loader> (0x0000000000000000) 0x00002b088aa9b1cb: repe movsq (%rsi),%es:(%rdi) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/4] [cmd] Add support for NUL in copy
by Marvin Nov. 19, 2012

Nov. 19, 2012

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=23016 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x53 position 0 in line 419 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 420 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on b.b [8]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 421 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 422 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on b.b [8]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 423 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 424 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on subdir\a.a [8]') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 866 (got 'h=%h i=a j=b k=c l=e m= o=%o', wanted 'h=%h i=a j=b k=c l=e m=%m o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 868 (got 'h=%h i=a j=b k=c l=d e f g m= n=%n o=%o', wanted 'h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 869 (got 'h=%h i=a j=c k= l= m= n=%n o=%o', wanted 'h=%h i=a j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 870 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 871 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o')

1 0