January 2015 - Wine-Devel - list.winehq.org

Re: [PATCH 2/5] wined3d: Handle the SM4 SV_POSITION pixel shader input semantic in the GLSL shader backend.
by Stefan Dösinger Jan. 19, 2015

Jan. 19, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-01-19 um 13:44 schrieb Henri Verbeet: > This is (mostly) equivalent to the vPos register in SM3. > ... > + if (!strcmp(semantic_name, "SV_POSITION")) > + shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", > + shader->u.ps.input_reg_map[i], reg_mask, reg_mask); The vpos variable has the d3d9 0.5 pixel offset applied, which to my knowledge is not correct for d3d10. Is this intentional? (I guess yes, either for simplicity to make patch 3 work and / or because we're still adding the offset on the vertex side even in d3d10.) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUvQcWAAoJEN0/YqbEcdMwutkP/irVdyJWjIwnAnwgltjehO9A Vp4CZneYnbnAP/SJjhvsY7RwhHdUelzhv8wX8m9q0Y92jPMtvTt6OMAdppxATSOY Bo70j7fpaMJbRG/GCrDSCp3geyzN/1p6CQu5JfahVuSBOGg7EIDdR0OA4hA9aDEE R/pzerlOuvIY8vMOejYk99wBWEOLWJUcWNfrRq30ASnyIK6wcBhr3QLdcRI8/57m +MtFG53+R6wGdRQih1PfmDP4CJnfhr33TQgKod9ezYGyNcS8X/rRTq3mE0uqq3TJ 7+S4A21o7j2nEBlEWlwt6op7Yg2xhMan5znQU/MwREFaGGPWdapNpl1NxpWM/wp0 zm992j3TgpCqHLCW0u8Z5t2fClWuyU8IcZWsLql2FVZa3DvG6QOeXS3oEVlw5jxu fU9iMiJeh7Aywt8tvro4kG5opA2CCUFUJu1Cf7FBQpAUtHYqY5B1vm67fzeMfLt5 C2XC6L79dK0L0YenFqrGWQOU5/u4skW5Cgi5Yt5AKx0Ifk4gTrPq1/pSCeEFUS+T H2ZjZCqCYYp7NCWSXQSpBSFcVE7bURfJNBC3j9TTBCoT/pCOTKr8vv6Dqn0pjxku 6hdmAEaW7vUKr6ucUopgDNQ6E+aCdaofUMqJuhlOAOL8arthwIPZbO2hb8lLTSBq Smb3+zJL2d2YBZZelE4f =0cAR -----END PGP SIGNATURE-----

2 1

ole32:fix CoWaitForMultipleHandles cause RPC hang (try 2)
by Changhui Liu Jan. 19, 2015

Jan. 19, 2015

Dear Sebastian: I commit a new ole32 path last month at here: http://source.winehq.org/patches/data/108302. Could you help me review it again when you are free? Thank you. ------------------ Regards, Changhui.

1 0

Re: [PATCH (try 3) 2/2] dpvoice: Turn GetCompressionTypes into a semi-stub.
by Stefan Dösinger Jan. 18, 2015

Jan. 18, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-01-16 um 08:44 schrieb Alex Henrie: > Star Trek Armada II needs GetCompressionTypes to return at least > one value, see https://bugs.winehq.org/show_bug.cgi?id=29238 Is the game happy if you return DV_OK and set *pdwNumElements = 0? > MS-PCM is guaranteed to be present on Windows XP, and it's already > implemented in Wine, so advertising this codec shouldn't cause any > trouble. Even though we have the codec we probably don't have the dpvoice infrastructure to hook up a dpvoice client to the codec, right? That's not necessarily a reason to reject the semi-stub though. > +extern HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO > *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) > DECLSPEC_HIDDEN; Please avoid hungarian notation names (dwThisIsAdWord, *pThisIsAPointer). > + string_loc = (LPWSTR)((char*)pData + sizeof(pcm_type)); + > memcpy(pData, &pcm_type, sizeof(pcm_type)); + memcpy(string_loc, > pcm_name, sizeof(pcm_name)); + pData->lpszName = string_loc; I think there should be a nicer way to do this. I didn't test this with the compiler, but I guess you can do something like this: struct { DVCOMPRESSIONINFO info; const WCHAR name[]; } codec = { {80, {0x8de12fd4,0x7cb3,0x48ce {0xa7,0xe8,0x9c,0x47,0xa2,0x2e,0x8a,0xc5}}, &codec.name, NULL, 0, 64000}}, {'M','S','-','P','C','M',' ','6','4',' ','k','b','i','t','/','s',0}; }; ... memcpy(pData, codec, sizeof(codec)); I don't know how well the variable-size array at the end of the struct works. It also won't easily work for more than one element. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUuUN7AAoJEN0/YqbEcdMwFwcP/iSIxX72VcW9TSqbWHnq1Pi6 7Yv9zcL3h/3Mx0rERFiaT15Tmz7+YNyKfngR6kZwM7ms5usqePHCW1y1dT7ImCfM gSAgd5WBTKuk5qpr0k2zLgl4O3TVJn4zTP8wKNa+lwGDJgY7d3ThcgDd/LI6kkiU KI2Uv+jyh00Co2G6egmhlZDfwWo3dI/b+7fndC1jnYCcyIIxjLywdiQ80SCi3IgB sktBaQW7mvzzQDtMKgwR/BNUSze6AQeWQ5+xmWivIm4jsPGETmr3r0VnRtxxMduA LzXJJewnGojJoaQ1dsjsXJJ+S+3rKCd5cKrbnlyFXJ2pqHGrBdkQwbFTWse+8Tsf +Au00otO85InuwenrvKutN92c4pP8hfyxAQbKJUjVCnD5ppMDXkRrx0xKfAy7SWB FpQuO6KLeWMotDYcC21kwY3jGLAxKOWGh02p7S5AUIlnZ0m1kJ3PK1DxhomRHYax 4pgQx0jb/MITw1/L5hJ8KlNcucLJxC2FBGpgRC32LAUHMVcNurs6bHQbgbl9UKUS zH4gOA7PzNTGG3G3To/IqmayhmzNMLk/b0XusIGKF1Ao3uyU3Yw+5RuzPlGaKOkT cAhRIl5Ujbcjt8JKgtdq4x1VeGMutHlePhPuUpgZX98n+/Bgk9uZ5rScVLW1ELGW XQ6zfKUWW2qirySBqy+A =StHs -----END PGP SIGNATURE-----

