February 2015 - 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

Speed of gdi vs opengl DirectDrawRenderer
by Jonas Maebe Oct. 11, 2015

Oct. 11, 2015

Hi, I had a problem with Majesty Gold HD running at glacial speed on my machine (quad Core i5 2.9GHz, NVidia GeForce GT 750M 1GB, OS X 10.9.5). I'm using wine 1.7.35, but I've had similar problems with older wine versions. It's a DirectDraw7 game that has been partially remastered to run on modern systems, but still uses DirectDraw7. This is a common problem on Windows too, but generally can be resolved by telling the game to use the DirectDraw blitter (instead of blitting itself). That didn't help on Wine though. I profiled wine (Instruments time profile) and noticed that most time was spent in wined3d's convert_r5g6b5_x8r8g8b8. Replacing that routine with an optimized sse2 version from pixman did not make much of a difference. Then I discovered that if I told the game to render to a 16 bit instead of to a 32 bit surface, wine would let OpenGL handle the colour conversion. Unfortunately, while this significantly reduced wine's cpu usage, it by no means made the game any faster. Looking at the OpenGL Driver Monitor stats, it seems the cpu was simply waiting all the time on the GPU, probably while it was blitting all of those 1920x1080 images to the screen. Reducing the resolution to the lowest supported by the game (800x600) made it slightly faster, but not much. Next, I added the DirectDrawRenderer registry key and set it to gdi. Now, while it's still slow at 1920x1080, the game runs much faster at 800x600 and even still at 1024x768. Profiling the gdi renderer shows that it has way higher cpu usage than the OpenGL renderer (virtually all in convert_to_8888), but it seems that for some reason it has causes much less traffic to the GPU. The wiki's wording suggests the gdi renderer is deprecated though. Does that mean this qualifies as a bug in the OpenGL renderer (maybe it tries to update the screen more often than necessary, saturating the bus that way?), and are there any things I can try to narrow down why the gdi renderer is so much faster? I didn't immediately see where it blits things actually to the screen. Thanks, Jonas

4 10

[PATCH] Use asserts for mmap failure modes
by Michael Gilbert July 26, 2015

July 26, 2015

Hi, Using exit in shared libraries is a discouraged practice, and wine's mmap implementation currently does that. I attach a proposed change using asserts instead. Let me know if you have any feedback. Best wishes, Mike (btw I'm the debian wine maintainer)

2 2

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

Wine 64 bit
by Kevin Davies June 5, 2015

June 5, 2015

Hello, Where would you find information on wine64 status for running 64 bit windows software under OSX. These days a lot of Windows programs are going 64bit to make use of the available memory. Its becoming necessary to have this capability. Many thanks Kevin

13 31

Re: [PATCH] user32/tests: Test SetUserObjectInformation for invisible winstation.
by Alexandre Julliard April 23, 2015

April 23, 2015

Qian Hong <qhong(a)codeweavers.com> writes: > --- > dlls/user32/tests/winstation.c | 57 > ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) Can you please fix the test failures introduced by your previous changes first? cf. https://test.winehq.org/data/tests/user32:winstation.html -- Alexandre Julliard julliard(a)winehq.org

3 8

WineConf 2015
by Michael Stefaniuc April 17, 2015

April 17, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello guys, after we rethought WineConf and did it at/during FOSDEM for the last two years, it is time for a real WineConf again. We are missing too much our keynote, our governance discussions as well as our hackatons. Also the two full days should give more time for the most important topic aka the hallway discussions. After two years in Europe the old tradition would call for a session over in USA/Canada but this is not a strict requirement. Now the most important thing is to find volunteers that would want to host the WineConf. They have the bigger say in the date too, there are two options: - - either in late spring (preferred by me), - - or early fall (preferred by Jeremy) I have started also http://wiki.winehq.org/WineConf2015 please feel free to add agenda topics to it. bye michael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlTY5awACgkQ0ei8kcpE1VG2YQCguwUys0se+wV96lPfjZ+Qi6LJ 8ooAoJDxist2eZLgMXsRqUZVloGpBRgz =7Ta5 -----END PGP SIGNATURE-----

6 12

Compiling with GCC 5.0
by Michael Cronenworth March 19, 2015

March 19, 2015

Has anyone given GCC 5.0 a shot? It breaks x86_64 for me and other Fedora 22+ users (22 and up use 5.0). Running wine as pure 32-bit does not exhibit issues. We're using 1.7.36 with wine-staging applied. In 64-bit mode it will not create a valid wine-prefix so I cannot run winedbg and nothing eventful happens with gdb attached to wine. Any ideas on how to debug this further? Here is the terminal output when a fresh prefix is attempted to be made: http://fpaste.org/187377/25868142/ Regards, Michael

3 9

My Ideas for GSoC 2015
by Zhenbo Li March 12, 2015

March 12, 2015

Hello, everyone I'm Zhenbo Li, a college student who participated in GSoC 2014 for mshtml.dll. Here are some ideas for GSoC 2015. 1. IDropTargetHelper ================== This interface is to display images [1]. I'm sure that it is necessary for VPT[2], and I guess implementing this interface will contribute to programs like 7zip. Although IDropTargetHelper is a useful interface, I haven't found a proper demo(most demos depend on MFC). So I'm writing a simple demo for this interface[3], with no MFC or .NET code. 2. IXMLHttpRequest ================== XMLHttpRequest is used heavily in AJAX programming.[4] Wine has implemented most of it in msxml component, but it's a stub in mshtml. Most js code doesn't treat wine IE as IE6 or earlier, so they will not choost ActiveX[5] to work around it(like Firebug Lite[6]) 3. sessionStorage =============== IHTMLStorage[7] is used widely, including Firebug Lite[6]. A well-implemented IHTMLStorage interface should support both sessionStorage and localStorage. I tried to write a hack, but found that it may be necessary to adjust wine-gecko code to support that(Thank Jacek). Therefore, implementing sessionStorage can be the first step of implementing localStorage, and it can be an example for WebIDL binding for further development. These are my humble ideas for GSoC 2015, and I'm glad to choose one of them as my proposal, if they meet the criteria for GSoC. Also, it is my honor if my ideas make a positive effect on other GSoC students. Thank you for reading this mail. I'm looking forward to your feedback. [1]: https://msdn.microsoft.com/en-us/library/windows/desktop/bb762028%28v=vs.85… [2]: http://virtualplaytable.com/ [3]: https://gitcafe.com/endle/IDrop_Helper_Example [4]: https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest [5]: http://en.wikipedia.org/wiki/XMLHttpRequest#Support_in_Internet_Explorer_ve… [6]: https://getfirebug.com/firebuglite [7]: https://msdn.microsoft.com/en-us/library/cc288313%28v=vs.85%29.aspx

1 1

Re: msvcrt: Use Dragon4 algorithm to fix inconsistent rounding behaviour for sprintf and add tests. (try 2)
by Dmitry Timoshkov March 4, 2015

March 4, 2015

YongHao Hu <christopherwuy(a)gmail.com> wrote: > +typedef int int32_t; > +typedef unsigned char uint8_t; > +typedef unsigned long uint32_t; > +typedef unsigned long long uint64_t; Please use appropriate win32 types instead. Besides using 'typedef unsigned long uint32_t' is wrong. -- Dmitry.

2 1

Help with testing new Gecko downloader
by Jacek Caban March 4, 2015

March 4, 2015

Hi all, My today patch [1] together with changes in Wine code from yesterday changed the way we interact with SourceForge for downloading Gecko. It's a risky change that could use wider testing from different locations. If you'd like to help, you need to: - Remove wine_gecko-2.36*.msi if you already have it. If you used downloader to get it, it's most likely in ~/.cache/wine. If you downloaded it manually, you know where to find it. - Create new wineprefix The most important thing is to ensure that downloading and installing Gecko still works. The expected difference is shorter connection time and faster downloads (or better said, no slow downloads). I appreciate any feedback on this. Thanks, Jacek [1] http://source.winehq.org/patches/data/109462

2 2

advapi32 redefines SECURITY_INFORMATION
by Francois Gouget Feb. 28, 2015

Feb. 28, 2015

--- So svcctl.idl needs the SECURITY_INFORMATION definition and it's not available from any other idl file. This results in this type being defined twice when compiling dlls/advapi32/service.c: once in winnt.h and then again in dlls/advapi32/svcctl.h. We normally avoid this type of situation. An easy fix is to introduce the usual _XXX_DEFINED macro check but this seems to be a first in an idl file. Is there a better way? include/wine/svcctl.idl | 3 +++ include/winnt.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index e8463b5..1c3d22f 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -65,7 +65,10 @@ interface svcctl typedef [context_handle] void *SC_RPC_LOCK; typedef [context_handle] void *SC_NOTIFY_RPC_HANDLE; + cpp_quote("#ifndef _SECURITY_INFORMATION_DEFINED") + cpp_quote("#define _SECURITY_INFORMATION_DEFINED") typedef DWORD SECURITY_INFORMATION; + cpp_quote("#endif") /* undocumented access rights */ cpp_quote("#define SERVICE_SET_STATUS 0x8000") diff --git a/include/winnt.h b/include/winnt.h index 4b06b2c..0a4185d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3971,7 +3971,10 @@ static const WCHAR SE_CREATE_GLOBAL_NAME[] = { 'S','e','C','r','e','a','t','e',' #define SE_RM_CONTROL_VALID 0x00004000 #define SE_SELF_RELATIVE 0x00008000 +#ifndef _SECURITY_INFORMATION_DEFINED +#define _SECURITY_INFORMATION_DEFINED typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION; +#endif typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; /* The security descriptor structure */ -- 2.1.4

2 1

Re: [PATCH 1/2] d3d9/tests: Extend the FPU setup test.
by Henri Verbeet Feb. 27, 2015

Feb. 27, 2015

Not that I would terribly mind if this got comitted, but I have to wonder if this really has a lot of value as a regression test?

3 3

Re: [PATCH] [shell32] Implement SHRunControlPanel using ShellExecute
by Nikolay Sivov Feb. 27, 2015

Feb. 27, 2015

On 26.02.2015 17:01, Robert Naumann wrote: > --- > dlls/shell32/shellord.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c > index 914dc5a..9ea3d62 100644 > --- a/dlls/shell32/shellord.c > +++ b/dlls/shell32/shellord.c > @@ -1129,8 +1129,10 @@ HRESULT WINAPI SHWinHelp (DWORD v, DWORD w, DWORD x, DWORD z) > */ > BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent) > { > - FIXME("(%s, %p): stub\n", debugstr_w(commandLine), parent); > - return FALSE; > + if((int)ShellExecute(parent,NULL,commandLine,NULL,NULL,SW_NORMAL)>32) > + return TRUE; > + else > + return FALSE; > } Why 32? Also please don't remove tracing line.

2 2

Re: msvcrt: Use Dragon4 algorithm to fix inconsistent rounding behaviour for sprintf and add tests.
by Zhenbo Li Feb. 26, 2015

Feb. 26, 2015

Hi, YongHao, Quite a huge patch lol I tried your patch. $ patch -p1 <0012-msvcrt-Use-Dragon4-algorithm-to-fix-inconsistent-round.txt (Stripping trailing CRs from patch; use --binary to disable.) patching file dlls/msvcrt/dragon4.h (Stripping trailing CRs from patch; use --binary to disable.) patching file dlls/msvcrt/printf.h (Stripping trailing CRs from patch; use --binary to disable.) patching file dlls/msvcrt/tests/printf.c (Stripping trailing CRs from patch; use --binary to disable.) patching file dlls/msvcrt/wine_printfloat.h Is this critical? Also, your patch failed to compile on my computer. dragon4.h:10:0: error: unterminated #ifndef #ifndef __WINE_STDIO_H Why is it necessary here? And then, wine_printfloat.h:26:15: error: unknown type name 'uint32_t' It seems that you're using C99 types? It is not allowed in wine code[1] Finally, you've created two files with ZLIB license. Is it better to move all the ZLIB license code to one file? I'm not sure about that. Could someone have a check to avoid legal problems? [1]: wiki.winehq.org/Developers-Hints 2015-02-26 23:13 GMT+08:00 YongHao Hu <christopherwuy(a)gmail.com>: > Fix bug https://bugs.winehq.org/show_bug.cgi?id=37913 . > The Dragon4 algorithm implementation is based on > http://www.ryanjuckett.com/programming/printing-floating-point-numbers/. > > --- > dlls/msvcrt/dragon4.h | 670 > ++++++++++++++++++++++++++++++++++++++++++ > dlls/msvcrt/printf.h | 43 +-- > dlls/msvcrt/tests/printf.c | 83 +++++- > dlls/msvcrt/wine_printfloat.h | 248 ++++++++++++++++ > 4 files changed, 1026 insertions(+), 18 deletions(-) > create mode 100644 dlls/msvcrt/dragon4.h > create mode 100644 dlls/msvcrt/wine_printfloat.h > > > > > -- Have a nice day! Zhenbo Li

2 1

Re: [PATCH 1/1] handling sysex midi messages in winecoreaudio
by Andrew Eikum Feb. 26, 2015

Feb. 26, 2015

On Wed, Feb 25, 2015 at 09:58:41PM +0100, tinez wrote: > Hi, > > this patch fixes handling sysex midi messages in winecoreaudio > driver. The code was based on winealsa driver implementation. > I've tested it using external midi hardware + midi monitoring tools > (MidiOX). My motivation was to fix Nord Modular Editor software > which is needed to control Nord Modular G1 hardware synthetizer. > After applying the patch it works without problems. > I've also sent out patch to electro-music.com for other people to > test and it was received well (you can see the thread here > electro-music.com/forum/viewtopic.php?t=62683) > Thanks, looks mostly good. A few Wine style notes in-line below. > regards, tinez > > --- > dlls/winecoreaudio.drv/midi.c | 66 > ++++++++++++++++++++++++++++++------------- > 1 file changed, 47 insertions(+), 19 deletions(-) > From e18b1c9876730d9557b97f3e16249b20eae4e875 Mon Sep 17 00:00:00 2001 > From: tinez <tinez(a)tlen.pl> Wine requires full, real names for patches. > Date: Thu, 21 Aug 2014 23:13:31 +0200 > Subject: [PATCH 1/1] handling sysex midi messages in winecoreaudio > > --- > dlls/winecoreaudio.drv/midi.c | 66 ++++++++++++++++++++++++++++++------------- > 1 file changed, 47 insertions(+), 19 deletions(-) > > diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c > index 8593e9c..c7a1ded 100644 > --- a/dlls/winecoreaudio.drv/midi.c > +++ b/dlls/winecoreaudio.drv/midi.c > @@ -437,9 +437,9 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) > return MMSYSERR_ERROR; > } > } > - else > + else if (destinations[wDevID].caps.wTechnology == MOD_MIDIPORT) > { > - FIXME("MOD_MIDIPORT\n"); > + MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, lpData, lpMidiHdr->dwBufferLength); > } > > lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; > @@ -836,26 +836,55 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD > if (src->state < 1) > { > TRACE("input not started, thrown away\n"); > - goto done; > - } > - /* FIXME skipping SysEx */ > - if (msg->data[0] == 0xF0) > - { > - FIXME("Starting System Exclusive\n"); > - src->state |= 2; > + return NULL; > } > - if (src->state & 2) > - { > - for (i = 0; i < msg->length; ++i) > - { > - if (msg->data[i] == 0xF7) > - { > - FIXME("Ending System Exclusive\n"); > - src->state &= ~2; > + > + bool sysexStart = (msg->data[0] == 0xF0); > + Wine uses C89, so we don't have 'bool'. You could change this to a BOOL instead. > + if (sysexStart || src->state & 2) { > + if (sysexStart) { > + TRACE("Receiving sysex message\n"); > + src->state |= 2; > + } > + > + int pos = 0; > + int len = msg->length; > + C89 also doesn't let you declare new variables in the middle of a block. They must be declared at the start of a block. > + EnterCriticalSection(&midiInLock); > + currentTime = GetTickCount() - src->startTime; > + > + while (len) { > + LPMIDIHDR lpMidiHdr = src->lpQueueHdr; > + > + if (lpMidiHdr != NULL) { > + int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); > + memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, msg->data + pos, copylen); > + lpMidiHdr->dwBytesRecorded += copylen; > + len -= copylen; > + pos += copylen; > + > + TRACE("Copied %d bytes of sysex message\n", copylen); > + > + if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || > + (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { > + TRACE("Sysex message complete (or buffer limit reached), dispatching %d bytes\n", lpMidiHdr->dwBytesRecorded); Tabs should be spaces, for consistency with the rest of your code. > + src->lpQueueHdr = lpMidiHdr->lpNext; > + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; > + lpMidiHdr->dwFlags |= MHDR_DONE; > + MIDI_NotifyClient(msg->devID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, currentTime); > + src->state &= ~2; > + } > + } > + else { Here, too. > + FIXME("Sysex data received but no buffer to store it!\n"); > + break; > } > } > - goto done; > + > + LeaveCriticalSection(&midiInLock); > + return NULL; > } > + > EnterCriticalSection(&midiInLock); > currentTime = GetTickCount() - src->startTime; > > @@ -889,7 +918,6 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD > CFRunLoopStop(CFRunLoopGetCurrent()); > break; > } > -done: > return NULL; > } > > -- > 1.9.3 (Apple Git-50)

2 2

Re: [PATCH try2] urlmon: Added IInternetBindInfo implementation to BindStatusCallback object.
by Marvin Feb. 26, 2015

Feb. 26, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11751 Your paranoid android. === w7u (32 bit url) === url.c:3632: Test failed: expected OnProgress_DOWNLOADINGDATA === wvistau64 (64 bit url) === url.c:3632: Test failed: expected OnProgress_DOWNLOADINGDATA

2 1

Re: [PATCH 3/5] wined3d: Remove ARB_/EXT_TEXTURE_ENV_ADD.
by Henri Verbeet Feb. 26, 2015

Feb. 26, 2015

On 24 February 2015 at 13:38, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Unused. > --- But they should be used by ffp_fragment_get_caps(), since set_tex_op() uses that functionality.

3 3

Re: [3/3] dpnet: Convert Address components to use a list
by Stefan Dösinger Feb. 26, 2015

Feb. 26, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Alistair, Alexandre made me aware that I missed a blaring issue here: Am 2015-02-26 um 04:32 schrieb Alistair Leslie-Hughes: > + temp = heap_realloc(This->components, sizeof(struct > component *) * This->comp_count+1 ); X * This->comp_count+1 won't do what you want it to do. Also he wants the array to be grown by doubling it. If the expected component count is low as you say, allocate the expected count at object creation (e.g. 4), and then double the array in case you need to grow it. Also, in terms of style, you can write sizeof(*This->components) instead of sizeof(struct component *). That way you won't have to change the code if you change the type of This->components. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU7tiXAAoJEN0/YqbEcdMw6NwP/iWzcMCi48YkZ5iu52GrQDTo 86BL0M0VjFy72VDJq58pXvrK+7skm7JlI+jj/hdF0dtXg7ga6OCHqMwdyKdpUisB P93rCUVNOWvtqWltjct3UjdFM0PUD+IU9s5r3nX6sYMxwU++Kt31q5Cxq5APwxUO XplBpKeoRKtx44xgX0o84/hv6MijePDbocn+sQ3gBSyG4UdC4lt9F1Ze57r87DoW F0LkapFizu+45sRVWm6d6ANL4VL+pq3vVmjlIFRUPerVlIRRGEXnE3/5RqBegOUw MWFqRzj7LicQsy2tyan01o+OoUqGQL6ynesKj+I2LMf76i5JlSPGxoYMYlsk3vE+ JXn74dqP9iX6+Rhk7mv6q4iOQNOYsH5BraRWWLCT3vzr5DZESk+pjqn3ECKPkkZQ S88g9ismdDLkQ5pSNT/tbxeV2oRQSa4cTPp8aSNa5ttZtvwJhoHZjUGtdxAU7Go2 DcJuSbmTXFQo50Iaaw8Qlb+ZPbUVE0rjcALkKH74Bhq5vSbRkA1eu69A2TQOB9S3 x1sVVT78YhhWkl6qjESrhP0NFApNiCunUIK2U110aagOHGUyFaRix5DNN3lCO0ZT n9bvdXbZGCgg5RhxgIaqvTuGBhVZh882tpWecazipmYePUmO+4GzGwWGfxfyPymO qzUzMMRIGsukENMDUaus =3JhD -----END PGP SIGNATURE-----

1 0

Re: [1/3] dpnet: Add check for mismatched string lengths
by Stefan Dösinger Feb. 26, 2015

