- wine-devel - winehq.org

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

15 Jan '15

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 15 Jan '15

15 Jan '15

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 15 Jan '15

15 Jan '15

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 15 Jan '15

15 Jan '15

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 15 Jan '15

15 Jan '15

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 15 Jan '15

15 Jan '15

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 15 Jan '15

15 Jan '15

1 0

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

15 Jan '15

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 15 Jan '15

15 Jan '15

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 15 Jan '15

15 Jan '15

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 15 Jan '15

15 Jan '15

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 14 Jan '15

14 Jan '15

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 14 Jan '15

14 Jan '15

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 14 Jan '15

14 Jan '15

Михаил Быстрянцев <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 14 Jan '15

14 Jan '15

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 14 Jan '15

14 Jan '15

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 14 Jan '15

14 Jan '15

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 14 Jan '15

14 Jan '15

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 14 Jan '15

14 Jan '15

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 13 Jan '15

13 Jan '15

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 13 Jan '15

13 Jan '15

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 12 Jan '15

12 Jan '15

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 12 Jan '15

12 Jan '15

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 11 Jan '15

11 Jan '15

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 11 Jan '15

11 Jan '15

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 09 Jan '15

09 Jan '15

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 09 Jan '15

09 Jan '15

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 08 Jan '15

08 Jan '15

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 08 Jan '15

08 Jan '15

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 08 Jan '15

08 Jan '15

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 08 Jan '15

08 Jan '15

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 08 Jan '15

08 Jan '15

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 08 Jan '15

08 Jan '15

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 08 Jan '15

08 Jan '15

-----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 07 Jan '15

07 Jan '15

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@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@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@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@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@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@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 07 Jan '15

07 Jan '15

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 07 Jan '15

07 Jan '15

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 07 Jan '15

07 Jan '15

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 07 Jan '15

07 Jan '15

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 07 Jan '15

07 Jan '15

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

Re: [resend 04/10] reg: Add sane_path function to do preliniary key validation
by Stefan Dösinger 06 Jan '15

06 Jan '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I was on holiday when you sent these patches, sorry for the late review. Am 2014-12-13 um 18:06 schrieb Jonathan Vollebregt: > +static LSTATUS sane_path(const WCHAR *key) > +{ > + if (key[0] == '\\' && key[1] == '\\' && key[2] != '\\') > + return ERROR_NO_REMOTE; > + > + return ERROR_SUCCESS; > +} This adds (or rather extends) a possible out of bound array access. Otherwise these patches look reasonable to me and worth review by others. A general note on the error handling code for other reviewers: Native reg.exe has very limited error reporting. With a few exceptions it just prints a generic message like "ERROR: INVALID SYNTAX" or something similar. I guess there are also some possible improvements on the output code as Bruno mentioned, but I think patch 3 is OK until (if ever) we have unified console output handling for all command line programs. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUrEB5AAoJEN0/YqbEcdMw8bUP/1dhlLDCE2kOZhLkhVXg0RVa BckpiGygdwfIIvGoyCaj6ObtgvrnYr7OMzZsruytK/X5UUvl+KsObctp8g1zjNY1 dFPQeBsra9TRtbtKTMX2pIdZS1wSNwWaOYrdZcKn5IkQfDWN0rwdKNujT8pAf+Ik 8dpFJUYtMjd6N0avPqphglRbW8rFhLhqYOlYuPjvzuEtBM11vGfy9mAp+sPA1ekX 8sRqGtn65w1JsT3cg054DvtY2xHNmRE5eTnrsbL7gqD/oljdPyU470eY6Vwofo3Z frAF8OKemJsU6MrxZLXe1US5GzyvvCRRpIBNcfrO6qzTTdio0/LBe77VDq9J0jAa GUWYFUtxIXw7Ccw1tNrxYp1JPo9bZnk5yONMMEAPfw2ij2iQCTvpv0lY9Kk58mqF kKzWrqzhVdi5aFGOGhnmrk7NZ4l8paA7Gk2S1c8IukWubww0hlOclrhrWDYpuEfJ ZKyGG8jFUvSjW3iTEES7NHMnCd+lWgaf+3TODrSGD5J/wdP6GQT9S78/HZ+SbM8m fxnvnDLylq9arQm3bh0wQy9ZoMCTMx4YtbTouQBpLZBDKAgZNK1BUC5sxP1NlO9P eP5JAZFHTzpGXCADkL+4OI4+ImG9mAMWGYytHGEQ3kwvAucNwTWP00twzMbSjHEX +8k+frQxyupijPZrL4vo =PJFk -----END PGP SIGNATURE-----