2 4

Re: [2/3] msi: Open 32-bit component registry keys with KEY_WOW64_32KEY flag. (try 2)
by Marvin Jan. 18, 2015

Jan. 18, 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=11200 Your paranoid android. === wxppro (32 bit install) === The test timed out

1 0

Re: user32: Allocate memory based on HICON instead of DWORD to fix 64 bit problems
by Stefan Dösinger Jan. 18, 2015

Jan. 18, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-01-17 um 23:51 schrieb Bruno Jesus: > - frames = HeapAlloc( GetProcessHeap(), 0, sizeof(DWORD)*header.num_frames ); > + frames = HeapAlloc( GetProcessHeap(), 0, sizeof(HICON)*header.num_frames ); sizeof(*frames)*header.num_frames would be better. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUu45mAAoJEN0/YqbEcdMwtrkP/2a+96GGXGtHq4g8P+UYBWjc AxGPcxAq5ND++lDYK22TyY1XC5ZXjByvxYOcrMsb4yhYRfJbPVgKx6gY+ALe6aog ilAFF0waM7kRPxXcNotcE9ZlXQpKAfLvTQajJSH9e1MgYUfcMbaSS8eSJMSNslcM Sa9rDDaeabp6wNymbvKOtpTjIOS767Jz9m7xCw+NtA9FFIHwrZsZ/LxeWiDQxDmR STNGPoEELt+vvAPB0K2Rnn/5AZrjekdYy0cUR78htsEqGIodBO86kD6K20r3cQ5s 7cmiAj8lHtUJ/6FPB54DynmSpNiPiXOlPc0dSL+ujsEEGJ/rI8wFtM/kCIzEe6GY 6sv881G8mXX8AMDgOg+O3Tlo0qprfWvVmkTE5ASGXGsdck04yPO4UfKvOon3IaXI dyrjRkBK8w2X63L5R39BzmKvtcZgKQj+r4M8is8Rn4hk2iAmz4ejFYlzcDVCJ0Zg W/kurjSSroUcOKsjcjMuB738W43mgHhh9xdbO/06FOYXULXOQVDFO7x19NI2ilpi VK5x6XRg4OxARuFU6tuSqll1a9PtNgIuzWc+BHDOS9Htc5WVpDTQvPUPtVif/6L/ 6MZbDeC9rm+IAytmXvpFDU+C6c2/axUMCfwB9idAKFaTKI5nemKLCeEPLiq1nVUh 5xulwJdbSnxoi7M72Vf6 =Tg70 -----END PGP SIGNATURE-----

1 0

Re: [PATCH (try 3) 2/2] dpvoice: Turn GetCompressionTypes into a semi-stub.
by Stefan Dösinger Jan. 16, 2015

Jan. 16, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-01-16 um 08:44 schrieb Alex Henrie: > Star Trek Armada II needs GetCompressionTypes to return at least > one value, see https://bugs.winehq.org/show_bug.cgi?id=29238 Is the game happy if you return DV_OK and set *pdwNumElements = 0? > MS-PCM is guaranteed to be present on Windows XP, and it's already > implemented in Wine, so advertising this codec shouldn't cause any > trouble. Even though we have the codec we probably don't have the dpvoice infrastructure to hook up a dpvoice client to the codec, right? That's not necessarily a reason to reject the semi-stub though. > +extern HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO > *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) > DECLSPEC_HIDDEN; Please avoid hungarian notation names (dwThisIsAdWord, *pThisIsAPointer). > + string_loc = (LPWSTR)((char*)pData + sizeof(pcm_type)); + > memcpy(pData, &pcm_type, sizeof(pcm_type)); + memcpy(string_loc, > pcm_name, sizeof(pcm_name)); + pData->lpszName = string_loc; I think there should be a nicer way to do this. I didn't test this with the compiler, but I guess you can do something like this: struct { DVCOMPRESSIONINFO info; const WCHAR name[]; } codec = { {80, {0x8de12fd4,0x7cb3,0x48ce {0xa7,0xe8,0x9c,0x47,0xa2,0x2e,0x8a,0xc5}}, &codec.name, NULL, 0, 64000}}, {'M','S','-','P','C','M',' ','6','4',' ','k','b','i','t','/','s',0}; }; ... memcpy(pData, codec, sizeof(codec)); I don't know how well the variable-size array at the end of the struct works. It also won't easily work for more than one element. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUuUNyAAoJEN0/YqbEcdMwb/wP/3QuWJc0dQtO7tcPo/alre6S ASLeDH+5+F+LBTwFBnlNJhkizO7PtpRUCqH6k0fxGtSprsNMnyu3T/KqBPTku8kx XUhS4jNcV6lDzSvruKEHx4m+Lrpgs/onSK4pLUa9cP0FvZgKpLA+XTJtXgOuX40K 31/TOW/DRq6gXeGE11Oxz97Vx2mILfhmLfhtIeTRA4RpkGyMlWlKST9l3xyNn0dt ystZG62OWVnljq/g2U8Ce4n+zz97Hlxzkk7uB4ZI2/m8/EBdGEhOgGTsUdEulu6P cChWJqzJOo8zxJr+RXeWnQN38V2yKW6CwxnIQ90INKd1WV1NvGZfiYDMXdUBMrYm XrQ4A6xaLwfCIVgzJ1wyPDGYFb92sOr34ly3v/fTuQNb2DnamdgENhw/Gj9APsIS ErfHiTgoWGbh77WuRm2GC/GfxpOsK2lpnO2uwXcrWXyYy8u2GP9zEhHLl3ohcG2+ dEL7Q0MABEitbGQJ4qTbpNffFIbLwWdKcKEP67gBFM2T937/4z5ISce0WlI6SBHX l+yXKK/vSJ1U+/B2i+fsbyFOr0rQMCIt1k6uAOlnPM29uwZOjJtG3gCp6BbK+vqw Jc2yGJl3PdAjwfHuHGTakWx6EflZLLGqqcLXWnfs3gzgExHnbHGZaOdKDYx+qsqz cEUAmwJUxAcp6cMGiuQX =ue9K -----END PGP SIGNATURE-----

1 0