Feb. 26, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I'm sorry, I missed one problem in my earlier reviews of this change: Am 2015-02-26 um 04:31 schrieb Alistair Leslie-Hughes: > case DPNA_DATATYPE_STRING: > + if (((strlenW((WCHAR*)lpvData)+1)*sizeof(WCHAR)) != dwDataSize) > + return DPNERR_INVALIDPARAM; > heap_free(entry->data.string); At the time when you do the check and the error return you have already allocated a new entry and added it to the list. Thus if the check fails you'll leave a zombie component attached to the address object. This also applies to the already existing DWORD size check. You can move the check in front of the loop that searches if such a component name already exists. I also recommend to to write extra tests for these cases: What happens if a new component with an invalid data size is added? Does GetComponentByName return something? What happens if a component already exists and you try to re-add it with an invalid data? Does the old data stay intact? The other two patches look good to me and seem to apply without this one. I'll inform Alexandre on IRC. The subject of patch 3 is broken though, maybe Alexandre can correct it. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU7tO3AAoJEN0/YqbEcdMw6z8P/AoWZwr4ysFdMvMBdqlZTVTH bUFYX62n8gj/IADpL1TIq8NN87Q2H2gv+V9p+6IOcvymMkDOVa/jfK+tBtZVLjmy MoLDx/+hJ2Ef8LteV2qiFO4y50btO32ibPrxY6C/jdJ5gj8dHrsjOQQSUiiAHAfQ N4Hl1j9BVblH7elBEa/Anuk+1aArnXncYU3q2wI50HRfgVShDo+3LO8jA4XzQyQM U3Gk0n5YeRapnPH0WAq9FH8o45dUFg3vtkx8M0wpzIHNGsZn91/RlIHOh7m5O9Xx S6mGU9xkhIDoWsRP+I0dIROa/QDVM7aTw8z8jpPVVwc7gS/z7k95BT/skSXw/ryH s4zOZvoS+P4vtJGgQrwnZDpEywJu7p6hdvWcUBEM85ZWvqh2Ui4em9WrW0nsmFeL VC9WcEFG4N8vzAGRK6yF2luyKrygj8KZGukZ2HCJGrjK0pAnln+BSs2V2M4cZMd6 uJus8bKJMcM2oGoB5UbpHMKRlIgSXrO0nwibUYJ02Kp3dpTUG0oHSXer+HFzImvA 2VLinduPKpA0g9XSXtCdUaXZghpQf6K4e7lwDyoikgFZs5x5G6qNYQIx2MtrJwJ2 oQ0YILD8thFi1QQrH7DLqQAGA0kAarDs0wClct5kQ3uiiT3t9a3Rklql/EYPdz3m VvgO1NqMg7yqPq0KMGKl =5ibs -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/3] services: Monitor process handles for process quit
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Andrew Eikum <aeikum(a)codeweavers.com> writes: > @@ -1636,13 +1638,30 @@ DWORD events_loop(void) > > do > { > - err = WaitForMultipleObjects(2, wait_handles, FALSE, timeout); > + num_handles = 2; > + > + /* monitor tracked process handles for process end */ > + EnterCriticalSection(&timeout_queue_cs); > + LIST_FOR_EACH_ENTRY(iter, &timeout_queue, struct timeout_queue_elem, entry) > + { > + if(num_handles == max_handles) > + { > + max_handles++; > + wait_handles = HeapReAlloc(GetProcessHeap(), 0, wait_handles, sizeof(HANDLE) * max_handles); > + } You don't need heap allocation, you can't wait for more than MAXIMUM_WAIT_OBJECTS anyway. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32: SysDateTimePick32 control add Alt+down hot key likewindows (try 2)
by Nikolay Sivov Feb. 25, 2015

Feb. 25, 2015

On 25.02.2015 10:56, Changhui Liu wrote: > Superseded patch 109085 > http://source.winehq.org/patches/data/109085 > > Change log: > 1, Pass test on all Windows. > > 2, Add DTN_DROPDOWN and DTN_CLOSEUPnotification test. > > 3, > >>>/ + case WM_SYSKEYDOWN: > />>/ + if (wParam == VK_DOWN) > />>/ + { > />>/ + POINT pt; > />>/ + RECT rect; > />>/ + GetClientRect(hwnd, &rect); > />>/ + pt.x = rect.right - GetSystemMetrics(SM_CXVSCROLL)/2; > />>/ + pt.y = rect.top + GetSystemMetrics(SM_CYHSCROLL)/2; > />>/ + > />>/ + return DATETIME_LButtonDown (infoPtr, (SHORT)pt.x, (SHORT)pt.y); > />>/ + } > />>/ + > />> >>>If it really works this way you should just make it drop directly, >>without faking click point coordinates. > > Because most of code of the directly implement are same as DATETIME_LButtonDown, > and too many repeat code looks bad. > So faking click point coordinates can reuse code. > I'm not saying you should duplicate it, but reuse it in a clean way without hit testing - move relevant code somewhere and use it. > + if (WM_NOTIFY == message) > + { > + NMHDR* hdr = (NMHDR*)lParam; > + > + if (hdr->code == DTN_DROPDOWN) > + { > + g_hWndMonthCal = (HWND)SendMessageA(hdr->hwndFrom, DTM_GETMONTHCAL, 0, 0); > + trace("open SysMonthCal32=%p\n", g_hWndMonthCal ); > + } > + else if (hdr->code == DTN_CLOSEUP) > + { > + trace("close SysMonthCal32=%p\n", g_hWndMonthCal); > + } > + } That's not a notification test as you don't check anything. Please add a proper message sequence test, we have tons of examples for those.

2 1

Re: urlmon: Added IInternetBindInfo implementation to BindStatusCallback object.
by Marvin Feb. 25, 2015

Feb. 25, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11740 Your paranoid android. === w2000pro (32 bit url) === url.c:2683: Test failed: Could not get IInternetBindInfo interface: 80004002 url: unhandled exception c0000005 at 0044A249

1 0

Re: (try 6)[1/5] imm32: Move thread data from TLSEntry to an internal list
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -1512,11 +1589,15 @@ BOOL WINAPI ImmGetConversionStatus( > */ > HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) > { > - if (IMM_GetThreadData()->hwndDefault == NULL) > - IMM_GetThreadData()->hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, > + HWND ret; > + IMMThreadData* thread_data = IMM_GetThreadData(0); > + if (thread_data->hwndDefault == NULL) > + thread_data->hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, > szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); > - TRACE("Default is %p\n",IMM_GetThreadData()->hwndDefault); > - return IMM_GetThreadData()->hwndDefault; > + ret = thread_data->hwndDefault; > + LeaveCriticalSection(&threaddata_cs); > + TRACE("Default is %p\n",ret); > + return ret; You can't create a window while holding the critical section, this will cause deadlocks. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: mshtml: Correctly handle S_OK with NULL URL return from TranslateUrl.
by Marvin Feb. 25, 2015

Feb. 25, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11724 Your paranoid android. === wvistau64 (32 bit htmldoc) === The test timed out

2 1

Re: comctl32: SysDateTimePick32 control add Alt+down hot key likewindows (try 2)
by Marvin Feb. 25, 2015

Feb. 25, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11722 Your paranoid android. === wvistau64 (32 bit datetime) === The test timed out

1 0

Re: [PATCH 3/3] scrrun: Implement HashVal for floating point keys (try2)
by Marvin Feb. 24, 2015

Feb. 24, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11712 Your paranoid android. === wvistau64 (64 bit dictionary) === dictionary.c:349: Test failed: got hash 0x000001f4 dictionary.c:374: Test failed: got hash 0x000001f4 === w2008s64 (64 bit dictionary) === dictionary.c:349: Test failed: got hash 0x000001f4 dictionary.c:374: Test failed: got hash 0x000001f4

1 0

Re: [PATCH 3/3] scrrun: Implement HashVal for floating point keys
by Marvin Feb. 24, 2015

Feb. 24, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11703 Your paranoid android. === w2000pro (32 bit dictionary) === dictionary.c:240: Test failed: 0: text mode: got hash 0x00000415, expected 0x00000000 dictionary.c:254: Test failed: 0: db mode: got hash 0x00000415, expected 0x00000000 dictionary.c:240: Test failed: 1: text mode: got hash 0x000003e8, expected 0x00000000 dictionary.c:254: Test failed: 1: db mode: got hash 0x000003e8, expected 0x00000000 dictionary.c:240: Test failed: 2: text mode: got hash 0x0000028a, expected 0x00000000 dictionary.c:254: Test failed: 2: db mode: got hash 0x0000028a, expected 0x00000000 dictionary.c:240: Test failed: 3: text mode: got hash 0x00000061, expected 0x00000000 dictionary.c:254: Test failed: 3: db mode: got hash 0x00000061, expected 0x00000000 dictionary.c:240: Test failed: 4: text mode: got hash 0x00000061, expected 0x00000000 dictionary.c:254: Test failed: 4: db mode: got hash 0x00000061, expected 0x00000000 dictionary.c:263: Test failed: got 0x00000000 dictionary.c:271: Test failed: got 0x00000000 dictionary.c:279: Test failed: got 0x00000000 dictionary.c:281: Test failed: got hash 0x000000a1 dictionary.c:287: Test failed: got 0x00000000 dictionary.c:295: Test failed: got 0x00000000 dictionary.c:303: Test failed: got 0x00000000 dictionary.c:347: Test failed: got 0x00000000 dictionary.c:349: Test failed: got hash 0x00000000 dictionary.c:372: Test failed: got 0x00000000 dictionary.c:374: Test failed: got hash 0x00000000 === w2003std (32 bit dictionary) === dictionary.c:263: Test failed: got 0x00000000 dictionary.c:271: Test failed: got 0x00000000 dictionary.c:279: Test failed: got 0x00000000 dictionary.c:281: Test failed: got hash 0x000000a1 dictionary.c:287: Test failed: got 0x00000000 dictionary.c:295: Test failed: got 0x00000000 dictionary.c:303: Test failed: got 0x00000000 dictionary.c:347: Test failed: got 0x00000000 dictionary.c:372: Test failed: got 0x00000000 === wvistau64 (64 bit dictionary) === dictionary.c:347: Test failed: got 0x00000000 dictionary.c:349: Test failed: got hash 0x000001f4 dictionary.c:372: Test failed: got 0x00000000 dictionary.c:374: Test failed: got hash 0x000001f4 === w2008s64 (64 bit dictionary) === dictionary.c:347: Test failed: got 0x00000000 dictionary.c:349: Test failed: got hash 0x000001f4 dictionary.c:372: Test failed: got 0x00000000 dictionary.c:374: Test failed: got hash 0x000001f4

1 0

Re: [PATCH 2/3] scrrun: Implement HashVal property for integer keys
by Marvin Feb. 24, 2015

Feb. 24, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11702 Your paranoid android. === w2000pro (32 bit dictionary) === dictionary.c:211: Test failed: 0: text mode: got hash 0x00000415, expected 0x00000000 dictionary.c:225: Test failed: 0: db mode: got hash 0x00000415, expected 0x00000000 dictionary.c:211: Test failed: 1: text mode: got hash 0x000003e8, expected 0x00000000 dictionary.c:225: Test failed: 1: db mode: got hash 0x000003e8, expected 0x00000000 dictionary.c:211: Test failed: 2: text mode: got hash 0x0000028a, expected 0x00000000 dictionary.c:225: Test failed: 2: db mode: got hash 0x0000028a, expected 0x00000000 dictionary.c:211: Test failed: 3: text mode: got hash 0x00000061, expected 0x00000000 dictionary.c:225: Test failed: 3: db mode: got hash 0x00000061, expected 0x00000000 dictionary.c:211: Test failed: 4: text mode: got hash 0x00000061, expected 0x00000000 dictionary.c:225: Test failed: 4: db mode: got hash 0x00000061, expected 0x00000000 dictionary.c:234: Test failed: got 0x00000000 dictionary.c:242: Test failed: got 0x00000000 dictionary.c:250: Test failed: got 0x00000000 dictionary.c:252: Test failed: got hash 0x000000a1 dictionary.c:258: Test failed: got 0x00000000 dictionary.c:266: Test failed: got 0x00000000 dictionary.c:274: Test failed: got 0x00000000 === w2003std (32 bit dictionary) === dictionary.c:234: Test failed: got 0x00000000 dictionary.c:242: Test failed: got 0x00000000 dictionary.c:250: Test failed: got 0x00000000 dictionary.c:252: Test failed: got hash 0x000000a1 dictionary.c:258: Test failed: got 0x00000000 dictionary.c:266: Test failed: got 0x00000000 dictionary.c:274: Test failed: got 0x00000000

1 0

Re: [PATCH 1/3] scrrun: Implement HashVal property for VT_BSTR case
by Marvin Feb. 24, 2015

Feb. 24, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11701 Your paranoid android. === w2000pro (32 bit dictionary) === dictionary.c:201: Test failed: 0: text mode: got hash 0x00000415, expected 0x00000000 dictionary.c:215: Test failed: 0: db mode: got hash 0x00000415, expected 0x00000000 dictionary.c:201: Test failed: 1: text mode: got hash 0x000003e8, expected 0x00000000 dictionary.c:215: Test failed: 1: db mode: got hash 0x000003e8, expected 0x00000000 dictionary.c:201: Test failed: 2: text mode: got hash 0x0000028a, expected 0x00000000 dictionary.c:215: Test failed: 2: db mode: got hash 0x0000028a, expected 0x00000000 dictionary.c:201: Test failed: 3: text mode: got hash 0x00000061, expected 0x00000000 dictionary.c:215: Test failed: 3: db mode: got hash 0x00000061, expected 0x00000000 dictionary.c:201: Test failed: 4: text mode: got hash 0x00000061, expected 0x00000000 dictionary.c:215: Test failed: 4: db mode: got hash 0x00000061, expected 0x00000000

1 0

Re: [2/3] winmm: Add .wav extension when searching for PlaySound.
by Marvin Feb. 24, 2015

Feb. 24, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11694 Your paranoid android. === w2000pro (32 bit wave) === wave.c:1679: Test failed: PlaySound succeeded, got 1 === wxppro (32 bit wave) === wave.c:1679: Test failed: PlaySound succeeded, got 1 === w2003std (32 bit wave) === wave.c:1679: Test failed: PlaySound succeeded, got 1 === wvistau64 (32 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0 === w2008s64 (32 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0 === wvistau64 (64 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0 === w2008s64 (64 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0

1 0

Re: [3/5] comctl32: Implement TaskDialogIndirect as a custom dialog box (try 2)
by Nikolay Sivov Feb. 24, 2015

Feb. 24, 2015

On 23.02.2015 15:42, Joachim Priesner wrote: > + if (IS_INTRESOURCE(text)) > + { > + SetLastError(S_OK); > + LoadStringW(instance, LOWORD(text), (LPWSTR)result, 0); > + return HRESULT_FROM_WIN32(GetLastError()); > + } You don't need SetLastError(), especially not with HRESULT value. And GetLastError() should only be used when LoadStringW() fails. The rest looks good enough to me.

3 8

Re: [1/3] winmm/tests: Add tests for PlaySound().
by Marvin Feb. 24, 2015

Feb. 24, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11693 Your paranoid android. === w2000pro (32 bit wave) === wave.c:1679: Test failed: PlaySound succeeded, got 1 === wxppro (32 bit wave) === wave.c:1679: Test failed: PlaySound succeeded, got 1 === w2003std (32 bit wave) === wave.c:1679: Test failed: PlaySound succeeded, got 1 === wvistau64 (32 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0 === w2008s64 (32 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0 === wvistau64 (64 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0 === w2008s64 (64 bit wave) === wave.c:1662: Test failed: PlaySound failed, got 0 wave.c:1666: Test failed: PlaySound failed, got 0 wave.c:1674: Test failed: PlaySound failed, got 0

1 0

Re: [PATCH] uxtheme: support images in GetThemeBackgroundRegion
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Mark Harmstone <hellas(a)burntcomma.com> writes: > + dc = CreateCompatibleDC(NULL); > + if (!dc) { > + WARN("CreateCompatibleDC failed\n"); > + DeleteObject(hrgn); > + return E_FAIL; > + } > + > + bmp = CreateBitmap(rect->right - rect->left, rect->bottom - rect->top, 1, 32, NULL); You need a DIB for this, not a device bitmap. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] ntdll/tests: Add tests for TpSimpleTryPost function.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Sebastian Lackner <sebastian(a)fds-team.de> writes: > + /* post the callback using new threadpool */ > + userdata = 0; > + memset(&environment, 0, sizeof(environment)); > + environment.Version = 1; > + environment.Pool = pool; > + status = pTpSimpleTryPost(simple_cb, &userdata, &environment); > + ok(!status, "TpSimpleTryPost failed with status %x\n", status); > + while (userdata == 0) Sleep(10); > + ok(userdata == 1, "expected userdata = 1, got %u\n", userdata); Please try to use synchronization objects instead of sleeps. > + /* make sure worker threads have terminated */ > + Sleep(100); Same here. Why do you need that? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/5] comctl32: Add and fix tests for invalid TaskDialogIndirect arguments (try 2)
by Nikolay Sivov Feb. 24, 2015

Feb. 24, 2015

On 23.02.2015 15:41, Joachim Priesner wrote: > > START_TEST(taskdialog) > @@ -49,6 +79,20 @@ START_TEST(taskdialog) > if (!load_v6_module(&ctx_cookie, &hCtx)) > return; > > + hComctl32 = LoadLibraryA("comctl32.dll"); > + if (!hComctl32) > + { > + skip("Failed to load comctl32.dll. Skipping the test\n"); > + return; > + } It's unlikely if will fail to load, also load_v6_module() already calls LoadLibraryA(), so you probably need GetModuleHandle().

1 0

Re: makedep: Sanitize the module names before turning them into resource ids.
by Alexandre Julliard Feb. 23, 2015

Feb. 23, 2015

Francois Gouget <fgouget(a)free.fr> writes: > Resource ids cannot contain dashes so replace them with underscores. > This makes it possible to build tests for dlls containing dashes into their names like the api-* ones. There's no reason that resource ids can't contain dashes, and besides, winetest won't know what to do with it if you change the name. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: dwrite/tests: Place test font file in a temporary location, make sure it's deleted at the end
by Marvin Feb. 23, 2015

Feb. 23, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11677 Your paranoid android. === wvistau64 (32 bit font) === font.c:99: Test failed: failed to delete file L"wine_test_font.ttf", error 2 === w2008s64 (32 bit font) === font.c:99: Test failed: failed to delete file L"wine_test_font.ttf", error 2 === wvistau64 (64 bit font) === font.c:99: Test failed: failed to delete file L"wine_test_font.ttf", error 2 === w2008s64 (64 bit font) === font.c:99: Test failed: failed to delete file L"wine_test_font.ttf", error 2 === wvistau64 (32 bit analyzer) === analyzer.c:474: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_test_font.ttf", error 5 === w2008s64 (32 bit analyzer) === analyzer.c:474: Test failed: failed to delete file L"C:\\Users\\ADMINI~1\\AppData\\Local\\Temp\\wine_test_font.ttf", error 5 === wvistau64 (64 bit analyzer) === analyzer.c:474: Test failed: failed to delete file L"C:\\Users\\winetest\\AppData\\Local\\Temp\\wine_test_font.ttf", error 5 === w2008s64 (64 bit analyzer) === analyzer.c:474: Test failed: failed to delete file L"C:\\Users\\ADMINI~1\\AppData\\Local\\Temp\\wine_test_font.ttf", error 5

1 0

Abbreviation of "microsecond" in sane.ds
by Alex Henrie Feb. 23, 2015

Feb. 23, 2015

http://source.winehq.org/git/wine.git/blob/c72f9a0082c3cc07454fb93bca88e294… Is there a compelling reason why "microsecond" is abbreviated as "us" instead of "μs"? This library doesn't correspond to any Windows library, so we should be free to use the more correct abbreviation. Or can sane.rc only accept ASCII characters? -Alex

3 3

Re: mshtml/tests: Remove an always true conditional subexpression (PVS-Studio)
by Marvin Feb. 23, 2015

Feb. 23, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11654 Your paranoid android. === wvistau64 (32 bit events) === events.c:939: Test failed: unexpected call img_onerror === w7u (32 bit events) === events.c:939: Test failed: unexpected call img_onerror The test timed out

2 1

Re: fltmgr.sys: add stub dll (try 2)
by Alistair Leslie-Hughes Feb. 23, 2015

Feb. 23, 2015

On 11/02/15 08:15, Austin English wrote: > https://bugs.winehq.org/show_bug.cgi?id=23583 > > -- > -Austin > This file belongs in the "system32\drivers" directory. Best Regards Alistair Leslie-Hughes

2 1

Re: [2/2] version: Test for VerQueryValueA
by Stefan Dösinger Feb. 23, 2015

Feb. 23, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-18 um 22:41 schrieb Mark Jansen: > + char preparedbuffer[] = { > + 0x04, 0x01, 0x34, 0x00, 0x00, 0x00, 0x56, 0x00, 0x53, 0x00, 0x5f, 0x00, 0x56, 0x00, 0x45, 0x00, > + 0x52, 0x00, 0x53, 0x00, 0x49, 0x00, 0x4f, 0x00, 0x4e, 0x00, 0x5f, 0x00, 0x49, 0x00, 0x4e, 0x00, > + 0x46, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x04, 0xef, 0xfe, 0x00, 0x00, 0x01, 0x00, > + 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, > ... Is it possible to put the test data into dlls/version/test/version.rc in plain text instead of using an unreadable blob? If not, please add a comment to explain what is in the blob. > + ret = VerQueryValueA(preparedbuffer, "StringFileInfo", (LPVOID*)&p, &len); > + ok(ret, "VerQueryValue error %u\n", GetLastError()); > + ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); > + ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); Does p point to a 0 byte now? (i.e., ok(!*p, "Expected a terminated string\n"); or something like this.) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU6ukyAAoJEN0/YqbEcdMwivkQAIz6mLYCOP2607ACoDIuX58M 5oaF83RA4wjqTAtOQYbIGFqTtM0kT5rANLgh5cMkgNETSttl8ZgJlyECUmz8ArHA VQv0kr0VsgdurFmhoxA37Cw9kou4b2hgsyimfr0dvjahJAroZJgIzXSbtUVgMVQ3 SUoluqPMSuXod/xW78lVwLI5HLm79/cJdizo+PiWLmLrlNiga6k295eKAfd5Tcco qHo+bCf56s0FRlaD4eZ+5AWl5nDP0eP7aGpddBtk4a0Y5E/3npD+9KE2L/hIlTdy kbSSW+NUfWAIUKzVFgVr9m/ejGjTMCb6ieHfuK/7S9oU6jCJyM/mwg++vsgdUJbI ts03c3UXV/JXGuDSEkxqMNLdhVM0Jv9RLCz4GlwdH7LlSiO9UOGjUpMF2steuULm FwirfHXCV1FyZBWIZyHfUw9wykoY4613S49Iq3EGZKKPQmzSi0p+Aygm2Mz6+LhM ApI/rVpGs7rqTxYZWZEgcaadpCGlwczOrgbQYEEoxdaYMm8GbEWRyDXjsHiC9NF4 RbWV+n69+wzC7bOIYqHQSkXEWNEuFlLjn4MElHCqBkGlwTsw9HIPofN6wDbORONt xKP5s14VduDyJdT21jYLJJUvIxO3R7OSNxoWIoKBOofFlQeT0c6WHvnqSqW9e7ED sX3108dzC77WwIVODqFm =gsJF -----END PGP SIGNATURE-----

2 1

Re: [PATCH 2/3] ntdll/tests: Add tests for RtlIpv6StringToAddress (try 3)
by Stefan Dösinger Feb. 23, 2015

Feb. 23, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Thanks again for your work and patience! This goes in the right direction in my eyes. The full set of address tests are run against both versions, and it documents the differences between non-ex and ex better. Can you do the same with the ipv4 tests in patch 1? Am 2015-02-19 um 23:38 schrieb Mark Jansen: > +/* ipv6 addresses from https://github.com/beaugunderson/javascript-ipv6/tree/master/test/data */ > +static const struct > +{ > + PCSTR address; > + NTSTATUS res; > + int terminator_offset; > + int ip[8]; > + int broken; What is the meaning of broken here? Different behavior among different Windows versions? Or deviation from your source above? > + int ex_fails; /* 1 means ex should fail, 2 means skip for ex */ Style hint: You can use an enum in this case. I guess you need the skip value because the last test fails on non-ex and succeeds on ex and your expected address does not match. Similarly, the behavior that the function writes to the output address even in case of a failure isn't exactly helpful. - From patch 3: > + if (ipv6_tests[i].ex_fails == 2) /* testing vs ex doesnt >make sense. */ > + continue; Please document why, it took me a while to come up with the guess above. (And I'm not even sure it's the real reason). You're also not checking the output IP for the IP tests from the non-ex tests here. Is there a reason for that? Are there any cases where -Ex returns a different IP than non-ex? > + if (ipv6_tests[i].ip[0] == -1) > + { > + for (j = 0; j < 8; ++j) > + expected_ip.s6_words[j] = 0xabab; > + } I guess you want to avoid writing 0xabab 8 times in the table. I don't have any objection, but I can't predict if Alexandre likes it - technically this is redundant code. I'd say keep it for now, if he doesn't like it he will tell you. > + for (j = 0; j < 8; ++j) > + expected_ip.s6_words[j] = ipv6_tests[i].ip[j]; Would this do the right thing on big endian machines? About some individual tests: > + { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 34, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0 }, 1 }, Now that's an interesting corner case. Out of curiosity, what does "1111:2222:3333:4444:5555:6666:7777:" do in non-ex and ex (one : removed)? > + { "::0:0:0:0:0:0:0", STATUS_SUCCESS, 13, { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, 1 }, > + { "::0:a:b:c:d:e:f", STATUS_SUCCESS, 13, { 0, 0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00 }, 0, 1 }, Here it would be interesting to know what IP -Ex writes before it fails. I don't see why -Ex would fail if -Ex calls non-ex, given that the terminator points way beyond the problematic "::" at the start. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5xDbAAoJEN0/YqbEcdMwmEIP/0ti3aPWMeI8yetig2eTIuAG 2QhNad7bgFgioJBremjKPDuDJViYhkv4XoIwie6bRFSF9VnEECmiv2wObhRz2e0E MgK1bGkZc0BXs4TiVoa/+JVxWgo3ddWn1Wpj+hyVRAvyEfj4NNfRWvcGaQ+cZmwu Sd0tx7BqCQLSPnNwyrl53nqVWjkkmARdSF2pLDMgXkwtGXlR2b2irYslYg+Sqgvb +ORAryKZvVLt8vL6wBclb8ruFWpro7/Rio6eZb8EfoRNH+8YdYWUrdfcoCE4Ui0i W2xsOnahZuPvuQR9id8zp4etIa+YrlGlVsIfHZrzDzCvbyuBlq+niSeWZxgNwMs+ IUpHoHj0TYNUZ9A7PB16UPHowsPVE5GYvsdjFr4Rj8rHxQqvftpTwFxRqWuV4qkQ Qx+achRcfA/qXWWYHksENuQJxF29vIbgiLbpvW256A6zmsAvB/+LlqndeF+BuW4I 3rQ2H7ADBAMx8IscePSDNLAKd2vsYWj8gFlw7y10HnIE7/zedqtWPIaGocFnS0u5 QR/ETfUW5uvOr4rqMcyMCxg3yhc/QvYV67LFMrLusJ1IlCBhcfAC4r2B91sECHXr fJvdfGwL6HBt3tAJ5zxXZjTEwiFc77TGxswbt4lQplhFqTHfi/ZovGUiS/W3nQl6 vX0zFtoYLTRAK0KtCNiP =JRkZ -----END PGP SIGNATURE-----

2 3

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 7)
by Stefan Dösinger Feb. 23, 2015

Feb. 23, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Thanks again for your work! Am 2015-02-23 um 08:41 schrieb Alistair Leslie-Hughes: > +{ > + if (!This->comp_count) > + This->components = heap_alloc( sizeof(struct component *) * This->comp_count+1 ); > + else > + This->components = heap_realloc(This->components, sizeof(struct component *) * This->comp_count+1 ); > + > + This->components[This->comp_count] = item; > + This->comp_count++; > +} This still has no error checks. > @@ -369,9 +397,48 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Ad > const DWORD dwComponentID, WCHAR *pwszName, DWORD *pdwNameLen, void *pvBuffer, > DWORD *pdwBufferSize, DWORD *pdwDataType) > { > ... > + if (!pdwNameLen || !pdwBufferSize) > + return E_POINTER; In GetComponentByName you have additional checks for !pvBuffer. What is pwszName name used for? Are you supposed to write the name of the retrieved component (with proper length checks)? > case DPNA_DATATYPE_STRING: > + if(dwDataSize != ((strlenW((WCHAR*)lpvData)+1) * sizeof(WCHAR))) > + return DPNERR_INVALIDPARAM; I expect this also applies to DPNA_DATATYPE_STRING_ANSI. Please move it to a separate patch (preferably before the GetComponentByIndex changes), together with the tests for the length check. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU6uQ9AAoJEN0/YqbEcdMwW4wP/0wYOQ+Sw3FZw/TAQ682yMmb FJBuRuymWoQthCAnc7kS7wsDwz+erbNPqjFE/MUrbuTHeIRtRJegtMTcLsq/ycSx pzV9uaZoG9MkGMPky/TTgWAyOvWu6w1fVBgUunnQlX8okMk+HMve+qiayeuHSgj9 CyznrrG/gLsVamZfJidnpMlwJ3a2Az5GOYG3yoCKGEiBzthS8niRvf4PLrNa/T5s /YUcfoorChwNnTEu1F+BEJt/CJTFy+qnrGOplDo5cCG6XJ9cK10JEsXybShSA1LT byol2yxMHNR1MdKw/ZsDJiS8RDnCPKTZiaY45FB7BZkyle5J/jJ9wfkBX/L+ID3M mMM1qo5nKjjbiICMkYIRHO4LW9lyCT4FKBLkXwGWTo7Npxpb7iB5Jo2X5sl8o3K4 d1TL7kjdmIj3nz+TbPyVrZZHV4GkBJ3Wgmv1b+uNdPQ6SSotzy6I6FzG1YkivQvF mo8cFFJTs0OO/fUBN5wggkiU4YAheHn258wz7EcepyPMH431GsFp9QVcZbNEQVNi hEasoqLeql/GzI0ZRmOLTLdueVsajZGhoHLGgN10SSql60dfsPZhfpQMrhsX8HQf Ub5SXqAWAc3vZmvv1I1POyUATNxTV8WWZfSmd7QBv+4qsJX2hsXE3Y4/I8cmIv0I OonvF4surL4lU+vFIkJC =eOzT -----END PGP SIGNATURE-----

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 7)
by Marvin Feb. 23, 2015

Feb. 23, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11662 Your paranoid android. === w8 (32 bit address) === The test timed out

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 6)
by Marvin Feb. 23, 2015

Feb. 23, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11659 Your paranoid android. === w2000pro (32 bit address) === address.c:100: Test failed: got 0x80070057 === wxppro (32 bit address) === address.c:100: Test failed: got 0x80070057 === w2003std (32 bit address) === address.c:100: Test failed: got 0x80070057 === wvistau64 (32 bit address) === address.c:100: Test failed: got 0x80070057 === w2008s64 (32 bit address) === address.c:100: Test failed: got 0x80070057 === w7u (32 bit address) === address.c:100: Test failed: got 0x80070057 === w8 (32 bit address) === The test timed out === wvistau64 (64 bit address) === address.c:100: Test failed: got 0x80070057 === w2008s64 (64 bit address) === address.c:100: Test failed: got 0x80070057

1 0

Want to work in your project in Google summer of code 2015
by Shanti Swarup Tunga Feb. 22, 2015

Feb. 22, 2015

Sir I Shanti Swarup Tunga , having good knowledge in C programming want to work in your project . So kindly suggest me some prerequisite knowledge to apply for your project.

2 1

Re: d3d8/tests: Test the return value of CreateVolumeTexture (PVS-Studio)
by Marvin Feb. 21, 2015

Feb. 21, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11656 Your paranoid android. === w8 (32 bit device) === device.c:1222: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1267: Test failed: Reset failed, hr 0x88760868. device.c:1269: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1273: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1280: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1281: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1282: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1283: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1284: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1285: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1290: Test failed: Screen width is 640, expected 800. device.c:1291: Test failed: Screen height is 480, expected 600. device.c:1297: Test failed: Back buffer width is 640, expected 800. device.c:1299: Test failed: Back buffer height is 480, expected 600. device.c:1329: Test failed: Screen width is 640, expected 1024. device.c:1330: Test failed: Screen height is 480, expected 768. device.c:2557: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2562: Test failed: The focus window is active. device.c:2570: Test failed: Got unexpected hr 0x88760869. device.c:2576: Test failed: Got unexpect screen size 800x600. device.c:2591: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2600: Test failed: Got unexpect screen size 800x600. device.c:2613: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2621: Test failed: Got unexpect width 640. device.c:2622: Test failed: Got unexpect height 480.

2 1

Re: [PATCH 2/5] d3d9/tests: Add a test for 2D D3DFMT_V16U16 textures.
by Stefan Dösinger Feb. 20, 2015

Feb. 20, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I am working on a more comprehensive test for V8U8, V16U16, L6V5U5, X8L8V8U8 and Q8W8V8U8. I have attached the current status of this test. I am still struggling with finding the right precision that makes all Windows machines happy. There are also some problems with our conversion code. Your test tests the case of a non-even width, whereas my test doesn't do that. I can build that into my test as well. We can still commit your test if you want, and I'll remove it again in my patch (together with x8l8v8u8_test). Stefan Am 2015-02-20 um 13:06 schrieb Matteo Bruni: > --- > dlls/d3d9/tests/visual.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 148 insertions(+) > > diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c > index 5f64ec3..2152ba6 100644 > --- a/dlls/d3d9/tests/visual.c > +++ b/dlls/d3d9/tests/visual.c > @@ -16208,6 +16208,153 @@ done: > DestroyWindow(window); > } > > +static void v16u16_test(void) > +{ > + IDirect3DTexture9 *texture; > + IDirect3DPixelShader9 *shader; > + IDirect3DDevice9 *device; > + D3DLOCKED_RECT rect; > + IDirect3D9 *d3d; > + unsigned int i; > + ULONG refcount; > + D3DCAPS9 caps; > + SHORT *texel; > + DWORD color; > + HWND window; > + HRESULT hr; > + > + static const struct > + { > + struct vec3 position; > + struct vec2 texcrd; > + } > + quads[] = > + { > + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f}}, > + {{-1.0f, 1.0f, 0.0f}, {0.0f, 1.0f}}, > + {{ 1.0f, -1.0f, 1.0f}, {1.0f, 0.0f}}, > + {{ 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f}}, > + }; > + static const DWORD shader_code[] = > + { > + 0xffff0101, /* ps_1_1 */ > + 0x00000051, 0xa00f0000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, */ > + 0x3f000000, 0x3f000000, /* 0.5, 0.5 */ > + 0x00000042, 0xb00f0000, /* tex t0 */ > + 0x00000004, 0x800f0000, 0xb0e40000, 0xa0e40000, 0xa0e40000, /* mad r0, t0, c0, c0 */ > + 0x0000ffff /* end */ > + }; > + > + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, > + 0, 0, 640, 480, NULL, NULL, NULL, NULL); > + d3d = Direct3DCreate9(D3D_SDK_VERSION); > + ok(!!d3d, "Failed to create a D3D object.\n"); > + if (!(device = create_device(d3d, window, window, TRUE))) > + { > + skip("Failed to create a D3D device, skipping tests.\n"); > + goto done; > + } > + > + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); > + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); > + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) > + { > + skip("No ps_1_1 support, skipping tests.\n"); > + IDirect3DDevice9_Release(device); > + goto done; > + } > + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, > + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_V16U16))) > + { > + skip("V16U16 textures are not supported, skipping test.\n"); > + IDirect3DDevice9_Release(device); > + goto done; > + } > + > + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); > + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); > + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); > + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); > + hr = IDirect3DDevice9_SetPixelShader(device, shader); > + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); > + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); > + ok(SUCCEEDED(hr), "Failed to set filter, hr %#x.\n", hr); > + > + for (i = 0; i < 2; ++i) > + { > + D3DPOOL pool; > + > + if (i) > + pool = D3DPOOL_SYSTEMMEM; > + else > + pool = D3DPOOL_MANAGED; > + > + hr = IDirect3DDevice9_CreateTexture(device, 1, 2, 1, 0, D3DFMT_V16U16, > + pool, &texture, NULL); > + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > + > + hr = IDirect3DTexture9_LockRect(texture, 0, &rect, NULL, 0); > + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); > + > + texel = (SHORT *)((BYTE *)rect.pBits + 0 * rect.Pitch); > + texel[0] = 32767; > + texel[1] = 32767; > + texel = (SHORT *)((BYTE *)rect.pBits + 1 * rect.Pitch); > + texel[0] = -32768; > + texel[1] = 0; > + > + hr = IDirect3DTexture9_UnlockRect(texture, 0); > + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); > + > + if (i) > + { > + IDirect3DTexture9 *texture2; > + > + hr = IDirect3DDevice9_CreateTexture(device, 1, 2, 1, 0, D3DFMT_V16U16, > + D3DPOOL_DEFAULT, &texture2, NULL); > + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > + > + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, > + (IDirect3DBaseTexture9 *)texture2); > + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); > + > + IDirect3DTexture9_Release(texture); > + texture = texture2; > + } > + > + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); > + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); > + > + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); > + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); > + hr = IDirect3DDevice9_BeginScene(device); > + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); > + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); > + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); > + hr = IDirect3DDevice9_EndScene(device); > + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); > + > + color = getPixelColor(device, 320, 160); > + ok (color_match(color, 0x00007fff, 1), > + "Expected color 0x00007fff, got %#x, V16U16 input -32768, 0.\n", color); > + color = getPixelColor(device, 320, 400); > + ok (color_match(color, 0x00ffffff, 1), > + "Expected color 0x00ffffff, got %#x, V16U16 input 32767, 32767.\n", color); > + > + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); > + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); > + > + IDirect3DVolumeTexture9_Release(texture); > + } > + > + IDirect3DPixelShader9_Release(shader); > + refcount = IDirect3DDevice9_Release(device); > + ok(!refcount, "Device has %u references left.\n", refcount); > +done: > + IDirect3D9_Release(d3d); > + DestroyWindow(window); > +} > + > static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) > { > HRESULT hr; > @@ -17566,6 +17713,7 @@ START_TEST(visual) > texkill_test(); > x8l8v8u8_test(); > volume_v16u16_test(); > + v16u16_test(); > constant_clamp_ps_test(); > cnd_test(); > dp2add_ps_test(); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5yi0AAoJEN0/YqbEcdMwXdcP/2QHNZaeHncB/4If+JfpQEOv Vto9Z3ip/eGDuOCRylNjiL47VZfYyuqXHe8EoGzKkuGmtGvPjr2ZhkebUf0l9OIN g2LAqQIa17nYTJFnO6ofzHjcWb++mdIDG1lVUJFKyhIS2vl0xjfB3V4wteMLDffS R6CTtAS49vxFL2lzDwrWaEj2SYhnnybNoKLdhOY5jXH31kcz5W9k3Fzr5Umb2dPB q3tyZHZtYHHsR5kXCmJO6DA456y8euFqzR9GK5/0nDUlh8CGV74pPL6pZMnoPn7c ssXU4HzPB9zPI6zVZBTV8+oOmHWFDn1YZL1M/w50rxY35XvjkU3vs4oezuHMkZBS wXt30QYWBRhFFB3Z2lq9jv9JZXA9V2+A8WmJMbblgv662QsctIAmT9ZAc2xycm7R ye89fHEC3xXFmM6jdJqS1k5MrA5R1li5YFbS18ujcAXVYCW3v8JtK0G05h2zy9e1 KifoVA8o+cVV0Sh2GtYoifLSNvpYo2AlCrP7/cjOyR6igiShK5pF+pktRIlsraM2 3Hl0wGjr2TPhTCTQQPKsskVNvKE+017e4+fwaFI8fRgF3zYSgLSKZELPFY05bzBX OOcbNSEqjRkFtoQoerBR7vx7yrU+85lwd945AGS3URF8KqkavK1LYsAfmLnFu90y YltdeSdbSvQDHCQ4CmmL =D2Pe -----END PGP SIGNATURE-----

3 3

Re: [PATCH 5/5] d3d9/tests: Move a Present out of the loops in fog_with_shader_test().
by Henri Verbeet Feb. 20, 2015

Feb. 20, 2015

On 20 February 2015 at 13:06, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > It reduces the duration of the visual test with all the other functions > from visual.c compiled out from 9 to 1.5 seconds for me (on a Radeon > HD 5650M, Linux, Mesa). > --- For what it's worth, I think we can actually just remove most of the Present() calls in the tests. It's perhaps fun to keep for nostalgic reasons, but I think the only time anyone really wants to see what gets drawn is while debugging failures.

2 1

Is it possible to detect if a variable is in stack or heap based on its address?
by Bruno Jesus Feb. 20, 2015

Feb. 20, 2015

Hi all, the subject explains my needs. I would like to understand if printing %p of a pointer can help me check if it's in the stack or was allocated with some memory management functions. Something like: void test() { char stack[10], *heap = HeapAlloc(1234); printf("%p %p", stack, heap); } Can I be sure the first printed value is from stack and the second from heap? A plus question would be: Is it possible to know if an address is a const string? These questions are related to debugging wine functions based on trace debugs. Thanks in advance and best wishes, Bruno

2 2

Re: [PATCH 3/3] dwrite/tests: Test default colors of render target memory HDC
by Marvin Feb. 20, 2015

Feb. 20, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11640 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/3] dwrite/tests: Fixed font instance leak
by Marvin Feb. 20, 2015