1 1

Re: [PATCH 2/5] winemac: Implement wglCreateContextAttribsARB.
by cdavis5x＠gmail.com 06 Jan '15

06 Jan '15

> On Jan 5, 2015, at 9:17 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > > As an aside, reported WGL extensions don't depend on the specific > GL context (e.g. WGL_ARB_pbuffer is reported as supported even on core > profile contexts). Do real Windows drivers behave like this? > @@ -1272,6 +1273,175 @@ static BOOL init_gl_info(void) […] > +/********************************************************************** > + * create_context > + */ > +static BOOL create_context(struct wgl_context *context, CGLContextObj share, BOOL core) > +{ […] > + attribs[n++] = kCGLPFAAuxBuffers; > + attribs[n++] = pf->aux_buffers; You must reject any pixel format with >0 auxiliary buffers when creating a core profile context. CGL will specifically fail the ChoosePixelFormat (with error 10000, kCGLBadAttribute) if you specify both a GL version >= 3.2 and a non-zero number of auxiliary buffers. > + > + attribs[n++] = kCGLPFAColorSize; > + attribs[n++] = color_modes[pf->color_mode].color_bits; > + attribs[n++] = kCGLPFAAlphaSize; > + attribs[n++] = color_modes[pf->color_mode].alpha_bits; > + if (color_modes[pf->color_mode].is_float) > + attribs[n++] = kCGLPFAColorFloat; > + > + attribs[n++] = kCGLPFADepthSize; > + attribs[n++] = pf->depth_bits; > + > + attribs[n++] = kCGLPFAStencilSize; > + attribs[n++] = pf->stencil_bits; > + > + if (pf->stereo) > + attribs[n++] = kCGLPFAStereo; > + > + if (pf->accum_mode) > + { > + attribs[n++] = kCGLPFAAccumSize; > + attribs[n++] = color_modes[pf->accum_mode - 1].color_bits; > + } You must also reject any pixel format with an accumulation buffer when creating a core profile context, for the same reason. > + > + /* Explicitly requesting pbuffers in CGLChoosePixelFormat fails with core contexts. */ > + if (pf->pbuffer && !core) > + attribs[n++] = kCGLPFAPBuffer; > + > + if (pf->sample_buffers && pf->samples) > + { > + attribs[n++] = kCGLPFASampleBuffers; > + attribs[n++] = pf->sample_buffers; > + attribs[n++] = kCGLPFASamples; > + attribs[n++] = pf->samples; > + } > + > + if (pf->backing_store) > + attribs[n++] = kCGLPFABackingStore; > + > + if (core) > + { > + attribs[n++] = kCGLPFAOpenGLProfile; > + attribs[n++] = (int)kCGLOGLPVersion_3_2_Core; > + } There’s a constant for requesting a 4.x core context, too. (But it’s only defined in the 10.9 and 10.10 SDKs.) You might consider using it if the requested version is >= 4.0. That way, creation will fail if the system doesn’t support it. > + > + attribs[n] = 0; > + > + err = CGLChoosePixelFormat(attribs, &pix, &virtualScreens); > + if (err != kCGLNoError || !pix) > + { > + WARN("CGLChoosePixelFormat() failed with error %d %s\n", err, CGLErrorString(err)); > + SetLastError(ERROR_INVALID_OPERATION); This is somewhat nitpicking, but one thing you might consider is setting the last error based on what CGL returned. For example, if you get the error kCGLBadAlloc, you could set the last error to ERROR_NO_SYSTEM_RESOURCES. > + return FALSE; > + } > + > + err = CGLCreateContext(pix, share, &context->cglcontext); > + CGLReleasePixelFormat(pix); > + if (err != kCGLNoError || !context->cglcontext) > + { > + context->cglcontext = NULL; > + WARN("CGLCreateContext() failed with error %d %s\n", err, CGLErrorString(err)); > + SetLastError(ERROR_INVALID_OPERATION); Ditto. > @@ -2076,6 +2246,133 @@ cant_match: […] > +/*********************************************************************** > + * macdrv_wglCreateContextAttribsARB > + * > + * WGL_ARB_create_context: wglCreateContextAttribsARB > + */ > +static struct wgl_context *macdrv_wglCreateContextAttribsARB(HDC hdc, > + struct wgl_context *share_context, > + const int *attrib_list) > +{ […] > + if (major > 3 || (major == 3 && minor >= 2)) > + { > + if (!(flags & WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB)) > + { > + WARN("OS X only supports forward-compatible 3.2+ contexts\n"); > + SetLastError(ERROR_INVALID_VERSION_ARB); > + return NULL; > + } Just so you know, a side effect of this is that our GL 3.x tests get skipped here, because they don’t specify the FOWARD_COMPATIBLE bit. Also, you should consider rejecting the DEBUG flag, if it’s set: OS X never returns that flag. (Or do you want to hook glGetInteger(3G) to return the debug flag if it’s set?) > + if (profile != WGL_CONTEXT_CORE_PROFILE_BIT_ARB) > + { > + WARN("Compatibility profiles for GL version >= 3.2 not supported\n"); > + SetLastError(ERROR_INVALID_PROFILE_ARB); > + return NULL; > + } > + core = TRUE; > + } > + else if (major == 3) > + { > + WARN("OS X doesn't support 3.0 or 3.1 contexts\n"); > + SetLastError(ERROR_INVALID_VERSION_ARB); > + return NULL; > + } I think we can support requests for 3.1 contexts, if the FORWARD_COMPATIBLE bit is set; we just won’t advertise GL_ARB_compatibility. Chip