Re: [PATCH (try 2) 1/2] dpvoice/tests: Add GetCompressionTypes tests.
by Stefan Dösinger Jan. 16, 2015

Jan. 16, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-01-15 um 12:55 schrieb Alex Henrie: > + DVCOMPRESSIONINFO data[32]; I can't really find any documentation about this. Is there a documented maximum number of elements returned? > + int i, j; Afaics you can make those unsigned. > + LPWSTR string_loc; Is the use of the LPFOO type intentional? > + if(GetCompressionTypes(iface, NULL, NULL, NULL, 0) == E_NOTIMPL) > + { > + skip("%s: GetCompressionTypes not implemented\n", name); > + return; > + } I think todo_wine ok(0, "GetCompressionTypes not implemented") is better here, but I don't particularly mind since you remove it in the next patch anyway. > + ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, > + "%s: tests[%i]: expected data_size between %i and %i got data_size=%i\n", > + name, i, sizeof(DVCOMPRESSIONINFO), sizeof(data) - 1, data_size); data_size is unsigned, you should use %u instead of %i. Same for i and j once you change them to unsigned. > + string_loc = (LPWSTR)((char*)data + num_elements * sizeof(DVCOMPRESSIONINFO)); It's interesting that native places the string in the same data blob, but it kinda makes sense. I think (WCHAR *)(data + num_elements) or (WCHAR *)&data[num_elements] should work as well. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUt7l0AAoJEN0/YqbEcdMwf/sQAIGsh8jbGM7AsbdeHt5uEJUD AGGg9OcqrDnW0PoCd5w36G70tNF/NFMRleNJ0tOL4r3HG8TD16BDXCkxW/U9hR7G 6c+DGAqnOFG0y6CjSAMGSvRh5VZVrD5OlI4XRTNFqYdL1QkVD0yQ/kXQl8YsvMUu x/sWJ1kF4FCcojmmhIP5tSo6AmZJlso18tlOReCBBnHDkdq+0ej8ltR/pG0NmZUp 3eOdSfyHd0Swc9P8nLossRKbieORr88fE0ZUBP7oOtg2JbLfs3l/F4fudbPoMF8v 5JbJXD+KuHdNvGYBJ2ppHEZCUC2ArHEYgMW0m2ffRoWfoXmrJCUE8AnJsyHsjaYI LFRiRGom7kRjoY8fhbTSJWdNTKLbW5swAiCzW7A+NkQvrXn5dcL2kZVpi2Z4x1gu 1JKYmb5G9G6SG+U4wblTWET4RWv5rAzoNeXvDZtznBW/KinnkNX2Ic7kug1/usqj ATJ9q8ARt+3DMPYRonk7sXzFdyRRXhlCROlBvqHBkPitVz3tLxvziB/4C1SZ9ybu wy28DMfEYfwbi/9iQnaHsn+811d7uf85QkKgiV6CBvS8XJ2xVzvHWnSWlbc0wNj1 /Gy5gCuKkluFWbJJjAliAf6+uHIypvBbFr85/Gn3gQy/tNUOH4FFSXPB18XrBXh3 CFH+vOFS/SN8fEA6WOtw =EJNM -----END PGP SIGNATURE-----

2 2

Re: [PATCH 4/5] opengl32: Store the OpenGL context version in the handle value.
by Alexandre Julliard Jan. 16, 2015

Jan. 16, 2015

Matteo Bruni <mbruni(a)codeweavers.com> writes: > @@ -53,7 +53,14 @@ enum wgl_handle_type > { > HANDLE_CONTEXT = 0 << 12, > HANDLE_PBUFFER = 1 << 12, > - HANDLE_TYPE_MASK = 15 << 12 > + HANDLE_TYPE_MASK = 7 << 12 > +}; > + > +enum wgl_opengl_version > +{ > + OPENGL_1 = 0 << 15, > + OPENGL_3 = 1 << 15, > + OPENGL_VER_MASK = 1 << 15 > }; That's certainly acceptable, but since it only applies to contexts I'm wondering if it wouldn't be cleaner to add a CONTEXT_V3 type in the existing enum. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: iphlpapi: Set 0.0.0.0 as the IP and mask of disconnected interfaces
by Bruno Jesus Jan. 16, 2015

Jan. 16, 2015

On Thu, Jan 15, 2015 at 10:13 AM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Superseeds 108610. > > In Windows if the eth cable is disconnected the interface returns > 0.0.0.0, when it's connected and using DHCP but no DHCP server is > found it returns an APIPA [1] address. In our case it's simpler to > assume that an IP less interface is a disconnected interface. > > Fixes bug https://bugs.winehq.org/show_bug.cgi?id=32205 > > [1] http://www.webopedia.com/TERM/A/APIPA.html I see the patch is pending. In defense of the patch all I can do is say that I manually tested this in different Windows versions by disconnecting the interface (physical cable/wifi connection). If there is a specific concern about it please tell me so I can look for alternatives. Windows 98 connected (ETH): Adapter '', IP 172.16.204.135, Mask 255.255.255.0 Windows 98 disconnected (ETH): Adapter '', IP 0.0.0.0, Mask 0.0.0.0 Windows XP connected (ETH): Adapter '{02FB7145-66CB-4DF2-8975-BBCAC6044973}', IP 172.16.204.131, Mask 255.255.255.0 Windows XP disconnected (ETH): Adapter '{02FB7145-66CB-4DF2-8975-BBCAC6044973}', IP 0.0.0.0, Mask 0.0.0.0 Windows 8.1 connected (ETH): Adapter '{8973E4B8-0C69-45E0-85D0-EF4A71D6BD87}', IP 10.100.200.60, Mask 255.0.0.0 Windows 8.1 disconnected (ETH): Adapter '{8973E4B8-0C69-45E0-85D0-EF4A71D6BD87}', IP 0.0.0.0, Mask 0.0.0.0 Windows 8.1 connected (WIFI): Adapter '{1E13889D-F3CC-49BC-A750-FFBE451AC8E1}', IP 192.168.251.136, Mask 255.255.255.0 Windows 8.1 disconnected (WIFI): Adapter '{1E13889D-F3CC-49BC-A750-FFBE451AC8E1}', IP 0.0.0.0, Mask 0.0.0.0 Best Regards, Bruno

1 0