Feb. 20, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11639 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: iccvid: Allow top-down videos to be played upside down
by Bruno Jesus Feb. 19, 2015

Feb. 19, 2015

On Wed, Feb 18, 2015 at 7:31 PM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > In my opinion this is better than not having videos played at all, and > it may attract other people attention to the real problem and possible > solutions on where to invert the buffer after decoding or maybe > decoding directly to the right buffer position inside decode_cinepak. > > Related to bug https://bugs.winehq.org/show_bug.cgi?id=29852 Please ignore this patch, Dmitry is shedding some light in this problem.

1 0

Re: xaudio2_{7, 8}: Implement IXaudio interface as stub (try 2)
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

> +static const struct IXAudio2Vtbl XAudio2_Vtbl; You wouldn't need this if you've moved XAudio2_create() after vtbl declaration. > + > +HRESULT XAudio2_create(IUnknown *pUnkOuter, LPVOID *ppObj) Please use better names, and "void **". > +{ > + IXAudio2Impl* object; > + > + TRACE("(%p, %p)\n", pUnkOuter, ppObj); > + > + if(pUnkOuter) > + return CLASS_E_NOAGGREGATION; > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IXAudio2Impl)); > + if(!object) > + return E_OUTOFMEMORY; No need for HEAP_ZERO_MEMORY. > + > + *ppObj = object; That's not how it's done - return proper interface pointer. > HRESULT WINAPI DllRegisterServer(void) > { > TRACE("\n"); > - return __wine_register_resources( instance ); > + return __wine_register_resources(instance); > } You can probably leave this as it is.

1 0

Re: [3/5] comctl32: Implement TaskDialogIndirect as a custom dialog box
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 15:23, Joachim Priesner wrote: > + WCHAR *windowTitleBuffer = NULL; > + UINT len = LoadStringW(config->hInstance, LOWORD(config->pszWindowTitle), (LPWSTR)&ptr, 0); > + if (len) > + { > + windowTitleBuffer = Alloc((len + 1) * sizeof(WCHAR)); > + if (!windowTitleBuffer) > + { > + EndDialog(hwnd, E_OUTOFMEMORY); > + return; > + } > + memcpy(windowTitleBuffer, ptr, len * sizeof(WCHAR)); > + windowTitleBuffer[len] = 0; > + SetWindowTextW(hwnd, windowTitleBuffer); > + } That's essentially the same code you're using to set IDC_CONTENT text. Could you add a helper that does all of that? Also it will probably take fewer lines to use LoadStringW() to fill your buffer and set terminating null. > + /* Destroy unused common buttons. */ > + TRACE("dwCommonButtons=%x\n", config->dwCommonButtons); > + if (!(config->dwCommonButtons & TDCBF_YES_BUTTON)) > + DestroyWindow(GetDlgItem(hwnd, IDYES)); Did you check that it's actually destroyed and not just hidden? > + WCHAR buttonText[1024]; > + int w, h; > + if (GetWindowTextW(hItem, buttonText, 1024)) Where does this limit come from? > + /* Query parent window/desktop size and center window. */ > + monitor = MonitorFromWindow(config->hwndParent ? config->hwndParent : GetActiveWindow(), > + MONITOR_DEFAULTTOPRIMARY); > + monitorInfo.cbSize = sizeof(monitorInfo); > + GetMonitorInfoW(monitor, &monitorInfo); > + windowLeft = (monitorInfo.rcWork.left + monitorInfo.rcWork.right > + - (windowClientWidth + windowBorderWidth)) / 2; > + windowTop = (monitorInfo.rcWork.top + monitorInfo.rcWork.bottom > + - (windowClientHeight + windowBorderHeight)) / 2; > + SetWindowPos(hwnd, 0, windowLeft, windowTop, > + windowClientWidth + windowBorderWidth, windowClientHeight + windowBorderHeight, > + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW); This looks overcomplicated, isn't it enough to use desktop window if no parent was specified? > + DeleteObject(mainInstructionFont); > + Free(contentBuffer); > + Free(mainInstructionBuffer); It's better to free right when you don't need it anymore, and please use simpler/shorter names.

2 1

Re: [2/5] comctl32: Add and fix tests for invalid TaskDialogIndirect arguments
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 15:22, Joachim Priesner wrote: > +static void test_TaskDialogIndirect_InvalidParameters(void) > +{ No need to be that explicit, just start test_TaskDialogIndirect() with these tests.

1 0

Re: [5/5] comctl32: Implement the TaskDialog function
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 15:23, Joachim Priesner wrote: > } > > /*********************************************************************** > + * TaskDialog [COMCTL32.@] > + */ > +HRESULT WINAPI TaskDialog(HWND hWndParent, HINSTANCE hInstance, PCWSTR pszWindowTitle, > + PCWSTR pszMainInstruction, PCWSTR pszContent, > + TASKDIALOG_COMMON_BUTTON_FLAGS dwCommonButtons, PCWSTR pszIcon, > + int *pnButton) Please don't use prefixed notation for names. > +static void test_TaskDialog_ProcAddr(void) > +{ > + void *ptr = GetProcAddress(hComctl32, (const CHAR*)344); > + ok(ptr == pTaskDialog, "got wrong pointer for ordinal 344, %p expected %p\n", ptr, pTaskDialog); > +} > + This doesn't need its own test function. > START_TEST(taskdialog) > { > ULONG_PTR ctx_cookie; > @@ -80,11 +87,22 @@ START_TEST(taskdialog) > if (!pTaskDialogIndirect) > { > win_skip("TaskDialogIndirect() is missing. Skipping the tests\n"); > - return; > + } > + else > + { > + test_TaskDialogIndirect_ProcAddr(); > + test_TaskDialogIndirect_InvalidParameters(); > } > > - test_TaskDialogIndirect_ProcAddr(); > - test_TaskDialogIndirect_InvalidParameters(); > + pTaskDialog = (void*)GetProcAddress(hComctl32, "TaskDialog"); > + if (!pTaskDialog) > + { > + win_skip("TaskDialog() is missing. Skipping the tests\n"); > + } > + else > + { > + test_TaskDialog_ProcAddr(); > + } > I don't think you need two win_skip()'s here. If TaskDialogIndirect() is available, TaskDialog() is here too, right?

1 0

Re: [v2 1/4] reg: Add sane_path function to do preliniary key validation
by Stefan Dösinger Feb. 19, 2015

Feb. 19, 2015

1 0

Re: [PATCH 1/3] ntdll/tests: Add tests for RtlIpv4StringToAddressEx, RtlIpv6StringToAddress (try 2)
by Stefan Dösinger Feb. 19, 2015

Feb. 19, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I've already talked to Mark about this on #winehackers, just repeating it for the list: My remaining request with these tests is that I believe we should test the full set of inputs against the Ex and non-Ex versions and ideally reuse the test table (for base and ex, not for ipv4 and ipv6). That will tell us if there's any difference in the IP parsing part of the base and Ex functions. It'll also be interesting how the base function handles ports in the string, and, in case of ipv6, brackets around the IP. Other than that two minor style issues: Change the subject of patch one (it only handles RtlIpv4StringToAddressEx), and you still have different levels of indentation in the line continuations of some ok() statements. Cheers, Stefan Am 2015-02-15 um 18:02 schrieb Mark Jansen: > Add test for RtlIpv4StringToAddressEx > > --- dlls/ntdll/tests/rtl.c | 101 > +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, > 101 insertions(+) > > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU4c5HAAoJEN0/YqbEcdMwnPIP/RT2i0fG4cPqKikwa26VbRyn EG2yeG78Wjx/vysLuQfGe8alhUycGrgMzW4N4m8QiAx/xNFv4eX0OdI+5gYMbSHK dYZSzTSKbqoJbnBlZwt1MoaaNceX/zIEy2WoaRCYpsUJfpscT/sOdJ+/gW55gDkH 605vvruhgJFSFVeZDVzfR9gQcY51iHB0KDemX2p1mwHElr6+HwYSHOQt+8KCL8YV wfC87NSMEAfEjIudYPL7SFHvUuLr3GoHBBt57R9p/2gNT7eJ7ll9ANvShFkRENjL jmKJQj7exehqrAGNWBqbeIPSjHBQoGl/UZPwIE39UioNhRo+sWi5A8tBbUMyL3o5 VENuxL987kU1L9Xpa6/jEcrQksgafCa742/wWSAjPGE0D2iTUr0hQN0zQoioTPA/ zuaDyDO3CBCyFaF0A9h9FzxOkuRAHo6TSKw0IYOrI2XENAoqQ+B+fX0ll9t/5Tu0 iUIea06yp2/fRButo58sJNAd3dUZpRKf1qT+Eu7Cn+AJfgi3TsKY/Lw0gvyb4XJh qOdp7EPzqY1PURn6+Z8aDwNZRA2du3NM91SSMfwz+qwZtakf8K/XtkpC1CpNLONJ kfltxHVALBKT0NTDzvprrSzvTVH90hJLE+nX/E5Qf6SzeRVqxsPomBtOj2VLuapZ 4ehIhXsaEJJz9jc31tr9 =E0dA -----END PGP SIGNATURE-----

2 2

Re: dlls/dsrole: Add undocumented api set
by Nikolay Sivov Feb. 19, 2015

Feb. 19, 2015

On 19.02.2015 3:58, Andrew Cook wrote: > Required by native aclui.dll If it's the only user, it's questionable whether we need this module.

2 1

Re: [PATCH 4/5] wined3d: Reject unsupported pitches in wined3d_surface_update_desc().
by Stefan Dösinger Feb. 18, 2015

Feb. 18, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-18 um 14:20 schrieb Matteo Bruni: > + if (pitch & (texture_resource->format->byte_count - 1)) > + { > + WARN("Pitch unsupported, not a multiple of the texture format byte width.\n"); > + return WINED3DERR_INVALIDCALL; > + } I'd prefer this to be an ERR instead, and the return statement removed. The idea is that since we don't ever expect this check to be true it shouldn't result in different behavior and can be compiled out in a build where debugging is disabled. The basic idea originated from Henri: https://www.winehq.org/pipermail/wine-devel/2013-August/100974.html . -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5KrDAAoJEN0/YqbEcdMwdj0P/0kphTArNNtcxtIbt5noekiX wTwi7X6YhxkjryHENqvYKKO8ckBftBoxJHo9o4I82Cc+IRvj9GvrvvuZ5FuiMsJO 6dGmo5JSHnGGNG3rl/oZt31v3P/1LAba3GoFAgRwBfXCULue6gNRyC8+57ahlbLy xVWc2m249URRP3ML/O9+bXlzA61oQdS+5q54T+jmYv3X8K8AgDHATu114mcpxaAq hkHIKmW2WCoigCBrNHQTzcxMG3lsavMbnuMxSvQ/01/mwrKvmYYkvvBtR/AVI6W+ I7HLF4KZlz5BLZnS71joW2LLL35/z/3qtmaHi8dq/kCMaajow9dBQmstcUFvwJ4p UknSxgcCOgKreAZH3yTOH5LNgf8qZvB21wQ5Cn0NGEBW7bZKdUxfRftFN8IQY1Ht NhGB9cmvo3Ozv0z+i7wMfcXjntT9wL/2H77RqC4Xb9Z/igo+E2LJN0XqQYvwvtj7 wG4Fw5rH7vrO4g/IcfFYvbT7CMUYrPWtFaTfiMn5IOQZ4mx2gacktHcpZJnCUjw5 /uTQo+089YosnM+xY/WvDnjjI13svZt5c3gUMlvha30RjsX7PDfih/vNrr0qR5Y/ C6TLk8ffbmPOX6TTobndfZrWdb2sP3d7x1T1tx9nMAKJG0HFy5wvFoygEDOzFRYU tG/x7wnrmr3fYfUSEPJY =LuAf -----END PGP SIGNATURE-----

3 4

Re: [PATCH 4/5] wined3d: Set GL_UNPACK_ALIGNMENT to 1 when uploading surfaces from user memory.
by Henri Verbeet Feb. 18, 2015

Feb. 18, 2015

On 10 February 2015 at 20:14, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); > + if (src_pitch & (surface_alignment - 1)) > + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); What's a bit awkward about this is that if the pitch isn't a multiple of the pixel byte width it's still not going to work. But I guess this is the best we can do.

3 5

Re: icinfo: Do not output an extra space at end of line
by Stefan Dösinger Feb. 18, 2015

Feb. 18, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-18 um 11:53 schrieb Hugh McMaster: > - if (ii.dwFlags & VIDCF_QUALITY) mywprintf(sspc_fmt, VIDCF_QUALITY_W); > + if (ii.dwFlags & VIDCF_QUALITY) mywprintf(s_fmt, VIDCF_QUALITY_W); > if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(sspc_fmt, VIDCF_CRUNCH_W); I don't think this works. If VIDCF_QUALITY is not set, but any other flag is, it will now print a leading space. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU5IZUAAoJEN0/YqbEcdMwTg8QAI0rVUkh9r19pCZbCEPnk+AQ z5Da4dia28IpRlUYYW1bvZgxUpbWZi67NQr7oAs12fbhVMzyvoNxRI+J4bUpB/Rl sFxcNNIxwiJ47iVXzOQ54d4jO0SlhjsRB07hm9Z6o/DcNCPLXpq8UvDEErkHRHMp dZMF0D5dRTaxkqxXGIcks8kLT7yODKeCsG/T4oZ4D7eYMYoKaODmw7lUbcaRsTk1 hKcqdz9BfgmmwLk1xcs+Ssy/7sgN+smJPwGDWEWT2W0kto2M3OLb6Aot6olKncQo ngn1KIhPOzauomfW7+XFr6ezQZaBq4mPVqDYpN7ZHUewPl/1TUDYYIzMxDaXwZrx xcgNPcrKR3HQEF2JycYoWgxb3zTfn5h9M4Q5vtz218ytgD7h8dQGgGBBDnjhTnr6 JyJnvrj4OezLZF2BR4kDYfIKCSPk9VVfFiRe/b+HfcKH56Dv9ALcI8Dq0tk/G35G VY/4YQEselJ9P7KL/D4gqvl6pJLOwSU9162qUQzKEAktfzIREZqmyQQya1hgtwP3 TyY9rMJ8uubLh2Tqn0cUiZxQO7XjhTP1r/BSEyxrJkl3lAx/TCnIsBwNgd849JJK MVFHBFqzsvXdCG+CYU393HviueMdWnJ1nxZmhAIK9i/FpHRHw1fZtxUGlQYYiB28 sqoZ3ohbVUpuGCNjDRHI =+LZ8 -----END PGP SIGNATURE-----

2 1

Re: [PATCH] msvcr120: Implemented Concurrency::details::_Condition_variable.
by Piotr Caban Feb. 18, 2015

Feb. 18, 2015

Hi, On 02/14/15 01:52, Yifu Wang wrote: > Implementation of Concurrency::details::_Condition_variable along with a producer-consumer test case. > The class is used in msvcp120.dll by _Cnd_t functions, which are used in std::condition_variable and std::thread. > --- > dlls/msvcr120/msvcr120.spec | 36 +++--- > dlls/msvcr120/tests/msvcr120.c | 277 +++++++++++++++++++++++++++++++++++++++++ > dlls/msvcrt/lock.c | 171 +++++++++++++++++++++++++ > 3 files changed, 466 insertions(+), 18 deletions(-) > Please also update msvcr110.spec and msvcr120_app.spec files. +@ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr ptr) _Condition_variable_wait_for The arguments types in spec file are incorrect (in this case there should be: ptr ptr long). I was not checking other entries. /* signal */ produced = consumed = 0; for(i = 0; i < NUM_PRODUCER; ++ i) t[i] = CreateThread(0, 0, producer_thread, (LPVOID)0, 0, 0); for(i = NUM_PRODUCER; i < NUM_PRODUCER + NUM_CONSUMER; ++ i) t[i] = CreateThread(0, 0, consumer_thread, (LPVOID)0, 0, 0); You don't need the (LPVOID)0 casts here. /* a quick sanity test on timed wait */ for(i = 0; i < 200; i += 10) { call_func1(p_critical_section_lock, &buf_cs); wake = (MSVCRT_bool)call_func3(p__Condition_variable_wait_for, &buf_not_empty, &buf_cs, i); ok(wake == FALSE, "_Condition_variable not supposed to wake\n"); call_func1(p_critical_section_unlock, &buf_cs); } I don't think that spending ~2 seconds on this tests is useful. It's enough to test it once (not in a loop). Cheers, Piotr

1 1

Re: version: Fix wrong length reported when selecting a block. (resend)
by Matteo Bruni Feb. 18, 2015

Feb. 18, 2015

2015-02-18 8:49 GMT+01:00 Mark Jansen <learn0more+wine(a)gmail.com>: > You shouldnt make the buffer static or const, because the VerQuery > functions will write to it. Ah yes, you're right. Ignore that point then. BTW, adding back wine-devel to cc.

1 0

Re: kernel32/tests: Add tests for job objects (try 3)
by Andrew Cook Feb. 18, 2015

Feb. 18, 2015