3 5

Re: loader: More generic pre_exec for Linux (try 2)
by André Hentschel 06 Jan '15

06 Jan '15

Am 29.12.2014 um 23:03 schrieb André Hentschel: > --- > loader/main.c | 26 ++++++++++++++++++-------- > 1 file changed, 18 insertions(+), 8 deletions(-) [After a small IRC discussion] My main goal is to also get the 2G/2G vmsplit warning on ARM, too. (and potential other platforms) There are still many ARM kernels out there with a 2G split. The problem is that Wine can't start on 2G/2G, it seems there are too much assumptions in the code for a 3G split. e.g. for shared user data. We can't allocate 0x7ffe0000-0x7fff0000 on 2G split, most likely something else is already there, idk

2 3

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex (try 4)
by Stefan Dösinger 06 Jan '15

06 Jan '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You have style inconsistencies in the patch. I won't point them out individually and just focus on suggestions on the code itself. Overall: Is there a way to remove components? I don't see a method that supports that, and AddComponent with a NULL pointer returns an error, so I guess components can't be removed. Am 2015-01-06 um 08:59 schrieb Alistair Leslie-Hughes:> +static void add_component(IDirectPlay8AddressImpl *This, struct component *item) > +{ > + if(!This->comp_count) > + This->components = HeapAlloc( GetProcessHeap(), 0, sizeof(struct component *) * This->comp_count+1 ); > + else > + This->components = HeapReAlloc( GetProcessHeap(), 0, This->components, sizeof(struct component *) * This->comp_count+1 ); How many components are usually added? If it is just a small number (say, < 10) this is OK. Otherwise it would be more efficient to grow the array by a factor (e.g. duplicate the array size each time you grow it), so you make growing an O(log(n)) instead of O(n). > + int i; > + struct component *entry; > > - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->components, struct component, entry) > + for(i=0; i < This->comp_count; i++) Mismatching data type. This->comp_count is a DWORD, i is an int. Please use DWORD consistently. (Using DWORD for the component is mandated by the parameters to GetComponentByIndex and return value of GetNumComponents) > + switch (entry->type) > + { > + case DPNA_DATATYPE_DWORD: > + memcpy(pvBuffer, &entry->data.value, sizeof(DWORD)); > + break; > + case DPNA_DATATYPE_GUID: > + memcpy(pvBuffer, &entry->data.guid, sizeof(GUID)); > + break; > + case DPNA_DATATYPE_STRING: > + memcpy(pvBuffer, &entry->data.string, entry->size); > + break; > + case DPNA_DATATYPE_STRING_ANSI: > + memcpy(pvBuffer, &entry->data.ansi, entry->size); > + break; > + case DPNA_DATATYPE_BINARY: > + memcpy(pvBuffer, &entry->data.binary, entry->size); > + break; > + } You can use assignments for DPNA_DATATYPE_DWORD and DPNA_DATATYPE_GUID. The same applies to the existing code in GetComponentByName. AddComponent already uses assignments. > --- a/dlls/dpnet/dpnet_private.h > +++ b/dlls/dpnet/dpnet_private.h > @@ -94,7 +94,8 @@ struct IDirectPlay8AddressImpl > GUID SP_guid; > BOOL init; > > - struct list components; > + struct component **components; > + DWORD comp_count; Do you need the extra indirection? If the number of components is small you can work without it I think. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUq/bOAAoJEN0/YqbEcdMwOnMP/RnnAWVfyTuK2ABnRqDLW9/1 DydTHhjeOpm1FDKJTy7ebzqU76HDL7YWJOqwSNYPhtr8e3omXt5nApptwVjOBst0 lpRxDju4sPGo9GYePy5w39TI/w78gPLEGLVHpIiV5GlMz+YRpgxKI05Q90jkGtfo whPpQ9ns1xiXz+d07iJnPn8GnEjWeTkIN2NnY6Nj+ARQ8rmUNSn3YR4ZGtZfuzrt nKUurOt04FUAqQzDNYNbdtpybYQq7SSVQr8vWpJAJOpedq7oNyCEdjC8Zl5Yitl5 bg6a4oTvl7PgGmYOSvNVzsh6L0dYv0HpjLZsfLUo97ULXRsCFgfX8yNogrCSq8o0 2KoZSWEhehn1RV+WCywMbxHxly5ZvkyEr9g9/h+8+7cpPrdg8TeoaMUjtjUxrqra fLDfLtGnMGs4DGiFmleRR3lBFmr8UMVkP4/YLEJ1HPKNdAAwXfQso6/ODmdvC78W 5sRfY/pSlLEn93szGfx+hunpUX30c2XkGmuBElLJQsQgVeoijmsNhUNOLUdhTx9k wPhslaQ+HCtR76KVghvQzN3iBHPuO+O0dfH4PWz5/7Grq5/pIhfbWcMCVJJM3d9u CNjKAOkw+NzPPsdLyJZsmMWWvv+BJ039l15xjMTmWxG2uH/QgaiBtvDyD2/u3KxJ MgsfOYAWEYondC/Jllaz =uIjr -----END PGP SIGNATURE-----