Re: [PATCH 3/5] opengl32: Update to GL 4.5.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Matteo Bruni <mbruni(a)codeweavers.com> writes: > I fixed up manually a couple of misgenerated bits, my feeling is that > similar fixups were done last time too. I'm not aware that fixups have ever been done by hand, that doesn't sound like a good idea. Please try to fix the script instead. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: ntdll: Fixed buffer size checking for ProcessWow64Information on 64bit in NtQueryInformationProcess. (try 2)
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Qian Hong <qhong(a)codeweavers.com> writes: > @@ -403,12 +403,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( > break; > > case ProcessWow64Information: > - len = sizeof(DWORD); > + len = sizeof(ULONG_PTR); You'd also have to write the correct size, and add tests demonstrating that. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: iphlpapi: Set 0.0.0.0 as the IP and mask of disconnected interfaces
by Henri Verbeet Jan. 15, 2015

Jan. 15, 2015

On 15 January 2015 at 13:13, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > 0.0.0.0, when it's connected and using DHCP but no DHCP server is > found it returns an APIPA [1] address. I think on Linux that's usually called an IPv4LL address, and it's set by the dhcp client if configured to do that.

2 1

Re: iphlpapi: Add a private network IP to interfaces without an IP address
by Bruno Jesus Jan. 15, 2015

Jan. 15, 2015

On Thu, Jan 15, 2015 at 10:05 AM, Michael Stefaniuc <mstefani(a)redhat.com> wrote: > Hello Bruno, Hi =) > I know that Windows assigns by default APIPA to IPv4 enabled interfaces > that are up. But what does it do if you disable that and the up > interface has no IP address? Will it still enumerate the interface? I already dropped this patch in exchange for [1]. When the interface is disabled it is not displayed; When it is enabled but not physically connected it displays 0.0.0.0; When it is enabled and physically connected and configured for DHCP and DHCP server is not found it uses APIPA. [1] http://source.winehq.org/patches/data/108636 Best wishes, Bruno

1 0

Re: ntdll: Fix calculation of process and thread affinity masks on systems with a large number of processors.
by Jonas Maebe Jan. 15, 2015

Jan. 15, 2015

On 15 Jan 2015, at 12:44, Hans Leidekker wrote: > + const DWORD shift = min(NtCurrentTeb()->Peb- > >NumberOfProcessors, sizeof(DWORD_PTR) * 8); > + const DWORD_PTR mask = (1 << shift) - 1; Note that this will result in a mask of 0 on i386 if NumberOfProcessors >= 32 (and on x86-64 if NumberProcessors >= 64). (1 << 32) == 1 on Intel if calculated as a 32 bit operation, and similarly (1 << 64) == 1 on 64 bit. Jonas

1 0

Re: iphlpapi: Add a private network IP to interfaces without an IP address
by Bruno Jesus Jan. 15, 2015

Jan. 15, 2015

On Thu, Jan 15, 2015 at 12:25 AM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Explanation in a comment inside the patch. > > To test this in Linux for example I have eth0 and wlan0, I'm connected > by wifi so eth0 does not have an IP and currently wine returns an > empty IP making Youku Desktop unhappy. More at > https://bugs.winehq.org/show_bug.cgi?id=32205#c13. > > Fixes bug https://bugs.winehq.org/show_bug.cgi?id=32205 > > Bibliography: > http://www.webopedia.com/TERM/A/APIPA.html > http://packetlife.net/blog/2008/sep/24/169-254-0-0-addresses-explained/ > http://tools.ietf.org/html/rfc3927 (I didn't read this completely) Please ignore this patch. I found a simpler way.

1 0

Re: atl: Don't conflict GWLP_USERDATA with user applications.
by Marvin Jan. 15, 2015

Jan. 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=11160 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [resend 1/8] reg: Add system error printing function
by Stefan Dösinger Jan. 15, 2015

Jan. 15, 2015

1 0

Re: [PATCH 2/2] dpvoice: Turn GetCompressionTypes into a semi-stub.
by Marvin Jan. 15, 2015

Jan. 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=11157 Your paranoid android. === w2000pro (32 bit voice) === voice.c:415: Test failed: server: expected ret=8015001e got ret=80004003 === wxppro (32 bit voice) === voice.c:415: Test failed: server: expected ret=8015001e got ret=80004003

1 0

Re: [PATCH 1/2] dpvoice/tests: Add GetCompressionTypes tests.
by Marvin Jan. 15, 2015

Jan. 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=11156 Your paranoid android. === w2000pro (32 bit voice) === voice.c:421: Test failed: server: expected ret=8015001e got ret=80004003 === wxppro (32 bit voice) === voice.c:421: Test failed: server: expected ret=8015001e got ret=80004003

1 0

Re: vbscript: Support 'End If' for single line If statements
by Marvin Jan. 15, 2015

Jan. 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=11152 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: dplayx: Cache GUID values so they persist after enumeration
by Marvin Jan. 15, 2015

Jan. 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=11147 Your paranoid android. === w8 (32 bit dplayx) === The test timed out

1 0

Mac Driver's functionality on Snow Leopard/Lion
by António Sarmento Jan. 14, 2015

Jan. 14, 2015

Hello everyone, I had a question about the functionality of the Mac Driver when I found out that winemac.drv.so wasn’t working on my machine with Snow Leopard with a Wine wrapper; this was partially discussed in another e-mail sent directly to Ken Thomases (I apologize for this, I should’ve found the use of this mailing list sooner), where I mentioned that the addition of kCGDisplayShowDuplicateLowResolutionModes was keeping Wine from creating windows on OS X 10.6 (building works, Wine just stops at loading winemac.drv.so), as specified in this log: err:module:load_builtin_dll failed to load .so lib for builtin L"winemac.drv": dlopen(/path/to/app/Contents/Frameworks/wswine.bundle/bin/../lib/wine/winemac.drv.so, 258): Symbol not found: _kCGDisplayShowDuplicateLowResolutionModes Referenced from: /path/to/app/Contents/Frameworks/wswine Application tried to create a window, but no driver could be loaded. Unknown error (127). wine: Unhandled exception 0x0eedfade in thread 9 at address 0x0000:0x7b82cda2 (thread 0009), starting debugger... Application tried to create a window, but no driver could be loaded. Unknown error (127). err:seh:setup_exception_record stack overflow 2016 bytes in thread 0009 eip 7bc3772c esp 00230b50 stack 0x230000-0x231000-0x330000 This, however, was a fault of my own since, as suggested by Ken, I should've included "-mmacosx-version-min=10.6" to the compiler flags if I wanted Snow Leopard to be included in the range of supported OS; The symbols that were causing trouble for me «might not be available at run time» now «resolve to a NULL address», so the driver is able to run (my app using winemac now crashes for another reason of which I shall make a proper research later). I doubt this particular log actually helps since it just further shows the problem trying to run winemac when it was not compiled for that OS. I shall ask more questions about the Mac Driver in the future, if there’s no problem with you. Thank you for your time! António

1 0

Re: dplayx/tests: Add DirectPlayEnumerate[A|W] tests
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Bruno Jesus <00cpxxx(a)gmail.com> writes: > Required for bug https://bugs.winehq.org/show_bug.cgi?id=37185 > > Manually tested in NT4 and 98. > > Windows 8 fails and I believe it's in a dialog box asking to install > direct play, the same issue already found by Alistair Leslie-Hughes > and that he is trying to fix. As soon as he fixes it in dpnet we will > be able to copy over dplayx too. It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dplayx.dll -p dplayx_test.exe.so dplayx && touch dplayx.ok dplayx.c:826: Test succeeded inside todo block: Expected equal GUID values dplayx.c:858: Test succeeded inside todo block: Expected equal GUID values dplayx.c:6668: Tests skipped: Run in interactive mode to run dplayx tests. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: cmd: implemented && and || functionality
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Михаил Быстрянцев <ho-rr-or(a)mail.ru> writes: > Implemented expected behavior of && and || delimeters, https://bugs.winehq.org/show_bug.cgi?id=32679 It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M cmd.exe -p cmd.exe_test.exe.so batch && touch batch.ok batch.c:312: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 398 (got 'foo3 not created', wanted 'foo3 not created') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 400 (got '--- on failure conditional or', wanted 'foo4') batch.c:304: Test failed: excess characters on line 134 (got '1 ', wanted '1') batch.c:304: Test failed: excess characters on line 137 (got '1 ', wanted '1') batch.c:304: Test failed: excess characters on line 139 (got '1 ', wanted '1') batch.c:304: Test failed: excess characters on line 141 (got '1 ', wanted '1') batch.c:304: Test failed: excess characters on line 142 (got '2 ', wanted '2') batch.c:304: Test failed: excess characters on line 144 (got '1 ', wanted '1') batch.c:304: Test failed: excess characters on line 145 (got '2 ', wanted '2') batch.c:304: Test failed: excess characters on line 148 (got '1 ', wanted '1') make[1]: *** [batch.ok] Error 10 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [resend 1/8] reg: Add system error printing function
by Jonathan Vollebregt Jan. 14, 2015

Jan. 14, 2015

This patchset has fallen off the list twice now, though Stefan looked over and OKd it both times. I'd appreciate it if you guys could take a look so I don't have to resend them again next month - thanks!

1 0

Re: [2/4] wbemdisp: Implement ISWbemObjectSet::get__NewEnum.
by Nikolay Sivov Jan. 14, 2015

Jan. 14, 2015

On 01/14/2015 05:36 PM, Hans Leidekker wrote: > --- > dlls/wbemdisp/locator.c | 156 +++++++++++++++++++++++++++++++++++++++-- > dlls/wbemdisp/tests/wbemdisp.c | 69 ++++++++++++++++++ > 2 files changed, 221 insertions(+), 4 deletions(-) > > +static HRESULT EnumVARIANT_create( ISWbemObjectSet *objectset, IEnumVARIANT **obj ) > +{ > + struct enumvar *enumvar; > + > + if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; > + enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl; > + enumvar->refs = 1; > + enumvar->objectset = objectset; > + ISWbemObjectSet_AddRef( enumvar->objectset ); That means that all IEnumVARIANT instances share same ISWbemObjectSet, so they all depend on its current state and Next/Skip on one IEnumVARIANT affects every instance. I don't think that's how IEnumVARIANT is supposed to behave.

1 0

feedback on my valgrind related patches
by Marc Bessières Jan. 14, 2015

Jan. 14, 2015

Hello, I know you are very busy, so sorry to disturb you. One month ago I submitted 2 valgrind related patches: http://source.winehq.org/patches/data/108226 and http://source.winehq.org/patches/data/108223 I also attach them to this mail. They are still in NEW, and I think after one month they go out of the queue. According to the legend it means they've not been looked at yet. Do you know what I can do to have some feedback for them? I tried to create commit messages as complete as possible to explain each change. I didn't add any regression test, because the valgrind errors were triggered by the existing tests. I presume that was not good enough though, but I'm willing to improve if I'm given some guidance. Cheers, Marc

1 0

Text run in DirectWrite
by Julian Rüger Jan. 14, 2015

Jan. 14, 2015

Hi List, I'm having some trouble translating "text run" (in the current release notes "Better text run support in DirectWrite.") I would appreciate an explanation and/or suggestions for a German translation. Is it some kind of moving text? An iteration of some sorts over a given text or string(s)? Thanks and a happy new year to everyone! Best, Julian

2 2

Re: dplayx/tests: Add DirectPlayEnumerate[A|W] tests
by Marvin Jan. 14, 2015

Jan. 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=11134 Your paranoid android. === w8 (32 bit dplayx) === Failure running script in VM: timed out waiting for the child process

1 0

Re: [PATCH 2/5] winecfg: Bring back 32-bit Windows versions for 64-bit WINEPREFIXES
by Nikolay Sivov Jan. 13, 2015

Jan. 13, 2015

On 10.01.2015 21:27, Ken Sharp wrote: > winecfg: Bring back 32-bit Windows versions for 64-bit WINEPREFIXES > > Having a 64-bit WINEPREFIX shouldn't exclude you from selecting 32-bit > versions of Windows. Yes, it should. There's no such thing as 64 bit win2k or winme.

6 7

Re: [PATCH] jscript: Don't allow function execution if script engine is not in started state.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Jacek Caban <jacek(a)codeweavers.com> writes: > try2: Fixed tests on win2k > > --- > dlls/jscript/function.c | 5 +++ > dlls/jscript/jscript.c | 9 +----- > dlls/jscript/jscript.h | 7 ++++ > dlls/jscript/tests/run.c | 84 > ++++++++++++++++++++++++++++++++++++++++++------ > 4 files changed, 87 insertions(+), 18 deletions(-) It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M wscript.exe -p wscript.exe_test.exe.so run && touch run.ok run.c:366: Test failed: expected reportSuccess make: *** [run.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: jscript: Don't allow function execution if script engine is not in started state.
by Marvin Jan. 12, 2015

Jan. 12, 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=11115 Your paranoid android. === w2000pro (32 bit run) === run.c:2072: Test failed: InvokeEx failed: 800a1393

1 0

[PATCH 5/5] winecfg: Distinguish between Windows XP and Windows XP x64
by Ken Sharp Jan. 12, 2015

Jan. 12, 2015

winecfg: Distinguish between Windows XP and Windows XP x64 A 64-bit WINEPREFIX user may want to select XP or XP x64. The two have different kernel versions (NT 5.1 versus NT 5.2). I think this may confuse users though so I send it here (rather than wine-patches) just for the hell of it. Besides, I'm not aware of a use case.

3 7

Re: [PATCH 1/5] winecfg: Group together Windows server versions
by Nikolay Sivov Jan. 11, 2015

Jan. 11, 2015

On 10.01.2015 21:24, Ken Sharp wrote: > winecfg: Group together Windows server versions > > With each new release of Windows comes a desktop and a server > version. This should make the list a bit more tidy. > I don't think such grouping makes much sense, a list is currently sorted by NT version, why mess it up?

3 4

About Bug 36092:dotnet 4.5 is supported on Wine?
by Akira Nakagawa Jan. 11, 2015

Jan. 11, 2015

I think next problem is whether wine is usable for dotnet4.5 program to install Microsoft Office 2013, but in default Wine registory, what number of version dotnet is (looked by Windows apps.)to be installed? How can I change it?

1 0

Re: Add support for Windows Server 2012/R2 (plus clean-up) (try 2)
by Ken Sharp Jan. 9, 2015

Jan. 9, 2015

Please disregard. I'll send these separately. There's an error and another change anyway. There may be a situation where you want to choose between XP and XP x64 in the same WINEPREFIX for different apps, though I'm ignoring that for now as I think it will be very rare. On 07/01/15 20:10, Ken Sharp wrote: > Please disregard previous patch for W2K8R2. > > Add support for Windows 2012/R2 (plus clean-up) > > 1. Add support for Windows 2012 and Windows 2012 R2. > Self explanatory. > > 2. #ifdef out Windows 2008 R2 for 32-bit. > Not available for 32-bit. > > 3. Reorder server versions in winecfg. > Move the server versions out of the way. It's unlikely a user will need > anything other than a workstation version, and number of options are > starting to build up! > > 4. Remove superfluous #else. > > I realise that these will probably need separate patches but it makes > sense giving all the changes are in the same area of the code. Just > shout and I'll send them separately, and try with the least mess possible. > > I could also add NT4 and 2000 server but I'm not sure that anything > actually checks for workstation/server. >

1 0

Re: ws2_32/tests: Show that send/recv functions set last error to zero on success
by Marvin Jan. 9, 2015

Jan. 9, 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=11067 Your paranoid android. === wxppro (32 bit sock) === sock.c:610: Test failed: oob_server (674): unexpectedly at the OOB mark: 0

1 0

Re: [PATCH 2/5] winemac: Implement wglCreateContextAttribsARB. (v2)
by Ken Thomases Jan. 8, 2015

Jan. 8, 2015

On Jan 8, 2015, at 8:07 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > It also allows to create core profile contexts. > > v2 should fix all the bits mentioned in the patch reviews, except for > the error conversion from CGL after CGLChoosePixelFormat and > CGLCreateContext. > --- > dlls/winemac.drv/opengl.c | 544 +++++++++++++++++++++++++++++++--------------- > 1 file changed, 366 insertions(+), 178 deletions(-) Looks good to me. Thanks! -Ken

1 0

Re: PATCH: imagehlp: handle security directories after the PE file
by Bruno Jesus Jan. 8, 2015

Jan. 8, 2015

On Fri, Dec 12, 2014 at 6:07 PM, Marcus Meissner <meissner(a)suse.de> wrote: > Subject: [PATCH] imagehlp: handle security directories after the PE Image > > J-Link.exe (some kind of usb programmer?) has the certificate right > after the last PE section. Implement that case. How do you test this? By simply opening the application? There are dozens of different versions [1] of the application, it's used together with a J-Tag device to read/write flash memory from some processors. https://www.segger.com/j-link-older-versions.html Best Regards, Bruno

2 2

Re: fonts: Added glyphs handptleft, handptright and handptdwn for wingdings, fixed handptup.
by Qian Hong Jan. 8, 2015

Jan. 8, 2015

On Wed, Dec 31, 2014 at 5:28 PM, Qian Hong <qhong(a)codeweavers.com> wrote: > However, I would like to bring a related discussion: > - Could we copy glyphs from GPL font like WenQuanYi Micro Hei and reuse in > Wine fonts? > - Could we copy glyphs from Apache license font like Adobe Source Han Sans > and reuse in Wine fonts? Anyone has comment on the above questions please? And one more: Could we copy glyphs from symbola font and reuse in Wine fonts? Symbola font is "offered free for any use", according to its official page: http://users.teilar.gr/~g1951d/ It also pass fedora's license review: https://bugzilla.redhat.com/show_bug.cgi?id=532819 FWIW, Yida Wang is working on an experiment program, using smart computer vision algorithm like PCANet ( http://arxiv.org/abs/1404.3606 ), to discover similar wingdings glyphs from symbola fonts automatically. So far the result is not bad, see the two attachments, windings.png is wingdings glyphs, and symbola.png is similar glyphs from symbola which map to wingdings glyphs. The result is not complete, it is just an experiment. Once the program is trained and optimized we could use it to discover more glyphs for wingdings/wingdings2/wingdings3/webdings/mtextra and even more, which are useful for not only Wine, but also Libreoffice, WPS and other Linux application. That might also bring a new question: would we want to redistribute Wingdings and similar fonts outsite of Wine, so that they could be installed to system directories like /usr/share/fonts/truetype and reused by application like WPS and Libreoffice? Any comment is still great appreciated! -- Regards, Qian Hong - http://www.codeweavers.com

2 2

Re: [PATCH 4/5] wined3d: Prefer the core glActiveTexture function. (v2)
by Henri Verbeet Jan. 8, 2015

Jan. 8, 2015

On 8 January 2015 at 15:07, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + #define MAP_GL_FUNCTION(core_func, ext_func) \ > + { \ > + if (!gl_info->gl_ops.ext.p_##core_func) \ > + gl_info->gl_ops.ext.p_##core_func = gl_info->gl_ops.ext.p_##ext_func; \ > + } > + > + MAP_GL_FUNCTION(glActiveTexture, glActiveTextureARB); > +#undef MAP_GL_FUNCTION That probably works here in practice, but in general you want to avoid defining macros like that. See e.g. https://gcc.gnu.org/onlinedocs/cpp/Swallowing-the-Semicolon.html for the explanation.

1 0

Re: [PATCH 3/5] wined3d: Inline GL_EXT_FUNCS_GEN in load_gl_funcs.
by Henri Verbeet Jan. 8, 2015

Jan. 8, 2015

On 8 January 2015 at 15:07, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > #include "wined3d_private.h" > +#include "wine/wglext.h" > I'd probably either just keep that in wined3d_gl.h, perhaps moving it below the wine/wgl.h include. > - GL_EXT_FUNCS_GEN; > + /* GL_APPLE_fence */ \ > + USE_GL_FUNC(glDeleteFencesAPPLE) \ You shouldn't need the line-continuations.

1 0

Re: [PATCH 1/2] d3d9/tests: fix volume_dxt5_test getPixelColor check.
by Henri Verbeet Jan. 8, 2015

Jan. 8, 2015

On 7 January 2015 at 14:21, Axel Davy <axel.davy(a)ens.fr> wrote: > getPixelColor should be called before Present, > because the device swapchain was created with discard mode. > Could you please fix the equivalent d3d8 tests as well?

1 0

About Wine Security
by Pierre Schweitzer Jan. 8, 2015

Jan. 8, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Dear all, I'm coming to you after a short discussion with Alexandre on this topic. Wine gets more and more used, in various ways: either directly by users, or because it gets shipped in various form. It can packaged in a distribution, forked to suit a project needs (thinking about pipelight), or even shipped along with software to save native portage costs. Not to say that it's core of the ReactOS operating system itself. But as any other software, Wine can present security vulnerabilities. MITRE exposes some of the code defects pattern (known as CWE) that can lead to potential exploitation and thus to security vulnerabilities [1]. When such defect is found and looks potentially exploitable (either because a crash was reported, or because it directly deals with callers data), a vulnerability ID (CVE) can be assigned by MITRE to reference the potential security vulnerability and make it known to people using it. Some of them (buffer overflow, overrun, double-free, use-after-free, and so on) are sometimes found and fixed in Wine without further consideration regarding what it would imply for real Wine (mis-)usage. Even if no Proof of Concept is available at the time when the commit is made, it doesn't mean it cannot be exploited later on. With such exploits, it generally means that the attacker can target a Linux OS through a crafted PE binary. What I'm proposing here is that I start requesting CVE-ID for these findings when I find them in the commit logs of Wine and that they look exploitable. My hope is that it would allow distributions to repackage Wine taking care of these issues, but also to make people shipping Wine aware that the Wine they are shipping is likely vulnerable. This proposal it though limited in space & time: I wouldn't only do it starting in 2015 (I don't believe going backwards would make that much sense) and for 1.7 branch which is, I believe, the most used. I'm looking for your feedback on my proposal and how you believe such vulnerabilities in Wine can affect the host Linux (or Mac). This wouldn't involve more work on your side (excepted if I ask for more details to make sure I'm right in my analysis of the issue). With my best regards, [1]: https://cwe.mitre.org/ - -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUrVTCAAoJEHVFVWw9WFsLPDgQAILhixxtba3y2qadCl+2dBWg 1v2qjsUouAJe7vq28tx63MNK0Tm6ykHB66SJuWWUTMwYAHIz+Uzr2PJMHCq0aZs+ dnGo4sTycEkuMNVC/i9zijJtCd7/r5v+VJBQNji1lVhwY+ZLsA8mlp+UKb9fjos6 wwMk+5lCsiqvPubKvVZ8qfXKD2xEBkjWu15JmivR6ZhaNm5vDXmNxtqVT590JowW WWmcn6GiWMQQgAj6CLzG9d8qaHiJiuNmHi0BtUPZ8e+9hfcl76DBMiy1L8M3PM0f 1YRWF1NMOTQOr6nqxuviPL5eO7DKUmsiNVK1KGnNXMbjf/8EwL03VobAFaPu0X55 6v3jcNdBq9NCcRpkzUVksSMOSlzj4S8lvLEFYY8mWYW/o3TfmdTbLqeO7UIVJJiP lx1Pth7WA03wqzvhm5+/sIavkDDn3Z6/TY9k0BVHzq3VahUx6TP59mYPjI9jUvwA /0HoCCaD6AcGnDf8fsTNkLgqtqD6s3iOMra0mpH7nUQoTUds82ehZXRJ4viWsHxj c0mfAy/3ct8uMZAbVwjnahrk/RrF6DzI3eKh/LI5l5rQ9COgPwE2Ij2IWnPRK2zv XJbG161RRQwZSSU8TeBr2I/OxxQ+VE2Z0E4xSZY4tjYhdk/i9Y32J9w68qquISlF 4wtw5d9I9DFwvxq/AnBV =auVK -----END PGP SIGNATURE-----

5 7

Re: cmd: implemented && and || functionality
by Marvin Jan. 7, 2015

Jan. 7, 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=11049 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 700 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 702 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 703 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 704 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 707 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 708 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 709 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 712 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 716 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 717 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 720 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 721 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 722 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 723 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 724 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 727 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 728 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 729 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 730 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 734 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 735 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 736 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 737 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 738 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 740 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 741 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 742 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 743 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 744 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 745 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 747 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 748 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 749 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 750 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 751 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 752 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 753 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 755 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 756 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 757 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 758 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 759 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 760 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 761 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 762 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 763 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 764 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 765 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 767 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 768 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 769 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 770 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 771 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 772 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 773 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 778 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 779 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 780 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 781 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 782 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 783 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 784 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 785 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 786 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 787 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 788 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 789 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 790 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 791 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1375 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1376 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1377 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path(a)foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1378 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1379 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1380 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- Extra endlocal in called batch', wanted '@drive@@path(a)foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1384 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1387 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1388 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1389 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1390 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1391 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1392 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1393 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path(a)foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 329 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 329 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 329 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

1 0

Re: winex11.drv: Ignore ConfigureNotify events on hidden windows
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

Piotr Caban <piotr(a)codeweavers.com> writes: > diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c > index ea24471..1b8e568 100644 > --- a/dlls/winex11.drv/event.c > +++ b/dlls/winex11.drv/event.c > @@ -1075,6 +1075,10 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) > event->serial, data->configure_serial ); > goto done; > } > +#ifdef HAVE_LIBXSHAPE > + /* ignore notifications on hidden window */ > + if (IsRectEmpty( &data->window_rect )) goto done; > +#endif It shouldn't make a difference whether we have XShape or not. Also note that there's already a check later on, which is probably where you'd want to change something. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] msvcp120: Implemented xtime functions. (try 2)
by Alexandre Julliard Jan. 7, 2015

Jan. 7, 2015

Yifu Wang <YWang(a)esri.com> writes: > @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); > #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) > #define TICKSPERSEC 10000000 > #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) > +#define NANOSEC_PER_MICROSEC 1000000 > +#define MICROSEC_PER_SEC 1000 Something's not quite right here ;-) -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [2/5] wbemdisp: Add IDispatch support to the services object.
by Nikolay Sivov Jan. 7, 2015

Jan. 7, 2015

On 07.01.2015 12:58, Hans Leidekker wrote: > --- > dlls/wbemdisp/locator.c | 145 +++++++++++++++++++++++++++++------------------- > 1 file changed, 89 insertions(+), 56 deletions(-) > > + > +static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) > +{ > ... > + } > + *ret = wbemdisp_typeinfo[tid]; > + return S_OK; > +} get_typeinfo() doesn't AddRef() returned pointer. > @@ -102,8 +155,10 @@ static HRESULT WINAPI services_GetTypeInfo( > LCID lcid, > ITypeInfo **info ) > { > - FIXME( "\n" ); > - return E_NOTIMPL; > + struct services *services = impl_from_ISWbemServices( iface ); > + TRACE( "%p, %u, %u, %p\n", services, index, lcid, info ); > + > + return get_typeinfo( ISWbemServices_tid, info ); > } That means you should AddRef() it here. > static HRESULT WINAPI services_GetIDsOfNames( > @@ -114,8 +169,21 @@ static HRESULT WINAPI services_GetIDsOfNames( > LCID lcid, > DISPID *dispid ) > { > - FIXME( "\n" ); > - return E_NOTIMPL; > + struct services *services = impl_from_ISWbemServices( iface ); > + ITypeInfo *typeinfo; > + HRESULT hr; > + > + TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); > + > + if (!names || !count || !dispid) return E_INVALIDARG; > + > + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); > + if (SUCCEEDED(hr)) > + { > + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); > + ITypeInfo_Release( typeinfo ); > + } > + return hr; And remove Release() here. Or am I missing something?

1 0

Review request: New header for programs writing to the console
by Hugh McMaster Jan. 7, 2015

Jan. 7, 2015

Wine has at least 11 programs that write output to the console. Each program, however, uses a different method to achieve the same purpose. These programs can be modified to use a unified console output method with only minor changes to each program's codebase. In anticipation of taking on this task, I've created a new header (output.h, attached) to contain the unified method. Before I submit the header to wine-patches, I'm asking for review by other developers. Any and all feedback/comments appreciated. -- Hugh

1 0

Re: [PATCH 4/4] dsound: support 5.1 sound
by Chris Robinson Jan. 7, 2015

Jan. 7, 2015

On 01/06/2015 11:27 AM, Mark Harmstone wrote: > + case DSSPEAKER_5POINT1_BACK: > + device->speaker_angles[0] = M_PI/180.0f * -135.0f; > + device->speaker_angles[1] = M_PI/180.0f * -45.0f; > + device->speaker_angles[2] = M_PI/180.0f * 0.0f; > + device->speaker_angles[3] = M_PI/180.0f * 45.0f; > + device->speaker_angles[4] = M_PI/180.0f * 135.0f; > + device->speaker_angles[5] = 9999.0f; > + device->speaker_num[0] = 4; /* Rear left */ > + device->speaker_num[1] = 0; /* Front left */ > + device->speaker_num[2] = 2; /* Front centre */ > + device->speaker_num[3] = 1; /* Front right */ > + device->speaker_num[4] = 5; /* Rear right */ > + device->speaker_num[5] = 3; /* LFE */ > + device->num_speakers = 6; > + device->lfe_channel = 3; > + break; This doesn't look right. According to <http://www.dolby.com/us/en/guide/surround-sound-speaker-setup/5-1-setup.html>, 5.1 should have the front-right/right speakers between +/-30 degrees max and +/-22 degrees min, and the back (surround) speakers between +/-110 degrees max, +/-90 degrees min. > + case DSSPEAKER_5POINT1_SURROUND: > + device->speaker_angles[0] = M_PI/180.0f * -90.0f; > + device->speaker_angles[1] = M_PI/180.0f * -30.0f; > + device->speaker_angles[2] = M_PI/180.0f * 0.0f; > + device->speaker_angles[3] = M_PI/180.0f * 30.0f; > + device->speaker_angles[4] = M_PI/180.0f * 90.0f; > + device->speaker_angles[5] = 9999.0f; > + device->speaker_num[0] = 4; /* Rear left */ > + device->speaker_num[1] = 0; /* Front left */ > + device->speaker_num[2] = 2; /* Front centre */ > + device->speaker_num[3] = 1; /* Front right */ > + device->speaker_num[4] = 5; /* Rear right */ > + device->speaker_num[5] = 3; /* LFE */ > + device->num_speakers = 6; > + device->lfe_channel = 3; > + break; This looks like it's based on OpenAL Soft (which is fine), which originally had 5.1side using 90 degrees. However I'm not sure it's really necessary for the two modes to use different angles. The current Git version of OpenAL Soft was changed so both 5.1 modes use 110 degree angles for the rear/side speakers, and the only difference is which output speakers they're mapped to. It's not exactly wrong to put 5POINT1_BACK at 110 degrees and 5POINT1_SURROUND at 90 (they're both within spec), but I think the intended difference is only for physical speaker mapping rather than positioning.

1 0