I'm never going to get this code in, am i? On Tue, 2015-02-17 at 11:00 +1100, Andrew Cook wrote: > Forgot a semicolon (i actually tested this one, it compiles) > > --- > dlls/kernel32/tests/Makefile.in | 1 + > dlls/kernel32/tests/job.c | 393 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 394 insertions(+) > create mode 100644 dlls/kernel32/tests/job.c > >

3 3

Re: [PATCH] uxtheme: fix colour errors in UXTHEME_StretchBlt
by Nikolay Sivov Feb. 17, 2015

Feb. 17, 2015

On 18.02.2015 3:59, Mark Harmstone wrote: > + old_stretch_mode = GetStretchBltMode(hdcDst); > + SetStretchBltMode(hdcDst, HALFTONE); This could be reduced to a single line.

1 0

Re: wininet: Include <unistd.h> in case we need off_t for zlib.
by Jacek Caban Feb. 17, 2015

Feb. 17, 2015

Hi Gerald, On 02/15/15 17:16, Gerald Pfeifer wrote: > After commit 5436fef80722fe7896aed5e659c31fdade4ef5b3 > > Author: Jacek Caban <jacek(a)codeweavers.com> > Date: Fri Feb 13 12:12:29 2015 +0100 > > wininet: Always use winsock sockets. > > FreeBSD not longer builds due to the following change: > > #include "config.h" > -#include "wine/port.h" > > -#if defined(__MINGW32__) || defined (_MSC_VER) > -#include <ws2tcpip.h> > +#ifdef HAVE_ZLIB > +# define Z_SOLO > +# include <zlib.h> > #endif > > zlib.h on FreeBSD 10.x uses off_t, but at this point this is not > defined yet. Including unistd.h before including zlib.h addresses > this. I'd expect zlib.h to handle its dependences, it's probably Z_SOLO that's doesn't work on FreeBSD. Could you try my recent wininet patches? They should fix the build. Thanks, Jacek

2 1

Re: version: Fix wrong length reported when selecting a block. (resend)
by Stefan Dösinger Feb. 17, 2015

Feb. 17, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-12 um 20:15 schrieb Mark Jansen: > LPWSTR lpSubBlockW; > + UINT dum = 0; > + if (!puLen) > + puLen = &dum; > > len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0); > lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > @@ -965,7 +968,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, > > HeapFree(GetProcessHeap(), 0, lpSubBlockW); > > - if (ret && isText) > + if (ret && isText && *puLen) I am afraid I have no idea what this patch is doing. I am not even sure I understand the original function properly :-( . VerQueryValueA seems like an A to W wrapper for VersionInfo32_QueryValue, but with the quirky behavior that it appends the ascii string after the unicode string. Can you elaborate a bit on what exactly goes wrong? What are the input values, and what does VersionInfo32_QueryValue return? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU3dGbAAoJEN0/YqbEcdMwpwEP+wabxLJtbw7O7enIEu21l8ls m6vxZr1PXP5RnTmOs4nk/QmWT4Oa68qY2EBdArZ79WwyVULLI7BjNJ1aLS67dw/Z l6Dk9fh8orxoD4HznH0o7PxYrWNrQ1nJ2jf39k+TO4DbSHMZB/eGXnGUZxVFwKVf H7yNxmoSISC0aWgQP0/QZF+AhtsJ5TLIWtNyJULpmTnZZGu9z94Ukftd9gDL+tZU ezFsqxdDhpy0nirb4ky/Yq77jXQtsCmz/pCNi7ntYuQqY5fEmtJQMAtpfOQhdG5h XP1Py7qFTu/RgqnBsO1Z3INRyKk7NS4BsPvULcLsk4WbDvoTGEqa1WwHwqHY4Dng IDHagE938Xkc8CPiHGzqJG6WDdPPkFiRzqM+2HH87ihJ2uAaVZcK/V46lGiJCx8q jDY+DlcDyZRmw28+fjwzOjPQHZx/jH2X3wLIpkliM5Ja03Ocb27Aaud9DEQ6H0vw 0VbD2Db6oOrPBv3oyDmZhI+NTPgvsUoaH6sNE+3cIEwBWpCKkOJMzoDZ6EiqWVqj jvJklcVcOn7nfUBH0YCfnG5szQokMnfcnZaOZxzkjWnPvwJbfC36eLQyESkbtbKf Y2Z+mvbWslkhdeR0jKAmQNwfDuFcfvZflinem3U9xJAqBKEmicLeqJ0dtwUIJyC7 TnJMMCP14EDaX0DZGHw3 =94Ql -----END PGP SIGNATURE-----

3 4

Re: [resend 1/8] reg: Add system error printing function
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Jonathan Vollebregt <jnvsor(a)gmail.com> writes: > +static void reg_print_error(LSTATUS error_code) > +{ > + switch (error_code) > + { > + case ERROR_SUCCESS: > + return; > + case ERROR_BAD_COMMAND: > + reg_message(STRING_INVALID_CMDLINE); > + return; > + default: > + { > + static const WCHAR error_string[] = {'%','0','5','d',':',' ','%','s',0}; > + WCHAR *message = NULL; > + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, > + NULL, error_code, 0, (WCHAR *)&message, 0, NULL); > + > + reg_message(STRING_ERROR); > + reg_printfW(error_string, error_code, message); > + LocalFree(message); > + return; > + } > + } > +} I don't think that's an improvement. There may be a need for generic Win32 error printing through FormatMessage for unknown codes, but I don't see why you'd want to route all errors through it. In particular, having to make up your own Win32 error codes only to convert them back to string ids is quite ugly. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH (resend) 1/2] dpvoice/tests: Add GetCompressionTypes tests.
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -343,6 +343,179 @@ static void create_voicetest(void) > } > } > > +static void test_GetCompressionTypes(HRESULT (__stdcall *GetCompressionTypes)(void*,void*,DWORD*,DWORD*,DWORD), > + void *iface, const char *name) These hacks with the void pointers are ugly. You should pass interface pointers and do a proper method call with one or the other, for instance something like this: if (client_iface) IDirectPlayVoiceClient_GetCompressionTypes( client_iface,... ); else IDirectPlayVoiceServer_GetCompressionTypes( server_iface,... ); -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] d3dx9_36: Consistently use 4 space indentation.
by Alexandre Julliard Feb. 17, 2015

Feb. 17, 2015

Stefan Dösinger <stefan(a)codeweavers.com> writes: > Before the next guy copypastes the bottom code and adds more mess. Could you please stop with this code formatting obsession of yours? As long as the code is readable, it doesn't matter if there's a line here and there with slightly inconsistent formatting. I appreciate your helping with the code reviews, but please let's try to concentrate on the real problems. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c (v2).
by Marvin Feb. 17, 2015

Feb. 17, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11581 Your paranoid android. === w8 (32 bit visual) === visual.c:1617: Test failed: unexpected colortable on offscreen surface === wvistau64 (32 bit ddraw2) === ddraw2.c:2659: Test failed: Expected message 0x46, but didn't receive it. ddraw2.c:2661: Test failed: Expected screen size 1024x768, got 0x0. ddraw2.c:2667: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2698: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2706: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2733: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2753: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2777: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2804: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2821: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2858: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2869: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2896: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2916: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2933: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2960: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:2977: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw2.c:3015: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}.

2 1

Re: [2/2] kernel32: force 4096 byte page alignment.
by Tijl Coosemans Feb. 17, 2015

Feb. 17, 2015

On Mon, 02 Feb 2015 22:20:57 +0200 David Naylor <dbn(a)freebsd.org> wrote: > FreeBSD prefers to use a 0x200000 (super) page alignment however this causes > the image base to be displaced from the requested 0x7b800000. Forcing a > smaller page size ensures FreeBSD can place the image starting at 0x7b800000. Just to clarify, the output of "readelf -l kernel32.dll.so" gives this: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000000 0x7b800000 0x7b800000 0x0c9e74 0x0c9e74 R E 0x200000 LOAD 0x0ca000 0x7baca000 0x7baca000 0x1a7eb0 0x1a8550 RW 0x200000 The segments have an alignment of 0x200000 bytes. This places the first segment at 0x7b800000 and the second at 0x7ba00000+Offset. With a MemSiz of 0x1a8550 this pushes the second segment over 0x7bc00000 where ntdll has been mapped already so loading kernel32 at 0x7b800000 fails. The patch forces a smaller alignment so the second segment fits below 0x7bc00000.

3 3

Re: version: partially implement GetFileVersionInfoSizeExA/W using GetFileVersionInfoSizeA/W (1/2)
by Nikolay Sivov Feb. 17, 2015

Feb. 17, 2015

On 17.02.2015 7:04, Austin English wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38090 > > -- > -Austin > > > Why not the other way around - moving everything to *Ex, and forwarding to it?

2 1

Re: kernel32/tests: Add tests for job objects (try 3)
by Marvin Feb. 16, 2015

Feb. 16, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11588 Your paranoid android. === build (build) === Make failed

1 0

Re: [PATCH 2/2] ddraw/tests: Create a device in test_surface_discard.
by Marvin Feb. 16, 2015

Feb. 16, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11582 Your paranoid android. === wvistau64 (32 bit ddraw1) === ddraw1.c:2453: Test failed: Expected message 0x46, but didn't receive it. ddraw1.c:2455: Test failed: Expected screen size 1024x768, got 0x0. ddraw1.c:2461: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2492: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2500: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2527: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2547: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2571: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2598: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2615: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2652: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2663: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2690: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2710: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2727: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2754: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2771: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. ddraw1.c:2809: Test failed: Expected {0, 0, 1024, 768}, got {-8, -8, 1032, 746}. === w8 (32 bit ddraw1) === ddraw1.c:6286: Test failed: Got unexpected color 0x000000ff. ddraw1.c:6290: Test failed: Got unexpected color 0x00000080.

1 0

Re: kernel32/tests: Add tests for job objects
by Marvin Feb. 16, 2015

Feb. 16, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11540 Your paranoid android. === w2000pro (32 bit job) === job.c:300: Test failed: Expected exit_code to be 1816 (ERROR_NOT_ENOUGH_QUOTA) is 0 === wxppro (32 bit job) === job.c:300: Test failed: Expected exit_code to be 1816 (ERROR_NOT_ENOUGH_QUOTA) is 0

3 3

Re: [PATCH 3/3] ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c.
by Henri Verbeet Feb. 16, 2015

Feb. 16, 2015

On 15 February 2015 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c > + color = get_surface_color(rt, 85, 85); > + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); > + color = get_surface_color(rt, 95, 95); > + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); > + color = get_surface_color(rt, 105, 105); > + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); > + color = get_surface_color(rt, 115, 115); > + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); This fails for me on Windows: ddraw1.c:6350: Test failed: Got unexpected color 0x0000ff00. ddraw1: 4215 tests executed (0 marked as todo, 1 failure), 0 skipped. The test seemed to pass when it was still in visual.c, for what it's worth.

2 1

Re: [PATCH 4/4] wininet: Always use winsock sockets.
by Sebastian Lackner Feb. 16, 2015

Feb. 16, 2015

This patch causes build failures on our Ubuntu Precise builders. I don't have a machine to test it directly, but somehow unistd.h is still included indirectly: In file included from http.c:37:0: ../../include/ws2tcpip.h:57:13: error: conflicting types for 'socklen_t' /usr/include/unistd.h:275:21: note: previous declaration of 'socklen_t' was here Full build log: https://launchpadlibrarian.net/197555168/buildlog_ubuntu-precise-i386.wine-… On 13.02.2015 12:12, Jacek Caban wrote: > --- > dlls/wininet/Makefile.in | 4 +- > dlls/wininet/cookie.c | 10 +-- > dlls/wininet/dialogs.c | 7 +- > dlls/wininet/ftp.c | 61 ++++---------- > dlls/wininet/http.c | 22 ++--- > dlls/wininet/internet.c | 18 +--- > dlls/wininet/internet.h | 23 ------ > dlls/wininet/netconnection.c | 193 > ++++--------------------------------------- > dlls/wininet/urlcache.c | 11 +-- > dlls/wininet/utility.c | 60 ++------------ > 10 files changed, 49 insertions(+), 360 deletions(-) > > > > >

3 6

Re: [PATCH 1/3] d3d11: Add prototype for CreateDeviceAndSwapChain
by Stefan Dösinger Feb. 16, 2015

Feb. 16, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Looks good to me. I have asked Henri to have a look. Jacek says they're OK too. I also verified the patches build OK. Thanks again for your work and patience! I'd say give Henri a workday or two to check them against the SDK headers and send the remaining 3 once the first 3 patches are in. There's one obstacle I ran into: Am 2015-02-13 um 14:06 schrieb Martell Malone: > * Copyright 2010 Rico Schüller > * Copyright 2013 Austin English > + * Copyright 2015 Martell Malone Fun stuff. There's something about the ü in Rico Schüller's name that breaks git am: fatal: cannot convert from y to UTF-8 But Jacek says downloading from http://source.winehq.org/patches/data/109106 and applying works, so it's probably nothing you have to worry about. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU3f+1AAoJEN0/YqbEcdMwQWAP/ApeB1n37Dc2afkabeA8zt2r j9Eo3HgRN/BfuTP2hPfOSMyC82Ic+1bQMgTbal0OtqNoKSR8BCUYM/mcV5V0z8qm tHkMoe68pQimulw89EJ2Z2u4FtGbZ16lvK8HAABMV+2NiRQdZFXrby/+pNlzRTAS 1gus/456vTyy/weyOd4HaOobLrFs3mmqOXDAS+z/CPzGXpN5YLAiyOVv39U7Lkt4 e5Gs8meen8PXuBiltM90QCRPQjwLWZBIW/fORH0Ljk3KhxOFQktQGVNferARSUWC 9xwIdz4KBBfqLqeYSiAZZCdt5DFMmyjnTe9KZ/LpXZOnDOvu7djYFNzypos3VK4E n0Y14WoTP+po9VtyFVLzWXFStIV3syJiv6Q6I/98M25xRAi+CPIV2RvStCi9RJAN YFSzD9zdr+Se01QBpvRl5XjLi01bOes5PBBDqzJ7LLinF1G2+nMHZcAGMxAgICvQ A/47RevBfmrdyP4MlIhKeWo47M+Onti6nrZ4EktSIqCp6LvZgIcuDj3mGhGx3Wuf HLe+YmTNl5BkGo9vUEoy/BLsyMPDXtN5QyfJpSds5pCDOgzFXipZLpdYcUdTbiO2 0dSqke/PHJTuFeltl1HaxfDpHewt3ySf+sISPhdYPD+aY2T8XNHuq+81voVD5sjg HPlmZRbNuuzLf/GuNsJj =11zU -----END PGP SIGNATURE-----

3 5

Re: [resend 2/2] reg: Clean up reg_delete
by Marvin Feb. 16, 2015

Feb. 16, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11571 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [resend 1/2] reg: Clean up reg_add
by Marvin Feb. 16, 2015

Feb. 16, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11570 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [resend 7/8] reg: Clean up reg_add
by Stefan Dösinger Feb. 16, 2015

Feb. 16, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-02-16 um 11:21 schrieb Jonathan Vollebregt: > +static int reg_add( const WCHAR *key_name, const WCHAR *value_name, const BOOL value_empty, > + const WCHAR *type, const WCHAR separator, const WCHAR *data, > + const BOOL force) Forgive me if I have asked this already: Do we have any precedent for this function declaration style in Wine? Patches 1-6 look good to me. I will tell Alexandre on IRC. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU4dRLAAoJEN0/YqbEcdMwlrIP/0HfUXV9QWb2ZiR0VOq8fIjn qZ75XFoN2yMxdHloVVHFqQe0sRRG9udVuGUq33b5eA9JCGUdCEV4FV1R2KrKUNaP 2nmwFCh67qqQBH1AnRZLVcQgzQGbvkVgzT8w46vtIlvL1EqAaT51lCB+Q1kWEj34 Y9W1SR0T4Yesxtg/rKDsUJZC3WoMq5q/tsPhs//K/1KTAlllVFLnTtu955kPr1IB EwfB6nfsdtLi7D/BTjbTmuYBblCF9EnvRXjbul2AwN/he6UvYcVR3+rmRMk8oGQ2 zlquslix7Ch2VY1gtguy67ZDTWlSwXXE4p8/9weavSYomHR7Sqq/3DNmTAOyHYZ2 m/NUZVo/oBlpywPCuhFk36uxrUku3FprFLRGAwvo0we1EnF8tw9YRLyl9crz6xVA vR6vgf/CSiqmDdS2OCnGQ0/H6aKU/WhsXF839v2ty5jCI95yQoHthybVTd9EZfYj nZpXe1dIMmJDb2eEoPzTlvm8/Na+0zQjvsk695t4wnP1xe4vicE8gl8SWW8KNOrP 23Hyhg42BwE3H2m5F8KqhdeE2XMbgD3GoBV+EMKaEVHE3FsLmHhAOMzgJQ/UEukH CX9oHWcbUTmtcu+RAl33UaSSSl4p0wz4rZa+NzlpgqEzvUO5izfMeHPV1udV9tP+ e/wAP5+YAUt5T8+LoRI8 =KrQx -----END PGP SIGNATURE-----

2 3

Re: [PATCH] winepulse: add audio driver
by Damjan Jovanovic Feb. 16, 2015

Feb. 16, 2015

AFAIK, even if for no other reason, this patch will probably be rejected because it patches configure, as opposed to just patching configure.ac and requesting configure to be regenerated. It might also have a better chance if broken up into several patches. Damjan On Wed, Feb 11, 2015 at 11:15 AM, Maarten Lankhorst <wine(a)mblankhorst.nl> wrote: > This is a squash of all the winepulse related patches in repo.or.cz/w/wine/multimedia.git > > Signed-off-by: Maarten Lankhorst <wine(a)mblankhorst.nl> > --- > diff --git a/configure b/configure > index abef0c3..51a420f 100755 > --- a/configure > +++ b/configure > @@ -653,6 +653,8 @@ OSS4_CFLAGS > ALSA_LIBS > GSTREAMER_LIBS > GSTREAMER_CFLAGS > +PULSEINCL > +PULSELIBS > GETTEXTPO_LIBS > Z_LIBS > FREETYPE_LIBS > @@ -827,6 +829,7 @@ with_oss > with_pcap > with_png > with_pthread > +with_pulse > with_sane > with_tiff > with_v4l > @@ -1296,6 +1299,7 @@ enable_winemapi > enable_winemp3_acm > enable_wineoss_drv > enable_wineps_drv > +enable_winepulse_drv > enable_wineqtdecoder > enable_winex11_drv > enable_wing32 > @@ -2130,6 +2134,7 @@ Optional Packages: > --without-pcap do not use the Packet Capture library > --without-png do not use PNG > --without-pthread do not use the pthread library > + --without-pulse do not use PulseAudio sound support > --without-sane do not use SANE (scanner support) > --without-tiff do not use TIFF > --without-v4l do not use v4l1 (v4l support) > @@ -3377,6 +3382,12 @@ if test "${with_pthread+set}" = set; then : > fi > > > +# Check whether --with-pulse was given. > +if test "${with_pulse+set}" = set; then : > + withval=$with_pulse; > +fi > + > + > # Check whether --with-sane was given. > if test "${with_sane+set}" = set; then : > withval=$with_sane; > @@ -12363,6 +12374,87 @@ esac > fi > fi > > +PULSELIBS="" > + > +PULSEINCL="" > + > +if test "x$with_pulse" != "xno"; > +then > + ac_save_CPPFLAGS="$CPPFLAGS" > + if test "$PKG_CONFIG" != "false"; > + then > + ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`" > + ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`" > + > + CPPFLAGS="$CPPFLAGS $ac_pulse_cflags" > + for ac_header in pulse/pulseaudio.h > +do : > + ac_fn_c_check_header_mongrel "$LINENO" "pulse/pulseaudio.h" "ac_cv_header_pulse_pulseaudio_h" "$ac_includes_default" > +if test "x$ac_cv_header_pulse_pulseaudio_h" = xyes; then : > + cat >>confdefs.h <<_ACEOF > +#define HAVE_PULSE_PULSEAUDIO_H 1 > +_ACEOF > + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pa_stream_is_corked in -lpulse" >&5 > +$as_echo_n "checking for pa_stream_is_corked in -lpulse... " >&6; } > +if ${ac_cv_lib_pulse_pa_stream_is_corked+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > + ac_check_lib_save_LIBS=$LIBS > +LIBS="-lpulse $ac_pulse_libs $LIBS" > +cat confdefs.h - <<_ACEOF >conftest.$ac_ext > +/* end confdefs.h. */ > + > +/* Override any GCC internal prototype to avoid an error. > + Use char because int might match the return type of a GCC > + builtin and then its argument prototype would still apply. */ > +#ifdef __cplusplus > +extern "C" > +#endif > +char pa_stream_is_corked (); > +int > +main () > +{ > +return pa_stream_is_corked (); > + ; > + return 0; > +} > +_ACEOF > +if ac_fn_c_try_link "$LINENO"; then : > + ac_cv_lib_pulse_pa_stream_is_corked=yes > +else > + ac_cv_lib_pulse_pa_stream_is_corked=no > +fi > +rm -f core conftest.err conftest.$ac_objext \ > + conftest$ac_exeext conftest.$ac_ext > +LIBS=$ac_check_lib_save_LIBS > +fi > +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pulse_pa_stream_is_corked" >&5 > +$as_echo "$ac_cv_lib_pulse_pa_stream_is_corked" >&6; } > +if test "x$ac_cv_lib_pulse_pa_stream_is_corked" = xyes; then : > + > +$as_echo "#define HAVE_PULSEAUDIO 1" >>confdefs.h > + > + PULSELIBS="$ac_pulse_libs" > + PULSEINCL="$ac_pulse_cflags" > +fi > + > + > +fi > + > +done > + > + fi > + CPPFLAGS="$ac_save_CPPFLAGS" > +fi > +if test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"; then : > + case "x$with_pulse" in > + x) as_fn_append wine_warnings "|libpulse ${notice_platform}development files not found or too old, Pulse won't be supported." ;; > + xno) ;; > + *) as_fn_error $? "libpulse ${notice_platform}development files not found or too old, Pulse won't be supported. > +This is an error since --with-pulse was requested." "$LINENO" 5 ;; > +esac > +fi > + > if test "x$with_gstreamer" != "xno" > then > if ${GSTREAMER_CFLAGS:+false} :; then : > @@ -13674,12 +13766,13 @@ fi > > test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} > test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} > +test -n "$PULSELIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} > test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} > test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} > > -if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \ > +if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSELIBS" = "x" -a \ > "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ > - "x$with_alsa$with_coreaudio$with_oss" != xnonono > + "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono > then > as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent." > fi > @@ -17616,7 +17709,7 @@ wine_fn_config_dll windowscodecs enable_windowscodecs clean,implib > wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test > wine_fn_config_dll windowscodecsext enable_windowscodecsext implib > wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test > -wine_fn_config_dll winealsa.drv enable_winealsa_drv > +wine_fn_config_dll winealsa.drv enable_winealsa_drv implib > wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv > wine_fn_config_lib winecrt0 > wine_fn_config_dll wined3d enable_wined3d implib > @@ -17628,6 +17721,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm > wine_fn_config_dll wineoss.drv enable_wineoss_drv > wine_fn_config_dll wineps.drv enable_wineps_drv clean,po > wine_fn_config_dll wineps16.drv16 enable_win16 > +wine_fn_config_dll winepulse.drv enable_winepulse_drv > wine_fn_config_dll wineqtdecoder enable_wineqtdecoder > wine_fn_config_dll winex11.drv enable_winex11_drv > wine_fn_config_dll wing.dll16 enable_win16 > diff --git a/configure.ac b/configure.ac > index 2e6cb4c..4146e8f 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -72,6 +72,7 @@ AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Ca > AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) > AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), > [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) > +AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) > AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) > AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) > AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) > @@ -1548,6 +1549,30 @@ then > [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) > fi > > +dnl **** Check for PulseAudio **** > +AC_SUBST(PULSELIBS,"") > +AC_SUBST(PULSEINCL,"") > +if test "x$with_pulse" != "xno"; > +then > + ac_save_CPPFLAGS="$CPPFLAGS" > + if test "$PKG_CONFIG" != "false"; > + then > + ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`" > + ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`" > + > + CPPFLAGS="$CPPFLAGS $ac_pulse_cflags" > + AC_CHECK_HEADERS(pulse/pulseaudio.h, > + [AC_CHECK_LIB(pulse, pa_stream_is_corked, > + [AC_DEFINE(HAVE_PULSEAUDIO, 1, [Define if you have pulseaudio]) > + PULSELIBS="$ac_pulse_libs" > + PULSEINCL="$ac_pulse_cflags"],,$ac_pulse_libs) > + ]) > + fi > + CPPFLAGS="$ac_save_CPPFLAGS" > +fi > +WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"], > + [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.]) > + > dnl **** Check for gstreamer **** > if test "x$with_gstreamer" != "xno" > then > @@ -1766,13 +1791,14 @@ fi > dnl **** Disable unsupported winmm drivers **** > test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} > test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} > +test -n "$PULSELIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} > test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} > test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} > > dnl **** Check for any sound system **** > -if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \ > +if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSELIBS" = "x" -a \ > "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ > - "x$with_alsa$with_coreaudio$with_oss" != xnonono > + "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono > then > WINE_WARNING([No sound system was found. Windows applications will be silent.]) > fi > @@ -3327,7 +3353,7 @@ WINE_CONFIG_DLL(windowscodecs,,[clean,implib]) > WINE_CONFIG_TEST(dlls/windowscodecs/tests) > WINE_CONFIG_DLL(windowscodecsext,,[implib]) > WINE_CONFIG_TEST(dlls/windowscodecsext/tests) > -WINE_CONFIG_DLL(winealsa.drv) > +WINE_CONFIG_DLL(winealsa.drv,,[implib]) > WINE_CONFIG_DLL(winecoreaudio.drv) > WINE_CONFIG_LIB(winecrt0) > WINE_CONFIG_DLL(wined3d,,[implib]) > @@ -3339,6 +3365,7 @@ WINE_CONFIG_DLL(winemp3.acm) > WINE_CONFIG_DLL(wineoss.drv) > WINE_CONFIG_DLL(wineps.drv,,[clean,po]) > WINE_CONFIG_DLL(wineps16.drv16,enable_win16) > +WINE_CONFIG_DLL(winepulse.drv) > WINE_CONFIG_DLL(wineqtdecoder) > WINE_CONFIG_DLL(winex11.drv) > WINE_CONFIG_DLL(wing.dll16,enable_win16) > diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c > index 52cf6f1..aa4baa5 100644 > --- a/dlls/mmdevapi/main.c > +++ b/dlls/mmdevapi/main.c > @@ -113,7 +113,7 @@ static BOOL init_driver(void) > { > static const WCHAR drv_value[] = {'A','u','d','i','o',0}; > > - static WCHAR default_list[] = {'a','l','s','a',',','o','s','s',',', > + static WCHAR default_list[] = {'p','u','l','s','e',',','a','l','s','a',',','o','s','s',',', > 'c','o','r','e','a','u','d','i','o',0}; > > DriverFuncs driver; > diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in > new file mode 100644 > index 0000000..3428329 > --- /dev/null > +++ b/dlls/winepulse.drv/Makefile.in > @@ -0,0 +1,8 @@ > +MODULE = winepulse.drv > +IMPORTS = dxguid uuid winmm user32 advapi32 ole32 > +DELAYIMPORTS = winealsa.drv > +EXTRALIBS = @PULSELIBS@ $(PTHREAD_LIBS) > +EXTRAINCL = @PULSEINCL@ > + > +C_SRCS = \ > + mmdevdrv.c > diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c > new file mode 100644 > index 0000000..ab78d5a > --- /dev/null > +++ b/dlls/winepulse.drv/mmdevdrv.c > @@ -0,0 +1,3182 @@ > +/* > + * Copyright 2011-2012 Maarten Lankhorst > + * Copyright 2010-2011 Maarten Lankhorst for CodeWeavers > + * Copyright 2011 Andrew Eikum for CodeWeavers > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#define NONAMELESSUNION > +#define COBJMACROS > +#define _GNU_SOURCE > + > +#include "config.h" > +#include <poll.h> > +#include <pthread.h> > + > +#include <stdarg.h> > +#include <unistd.h> > +#include <math.h> > +#include <stdio.h> > +#include <errno.h> > + > +#include <pulse/pulseaudio.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "winnls.h" > +#include "winreg.h" > +#include "wine/debug.h" > +#include "wine/unicode.h" > +#include "wine/list.h" > + > +#include "ole2.h" > +#include "dshow.h" > +#include "dsound.h" > +#include "propsys.h" > + > +#include "initguid.h" > +#include "ks.h" > +#include "ksmedia.h" > +#include "propkey.h" > +#include "mmdeviceapi.h" > +#include "audioclient.h" > +#include "endpointvolume.h" > +#include "audiopolicy.h" > + > +#include "wine/list.h" > + > +#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) > + > +WINE_DEFAULT_DEBUG_CHANNEL(pulse); > + > +/* From <dlls/mmdevapi/mmdevapi.h> */ > +enum DriverPriority { > + Priority_Unavailable = 0, > + Priority_Low, > + Priority_Neutral, > + Priority_Preferred > +}; > + > +static const REFERENCE_TIME MinimumPeriod = 30000; > +static const REFERENCE_TIME DefaultPeriod = 100000; > + > +static pa_context *pulse_ctx; > +static pa_mainloop *pulse_ml; > + > +static HANDLE pulse_thread; > +static pthread_mutex_t pulse_lock; > +static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; > +static struct list g_sessions = LIST_INIT(g_sessions); > + > +/* Mixer format + period times */ > +static WAVEFORMATEXTENSIBLE pulse_fmt[2]; > +static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; > + > +static GUID pulse_render_guid = > +{ 0xfd47d9cc, 0x4218, 0x4135, { 0x9c, 0xe2, 0x0c, 0x19, 0x5c, 0x87, 0x40, 0x5b } }; > +static GUID pulse_capture_guid = > +{ 0x25da76d0, 0x033c, 0x4235, { 0x90, 0x02, 0x19, 0xf4, 0x88, 0x94, 0xac, 0x6f } }; > + > +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) > +{ > + if (reason == DLL_PROCESS_ATTACH) { > + pthread_mutexattr_t attr; > + > + DisableThreadLibraryCalls(dll); > + > + pthread_mutexattr_init(&attr); > + pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); > + > + if (pthread_mutex_init(&pulse_lock, &attr) != 0) > + pthread_mutex_init(&pulse_lock, NULL); > + } else if (reason == DLL_PROCESS_DETACH) { > + if (pulse_thread) > + SetThreadPriority(pulse_thread, 0); > + if (pulse_ctx) { > + pa_context_disconnect(pulse_ctx); > + pa_context_unref(pulse_ctx); > + } > + if (pulse_ml) > + pa_mainloop_quit(pulse_ml, 0); > + if (pulse_thread) > + CloseHandle(pulse_thread); > + } > + return TRUE; > +} > + > +typedef struct ACImpl ACImpl; > + > +typedef struct _AudioSession { > + GUID guid; > + struct list clients; > + > + IMMDevice *device; > + > + float master_vol; > + UINT32 channel_count; > + float *channel_vols; > + BOOL mute; > + > + struct list entry; > +} AudioSession; > + > +typedef struct _AudioSessionWrapper { > + IAudioSessionControl2 IAudioSessionControl2_iface; > + IChannelAudioVolume IChannelAudioVolume_iface; > + ISimpleAudioVolume ISimpleAudioVolume_iface; > + > + LONG ref; > + > + ACImpl *client; > + AudioSession *session; > +} AudioSessionWrapper; > + > +typedef struct _ACPacket { > + struct list entry; > + UINT64 qpcpos; > + BYTE *data; > + UINT32 discont; > +} ACPacket; > + > +struct ACImpl { > + IAudioClient IAudioClient_iface; > + IAudioRenderClient IAudioRenderClient_iface; > + IAudioCaptureClient IAudioCaptureClient_iface; > + IAudioClock IAudioClock_iface; > + IAudioClock2 IAudioClock2_iface; > + IAudioStreamVolume IAudioStreamVolume_iface; > + IUnknown *marshal; > + IMMDevice *parent; > + struct list entry; > + float vol[PA_CHANNELS_MAX]; > + > + LONG ref; > + EDataFlow dataflow; > + DWORD flags; > + AUDCLNT_SHAREMODE share; > + HANDLE event; > + > + UINT32 bufsize_frames, bufsize_bytes, locked, capture_period, pad, started, peek_ofs; > + void *locked_ptr, *tmp_buffer; > + > + pa_stream *stream; > + pa_sample_spec ss; > + pa_channel_map map; > + > + INT64 clock_lastpos, clock_written; > + > + AudioSession *session; > + AudioSessionWrapper *session_wrapper; > + struct list packet_free_head; > + struct list packet_filled_head; > +}; > + > +static const WCHAR defaultW[] = {'P','u','l','s','e','a','u','d','i','o',0}; > + > +static const IAudioClientVtbl AudioClient_Vtbl; > +static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; > +static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; > +static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; > +static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; > +static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; > +static const IAudioClockVtbl AudioClock_Vtbl; > +static const IAudioClock2Vtbl AudioClock2_Vtbl; > +static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; > + > +static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); > + > +static inline ACImpl *impl_from_IAudioClient(IAudioClient *iface) > +{ > + return CONTAINING_RECORD(iface, ACImpl, IAudioClient_iface); > +} > + > +static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) > +{ > + return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); > +} > + > +static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) > +{ > + return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); > +} > + > +static inline AudioSessionWrapper *impl_from_IAudioSessionControl2(IAudioSessionControl2 *iface) > +{ > + return CONTAINING_RECORD(iface, AudioSessionWrapper, IAudioSessionControl2_iface); > +} > + > +static inline AudioSessionWrapper *impl_from_ISimpleAudioVolume(ISimpleAudioVolume *iface) > +{ > + return CONTAINING_RECORD(iface, AudioSessionWrapper, ISimpleAudioVolume_iface); > +} > + > +static inline AudioSessionWrapper *impl_from_IChannelAudioVolume(IChannelAudioVolume *iface) > +{ > + return CONTAINING_RECORD(iface, AudioSessionWrapper, IChannelAudioVolume_iface); > +} > + > +static inline ACImpl *impl_from_IAudioClock(IAudioClock *iface) > +{ > + return CONTAINING_RECORD(iface, ACImpl, IAudioClock_iface); > +} > + > +static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) > +{ > + return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); > +} > + > +static inline ACImpl *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) > +{ > + return CONTAINING_RECORD(iface, ACImpl, IAudioStreamVolume_iface); > +} > + > +/* Following pulseaudio design here, mainloop has the lock taken whenever > + * it is handling something for pulse, and the lock is required whenever > + * doing any pa_* call that can affect the state in any way > + * > + * pa_cond_wait is used when waiting on results, because the mainloop needs > + * the same lock taken to affect the state > + * > + * This is basically the same as the pa_threaded_mainloop implementation, > + * but that cannot be used because it uses pthread_create directly > + * > + * pa_threaded_mainloop_(un)lock -> pthread_mutex_(un)lock > + * pa_threaded_mainloop_signal -> pthread_cond_signal > + * pa_threaded_mainloop_wait -> pthread_cond_wait > + */ > + > +static int pulse_poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, void *userdata) { > + int r; > + pthread_mutex_unlock(&pulse_lock); > + r = poll(ufds, nfds, timeout); > + pthread_mutex_lock(&pulse_lock); > + return r; > +} > + > +static DWORD CALLBACK pulse_mainloop_thread(void *tmp) { > + int ret; > + pulse_ml = pa_mainloop_new(); > + pa_mainloop_set_poll_func(pulse_ml, pulse_poll_func, NULL); > + pthread_mutex_lock(&pulse_lock); > + pthread_cond_signal(&pulse_cond); > + pa_mainloop_run(pulse_ml, &ret); > + pthread_mutex_unlock(&pulse_lock); > + pa_mainloop_free(pulse_ml); > + CloseHandle(pulse_thread); > + return ret; > +} > + > +static void pulse_contextcallback(pa_context *c, void *userdata); > +static void pulse_stream_state(pa_stream *s, void *user); > + > +static const enum pa_channel_position pulse_pos_from_wfx[] = { > + PA_CHANNEL_POSITION_FRONT_LEFT, > + PA_CHANNEL_POSITION_FRONT_RIGHT, > + PA_CHANNEL_POSITION_FRONT_CENTER, > + PA_CHANNEL_POSITION_LFE, > + PA_CHANNEL_POSITION_REAR_LEFT, > + PA_CHANNEL_POSITION_REAR_RIGHT, > + PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, > + PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, > + PA_CHANNEL_POSITION_REAR_CENTER, > + PA_CHANNEL_POSITION_SIDE_LEFT, > + PA_CHANNEL_POSITION_SIDE_RIGHT, > + PA_CHANNEL_POSITION_TOP_CENTER, > + PA_CHANNEL_POSITION_TOP_FRONT_LEFT, > + PA_CHANNEL_POSITION_TOP_FRONT_CENTER, > + PA_CHANNEL_POSITION_TOP_FRONT_RIGHT, > + PA_CHANNEL_POSITION_TOP_REAR_LEFT, > + PA_CHANNEL_POSITION_TOP_REAR_CENTER, > + PA_CHANNEL_POSITION_TOP_REAR_RIGHT > +}; > + > +static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) { > + int i; > + DWORD mask = 0; > + > + for (i = 0; i < map->channels; ++i) > + switch (map->map[i]) { > + default: FIXME("Unhandled channel %s\n", pa_channel_position_to_string(map->map[i])); break; > + case PA_CHANNEL_POSITION_FRONT_LEFT: mask |= SPEAKER_FRONT_LEFT; break; > + case PA_CHANNEL_POSITION_MONO: > + case PA_CHANNEL_POSITION_FRONT_CENTER: mask |= SPEAKER_FRONT_CENTER; break; > + case PA_CHANNEL_POSITION_FRONT_RIGHT: mask |= SPEAKER_FRONT_RIGHT; break; > + case PA_CHANNEL_POSITION_REAR_LEFT: mask |= SPEAKER_BACK_LEFT; break; > + case PA_CHANNEL_POSITION_REAR_CENTER: mask |= SPEAKER_BACK_CENTER; break; > + case PA_CHANNEL_POSITION_REAR_RIGHT: mask |= SPEAKER_BACK_RIGHT; break; > + case PA_CHANNEL_POSITION_LFE: mask |= SPEAKER_LOW_FREQUENCY; break; > + case PA_CHANNEL_POSITION_SIDE_LEFT: mask |= SPEAKER_SIDE_LEFT; break; > + case PA_CHANNEL_POSITION_SIDE_RIGHT: mask |= SPEAKER_SIDE_RIGHT; break; > + case PA_CHANNEL_POSITION_TOP_CENTER: mask |= SPEAKER_TOP_CENTER; break; > + case PA_CHANNEL_POSITION_TOP_FRONT_LEFT: mask |= SPEAKER_TOP_FRONT_LEFT; break; > + case PA_CHANNEL_POSITION_TOP_FRONT_CENTER: mask |= SPEAKER_TOP_FRONT_CENTER; break; > + case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT: mask |= SPEAKER_TOP_FRONT_RIGHT; break; > + case PA_CHANNEL_POSITION_TOP_REAR_LEFT: mask |= SPEAKER_TOP_BACK_LEFT; break; > + case PA_CHANNEL_POSITION_TOP_REAR_CENTER: mask |= SPEAKER_TOP_BACK_CENTER; break; > + case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: mask |= SPEAKER_TOP_BACK_RIGHT; break; > + case PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; > + case PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; > + } > + > + return mask; > +} > + > +static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { > + WAVEFORMATEX *wfx = &fmt->Format; > + pa_stream *stream; > + pa_channel_map map; > + pa_sample_spec ss; > + pa_buffer_attr attr; > + int ret; > + unsigned int length = 0; > + > + pa_channel_map_init_auto(&map, 2, PA_CHANNEL_MAP_ALSA); > + ss.rate = 48000; > + ss.format = PA_SAMPLE_FLOAT32LE; > + ss.channels = map.channels; > + > + attr.maxlength = -1; > + attr.tlength = -1; > + attr.minreq = attr.fragsize = pa_frame_size(&ss); > + attr.prebuf = 0; > + > + stream = pa_stream_new(pulse_ctx, "format test stream", &ss, &map); > + if (stream) > + pa_stream_set_state_callback(stream, pulse_stream_state, NULL); > + if (!stream) > + ret = -1; > + else if (render) > + ret = pa_stream_connect_playback(stream, NULL, &attr, > + PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS, NULL, NULL); > + else > + ret = pa_stream_connect_record(stream, NULL, &attr, PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS); > + if (ret >= 0) { > + while (pa_stream_get_state(stream) == PA_STREAM_CREATING) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + if (pa_stream_get_state(stream) == PA_STREAM_READY) { > + ss = *pa_stream_get_sample_spec(stream); > + map = *pa_stream_get_channel_map(stream); > + if (render) > + length = pa_stream_get_buffer_attr(stream)->minreq; > + else > + length = pa_stream_get_buffer_attr(stream)->fragsize; > + pa_stream_disconnect(stream); > + while (pa_stream_get_state(stream) == PA_STREAM_READY) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + } > + } > + if (stream) > + pa_stream_unref(stream); > + if (length) > + pulse_def_period[!render] = pulse_min_period[!render] = pa_bytes_to_usec(10 * length, &ss); > + else > + pulse_min_period[!render] = MinimumPeriod; > + if (pulse_def_period[!render] <= DefaultPeriod) > + pulse_def_period[!render] = DefaultPeriod; > + > + wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; > + wfx->cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); > + wfx->nChannels = ss.channels; > + wfx->wBitsPerSample = 8 * pa_sample_size_of_format(ss.format); > + wfx->nSamplesPerSec = ss.rate; > + wfx->nBlockAlign = pa_frame_size(&ss); > + wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; > + if (ss.format != PA_SAMPLE_S24_32LE) > + fmt->Samples.wValidBitsPerSample = wfx->wBitsPerSample; > + else > + fmt->Samples.wValidBitsPerSample = 24; > + if (ss.format == PA_SAMPLE_FLOAT32LE) > + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > + else > + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > + > + fmt->dwChannelMask = pulse_channel_map_to_channel_mask(&map); > +} > + > +static HRESULT pulse_connect(void) > +{ > + int len; > + WCHAR path[PATH_MAX], *name; > + char *str; > + > + if (!pulse_thread) > + { > + if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, NULL, 0, NULL))) > + { > + ERR("Failed to create mainloop thread."); > + return E_FAIL; > + } > + SetThreadPriority(pulse_thread, THREAD_PRIORITY_TIME_CRITICAL); > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + } > + > + if (pulse_ctx && PA_CONTEXT_IS_GOOD(pa_context_get_state(pulse_ctx))) > + return S_OK; > + if (pulse_ctx) > + pa_context_unref(pulse_ctx); > + > + GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path)); > + name = strrchrW(path, '\\'); > + if (!name) > + name = path; > + else > + name++; > + len = WideCharToMultiByte(CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL); > + str = pa_xmalloc(len); > + WideCharToMultiByte(CP_UNIXCP, 0, name, -1, str, len, NULL, NULL); > + TRACE("Name: %s\n", str); > + pulse_ctx = pa_context_new(pa_mainloop_get_api(pulse_ml), str); > + pa_xfree(str); > + if (!pulse_ctx) { > + ERR("Failed to create context\n"); > + return E_FAIL; > + } > + > + pa_context_set_state_callback(pulse_ctx, pulse_contextcallback, NULL); > + > + TRACE("libpulse protocol version: %u. API Version %u\n", pa_context_get_protocol_version(pulse_ctx), PA_API_VERSION); > + if (pa_context_connect(pulse_ctx, NULL, 0, NULL) < 0) > + goto fail; > + > + /* Wait for connection */ > + while (pthread_cond_wait(&pulse_cond, &pulse_lock)) { > + pa_context_state_t state = pa_context_get_state(pulse_ctx); > + > + if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED) > + goto fail; > + > + if (state == PA_CONTEXT_READY) > + break; > + } > + > + TRACE("Connected to server %s with protocol version: %i.\n", > + pa_context_get_server(pulse_ctx), > + pa_context_get_server_protocol_version(pulse_ctx)); > + pulse_probe_settings(1, &pulse_fmt[0]); > + pulse_probe_settings(0, &pulse_fmt[1]); > + return S_OK; > + > +fail: > + pa_context_unref(pulse_ctx); > + pulse_ctx = NULL; > + return E_FAIL; > +} > + > +static void pulse_contextcallback(pa_context *c, void *userdata) { > + switch (pa_context_get_state(c)) { > + default: > + FIXME("Unhandled state: %i\n", pa_context_get_state(c)); > + case PA_CONTEXT_CONNECTING: > + case PA_CONTEXT_UNCONNECTED: > + case PA_CONTEXT_AUTHORIZING: > + case PA_CONTEXT_SETTING_NAME: > + case PA_CONTEXT_TERMINATED: > + TRACE("State change to %i\n", pa_context_get_state(c)); > + return; > + > + case PA_CONTEXT_READY: > + TRACE("Ready\n"); > + break; > + > + case PA_CONTEXT_FAILED: > + ERR("Context failed: %s\n", pa_strerror(pa_context_errno(c))); > + break; > + } > + pthread_cond_signal(&pulse_cond); > +} > + > +static HRESULT pulse_stream_valid(ACImpl *This) { > + if (!This->stream) > + return AUDCLNT_E_NOT_INITIALIZED; > + if (!This->stream || pa_stream_get_state(This->stream) != PA_STREAM_READY) > + return AUDCLNT_E_DEVICE_INVALIDATED; > + return S_OK; > +} > + > +static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes) > +{ > + memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); > +} > + > +static void dump_attr(const pa_buffer_attr *attr) { > + TRACE("maxlength: %u\n", attr->maxlength); > + TRACE("minreq: %u\n", attr->minreq); > + TRACE("fragsize: %u\n", attr->fragsize); > + TRACE("tlength: %u\n", attr->tlength); > + TRACE("prebuf: %u\n", attr->prebuf); > +} > + > +static void pulse_op_cb(pa_stream *s, int success, void *user) { > + TRACE("Success: %i\n", success); > + *(int*)user = success; > + pthread_cond_signal(&pulse_cond); > +} > + > +static void pulse_attr_update(pa_stream *s, void *user) { > + const pa_buffer_attr *attr = pa_stream_get_buffer_attr(s); > + TRACE("New attributes or device moved:\n"); > + dump_attr(attr); > +} > + > +static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) > +{ > + ACImpl *This = userdata; > + UINT32 oldpad = This->pad; > + > + if (bytes < This->bufsize_bytes) > + This->pad = This->bufsize_bytes - bytes; > + else > + This->pad = 0; > + > + if (oldpad == This->pad) > + return; > + > + assert(oldpad > This->pad); > + > + This->clock_written += oldpad - This->pad; > + TRACE("New pad: %zu (-%zu)\n", This->pad / pa_frame_size(&This->ss), (oldpad - This->pad) / pa_frame_size(&This->ss)); > + > + if (This->event) > + SetEvent(This->event); > +} > + > +static void pulse_underflow_callback(pa_stream *s, void *userdata) > +{ > + WARN("Underflow\n"); > +} > + > +/* Latency is periodically updated even when nothing is played, > + * because of PA_STREAM_AUTO_TIMING_UPDATE so use it as timer > + * > + * Perfect for passing all tests :) > + */ > +static void pulse_latency_callback(pa_stream *s, void *userdata) > +{ > + ACImpl *This = userdata; > + if (!This->pad && This->event) > + SetEvent(This->event); > +} > + > +static void pulse_started_callback(pa_stream *s, void *userdata) > +{ > + TRACE("(Re)started playing\n"); > +} > + > +static void pulse_rd_loop(ACImpl *This, size_t bytes) > +{ > + while (bytes >= This->capture_period) { > + ACPacket *p, *next; > + LARGE_INTEGER stamp, freq; > + BYTE *dst, *src; > + size_t src_len, copy, rem = This->capture_period; > + if (!(p = (ACPacket*)list_head(&This->packet_free_head))) { > + p = (ACPacket*)list_head(&This->packet_filled_head); > + if (!p->discont) { > + next = (ACPacket*)p->entry.next; > + next->discont = 1; > + } else > + p = (ACPacket*)list_tail(&This->packet_filled_head); > + assert(This->pad == This->bufsize_bytes); > + } else { > + assert(This->pad < This->bufsize_bytes); > + This->pad += This->capture_period; > + assert(This->pad <= This->bufsize_bytes); > + } > + QueryPerformanceCounter(&stamp); > + QueryPerformanceFrequency(&freq); > + p->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; > + p->discont = 0; > + list_remove(&p->entry); > + list_add_tail(&This->packet_filled_head, &p->entry); > + > + dst = p->data; > + while (rem) { > + pa_stream_peek(This->stream, (const void**)&src, &src_len); > + assert(src_len); > + assert(This->peek_ofs < src_len); > + src += This->peek_ofs; > + src_len -= This->peek_ofs; > + assert(src_len <= bytes); > + > + copy = rem; > + if (copy > src_len) > + copy = src_len; > + memcpy(dst, src, rem); > + src += copy; > + src_len -= copy; > + dst += copy; > + rem -= copy; > + > + if (!src_len) { > + This->peek_ofs = 0; > + pa_stream_drop(This->stream); > + } else > + This->peek_ofs += copy; > + } > + bytes -= This->capture_period; > + } > +} > + > +static void pulse_rd_drop(ACImpl *This, size_t bytes) > +{ > + while (bytes >= This->capture_period) { > + size_t src_len, copy, rem = This->capture_period; > + while (rem) { > + const void *src; > + pa_stream_peek(This->stream, &src, &src_len); > + assert(src_len); > + assert(This->peek_ofs < src_len); > + src_len -= This->peek_ofs; > + assert(src_len <= bytes); > + > + copy = rem; > + if (copy > src_len) > + copy = src_len; > + > + src_len -= copy; > + rem -= copy; > + > + if (!src_len) { > + This->peek_ofs = 0; > + pa_stream_drop(This->stream); > + } else > + This->peek_ofs += copy; > + bytes -= copy; > + } > + } > +} > + > +static void pulse_rd_callback(pa_stream *s, size_t bytes, void *userdata) > +{ > + ACImpl *This = userdata; > + > + TRACE("Readable total: %zu, fragsize: %u\n", bytes, pa_stream_get_buffer_attr(s)->fragsize); > + assert(bytes >= This->peek_ofs); > + bytes -= This->peek_ofs; > + if (bytes < This->capture_period) > + return; > + > + if (This->started) > + pulse_rd_loop(This, bytes); > + else > + pulse_rd_drop(This, bytes); > + > + if (This->event) > + SetEvent(This->event); > +} > + > +static void pulse_stream_state(pa_stream *s, void *user) > +{ > + pa_stream_state_t state = pa_stream_get_state(s); > + TRACE("Stream state changed to %i\n", state); > + pthread_cond_signal(&pulse_cond); > +} > + > +static HRESULT pulse_stream_connect(ACImpl *This, UINT32 period_bytes) { > + int ret; > + char buffer[64]; > + static LONG number; > + pa_buffer_attr attr; > + if (This->stream) { > + pa_stream_disconnect(This->stream); > + while (pa_stream_get_state(This->stream) == PA_STREAM_READY) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + pa_stream_unref(This->stream); > + } > + ret = InterlockedIncrement(&number); > + sprintf(buffer, "audio stream #%i", ret); > + This->stream = pa_stream_new(pulse_ctx, buffer, &This->ss, &This->map); > + > + if (!This->stream) { > + WARN("pa_stream_new returned error %i\n", pa_context_errno(pulse_ctx)); > + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; > + } > + > + pa_stream_set_state_callback(This->stream, pulse_stream_state, This); > + pa_stream_set_buffer_attr_callback(This->stream, pulse_attr_update, This); > + pa_stream_set_moved_callback(This->stream, pulse_attr_update, This); > + > + /* Pulseaudio will fill in correct values */ > + attr.minreq = attr.fragsize = period_bytes; > + attr.maxlength = attr.tlength = This->bufsize_bytes; > + attr.prebuf = pa_frame_size(&This->ss); > + dump_attr(&attr); > + if (This->dataflow == eRender) > + ret = pa_stream_connect_playback(This->stream, NULL, &attr, > + PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_EARLY_REQUESTS, NULL, NULL); > + else > + ret = pa_stream_connect_record(This->stream, NULL, &attr, > + PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_EARLY_REQUESTS); > + if (ret < 0) { > + WARN("Returns %i\n", ret); > + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; > + } > + while (pa_stream_get_state(This->stream) == PA_STREAM_CREATING) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + if (pa_stream_get_state(This->stream) != PA_STREAM_READY) > + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; > + > + if (This->dataflow == eRender) { > + pa_stream_set_write_callback(This->stream, pulse_wr_callback, This); > + pa_stream_set_underflow_callback(This->stream, pulse_underflow_callback, This); > + pa_stream_set_started_callback(This->stream, pulse_started_callback, This); > + } else > + pa_stream_set_read_callback(This->stream, pulse_rd_callback, This); > + return S_OK; > +} > + > +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, > + UINT *num, UINT *def_index) > +{ > + HRESULT hr = S_OK; > + WCHAR *id; > + > + TRACE("%d %p %p %p\n", flow, ids, num, def_index); > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_connect(); > + pthread_mutex_unlock(&pulse_lock); > + if (FAILED(hr)) > + return hr; > + *num = 1; > + *def_index = 0; > + > + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(**ids)); > + *keys = NULL; > + if (!*ids) > + return E_OUTOFMEMORY; > + > + (*ids)[0] = id = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); > + *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(**keys)); > + if (!*keys || !id) { > + HeapFree(GetProcessHeap(), 0, id); > + HeapFree(GetProcessHeap(), 0, *keys); > + HeapFree(GetProcessHeap(), 0, *ids); > + *ids = NULL; > + *keys = NULL; > + return E_OUTOFMEMORY; > + } > + memcpy(id, defaultW, sizeof(defaultW)); > + > + if (flow == eRender) > + (*keys)[0] = pulse_render_guid; > + else > + (*keys)[0] = pulse_capture_guid; > + > + return S_OK; > +} > + > +int WINAPI AUDDRV_GetPriority(void) > +{ > + HRESULT hr; > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_connect(); > + pthread_mutex_unlock(&pulse_lock); > + return SUCCEEDED(hr) ? Priority_Preferred : Priority_Unavailable; > +} > + > +HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) > +{ > + HRESULT hr; > + ACImpl *This; > + int i; > + EDataFlow dataflow; > + > + TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); > + if (IsEqualGUID(guid, &pulse_render_guid)) > + dataflow = eRender; > + else if (IsEqualGUID(guid, &pulse_capture_guid)) > + dataflow = eCapture; > + else > + return E_UNEXPECTED; > + > + *out = NULL; > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_connect(); > + pthread_mutex_unlock(&pulse_lock); > + if (FAILED(hr)) > + return hr; > + > + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); > + if (!This) > + return E_OUTOFMEMORY; > + > + This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; > + This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; > + This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; > + This->IAudioClock_iface.lpVtbl = &AudioClock_Vtbl; > + This->IAudioClock2_iface.lpVtbl = &AudioClock2_Vtbl; > + This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; > + This->dataflow = dataflow; > + This->parent = dev; > + for (i = 0; i < PA_CHANNELS_MAX; ++i) > + This->vol[i] = 1.f; > + > + hr = CoCreateFreeThreadedMarshaler((IUnknown*)This, &This->marshal); > + if (hr) { > + HeapFree(GetProcessHeap(), 0, This); > + return hr; > + } > + IMMDevice_AddRef(This->parent); > + > + *out = &This->IAudioClient_iface; > + IAudioClient_AddRef(&This->IAudioClient_iface); > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, > + REFIID riid, void **ppv) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + > + *ppv = NULL; > + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + if (IsEqualIID(riid, &IID_IMarshal)) > + return IUnknown_QueryInterface(This->marshal, riid, ppv); > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI AudioClient_AddRef(IAudioClient *iface) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + ULONG ref; > + ref = InterlockedIncrement(&This->ref); > + TRACE("(%p) Refcount now %u\n", This, ref); > + return ref; > +} > + > +static ULONG WINAPI AudioClient_Release(IAudioClient *iface) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + ULONG ref; > + ref = InterlockedDecrement(&This->ref); > + TRACE("(%p) Refcount now %u\n", This, ref); > + if (!ref) { > + if (This->stream) { > + pthread_mutex_lock(&pulse_lock); > + if (PA_STREAM_IS_GOOD(pa_stream_get_state(This->stream))) { > + pa_stream_disconnect(This->stream); > + while (PA_STREAM_IS_GOOD(pa_stream_get_state(This->stream))) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + } > + pa_stream_unref(This->stream); > + This->stream = NULL; > + list_remove(&This->entry); > + pthread_mutex_unlock(&pulse_lock); > + } > + IUnknown_Release(This->marshal); > + IMMDevice_Release(This->parent); > + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); > + HeapFree(GetProcessHeap(), 0, This); > + } > + return ref; > +} > + > +static void dump_fmt(const WAVEFORMATEX *fmt) > +{ > + TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); > + switch(fmt->wFormatTag) { > + case WAVE_FORMAT_PCM: > + TRACE("WAVE_FORMAT_PCM"); > + break; > + case WAVE_FORMAT_IEEE_FLOAT: > + TRACE("WAVE_FORMAT_IEEE_FLOAT"); > + break; > + case WAVE_FORMAT_EXTENSIBLE: > + TRACE("WAVE_FORMAT_EXTENSIBLE"); > + break; > + default: > + TRACE("Unknown"); > + break; > + } > + TRACE(")\n"); > + > + TRACE("nChannels: %u\n", fmt->nChannels); > + TRACE("nSamplesPerSec: %u\n", fmt->nSamplesPerSec); > + TRACE("nAvgBytesPerSec: %u\n", fmt->nAvgBytesPerSec); > + TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); > + TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); > + TRACE("cbSize: %u\n", fmt->cbSize); > + > + if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { > + WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; > + TRACE("dwChannelMask: %08x\n", fmtex->dwChannelMask); > + TRACE("Samples: %04x\n", fmtex->Samples.wReserved); > + TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); > + } > +} > + > +static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) > +{ > + WAVEFORMATEX *ret; > + size_t size; > + > + if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > + size = sizeof(WAVEFORMATEXTENSIBLE); > + else > + size = sizeof(WAVEFORMATEX); > + > + ret = CoTaskMemAlloc(size); > + if (!ret) > + return NULL; > + > + memcpy(ret, fmt, size); > + > + ret->cbSize = size - sizeof(WAVEFORMATEX); > + > + return ret; > +} > + > +static DWORD get_channel_mask(unsigned int channels) > +{ > + switch(channels) { > + case 0: > + return 0; > + case 1: > + return KSAUDIO_SPEAKER_MONO; > + case 2: > + return KSAUDIO_SPEAKER_STEREO; > + case 3: > + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; > + case 4: > + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ > + case 5: > + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; > + case 6: > + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ > + case 7: > + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; > + case 8: > + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ > + } > + FIXME("Unknown speaker configuration: %u\n", channels); > + return 0; > +} > + > +static void session_init_vols(AudioSession *session, UINT channels) > +{ > + if (session->channel_count < channels) { > + UINT i; > + > + if (session->channel_vols) > + session->channel_vols = HeapReAlloc(GetProcessHeap(), 0, > + session->channel_vols, sizeof(float) * channels); > + else > + session->channel_vols = HeapAlloc(GetProcessHeap(), 0, > + sizeof(float) * channels); > + if (!session->channel_vols) > + return; > + > + for(i = session->channel_count; i < channels; ++i) > + session->channel_vols[i] = 1.f; > + > + session->channel_count = channels; > + } > +} > + > +static AudioSession *create_session(const GUID *guid, IMMDevice *device, > + UINT num_channels) > +{ > + AudioSession *ret; > + > + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioSession)); > + if (!ret) > + return NULL; > + > + memcpy(&ret->guid, guid, sizeof(GUID)); > + > + ret->device = device; > + > + list_init(&ret->clients); > + > + list_add_head(&g_sessions, &ret->entry); > + > + session_init_vols(ret, num_channels); > + > + ret->master_vol = 1.f; > + > + return ret; > +} > + > +/* if channels == 0, then this will return or create a session with > + * matching dataflow and GUID. otherwise, channels must also match */ > +static HRESULT get_audio_session(const GUID *sessionguid, > + IMMDevice *device, UINT channels, AudioSession **out) > +{ > + AudioSession *session; > + > + if (!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)) { > + *out = create_session(&GUID_NULL, device, channels); > + if (!*out) > + return E_OUTOFMEMORY; > + > + return S_OK; > + } > + > + *out = NULL; > + LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry) { > + if (session->device == device && > + IsEqualGUID(sessionguid, &session->guid)) { > + session_init_vols(session, channels); > + *out = session; > + break; > + } > + } > + > + if (!*out) { > + *out = create_session(sessionguid, device, channels); > + if (!*out) > + return E_OUTOFMEMORY; > + } > + > + return S_OK; > +} > + > +static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) > +{ > + pa_channel_map_init(&This->map); > + This->ss.rate = fmt->nSamplesPerSec; > + This->ss.format = PA_SAMPLE_INVALID; > + > + switch(fmt->wFormatTag) { > + case WAVE_FORMAT_IEEE_FLOAT: > + if (!fmt->nChannels || fmt->nChannels > 2 || fmt->wBitsPerSample != 32) > + break; > + This->ss.format = PA_SAMPLE_FLOAT32LE; > + pa_channel_map_init_auto(&This->map, fmt->nChannels, PA_CHANNEL_MAP_ALSA); > + break; > + case WAVE_FORMAT_PCM: > + if (!fmt->nChannels || fmt->nChannels > 2) > + break; > + if (fmt->wBitsPerSample == 8) > + This->ss.format = PA_SAMPLE_U8; > + else if (fmt->wBitsPerSample == 16) > + This->ss.format = PA_SAMPLE_S16LE; > + else > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + pa_channel_map_init_auto(&This->map, fmt->nChannels, PA_CHANNEL_MAP_ALSA); > + break; > + case WAVE_FORMAT_EXTENSIBLE: { > + WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE*)fmt; > + DWORD mask = wfe->dwChannelMask; > + DWORD i = 0, j; > + if (fmt->cbSize != (sizeof(*wfe) - sizeof(*fmt)) && fmt->cbSize != sizeof(*wfe)) > + break; > + if (IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) && > + (!wfe->Samples.wValidBitsPerSample || wfe->Samples.wValidBitsPerSample == 32) && > + fmt->wBitsPerSample == 32) > + This->ss.format = PA_SAMPLE_FLOAT32LE; > + else if (IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { > + DWORD valid = wfe->Samples.wValidBitsPerSample; > + if (!valid) > + valid = fmt->wBitsPerSample; > + if (!valid || valid > fmt->wBitsPerSample) > + break; > + switch (fmt->wBitsPerSample) { > + case 8: > + if (valid == 8) > + This->ss.format = PA_SAMPLE_U8; > + break; > + case 16: > + if (valid == 16) > + This->ss.format = PA_SAMPLE_S16LE; > + break; > + case 24: > + if (valid == 24) > + This->ss.format = PA_SAMPLE_S24LE; > + break; > + case 32: > + if (valid == 24) > + This->ss.format = PA_SAMPLE_S24_32LE; > + else if (valid == 32) > + This->ss.format = PA_SAMPLE_S32LE; > + break; > + default: > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + } > + } > + This->map.channels = fmt->nChannels; > + if (!mask || (mask & (SPEAKER_ALL|SPEAKER_RESERVED))) > + mask = get_channel_mask(fmt->nChannels); > + for (j = 0; j < sizeof(pulse_pos_from_wfx)/sizeof(*pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { > + if (mask & (1 << j)) > + This->map.map[i++] = pulse_pos_from_wfx[j]; > + } > + > + /* Special case for mono since pulse appears to map it differently */ > + if (mask == SPEAKER_FRONT_CENTER) > + This->map.map[0] = PA_CHANNEL_POSITION_MONO; > + > + if (i < fmt->nChannels || (mask & SPEAKER_RESERVED)) { > + This->map.channels = 0; > + ERR("Invalid channel mask: %i/%i and %x(%x)\n", i, fmt->nChannels, mask, wfe->dwChannelMask); > + break; > + } > + break; > + } > + case WAVE_FORMAT_ALAW: > + case WAVE_FORMAT_MULAW: > + if (fmt->wBitsPerSample != 8) { > + FIXME("Unsupported bpp %u for LAW\n", fmt->wBitsPerSample); > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + } > + if (fmt->nChannels != 1 && fmt->nChannels != 2) { > + FIXME("Unsupported channels %u for LAW\n", fmt->nChannels); > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + } > + This->ss.format = fmt->wFormatTag == WAVE_FORMAT_MULAW ? PA_SAMPLE_ULAW : PA_SAMPLE_ALAW; > + pa_channel_map_init_auto(&This->map, fmt->nChannels, PA_CHANNEL_MAP_ALSA); > + break; > + default: > + WARN("Unhandled tag %x\n", fmt->wFormatTag); > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + } > + This->ss.channels = This->map.channels; > + if (!pa_channel_map_valid(&This->map) || This->ss.format == PA_SAMPLE_INVALID) { > + ERR("Invalid format! Channel spec valid: %i, format: %i\n", pa_channel_map_valid(&This->map), This->ss.format); > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + } > + return S_OK; > +} > + > +static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, > + AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, > + REFERENCE_TIME period, const WAVEFORMATEX *fmt, > + const GUID *sessionguid) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr = S_OK; > + UINT period_bytes; > + > + TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, > + wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); > + > + if (!fmt) > + return E_POINTER; > + > + if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) > + return AUDCLNT_E_NOT_INITIALIZED; > + if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) > + return AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; > + > + if (flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | > + AUDCLNT_STREAMFLAGS_LOOPBACK | > + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | > + AUDCLNT_STREAMFLAGS_NOPERSIST | > + AUDCLNT_STREAMFLAGS_RATEADJUST | > + AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | > + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | > + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)) { > + TRACE("Unknown flags: %08x\n", flags); > + return E_INVALIDARG; > + } > + > + pthread_mutex_lock(&pulse_lock); > + if (This->stream) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_ALREADY_INITIALIZED; > + } > + > + hr = pulse_spec_from_waveformat(This, fmt); > + TRACE("Obtaining format returns %08x\n", hr); > + dump_fmt(fmt); > + > + if (FAILED(hr)) > + goto exit; > + > + if (mode == AUDCLNT_SHAREMODE_SHARED) { > + REFERENCE_TIME def = pulse_def_period[This->dataflow == eCapture]; > + REFERENCE_TIME min = pulse_min_period[This->dataflow == eCapture]; > + > + /* Switch to low latency mode if below 2 default periods, > + * which is 20 ms by default, this will increase the amount > + * of interrupts but allows very low latency. In dsound I > + * managed to get a total latency of ~8ms, which is well below > + * default > + */ > + if (duration < 2 * def) > + period = min; > + else > + period = def; > + if (duration < 2 * period) > + duration = 2 * period; > + > + /* Uh oh, really low latency requested.. */ > + if (duration <= 2 * period) > + period /= 2; > + } > + period_bytes = pa_frame_size(&This->ss) * MulDiv(period, This->ss.rate, 10000000); > + > + if (duration < 20000000) > + This->bufsize_frames = ceil((duration / 10000000.) * fmt->nSamplesPerSec); > + else > + This->bufsize_frames = 2 * fmt->nSamplesPerSec; > + This->bufsize_bytes = This->bufsize_frames * pa_frame_size(&This->ss); > + > + This->share = mode; > + This->flags = flags; > + hr = pulse_stream_connect(This, period_bytes); > + if (SUCCEEDED(hr)) { > + UINT32 unalign; > + const pa_buffer_attr *attr = pa_stream_get_buffer_attr(This->stream); > + /* Update frames according to new size */ > + dump_attr(attr); > + if (This->dataflow == eRender) > + This->bufsize_bytes = attr->tlength; > + else { > + This->capture_period = period_bytes = attr->fragsize; > + if ((unalign = This->bufsize_bytes % period_bytes)) > + This->bufsize_bytes += period_bytes - unalign; > + } > + This->bufsize_frames = This->bufsize_bytes / pa_frame_size(&This->ss); > + } > + if (SUCCEEDED(hr)) { > + UINT32 i, capture_packets = This->capture_period ? This->bufsize_bytes / This->capture_period : 0; > + This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_bytes + capture_packets * sizeof(ACPacket)); > + if (!This->tmp_buffer) > + hr = E_OUTOFMEMORY; > + else { > + ACPacket *cur_packet = (ACPacket*)((char*)This->tmp_buffer + This->bufsize_bytes); > + BYTE *data = This->tmp_buffer; > + silence_buffer(This->ss.format, This->tmp_buffer, This->bufsize_bytes); > + list_init(&This->packet_free_head); > + list_init(&This->packet_filled_head); > + for (i = 0; i < capture_packets; ++i, ++cur_packet) { > + list_add_tail(&This->packet_free_head, &cur_packet->entry); > + cur_packet->data = data; > + data += This->capture_period; > + } > + assert(!This->capture_period || This->bufsize_bytes == This->capture_period * capture_packets); > + assert(!capture_packets || data - This->bufsize_bytes == This->tmp_buffer); > + } > + } > + if (SUCCEEDED(hr)) > + hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); > + if (SUCCEEDED(hr)) > + list_add_tail(&This->session->clients, &This->entry); > + > +exit: > + if (FAILED(hr)) { > + HeapFree(GetProcessHeap(), 0, This->tmp_buffer); > + This->tmp_buffer = NULL; > + if (This->stream) { > + pa_stream_disconnect(This->stream); > + pa_stream_unref(This->stream); > + This->stream = NULL; > + } > + } > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient *iface, > + UINT32 *out) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr; > + > + TRACE("(%p)->(%p)\n", This, out); > + > + if (!out) > + return E_POINTER; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (SUCCEEDED(hr)) > + *out = This->bufsize_frames; > + pthread_mutex_unlock(&pulse_lock); > + > + return hr; > +} > + > +static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, > + REFERENCE_TIME *latency) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + const pa_buffer_attr *attr; > + REFERENCE_TIME lat; > + HRESULT hr; > + > + TRACE("(%p)->(%p)\n", This, latency); > + > + if (!latency) > + return E_POINTER; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) { > + pthread_mutex_unlock(&pulse_lock); > + return hr; > + } > + attr = pa_stream_get_buffer_attr(This->stream); > + if (This->dataflow == eRender) > + lat = attr->minreq / pa_frame_size(&This->ss); > + else > + lat = attr->fragsize / pa_frame_size(&This->ss); > + *latency = 10000000; > + *latency *= lat; > + *latency /= This->ss.rate; > + pthread_mutex_unlock(&pulse_lock); > + TRACE("Latency: %u ms\n", (DWORD)(*latency / 10000)); > + return S_OK; > +} > + > +static void ACImpl_GetRenderPad(ACImpl *This, UINT32 *out) > +{ > + *out = This->pad / pa_frame_size(&This->ss); > +} > + > +static void ACImpl_GetCapturePad(ACImpl *This, UINT32 *out) > +{ > + ACPacket *packet = This->locked_ptr; > + if (!packet && !list_empty(&This->packet_filled_head)) { > + packet = (ACPacket*)list_head(&This->packet_filled_head); > + This->locked_ptr = packet; > + list_remove(&packet->entry); > + } > + if (out) > + *out = This->pad / pa_frame_size(&This->ss); > +} > + > +static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient *iface, > + UINT32 *out) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr; > + > + TRACE("(%p)->(%p)\n", This, out); > + > + if (!out) > + return E_POINTER; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) { > + pthread_mutex_unlock(&pulse_lock); > + return hr; > + } > + > + if (This->dataflow == eRender) > + ACImpl_GetRenderPad(This, out); > + else > + ACImpl_GetCapturePad(This, out); > + pthread_mutex_unlock(&pulse_lock); > + > + TRACE("%p Pad: %u ms (%u)\n", This, MulDiv(*out, 1000, This->ss.rate), *out); > + return S_OK; > +} > + > +static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, > + AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt, > + WAVEFORMATEX **out) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr = S_OK; > + WAVEFORMATEX *closest = NULL; > + BOOL exclusive; > + > + TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); > + > + if (!fmt) > + return E_POINTER; > + > + if (out) > + *out = NULL; > + > + if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) { > + exclusive = 1; > + out = NULL; > + } else if (mode == AUDCLNT_SHAREMODE_SHARED) { > + exclusive = 0; > + if (!out) > + return E_POINTER; > + } else > + return E_INVALIDARG; > + > + if (fmt->nChannels == 0) > + return AUDCLNT_E_UNSUPPORTED_FORMAT; > + > + closest = clone_format(fmt); > + if (!closest) > + return E_OUTOFMEMORY; > + > + dump_fmt(fmt); > + > + switch (fmt->wFormatTag) { > + case WAVE_FORMAT_EXTENSIBLE: { > + WAVEFORMATEXTENSIBLE *ext = (WAVEFORMATEXTENSIBLE*)closest; > + > + if ((fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX) && > + fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE)) || > + fmt->nBlockAlign != fmt->wBitsPerSample / 8 * fmt->nChannels || > + ext->Samples.wValidBitsPerSample > fmt->wBitsPerSample || > + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec) { > + hr = E_INVALIDARG; > + break; > + } > + > + if (exclusive) { > + UINT32 mask = 0, i, channels = 0; > + > + if (!(ext->dwChannelMask & (SPEAKER_ALL | SPEAKER_RESERVED))) { > + for (i = 1; !(i & SPEAKER_RESERVED); i <<= 1) { > + if (i & ext->dwChannelMask) { > + mask |= i; > + channels++; > + } > + } > + > + if (channels != fmt->nChannels || (ext->dwChannelMask & ~mask)) { > + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; > + break; > + } > + } else { > + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; > + break; > + } > + } > + > + if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { > + if (fmt->wBitsPerSample != 32) { > + hr = E_INVALIDARG; > + break; > + } > + > + if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample) { > + hr = S_FALSE; > + ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample; > + } > + } else if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { > + if (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8) { > + hr = E_INVALIDARG; > + break; > + } > + > + if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample && > + !(fmt->wBitsPerSample == 32 && > + ext->Samples.wValidBitsPerSample == 24)) { > + hr = S_FALSE; > + ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample; > + break; > + } > + } else { > + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; > + break; > + } > + > + break; > + } > + > + case WAVE_FORMAT_ALAW: > + case WAVE_FORMAT_MULAW: > + if (fmt->wBitsPerSample != 8) { > + hr = E_INVALIDARG; > + break; > + } > + /* Fall-through */ > + case WAVE_FORMAT_IEEE_FLOAT: > + if (fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT && fmt->wBitsPerSample != 32) { > + hr = E_INVALIDARG; > + break; > + } > + /* Fall-through */ > + case WAVE_FORMAT_PCM: > + if (fmt->wFormatTag == WAVE_FORMAT_PCM && > + (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8)) { > + hr = E_INVALIDARG; > + break; > + } > + > + if (fmt->nChannels > 2) { > + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; > + break; > + } > + /* > + * fmt->cbSize, fmt->nBlockAlign and fmt->nAvgBytesPerSec seem to be > + * ignored, invalid values are happily accepted. > + */ > + break; > + default: > + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; > + break; > + } > + > + if (exclusive && hr != S_OK) { > + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; > + CoTaskMemFree(closest); > + } else if (hr != S_FALSE) > + CoTaskMemFree(closest); > + else > + *out = closest; > + > + /* Winepulse does not currently support exclusive mode, if you know of an > + * application that uses it, I will correct this.. > + */ > + if (hr == S_OK && exclusive) > + return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED; > + > + TRACE("returning: %08x %p\n", hr, out ? *out : NULL); > + return hr; > +} > + > +static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > + WAVEFORMATEX **pwfx) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + WAVEFORMATEXTENSIBLE *fmt = &pulse_fmt[This->dataflow == eCapture]; > + > + TRACE("(%p)->(%p)\n", This, pwfx); > + > + if (!pwfx) > + return E_POINTER; > + > + *pwfx = clone_format(&fmt->Format); > + if (!*pwfx) > + return E_OUTOFMEMORY; > + dump_fmt(*pwfx); > + return S_OK; > +} > + > +static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, > + REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + > + TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); > + > + if (!defperiod && !minperiod) > + return E_POINTER; > + > + if (defperiod) > + *defperiod = pulse_def_period[This->dataflow == eCapture]; > + if (minperiod) > + *minperiod = pulse_min_period[This->dataflow == eCapture]; > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr = S_OK; > + int success; > + pa_operation *o; > + > + TRACE("(%p)\n", This); > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) { > + pthread_mutex_unlock(&pulse_lock); > + return hr; > + } > + > + if ((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_EVENTHANDLE_NOT_SET; > + } > + > + if (This->started) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_NOT_STOPPED; > + } > + > + if (pa_stream_is_corked(This->stream)) { > + o = pa_stream_cork(This->stream, 0, pulse_op_cb, &success); > + if (o) { > + while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + pa_operation_unref(o); > + } else > + success = 0; > + if (!success) > + hr = E_FAIL; > + } > + if (SUCCEEDED(hr)) { > + This->started = TRUE; > + if (This->dataflow == eRender && This->event) > + pa_stream_set_latency_update_callback(This->stream, pulse_latency_callback, This); > + } > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr = S_OK; > + pa_operation *o; > + int success; > + > + TRACE("(%p)\n", This); > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) { > + pthread_mutex_unlock(&pulse_lock); > + return hr; > + } > + > + if (!This->started) { > + pthread_mutex_unlock(&pulse_lock); > + return S_FALSE; > + } > + > + if (This->dataflow == eRender) { > + o = pa_stream_cork(This->stream, 1, pulse_op_cb, &success); > + if (o) { > + while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + pa_operation_unref(o); > + } else > + success = 0; > + if (!success) > + hr = E_FAIL; > + } > + if (SUCCEEDED(hr)) { > + This->started = FALSE; > + } > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr = S_OK; > + > + TRACE("(%p)\n", This); > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) { > + pthread_mutex_unlock(&pulse_lock); > + return hr; > + } > + > + if (This->started) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_NOT_STOPPED; > + } > + > + if (This->locked) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_BUFFER_OPERATION_PENDING; > + } > + > + if (This->dataflow == eRender) { > + /* If there is still data in the render buffer it needs to be removed from the server */ > + int success = 0; > + if (This->pad) { > + pa_operation *o = pa_stream_flush(This->stream, pulse_op_cb, &success); > + if (o) { > + while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + pa_operation_unref(o); > + } > + } > + if (success || !This->pad) > + This->clock_lastpos = This->clock_written = This->pad = 0; > + } else { > + ACPacket *p; > + This->clock_written += This->pad; > + This->pad = 0; > + > + if ((p = This->locked_ptr)) { > + This->locked_ptr = NULL; > + list_add_tail(&This->packet_free_head, &p->entry); > + } > + list_move_tail(&This->packet_free_head, &This->packet_filled_head); > + } > + pthread_mutex_unlock(&pulse_lock); > + > + return hr; > +} > + > +static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient *iface, > + HANDLE event) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr; > + > + TRACE("(%p)->(%p)\n", This, event); > + > + if (!event) > + return E_INVALIDARG; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) { > + pthread_mutex_unlock(&pulse_lock); > + return hr; > + } > + > + if (!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) > + hr = AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; > + else if (This->event) > + hr = HRESULT_FROM_WIN32(ERROR_INVALID_NAME); > + else > + This->event = event; > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, > + void **ppv) > +{ > + ACImpl *This = impl_from_IAudioClient(iface); > + HRESULT hr; > + > + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + pthread_mutex_unlock(&pulse_lock); > + if (FAILED(hr)) > + return hr; > + > + if (IsEqualIID(riid, &IID_IAudioRenderClient)) { > + if (This->dataflow != eRender) > + return AUDCLNT_E_WRONG_ENDPOINT_TYPE; > + *ppv = &This->IAudioRenderClient_iface; > + } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) { > + if (This->dataflow != eCapture) > + return AUDCLNT_E_WRONG_ENDPOINT_TYPE; > + *ppv = &This->IAudioCaptureClient_iface; > + } else if (IsEqualIID(riid, &IID_IAudioClock)) { > + *ppv = &This->IAudioClock_iface; > + } else if (IsEqualIID(riid, &IID_IAudioStreamVolume)) { > + *ppv = &This->IAudioStreamVolume_iface; > + } else if (IsEqualIID(riid, &IID_IAudioSessionControl) || > + IsEqualIID(riid, &IID_IChannelAudioVolume) || > + IsEqualIID(riid, &IID_ISimpleAudioVolume)) { > + if (!This->session_wrapper) { > + This->session_wrapper = AudioSessionWrapper_Create(This); > + if (!This->session_wrapper) > + return E_OUTOFMEMORY; > + } > + if (IsEqualIID(riid, &IID_IAudioSessionControl)) > + *ppv = &This->session_wrapper->IAudioSessionControl2_iface; > + else if (IsEqualIID(riid, &IID_IChannelAudioVolume)) > + *ppv = &This->session_wrapper->IChannelAudioVolume_iface; > + else if (IsEqualIID(riid, &IID_ISimpleAudioVolume)) > + *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; > + } > + > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + FIXME("stub %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static const IAudioClientVtbl AudioClient_Vtbl = > +{ > + AudioClient_QueryInterface, > + AudioClient_AddRef, > + AudioClient_Release, > + AudioClient_Initialize, > + AudioClient_GetBufferSize, > + AudioClient_GetStreamLatency, > + AudioClient_GetCurrentPadding, > + AudioClient_IsFormatSupported, > + AudioClient_GetMixFormat, > + AudioClient_GetDevicePeriod, > + AudioClient_Start, > + AudioClient_Stop, > + AudioClient_Reset, > + AudioClient_SetEventHandle, > + AudioClient_GetService > +}; > + > +static HRESULT WINAPI AudioRenderClient_QueryInterface( > + IAudioRenderClient *iface, REFIID riid, void **ppv) > +{ > + ACImpl *This = impl_from_IAudioRenderClient(iface); > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || > + IsEqualIID(riid, &IID_IAudioRenderClient)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + if (IsEqualIID(riid, &IID_IMarshal)) > + return IUnknown_QueryInterface(This->marshal, riid, ppv); > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) > +{ > + ACImpl *This = impl_from_IAudioRenderClient(iface); > + return AudioClient_AddRef(&This->IAudioClient_iface); > +} > + > +static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) > +{ > + ACImpl *This = impl_from_IAudioRenderClient(iface); > + return AudioClient_Release(&This->IAudioClient_iface); > +} > + > +static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, > + UINT32 frames, BYTE **data) > +{ > + ACImpl *This = impl_from_IAudioRenderClient(iface); > + size_t avail, req, bytes = frames * pa_frame_size(&This->ss); > + UINT32 pad; > + HRESULT hr = S_OK; > + int ret = -1; > + > + TRACE("(%p)->(%u, %p)\n", This, frames, data); > + > + if (!data) > + return E_POINTER; > + *data = NULL; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr) || This->locked) { > + pthread_mutex_unlock(&pulse_lock); > + return FAILED(hr) ? hr : AUDCLNT_E_OUT_OF_ORDER; > + } > + if (!frames) { > + pthread_mutex_unlock(&pulse_lock); > + return S_OK; > + } > + > + ACImpl_GetRenderPad(This, &pad); > + avail = This->bufsize_frames - pad; > + if (avail < frames || bytes > This->bufsize_bytes) { > + pthread_mutex_unlock(&pulse_lock); > + WARN("Wanted to write %u, but only %zu available\n", frames, avail); > + return AUDCLNT_E_BUFFER_TOO_LARGE; > + } > + > + This->locked = frames; > + req = bytes; > + ret = pa_stream_begin_write(This->stream, &This->locked_ptr, &req); > + if (ret < 0 || req < bytes) { > + FIXME("%p Not using pulse locked data: %i %zu/%u %u/%u\n", This, ret, req/pa_frame_size(&This->ss), frames, pad, This->bufsize_frames); > + if (ret >= 0) > + pa_stream_cancel_write(This->stream); > + *data = This->tmp_buffer; > + This->locked_ptr = NULL; > + } else > + *data = This->locked_ptr; > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static void pulse_free_noop(void *buf) > +{ > +} > + > +static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( > + IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) > +{ > + ACImpl *This = impl_from_IAudioRenderClient(iface); > + UINT32 written_bytes = written_frames * pa_frame_size(&This->ss); > + > + TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); > + > + pthread_mutex_lock(&pulse_lock); > + if (!This->locked || !written_frames) { > + if (This->locked_ptr) > + pa_stream_cancel_write(This->stream); > + This->locked = 0; > + This->locked_ptr = NULL; > + pthread_mutex_unlock(&pulse_lock); > + return written_frames ? AUDCLNT_E_OUT_OF_ORDER : S_OK; > + } > + > + if (This->locked < written_frames) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_INVALID_SIZE; > + } > + > + This->locked = 0; > + if (This->locked_ptr) { > + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) > + silence_buffer(This->ss.format, This->locked_ptr, written_bytes); > + pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE); > + } else { > + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) > + silence_buffer(This->ss.format, This->tmp_buffer, written_bytes); > + pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE); > + } > + > + This->pad += written_bytes; > + This->locked_ptr = NULL; > + TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss)); > + assert(This->pad <= This->bufsize_bytes); > + > + pthread_mutex_unlock(&pulse_lock); > + return S_OK; > +} > + > +static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { > + AudioRenderClient_QueryInterface, > + AudioRenderClient_AddRef, > + AudioRenderClient_Release, > + AudioRenderClient_GetBuffer, > + AudioRenderClient_ReleaseBuffer > +}; > + > +static HRESULT WINAPI AudioCaptureClient_QueryInterface( > + IAudioCaptureClient *iface, REFIID riid, void **ppv) > +{ > + ACImpl *This = impl_from_IAudioCaptureClient(iface); > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || > + IsEqualIID(riid, &IID_IAudioCaptureClient)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + if (IsEqualIID(riid, &IID_IMarshal)) > + return IUnknown_QueryInterface(This->marshal, riid, ppv); > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) > +{ > + ACImpl *This = impl_from_IAudioCaptureClient(iface); > + return IAudioClient_AddRef(&This->IAudioClient_iface); > +} > + > +static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) > +{ > + ACImpl *This = impl_from_IAudioCaptureClient(iface); > + return IAudioClient_Release(&This->IAudioClient_iface); > +} > + > +static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, > + BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, > + UINT64 *qpcpos) > +{ > + ACImpl *This = impl_from_IAudioCaptureClient(iface); > + HRESULT hr; > + ACPacket *packet; > + > + TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, > + devpos, qpcpos); > + > + if (!data || !frames || !flags) > + return E_POINTER; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr) || This->locked) { > + pthread_mutex_unlock(&pulse_lock); > + return FAILED(hr) ? hr : AUDCLNT_E_OUT_OF_ORDER; > + } > + > + ACImpl_GetCapturePad(This, NULL); > + if ((packet = This->locked_ptr)) { > + *frames = This->capture_period / pa_frame_size(&This->ss); > + *flags = 0; > + if (packet->discont) > + *flags |= AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY; > + if (devpos) { > + if (packet->discont) > + *devpos = (This->clock_written + This->capture_period) / pa_frame_size(&This->ss); > + else > + *devpos = This->clock_written / pa_frame_size(&This->ss); > + } > + if (qpcpos) > + *qpcpos = packet->qpcpos; > + *data = packet->data; > + } > + else > + *frames = 0; > + This->locked = *frames; > + pthread_mutex_unlock(&pulse_lock); > + return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; > +} > + > +static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( > + IAudioCaptureClient *iface, UINT32 done) > +{ > + ACImpl *This = impl_from_IAudioCaptureClient(iface); > + > + TRACE("(%p)->(%u)\n", This, done); > + > + pthread_mutex_lock(&pulse_lock); > + if (!This->locked && done) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_OUT_OF_ORDER; > + } > + if (done && This->locked != done) { > + pthread_mutex_unlock(&pulse_lock); > + return AUDCLNT_E_INVALID_SIZE; > + } > + if (done) { > + ACPacket *packet = This->locked_ptr; > + This->locked_ptr = NULL; > + This->pad -= This->capture_period; > + if (packet->discont) > + This->clock_written += 2 * This->capture_period; > + else > + This->clock_written += This->capture_period; > + list_add_tail(&This->packet_free_head, &packet->entry); > + } > + This->locked = 0; > + pthread_mutex_unlock(&pulse_lock); > + return S_OK; > +} > + > +static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( > + IAudioCaptureClient *iface, UINT32 *frames) > +{ > + ACImpl *This = impl_from_IAudioCaptureClient(iface); > + > + TRACE("(%p)->(%p)\n", This, frames); > + if (!frames) > + return E_POINTER; > + > + pthread_mutex_lock(&pulse_lock); > + ACImpl_GetCapturePad(This, NULL); > + if (This->locked_ptr) > + *frames = This->capture_period / pa_frame_size(&This->ss); > + else > + *frames = 0; > + pthread_mutex_unlock(&pulse_lock); > + return S_OK; > +} > + > +static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = > +{ > + AudioCaptureClient_QueryInterface, > + AudioCaptureClient_AddRef, > + AudioCaptureClient_Release, > + AudioCaptureClient_GetBuffer, > + AudioCaptureClient_ReleaseBuffer, > + AudioCaptureClient_GetNextPacketSize > +}; > + > +static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, > + REFIID riid, void **ppv) > +{ > + ACImpl *This = impl_from_IAudioClock(iface); > + > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) > + *ppv = iface; > + else if (IsEqualIID(riid, &IID_IAudioClock2)) > + *ppv = &This->IAudioClock2_iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + if (IsEqualIID(riid, &IID_IMarshal)) > + return IUnknown_QueryInterface(This->marshal, riid, ppv); > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) > +{ > + ACImpl *This = impl_from_IAudioClock(iface); > + return IAudioClient_AddRef(&This->IAudioClient_iface); > +} > + > +static ULONG WINAPI AudioClock_Release(IAudioClock *iface) > +{ > + ACImpl *This = impl_from_IAudioClock(iface); > + return IAudioClient_Release(&This->IAudioClient_iface); > +} > + > +static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) > +{ > + ACImpl *This = impl_from_IAudioClock(iface); > + HRESULT hr; > + > + TRACE("(%p)->(%p)\n", This, freq); > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (SUCCEEDED(hr)) { > + if (This->share == AUDCLNT_SHAREMODE_SHARED) > + *freq = This->ss.rate * pa_frame_size(&This->ss); > + else > + *freq = This->ss.rate; > + } > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, > + UINT64 *qpctime) > +{ > + ACImpl *This = impl_from_IAudioClock(iface); > + HRESULT hr; > + > + TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); > + > + if (!pos) > + return E_POINTER; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) { > + pthread_mutex_unlock(&pulse_lock); > + return hr; > + } > + > + *pos = This->clock_written; > + > + if (This->share == AUDCLNT_SHAREMODE_EXCLUSIVE) > + *pos /= pa_frame_size(&This->ss); > + > + /* Make time never go backwards */ > + if (*pos < This->clock_lastpos) > + *pos = This->clock_lastpos; > + else > + This->clock_lastpos = *pos; > + pthread_mutex_unlock(&pulse_lock); > + > + TRACE("%p Position: %u\n", This, (unsigned)*pos); > + > + if (qpctime) { > + LARGE_INTEGER stamp, freq; > + QueryPerformanceCounter(&stamp); > + QueryPerformanceFrequency(&freq); > + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; > + } > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, > + DWORD *chars) > +{ > + ACImpl *This = impl_from_IAudioClock(iface); > + > + TRACE("(%p)->(%p)\n", This, chars); > + > + if (!chars) > + return E_POINTER; > + > + *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; > + > + return S_OK; > +} > + > +static const IAudioClockVtbl AudioClock_Vtbl = > +{ > + AudioClock_QueryInterface, > + AudioClock_AddRef, > + AudioClock_Release, > + AudioClock_GetFrequency, > + AudioClock_GetPosition, > + AudioClock_GetCharacteristics > +}; > + > +static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, > + REFIID riid, void **ppv) > +{ > + ACImpl *This = impl_from_IAudioClock2(iface); > + return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); > +} > + > +static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) > +{ > + ACImpl *This = impl_from_IAudioClock2(iface); > + return IAudioClient_AddRef(&This->IAudioClient_iface); > +} > + > +static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) > +{ > + ACImpl *This = impl_from_IAudioClock2(iface); > + return IAudioClient_Release(&This->IAudioClient_iface); > +} > + > +static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, > + UINT64 *pos, UINT64 *qpctime) > +{ > + ACImpl *This = impl_from_IAudioClock2(iface); > + HRESULT hr = AudioClock_GetPosition(&This->IAudioClock_iface, pos, qpctime); > + if (SUCCEEDED(hr) && This->share == AUDCLNT_SHAREMODE_SHARED) > + *pos /= pa_frame_size(&This->ss); > + return hr; > +} > + > +static const IAudioClock2Vtbl AudioClock2_Vtbl = > +{ > + AudioClock2_QueryInterface, > + AudioClock2_AddRef, > + AudioClock2_Release, > + AudioClock2_GetDevicePosition > +}; > + > +static HRESULT WINAPI AudioStreamVolume_QueryInterface( > + IAudioStreamVolume *iface, REFIID riid, void **ppv) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || > + IsEqualIID(riid, &IID_IAudioStreamVolume)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + if (IsEqualIID(riid, &IID_IMarshal)) > + return IUnknown_QueryInterface(This->marshal, riid, ppv); > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI AudioStreamVolume_AddRef(IAudioStreamVolume *iface) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + return IAudioClient_AddRef(&This->IAudioClient_iface); > +} > + > +static ULONG WINAPI AudioStreamVolume_Release(IAudioStreamVolume *iface) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + return IAudioClient_Release(&This->IAudioClient_iface); > +} > + > +static HRESULT WINAPI AudioStreamVolume_GetChannelCount( > + IAudioStreamVolume *iface, UINT32 *out) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + > + TRACE("(%p)->(%p)\n", This, out); > + > + if (!out) > + return E_POINTER; > + > + *out = This->ss.channels; > + > + return S_OK; > +} > + > +struct pulse_info_cb_data { > + UINT32 n; > + float *levels; > +}; > + > +static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( > + IAudioStreamVolume *iface, UINT32 count, const float *levels) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + HRESULT hr; > + int i; > + > + TRACE("(%p)->(%d, %p)\n", This, count, levels); > + > + if (!levels) > + return E_POINTER; > + > + if (count != This->ss.channels) > + return E_INVALIDARG; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) > + goto out; > + > + for (i = 0; i < count; ++i) > + This->vol[i] = levels[i]; > + > +out: > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( > + IAudioStreamVolume *iface, UINT32 count, float *levels) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + HRESULT hr; > + int i; > + > + TRACE("(%p)->(%d, %p)\n", This, count, levels); > + > + if (!levels) > + return E_POINTER; > + > + if (count != This->ss.channels) > + return E_INVALIDARG; > + > + pthread_mutex_lock(&pulse_lock); > + hr = pulse_stream_valid(This); > + if (FAILED(hr)) > + goto out; > + > + for (i = 0; i < count; ++i) > + levels[i] = This->vol[i]; > + > +out: > + pthread_mutex_unlock(&pulse_lock); > + return hr; > +} > + > +static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( > + IAudioStreamVolume *iface, UINT32 index, float level) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + HRESULT hr; > + float volumes[PA_CHANNELS_MAX]; > + > + TRACE("(%p)->(%d, %f)\n", This, index, level); > + > + if (level < 0.f || level > 1.f) > + return E_INVALIDARG; > + > + if (index >= This->ss.channels) > + return E_INVALIDARG; > + > + hr = AudioStreamVolume_GetAllVolumes(iface, This->ss.channels, volumes); > + volumes[index] = level; > + if (SUCCEEDED(hr)) > + hr = AudioStreamVolume_SetAllVolumes(iface, This->ss.channels, volumes); > + return hr; > +} > + > +static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( > + IAudioStreamVolume *iface, UINT32 index, float *level) > +{ > + ACImpl *This = impl_from_IAudioStreamVolume(iface); > + float volumes[PA_CHANNELS_MAX]; > + HRESULT hr; > + > + TRACE("(%p)->(%d, %p)\n", This, index, level); > + > + if (!level) > + return E_POINTER; > + > + if (index >= This->ss.channels) > + return E_INVALIDARG; > + > + hr = AudioStreamVolume_GetAllVolumes(iface, This->ss.channels, volumes); > + if (SUCCEEDED(hr)) > + *level = volumes[index]; > + return hr; > +} > + > +static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl = > +{ > + AudioStreamVolume_QueryInterface, > + AudioStreamVolume_AddRef, > + AudioStreamVolume_Release, > + AudioStreamVolume_GetChannelCount, > + AudioStreamVolume_SetChannelVolume, > + AudioStreamVolume_GetChannelVolume, > + AudioStreamVolume_SetAllVolumes, > + AudioStreamVolume_GetAllVolumes > +}; > + > +static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) > +{ > + AudioSessionWrapper *ret; > + > + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(AudioSessionWrapper)); > + if (!ret) > + return NULL; > + > + ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl; > + ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; > + ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; > + > + ret->ref = !client; > + > + ret->client = client; > + if (client) { > + ret->session = client->session; > + AudioClient_AddRef(&client->IAudioClient_iface); > + } > + > + return ret; > +} > + > +static HRESULT WINAPI AudioSessionControl_QueryInterface( > + IAudioSessionControl2 *iface, REFIID riid, void **ppv) > +{ > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || > + IsEqualIID(riid, &IID_IAudioSessionControl) || > + IsEqualIID(riid, &IID_IAudioSessionControl2)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI AudioSessionControl_AddRef(IAudioSessionControl2 *iface) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + ULONG ref; > + ref = InterlockedIncrement(&This->ref); > + TRACE("(%p) Refcount now %u\n", This, ref); > + return ref; > +} > + > +static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + ULONG ref; > + ref = InterlockedDecrement(&This->ref); > + TRACE("(%p) Refcount now %u\n", This, ref); > + if (!ref) { > + if (This->client) { > + This->client->session_wrapper = NULL; > + AudioClient_Release(&This->client->IAudioClient_iface); > + } > + HeapFree(GetProcessHeap(), 0, This); > + } > + return ref; > +} > + > +static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, > + AudioSessionState *state) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + ACImpl *client; > + > + TRACE("(%p)->(%p)\n", This, state); > + > + if (!state) > + return NULL_PTR_ERR; > + > + pthread_mutex_lock(&pulse_lock); > + if (list_empty(&This->session->clients)) { > + *state = AudioSessionStateExpired; > + goto out; > + } > + LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) { > + if (client->started) { > + *state = AudioSessionStateActive; > + goto out; > + } > + } > + *state = AudioSessionStateInactive; > + > +out: > + pthread_mutex_unlock(&pulse_lock); > + return S_OK; > +} > + > +static HRESULT WINAPI AudioSessionControl_GetDisplayName( > + IAudioSessionControl2 *iface, WCHAR **name) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p) - stub\n", This, name); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_SetDisplayName( > + IAudioSessionControl2 *iface, const WCHAR *name, const GUID *session) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p, %s) - stub\n", This, name, debugstr_guid(session)); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_GetIconPath( > + IAudioSessionControl2 *iface, WCHAR **path) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p) - stub\n", This, path); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_SetIconPath( > + IAudioSessionControl2 *iface, const WCHAR *path, const GUID *session) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p, %s) - stub\n", This, path, debugstr_guid(session)); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_GetGroupingParam( > + IAudioSessionControl2 *iface, GUID *group) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p) - stub\n", This, group); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_SetGroupingParam( > + IAudioSessionControl2 *iface, const GUID *group, const GUID *session) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%s, %s) - stub\n", This, debugstr_guid(group), > + debugstr_guid(session)); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_RegisterAudioSessionNotification( > + IAudioSessionControl2 *iface, IAudioSessionEvents *events) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p) - stub\n", This, events); > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioSessionControl_UnregisterAudioSessionNotification( > + IAudioSessionControl2 *iface, IAudioSessionEvents *events) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p) - stub\n", This, events); > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioSessionControl_GetSessionIdentifier( > + IAudioSessionControl2 *iface, WCHAR **id) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p) - stub\n", This, id); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_GetSessionInstanceIdentifier( > + IAudioSessionControl2 *iface, WCHAR **id) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + FIXME("(%p)->(%p) - stub\n", This, id); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionControl_GetProcessId( > + IAudioSessionControl2 *iface, DWORD *pid) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + TRACE("(%p)->(%p)\n", This, pid); > + > + if (!pid) > + return E_POINTER; > + > + *pid = GetCurrentProcessId(); > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioSessionControl_IsSystemSoundsSession( > + IAudioSessionControl2 *iface) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + TRACE("(%p)\n", This); > + > + return S_FALSE; > +} > + > +static HRESULT WINAPI AudioSessionControl_SetDuckingPreference( > + IAudioSessionControl2 *iface, BOOL optout) > +{ > + AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); > + > + TRACE("(%p)->(%d)\n", This, optout); > + > + return S_OK; > +} > + > +static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = > +{ > + AudioSessionControl_QueryInterface, > + AudioSessionControl_AddRef, > + AudioSessionControl_Release, > + AudioSessionControl_GetState, > + AudioSessionControl_GetDisplayName, > + AudioSessionControl_SetDisplayName, > + AudioSessionControl_GetIconPath, > + AudioSessionControl_SetIconPath, > + AudioSessionControl_GetGroupingParam, > + AudioSessionControl_SetGroupingParam, > + AudioSessionControl_RegisterAudioSessionNotification, > + AudioSessionControl_UnregisterAudioSessionNotification, > + AudioSessionControl_GetSessionIdentifier, > + AudioSessionControl_GetSessionInstanceIdentifier, > + AudioSessionControl_GetProcessId, > + AudioSessionControl_IsSystemSoundsSession, > + AudioSessionControl_SetDuckingPreference > +}; > + > +typedef struct _SessionMgr { > + IAudioSessionManager2 IAudioSessionManager2_iface; > + > + LONG ref; > + > + IMMDevice *device; > +} SessionMgr; > + > +static HRESULT WINAPI AudioSessionManager_QueryInterface(IAudioSessionManager2 *iface, > + REFIID riid, void **ppv) > +{ > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || > + IsEqualIID(riid, &IID_IAudioSessionManager) || > + IsEqualIID(riid, &IID_IAudioSessionManager2)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 *iface) > +{ > + return CONTAINING_RECORD(iface, SessionMgr, IAudioSessionManager2_iface); > +} > + > +static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + ULONG ref; > + ref = InterlockedIncrement(&This->ref); > + TRACE("(%p) Refcount now %u\n", This, ref); > + return ref; > +} > + > +static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + ULONG ref; > + ref = InterlockedDecrement(&This->ref); > + TRACE("(%p) Refcount now %u\n", This, ref); > + if (!ref) > + HeapFree(GetProcessHeap(), 0, This); > + return ref; > +} > + > +static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( > + IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, > + IAudioSessionControl **out) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + AudioSession *session; > + AudioSessionWrapper *wrapper; > + HRESULT hr; > + > + TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), > + flags, out); > + > + hr = get_audio_session(session_guid, This->device, 0, &session); > + if (FAILED(hr)) > + return hr; > + > + wrapper = AudioSessionWrapper_Create(NULL); > + if (!wrapper) > + return E_OUTOFMEMORY; > + > + wrapper->session = session; > + > + *out = (IAudioSessionControl*)&wrapper->IAudioSessionControl2_iface; > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( > + IAudioSessionManager2 *iface, const GUID *session_guid, DWORD flags, > + ISimpleAudioVolume **out) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + AudioSession *session; > + AudioSessionWrapper *wrapper; > + HRESULT hr; > + > + TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), > + flags, out); > + > + hr = get_audio_session(session_guid, This->device, 0, &session); > + if (FAILED(hr)) > + return hr; > + > + wrapper = AudioSessionWrapper_Create(NULL); > + if (!wrapper) > + return E_OUTOFMEMORY; > + > + wrapper->session = session; > + > + *out = &wrapper->ISimpleAudioVolume_iface; > + > + return S_OK; > +} > + > +static HRESULT WINAPI AudioSessionManager_GetSessionEnumerator( > + IAudioSessionManager2 *iface, IAudioSessionEnumerator **out) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + FIXME("(%p)->(%p) - stub\n", This, out); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionManager_RegisterSessionNotification( > + IAudioSessionManager2 *iface, IAudioSessionNotification *notification) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + FIXME("(%p)->(%p) - stub\n", This, notification); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionManager_UnregisterSessionNotification( > + IAudioSessionManager2 *iface, IAudioSessionNotification *notification) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + FIXME("(%p)->(%p) - stub\n", This, notification); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionManager_RegisterDuckNotification( > + IAudioSessionManager2 *iface, const WCHAR *session_id, > + IAudioVolumeDuckNotification *notification) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + FIXME("(%p)->(%p) - stub\n", This, notification); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI AudioSessionManager_UnregisterDuckNotification( > + IAudioSessionManager2 *iface, > + IAudioVolumeDuckNotification *notification) > +{ > + SessionMgr *This = impl_from_IAudioSessionManager2(iface); > + FIXME("(%p)->(%p) - stub\n", This, notification); > + return E_NOTIMPL; > +} > + > +static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl = > +{ > + AudioSessionManager_QueryInterface, > + AudioSessionManager_AddRef, > + AudioSessionManager_Release, > + AudioSessionManager_GetAudioSessionControl, > + AudioSessionManager_GetSimpleAudioVolume, > + AudioSessionManager_GetSessionEnumerator, > + AudioSessionManager_RegisterSessionNotification, > + AudioSessionManager_UnregisterSessionNotification, > + AudioSessionManager_RegisterDuckNotification, > + AudioSessionManager_UnregisterDuckNotification > +}; > + > +static HRESULT WINAPI SimpleAudioVolume_QueryInterface( > + ISimpleAudioVolume *iface, REFIID riid, void **ppv) > +{ > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || > + IsEqualIID(riid, &IID_ISimpleAudioVolume)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) > +{ > + AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); > + return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); > +} > + > +static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) > +{ > + AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); > + return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); > +} > + > +static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( > + ISimpleAudioVolume *iface, float level, const GUID *context) > +{ > + AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); > + AudioSession *session = This->session; > + > + TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); > + > + if (level < 0.f || level > 1.f) > + return E_INVALIDARG; > + > + if (context) > + FIXME("Notifications not supported yet\n"); > + > + TRACE("Pulseaudio does not support session volume control\n"); > + > + pthread_mutex_lock(&pulse_lock); > + session->master_vol = level; > + pthread_mutex_unlock(&pulse_lock); > + > + return S_OK; > +} > + > +static HRESULT WINAPI SimpleAudioVolume_GetMasterVolume( > + ISimpleAudioVolume *iface, float *level) > +{ > + AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); > + AudioSession *session = This->session; > + > + TRACE("(%p)->(%p)\n", session, level); > + > + if (!level) > + return NULL_PTR_ERR; > + > + *level = session->master_vol; > + > + return S_OK; > +} > + > +static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, > + BOOL mute, const GUID *context) > +{ > + AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); > + AudioSession *session = This->session; > + > + TRACE("(%p)->(%u, %p)\n", session, mute, context); > + > + if (context) > + FIXME("Notifications not supported yet\n"); > + > + session->mute = mute; > + > + return S_OK; > +} > + > +static HRESULT WINAPI SimpleAudioVolume_GetMute(ISimpleAudioVolume *iface, > + BOOL *mute) > +{ > + AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); > + AudioSession *session = This->session; > + > + TRACE("(%p)->(%p)\n", session, mute); > + > + if (!mute) > + return NULL_PTR_ERR; > + > + *mute = session->mute; > + > + return S_OK; > +} > + > +static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl = > +{ > + SimpleAudioVolume_QueryInterface, > + SimpleAudioVolume_AddRef, > + SimpleAudioVolume_Release, > + SimpleAudioVolume_SetMasterVolume, > + SimpleAudioVolume_GetMasterVolume, > + SimpleAudioVolume_SetMute, > + SimpleAudioVolume_GetMute > +}; > + > +static HRESULT WINAPI ChannelAudioVolume_QueryInterface( > + IChannelAudioVolume *iface, REFIID riid, void **ppv) > +{ > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); > + > + if (!ppv) > + return E_POINTER; > + *ppv = NULL; > + > + if (IsEqualIID(riid, &IID_IUnknown) || > + IsEqualIID(riid, &IID_IChannelAudioVolume)) > + *ppv = iface; > + if (*ppv) { > + IUnknown_AddRef((IUnknown*)*ppv); > + return S_OK; > + } > + > + WARN("Unknown interface %s\n", debugstr_guid(riid)); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) > +{ > + AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); > + return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); > +} > + > +static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) > +{ > + AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); > + return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); > +} > + > +static HRESULT WINAPI ChannelAudioVolume_GetChannelCount( > + IChannelAudioVolume *iface, UINT32 *out) > +{ > + AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); > + AudioSession *session = This->session; > + > + TRACE("(%p)->(%p)\n", session, out); > + > + if (!out) > + return NULL_PTR_ERR; > + > + *out = session->channel_count; > + > + return S_OK; > +} > + > +static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( > + IChannelAudioVolume *iface, UINT32 index, float level, > + const GUID *context) > +{ > + AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); > + AudioSession *session = This->session; > + > + TRACE("(%p)->(%d, %f, %s)\n", session, index, level, > + wine_dbgstr_guid(context)); > + > + if (level < 0.f || level > 1.f) > + return E_INVALIDARG; > + > + if (index >= session->channel_count) > + return E_INVALIDARG; > + > + if (context) > + FIXME("Notifications not supported yet\n"); > + > + TRACE("Pulseaudio does not support session volume control\n"); > + > + pthread_mutex_lock(&pulse_lock); > + session->channel_vols[index] = level; > + pthread_mutex_unlock(&pulse_lock); > + > + return S_OK; > +} > + > +static HRESULT WINAPI ChannelAudioVolume_GetChannelVolume( > + IChannelAudioVolume *iface, UINT32 index, float *level) > +{ > + AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); > + AudioSession *session = This->session; > + > + TRACE("(%p)->(%d, %p)\n", session, index, level); > + > + if (!level) > + return NULL_PTR_ERR; > + > + if (index >= session->channel_count) > + return E_INVALIDARG; > + > + *level = session->channel_vols[index]; > + > + return S_OK; > +} > + > +static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( > + IChannelAudioVolume *iface, UINT32 count, const float *levels, > + const GUID *context) > +{ > + AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); > + AudioSession *session = This->session; > + int i; > + > + TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, > + wine_dbgstr_guid(context)); > + > + if (!levels) > + return NULL_PTR_ERR; > + > + if (count != session->channel_count) > + return E_INVALIDARG; > + > + if (context) > + FIXME("Notifications not supported yet\n"); > + > + TRACE("Pulseaudio does not support session volume control\n"); > + > + pthread_mutex_lock(&pulse_lock); > + for(i = 0; i < count; ++i) > + session->channel_vols[i] = levels[i]; > + pthread_mutex_unlock(&pulse_lock); > + return S_OK; > +} > + > +static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( > + IChannelAudioVolume *iface, UINT32 count, float *levels) > +{ > + AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); > + AudioSession *session = This->session; > + int i; > + > + TRACE("(%p)->(%d, %p)\n", session, count, levels); > + > + if (!levels) > + return NULL_PTR_ERR; > + > + if (count != session->channel_count) > + return E_INVALIDARG; > + > + for(i = 0; i < count; ++i) > + levels[i] = session->channel_vols[i]; > + > + return S_OK; > +} > + > +static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl = > +{ > + ChannelAudioVolume_QueryInterface, > + ChannelAudioVolume_AddRef, > + ChannelAudioVolume_Release, > + ChannelAudioVolume_GetChannelCount, > + ChannelAudioVolume_SetChannelVolume, > + ChannelAudioVolume_GetChannelVolume, > + ChannelAudioVolume_SetAllVolumes, > + ChannelAudioVolume_GetAllVolumes > +}; > + > +HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, > + IAudioSessionManager2 **out) > +{ > + SessionMgr *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SessionMgr)); > + *out = NULL; > + if (!This) > + return E_OUTOFMEMORY; > + This->IAudioSessionManager2_iface.lpVtbl = &AudioSessionManager2_Vtbl; > + This->device = device; > + This->ref = 1; > + *out = &This->IAudioSessionManager2_iface; > + return S_OK; > +} > + > +static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) > +{ > + PROPVARIANT *pv = userdata; > + > + if (i) > + pv->u.ulVal |= pulse_channel_map_to_channel_mask(&i->channel_map); > + > + pthread_cond_signal(&pulse_cond); > +} > + > +HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) > +{ > + pa_operation *o; > + > + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); > + > + if (IsEqualGUID(guid, &pulse_render_guid) && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { > + /* For default Pulseaudio render device, OR together all of the > + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ > + > + out->vt = VT_UI4; > + out->u.ulVal = 0; > + > + pthread_mutex_lock(&pulse_lock); > + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, out); > + if (o) { > + while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) > + pthread_cond_wait(&pulse_cond, &pulse_lock); > + pa_operation_unref(o); > + } > + pthread_mutex_unlock(&pulse_lock); > + return out->u.ulVal ? S_OK : E_FAIL; > + } > + > + return E_NOTIMPL; > +} > diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec > new file mode 100644 > index 0000000..7aeb175 > --- /dev/null > +++ b/dlls/winepulse.drv/winepulse.drv.spec > @@ -0,0 +1,11 @@ > +# MMDevAPI driver functions > +@ stdcall -private GetPriority() AUDDRV_GetPriority > +@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs > +@ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint > +@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager > +@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue > + > +# WinMM driver functions > +@ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc > +@ stdcall -private midMessage(long long long long long) winealsa.drv.midMessage > +@ stdcall -private modMessage(long long long long long) winealsa.drv.modMessage > diff --git a/include/config.h.in b/include/config.h.in > index 4d7c7ac..0e44fd7 100644 > --- a/include/config.h.in > +++ b/include/config.h.in > @@ -687,6 +687,12 @@ > /* Define to 1 if you have the <pthread_np.h> header file. */ > #undef HAVE_PTHREAD_NP_H > > +/* Define if you have pulseaudio */ > +#undef HAVE_PULSEAUDIO > + > +/* Define to 1 if you have the <pulse/pulseaudio.h> header file. */ > +#undef HAVE_PULSE_PULSEAUDIO_H > + > /* Define to 1 if you have the <pwd.h> header file. */ > #undef HAVE_PWD_H > > > >

5 4

Re: ntdll/tests: Add tests for RtlIpv4StringToAddressEx, RtlIpv6StringToAddress (resend)
by Stefan Dösinger Feb. 15, 2015

Feb. 15, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Please split the patch into one patch per tested function (ipv4ex, ipv6, ipv6ex). Am 2015-02-13 um 22:35 schrieb Mark Jansen: > + struct > + { > + PCSTR address; > + NTSTATUS res; > + int ip[4]; > + USHORT port; > + } tests[] = You can make this const (or even static const, not much difference though). > + { "1.1.1.1:", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, > + { "1.1.1.1+", STATUS_INVALID_PARAMETER, { 1, 1, 1, 1 }, 0xdead }, > + { "1.1.1.1:1", STATUS_SUCCESS, { 1, 1, 1, 1 }, 0x100 }, I recommend to add a few more tests: "1.1.1.1" - without a port "256.1.1.1:1" - out of range ip "-1.1.1.1:1" - negative ip "1.1.0.1" - There's a zero in it, should still be valid though. Hex and octal IPs > + const int testcount = sizeof(tests) / sizeof(tests[0]); > + int i, Strict; Technically i and testcount can be made unsigned. According to your function definition earlier in the file Strict should be a BOOLEAN. For consistency "Strict" should be renamed to lower case "strict". > + ok(res == STATUS_INVALID_PARAMETER, > + "[null address] res = 0x%08x, expected 0x%08x\n", > + res, STATUS_INVALID_PARAMETER); > ... > + ok(res == tests[i].res, > + "[%s] res = 0x%08x, expected 0x%08x\n", > + tests[i].address, res, tests[i].res); Indentation inconsistency in the line continuation. > + expected_ip.S_un.S_un_b.s_b1 = tests[i].ip[0]; > + expected_ip.S_un.S_un_b.s_b2 = tests[i].ip[1]; > + expected_ip.S_un.S_un_b.s_b3 = tests[i].ip[2]; > + expected_ip.S_un.S_un_b.s_b4 = tests[i].ip[3]; Is there a reason why you didn't just put a IN_ADDR in the test structure? You'll probably need an extra curly brackets around each member of struct S_un_b and one for the union: {{1}, {1}, {1}, {1}} Most of this applies in the same fashion to the ipv6 tests. > +/* ipv6 addresses from https://github.com/beaugunderson/javascript-ipv6/tree/master/test/data */ This is licensed under MIT. IANAL, but I think it is ok to transfer to an LGPLv2 licensed project. > +static void test_RtlIpv6StringToAddress(void) > ... > + struct > + { > + PCSTR address; > + NTSTATUS res; > + int terminator_offset; > + int ip[8]; > + } tests[] = > ... > + struct > + { > + PCSTR address; > + NTSTATUS res; > + ULONG scope; > + USHORT port; > + int ip[8]; > + } tests[] = Did you try to share the data for the ipv6 and ipv6ex test? Unfortunately my ipv6-foo is too limited to say much about the tests in the table :-( . > + /* sanity check */ > + ok(sizeof(ip._S6_un) == (sizeof(USHORT)* 8), "sizeof(ip._S6_un)\n"); I think we have compile-time asserts for things like this, but I don't know how they work. > + res = pRtlIpv6StringToAddressExA("::", &ip, &scope, &port); > + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); > + res = pRtlIpv6StringToAddressExA(NULL, &ip, &scope, &port); > + ok(res == STATUS_INVALID_PARAMETER, "[null string] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); > + res = pRtlIpv6StringToAddressExA("::", NULL, &scope, &port); > + ok(res == STATUS_INVALID_PARAMETER, "[null result] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); > + res = pRtlIpv6StringToAddressExA("::", &ip, NULL, &port); > + ok(res == STATUS_INVALID_PARAMETER, "[null scope] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); > + res = pRtlIpv6StringToAddressExA("::", &ip, &scope, NULL); > + ok(res == STATUS_INVALID_PARAMETER, "[null port] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); Checking that the output variables remain unmodified in the ipv4 test was a good idea IMO. Please add it here as well. (It is somewhat redundant because the test table has invalid tests and checks if the output is untouched, but this wouldn't be the first place where we find strange error handling behavior... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJU4Go3AAoJEN0/YqbEcdMwP/wP/j5pbxPuTt4dBpr/fxA/E/rv H6+hoXqq3irBQWgIuU4sprfvR/VEcKYR7HnMvL8SX/aa7xvuFPSdZerjHGgpoz1R SKlqg46X8HxIe6BvODUSpi90OrJ4UNmAutL2vhpFQVzSsblZ1xPkk3GKHnIubslC fmUi9I91Vyk6Upvk4xI9FNyf7OddUcHkb+Xkw5qFCip/R4Mcad/lZ5lKq6pJWNhE 4VRIA19IlCshi0Z3CY1NM8ZdRCCg8Wi8MqP8jgBaHsR3yPfEoBa3qUjsB2ryhrlP 2ityxJSFgAl38OQ89kwwkL7KIxxrP7t8oDrjGpb76mPdnpWxRBNarmSSu+JAmDDg jUlzsjftCifjTs2vZloDWbqqhEBY3a/SQ2tUHeIxuYplKpR/AN75WH7WxFOKpR1h KgafrCMeCGi0s2dVymkqXNa8zluQ3nq/pC16nddelgXD4D3RMPwWBnEDY8bpspR7 n0SR2mMTDAt2mndeI8DXvSyyVE4umsl8sUCjWVpKE/lj2xKZjKyPWFVx8yv1omx+ EqF+RUA2Qld+HOCy7d2c00mPy0bNmthaj7T5tmQSjEVStmGgwSH0RytkrI1yqwU8 MyDotAIxZ3OAiHvMl6RHvq5pquWDM4FTJ+yMpdxiEKPIZ4dwMa5mkZvaCYWBB2Qv NnxWITxzj7GvV1YH7U/5 =uuX8 -----END PGP SIGNATURE-----

3 3

Re: [PATCH 3/3] ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c.
by Marvin Feb. 15, 2015

Feb. 15, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11559 Your paranoid android. === w8 (32 bit visual) === visual.c:1617: Test failed: unexpected colortable on offscreen surface

1 0

Re: [PATCH 1/3] ddraw/tests: Port D3D1_TextureMapBlendTest to ddraw1.c.
by Marvin Feb. 15, 2015

Feb. 15, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11557 Your paranoid android. === w8 (32 bit visual) === visual.c:1897: Test failed: unexpected colortable on offscreen surface

1 0

Re: comctl32: SysDateTimePick32 control add Alt+down hot key like windows
by Dmitry Timoshkov Feb. 15, 2015

Feb. 15, 2015

"Changhui Liu" <liuchanghui(a)linuxdeepin.com> wrote: > + case WM_SYSKEYDOWN: > + if (wParam == VK_DOWN) > + { > + POINT pt; > + RECT rect; > + GetClientRect(hwnd, &rect); > + pt.x = rect.right - GetSystemMetrics(SM_CXVSCROLL)/2; > + pt.y = rect.top + GetSystemMetrics(SM_CYHSCROLL)/2; > + > + return DATETIME_LButtonDown (infoPtr, (SHORT)pt.x, (SHORT)pt.y); I wouldn't be surprised if the control just does SendMessage with an appropriate message to itself. Is it possible to add a message test? > + } > + Did you miss a 'break;' or a fall through is intentiional? In the latter case please add a proper comment. -- Dmitry.

3 2

Re: [PATCH] user32: use InvalidateRect to repaint buttons
by Nikolay Sivov Feb. 15, 2015

Feb. 15, 2015

On 11.02.2015 0:48, Mark Harmstone wrote: > At present, whenever a button needs to be redrawn user32 calls its own > internal function. This causes problems if the button is subclassed, as > the superclass then won't receive the WM_PAINT message - this is why > themed buttons lose their theme when you click on them. This patch changes > it to instead call InvalidateRect, which will force a WM_PAINT message > to be sent to the topmost class. > > --- > dlls/user32/button.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > That sounds like a case when proper fix is to reimplement themed controls in comctl32, the way Windows does that. I remember when I copied over tests for buttons to comctl32/tests I had to fix painting sequences too. To make it work properly we'll need to make comctl32 register separate classes, when loaded within context, or even better - to build two separate modules like windows does. Those separate classes should be named as "Classname!x.x.x.x", where x.x.x.x is a comctl32 version. After this done user32 needs to be fixed at CreateWindow() level to properly forward to those classes.

1 0

Re: quartz: Add stub IAMStreamSelect to MPEG-1 Stream Splitter.
by Nikolay Sivov Feb. 15, 2015

Feb. 15, 2015

On 02/14/2015 07:52 PM, Anton Baskanov wrote: > + if ( IsEqualIID(riid, &IID_IUnknown) > + || IsEqualIID(riid, &IID_IPersist) > + || IsEqualIID(riid, &IID_IMediaFilter) > + || IsEqualIID(riid, &IID_IBaseFilter) ) > + *ppv = This; > + > + if ( IsEqualIID(riid, &IID_IAMStreamSelect) ) > + *ppv = &This->IAMStreamSelect_iface; > + > + if (*ppv) > + { > + IBaseFilter_AddRef(&This->Parser.filter.IBaseFilter_iface); > + return S_OK; > + } Cleaner way is to use 'iface' when setting out pointer, and for AddRef. For AddRef() it just makes it shorter, for assignment you actually have to return interface pointer instead and not to rely on implementation struct layout. > + > + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) > + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); Do you really need to limit it like that?

3 2

Re: kernel32/tests: Add tests for job objects
by Marvin Feb. 14, 2015

Feb. 14, 2015

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 https://testbot.winehq.org/JobDetails.pl?Key=11532 Your paranoid android. === w2000pro (32 bit job) === job.c:169: Test failed: QueryInformationJobObject (24) job.c:172: Test failed: Expected pid_list->NumberOfProcessIdsInList to be 2 (2) is 1 job.c:174: Test failed: Expected pid_list->ProcessIdList[1] to be 872 (pi[1].dwProcessId) is 3211296 job: unhandled exception c0000005 at 00000000 === wxppro (32 bit job) === job.c:169: Test failed: QueryInformationJobObject (24) job.c:172: Test failed: Expected pid_list->NumberOfProcessIdsInList to be 2 (2) is 1 job.c:174: Test failed: Expected pid_list->ProcessIdList[1] to be 3060 (pi[1].dwProcessId) is 65535 === w2003std (32 bit job) === job.c:169: Test failed: QueryInformationJobObject (24) job.c:172: Test failed: Expected pid_list->NumberOfProcessIdsInList to be 2 (2) is 1 job.c:174: Test failed: Expected pid_list->ProcessIdList[1] to be 900 (pi[1].dwProcessId) is 0 === wvistau64 (32 bit job) === job.c:169: Test failed: QueryInformationJobObject (24) job.c:171: Test failed: Expected pid_list->NumberOfAssignedProcesses to be 2 (2) is 7479129 job.c:172: Test failed: Expected pid_list->NumberOfProcessIdsInList to be 2 (2) is 7340228 job.c:173: Test failed: Expected pid_list->ProcessIdList[0] to be 636 (pi[0].dwProcessId) is 6029360 job.c:174: Test failed: Expected pid_list->ProcessIdList[1] to be 308 (pi[1].dwProcessId) is 0 === w2008s64 (32 bit job) === job.c:169: Test failed: QueryInformationJobObject (24) job.c:171: Test failed: Expected pid_list->NumberOfAssignedProcesses to be 2 (2) is 7572569 job.c:172: Test failed: Expected pid_list->NumberOfProcessIdsInList to be 2 (2) is 7471300 job.c:173: Test failed: Expected pid_list->ProcessIdList[0] to be 2996 (pi[0].dwProcessId) is 909153100 job.c:174: Test failed: Expected pid_list->ProcessIdList[1] to be 2128 (pi[1].dwProcessId) is 167774375

1 0

Re: shell32: Implement IApplicationAssociationRegistration QueryCurrentDefault (try 7 - resend)
by Nikolay Sivov Feb. 14, 2015

Feb. 14, 2015

On 13.02.2015 10:53, Alistair Leslie-Hughes wrote: I would rearrange this a bit if I was doing it to make a patch shorter, and keep conditions nesting level lower, something like: - get root key either from HKCR or HKCU; - get a path to a value; - have a single RegGetValueW() for all cases, once you know path. But that's more of a suggestion, not a blocker. > + lstrcatW(path, slash); > + lstrcatW(path, query); > + lstrcatW(path, slash); > + lstrcatW(path, choice); You could get rid of two calls if you move backslashes to 'choice' and '*assoc' strings.

1 0

Re: comctl32: SysDateTimePick32 control add Alt+down hot key like windows
by Nikolay Sivov Feb. 14, 2015

Feb. 14, 2015

> + case WM_SYSKEYDOWN: > + if (wParam == VK_DOWN) > + { > + POINT pt; > + RECT rect; > + GetClientRect(hwnd, &rect); > + pt.x = rect.right - GetSystemMetrics(SM_CXVSCROLL)/2; > + pt.y = rect.top + GetSystemMetrics(SM_CYHSCROLL)/2; > + > + return DATETIME_LButtonDown (infoPtr, (SHORT)pt.x, (SHORT)pt.y); > + } > + If it really works this way you should just make it drop directly, without faking click point coordinates. > +static void test_dtm_hotkey(void) > +{ > + HWND hWnd; > + HWND hWndMonthCal; > + > + hWnd = create_datetime_control(0); > + ok(hWnd != NULL, "Expected window to be valid\n"); > + ShowWindow(hWnd, SW_NORMAL); > + > + hWndMonthCal = SendMessageA(hWnd, DTM_GETMONTHCAL, 0, 0); > + ok(hWndMonthCal != NULL, "Expected MonthCal to be valid\n"); > + ok(!IsWindowVisible(hWndMonthCal), "Expected MonthCal to be invisible\n"); > + > + SendMessageA(hWnd, WM_SYSKEYDOWN, VK_DOWN, 0); > + ok(IsWindowVisible(hWndMonthCal), "Expected MonthCal to be visible\n"); > + > + DestroyWindow(hWnd); > +} Please add notification tests too.

1 0

Official Wine coding style rules/guidelines ?
by Indrek Altpere Feb. 13, 2015

Feb. 13, 2015

Hello Would it be possible to get more of the guidelines written down on the http://wiki.winehq.org/Developers-Hints or http://wiki.winehq.org/SubmittingPatches pages, to get them set in stone, so-to-speak? And also somehow show which components have different guidelines and what are they? Right now, all the information seems to get reiterated to each new developer, causing a lots of overhead to the reviewers. After being subscribed to this mailing list for a few months, I have noticed a pattern with new developers trying to submit patches: 1) first patches tend to receive lots of style related feedback 2) due to the big list of changes requested, the developers tend to miss a few with their resend and have to re-resend the patches again or due to the initial patches being too "out-of-style" the reviewers missed a few places in the first round and point them out in later round, causing the re-resend 3) sometimes the cycle goes on for quite a while And to confuse things more: 1) sometimes different reviewers have different/conflicting opinions about style rules 2) some rules are component specific, mostly set by the maintainer 3) http://wiki.winehq.org/SubmittingPatches has only general rules 3.1) "Follow the style of surrounding code as much as possible, except when it is completely impractical to do so" - there have been many cases where patches get rejected because although it was done in the style of surrounding code, the component (or wine overall) has adopted new style rules, which are not evident in the surrounding code at all. 3.2) as a minor issue, the reference to Developer-Hints in the guidelines is not linked to http://wiki.winehq.org/Developers-Hints Lots of work has already been done with the Developer-Hints page, but many issues still come up in the mailinglist that have not been mentioned there. UINT vs unsigned int, int* foo vs int *foo, -1 vs ~0U, function parameter naming (Hungarian notation ? Ok for API function definitions based on MSDN doc or not?). Officially LONG use is suggested because long differs between 64bit linux and 64bit windows. Should the developers also BOOL FLOAT etc uppercase "safe" defines everywhere or not? true/false vs TRUE/FALSE? It also seems that (at least in D3D related code) LP* usages are not allowed, LPWSTR => const WCHAR * should be used for parameters. But for example in kernel32/volume.c the LPWSTR is used in 10 places as function parameter, const WCHAR * is used in only one place as function parameter. Is the LP* rule overall rule, is it D3D specific? If overall, then why is it so widely used in all the kernel files? If D3D specific, how does the developer know it beforehand? Suggestions, comments etc ? Regards, Indrek Altpere

2 1

Re: d3dx9_36: add D3DXDisassembleShader stub (try 3)
by Matteo Bruni Feb. 13, 2015

Feb. 13, 2015

2015-02-11 0:30 GMT+01:00 Austin English <austinenglish(a)gmail.com>: > > > -- > -Austin The E_OUTOFMEMORY return instead of the more typical E_NOTIMPL is slightly surprising, although I guess E_OUTOFMEMORY is possibly more likely to be handled by applications since it's listed in MSDN in the "return value" section. Anyway, this patch is okay for me.

1 0