1 0

Re: windowscodecs: DibDecoder_CreateInstance() is unused so remove it.
by Vincent Povirk 06 Jan '15

06 Jan '15

The original intent was that this could be used by d3dx9 to implement reading of the DIB format, but I didn't have the knowledge of d3dx9 to test that this really does what is needed.

2 1

Re: [PATCH] xaudio2_7: add stub DLL
by Alexandre Julliard 06 Jan '15

06 Jan '15

Mark Harmstone <hellas(a)burntcomma.com> writes: > diff --git a/dlls/xaudio2_7/xaudio2_7.spec b/dlls/xaudio2_7/xaudio2_7.spec > new file mode 100644 > index 0000000..e69de29 Please list stubs for all the exported functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/5] opengl32: Fix extension checks on OpenGL core profile contexts.
by Henri Verbeet 06 Jan '15

06 Jan '15

On 5 January 2015 at 17:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > static BOOL has_extension( const char *list, const char *ext, size_t len ) > { > + if (!list) > + { > + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; > + const char *gl_ext; > + unsigned int i; > + GLint extensions_count; > + > + glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); > + for (i = 0; i < extensions_count; ++i) > + { > + gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); > + if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) > + return TRUE; > + } > + return FALSE; > + } > + If I'm reading this correctly, this effectively ignores DisabledExtensions for anything newer than GL 3.0. (And at least as far as wglGetProcAddress() is concerned it affects both compatibility and core contexts.) > + gl_version = (const char *)glGetString(GL_VERSION); > + sscanf(gl_version, "%u", &major); > + if (major >= 3) > + { It seems tempting to just flag the context in wglCreateContextAttribsARB() under the appropriate conditions, perhaps in a similar way to wgl_handle_type. Not sure if it would really make it better though. As an aside, note that winex11.drv also uses "glGetString(GL_EXTENSIONS);" in X11DRV_WineGL_InitOpenglInfo().

3 4

Re: [PATCH 2/5] winemac: Implement wglCreateContextAttribsARB.
by Ken Thomases 05 Jan '15

05 Jan '15

On Jan 5, 2015, at 10:17 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 > + if (core) > + { > + WARN("OS X version >= 10.7 is required to be able to create core contexts\n", > + err, CGLErrorString(err)); The "err, CGLErrorString(err)" arguments are superfluous. > + return FALSE; > + } > + if (core) > + { > + attribs[n++] = kCGLPFAOpenGLProfile; > + attribs[n++] = (int)kCGLOGLPVersion_3_2_Core; > + } These lines won't compile when the SDK is earlier than 10.7. So, they also need to be guarded with the appropriate #if. > + case WGL_CONTEXT_PROFILE_MASK_ARB: > + if ((value & ~VALID_PROFILE_BITS_MASK) || !value || > + (value & VALID_PROFILE_BITS_MASK) == VALID_PROFILE_BITS_MASK) I think it would be better to simply do: if (value != WGL_CONTEXT_CORE_PROFILE_BIT_ARB && value != WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB) Or did I miss something about the logic you used? > + { > + WARN("WGL_CONTEXT_PROFILE_MASK_ARB bits %#x invalid\n", value); > + SetLastError(ERROR_INVALID_PROFILE_ARB); > + return NULL; > + } > + profile = value; > + break; > + register_extension("WGL_ARB_create_context"); > + register_extension("WGL_ARB_create_context_profile"); > + opengl_funcs.ext.p_wglCreateContextAttribsARB = macdrv_wglCreateContextAttribsARB; These should only be advertised when building against the 10.7 SDK or later. So, this should be guarded by the SDK #if directive. Also, given that it's possible to build against a 10.7+ SDK but target deployment back to 10.6, I'm tempted to say we should determine if core profiles are actually available and only advertise those extensions if so. Basically, call CGLChoosePixelFormat() with the simplest set of attributes that specify the core profile and see if it succeeds. -Ken

2 2

Re: [PATCH 5/5] wined3d: Prefer the core glActiveTexture function.
by Henri Verbeet 05 Jan '15

05 Jan '15

On 5 January 2015 at 17:17, 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 > + This kind of thing doesn't exactly fill me with joy, but I guess the alternatives wouldn't be much better. Any reason this can't be part of load_gl_funcs()? (And while we're touching load_gl_funcs(), I don't see much of a reason we couldn't just inline GL_EXT_FUNCS_GEN these days.) > + /* Newer core functions */ \ > + USE_GL_FUNC(glActiveTexture) \ It would probably be nice to note the exact GL version where the function entered core GL.

2 3

Re: [PATCH 1/5] winemac: Make the implementation of clearToBlackIfNeeded compatible with core contexts.
by Ken Thomases 05 Jan '15

05 Jan '15

On Jan 5, 2015, at 10:17 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > --- > dlls/winemac.drv/cocoa_opengl.m | 29 +++++++++++++++++++++++++++-- > 1 file changed, 27 insertions(+), 2 deletions(-) Looks OK to me. -Ken

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel