wine-devel January 2015

wine-devel@winehq.org

48 participants
120 discussions

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 … [View More]

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 > + */ > +… [View More]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 [View Less]

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. … [View More]

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 … [View More]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----- [View Less]

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 < … [View More]

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) > + { > + … [View More]

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(… [View More]

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

Re: dwrite: release_freetype() is unused so remove it.
by Nikolay Sivov 05 Jan '15

05 Jan '15

I'll send a patch to make it used.

1 0

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

05 Jan '15

On 5 January 2015 at 17:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c > index 4da8c7d..023bcbf 100644 > --- a/dlls/wined3d/context.c > +++ b/dlls/wined3d/context.c > @@ -1328,8 +1328,8 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc > > for (i = 0; i < count; ++i) > { > - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); > - … [View More]

2 2

Re: [PATCH 4/5] d3d9/tests: Remove a couple duplicate lines.
by Bruno Jesus 05 Jan '15

05 Jan '15

On Mon, Jan 5, 2015 at 2:17 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: Ciao, Matteo. > --- > dlls/d3d9/tests/visual.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c > index d1aa3d4..acc3a44 100644 > --- a/dlls/d3d9/tests/visual.c > +++ b/dlls/d3d9/tests/visual.c > @@ -6775,8 +6775,6 @@ static void pretransformed_varying_test(void) > hr = IDirect3DDevice9_SetVertexDeclaration(device,… [View More]

2 1

Re: winhttp/tests: Use a wait event instead of an unconditional sleep in the server thread.
by Marvin 05 Jan '15

05 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=11019 Your paranoid android. === w8 (32 bit winhttp) === winhttp.c:2042: Test failed: failed to receive response 12152 winhttp.c:2047: Test failed: request failed unexpectedly 327681

1 0

Re: dplayx: Cache the results of DirectPlayEnumerateAW()
by Stefan Dösinger 05 Jan '15

05 Jan '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Bruno, Some tests for this behavior would be useful. Also consider adding tests that check if DirectPlayEnumerate always enumerates the same pointers. Am 2015-01-04 um 23:05 schrieb Bruno Jesus: > + static struct _data > + { > + GUID guid; > + WCHAR descriptionW[256]; > + char descriptionA[256]; > + } *providers_cache; You don't have to give this structure a name. (i.e., remove "_data"). > + … [View More] /* Some applications require that the data returned through the callback persist after the callbacks > + * are called, so we buffer the information first and do the callbacks later. We will always rewrite > + * the buffer as some applications may change it (on purpose or due to bugs). > + */ Please name the application. 2 years from now nobody will remember it, and a search through wine-patches might not be successful. > + HeapFree(GetProcessHeap(), 0, providers_cache); > + providers_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(*providers_cache) * dwIndex); > + if (!providers_cache) > + { > + ERR(": failed to alloc required memory.\n"); > + return DPERR_EXCEPTION; > + } Does the registry data change during runtime? I think it is created during prefix creation and then never touched again. > + if (sizeOfDescription > max_sizeOfDescriptionW) > + { > + HeapFree(GetProcessHeap(), 0, descriptionW); > + max_sizeOfDescriptionW = sizeOfDescription; > + } > + descriptionW = HeapAlloc(GetProcessHeap(), 0, sizeOfDescription); This can leak descriptionW. You're also hard-coding a size limit of 256 in providers_cache. One of the two isn't right, most likely the hard-coded limit. > + RegQueryValueExW(hkServiceProvider, descW, > + NULL, NULL, (LPBYTE) descriptionW, &sizeOfDescription); > + > + lstrcpynW(providers_cache[dwIndex].descriptionW, descriptionW, sizeof(providers_cache[0].descriptionW)); > + WideCharToMultiByte(CP_ACP, 0, providers_cache[dwIndex].descriptionW, -1, providers_cache[dwIndex].descriptionA, > + sizeof(providers_cache[0].descriptionA), NULL, NULL); The old code queries two different values, "DescriptionA" and "DescriptionW". Your code queries "DescriptionW" and converts the content to ASCII. Do DescriptionA and DescriptionW always contain the same content? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUqlckAAoJEN0/YqbEcdMwPYcP/1zJL5U+YlDNVLsjHaiZQClj x0gyVMUcAB/0IH5QA1l37o0OChMgPg+xjkKuHfV9yx1ESFiulbm6bb1Qc1MfHmSO KB0hswxd1G9LVw8VUcbfCMmS3LK4JQl/Ha8Zj2RcFpcU+xIRc+p0LY+bg0QJyML2 i0XYSomKubZoKDeW1ZW8oAGXHc67kT2kBVXoZ9jCThjob8Lzy0bsZaKqEGiEjm5v UqGCjfv7wLsd3egEAA6WBa/sxmV5pGUqPbYe0OLNxExtOOHmZE7u0Ti9bAdGLZLE FnEB46IW6ECgMbdizIh9yZU/1pNB1AjVXKC1nhJevPPA4Bbln+4OkOrjKuYSQyqq lITarHscB9wnDdhXc3iwvi1vOB1B0v0X7CvTSAc+xBkx7gjK8/pyRSShcm6ho7yj 7UeKJuTqZ/+WRoMX2ariim7vzSzedWw+P1V0vcO/J5bA6icWpAxoivihSM7OzXFT lFYAr98BwlwVljr7QYKMtC1CkmBHIXIaaIoV7c6miTounpwXGvI4BdXvOt679jTV bKfMo7p5rx9n2K2cro7/J/g0bPcIX6PAg0ay9g+jD7XzhWkxQTjzHQF79uko3XG7 U3Y3ApC1dRwzJ7PzDIiS3F0t1Bk1+PcaMK269cOISni9odiODz1I7uzQFsVJE0S8 H9a8YJIdWhzvjszLKn44 =76/t -----END PGP SIGNATURE----- [View Less]

2 1

Re: kernel32: Implement Get{Time,Date}FormatEx
by Nikolay Sivov 04 Jan '15

04 Jan '15

On 30.12.2014 2:06, Sean Burke wrote: > Provides an implementation of time and date format functions added in > Vista sufficient to allow some basic applications requiring them to run. > Includes necessary tests and header defs. > > > Sean Burke > > > Hi, Sean. As you can see tests are failing on win2000 and winxp because these calls are not available on these platforms. You should use GetProcAddress() to fix that. > +@ stdcall GetDateFormatEx(ptr long ptr … [View More]

2 2

Re: secur32: Add support for ECDHE algorithms using gnutls
by Jacek Caban 04 Jan '15

04 Jan '15

Hi Sean, On 12/30/14 00:08, Sean Burke wrote: > diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c > index 638b3c5..810c598 100644 > --- a/dlls/secur32/schannel_gnutls.c > +++ b/dlls/secur32/schannel_gnutls.c > @@ -328,6 +328,8 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) > switch (kx) > { > case GNUTLS_KX_RSA: return CALG_RSA_KEYX; > + case GNUTLS_KX_ECDHE_ECDSA: Shouldn't this case use … [View More]

2 1

Re: Unicode Support in wine-devel
by Akira Nakagawa 02 Jan '15

02 Jan '15

>I can see those working fine on this mailing list both through my mail client and through both of the online mailing list browsers ( https://www.winehq.org/pipermail/wine-devel/ && http://news.gmane.org/gmane.comp.emulators.wine.devel ) So, are You sure there is an actual problem? Probably the encoding of the mail sent by wine-devel-digest is not formatted as Unicode. It doesn't problem of server, but the mail. All chinese characters are viewed as ??????? in my gmail. It is a SMTP's problem,isn't it?

1 0

Re: [PATCH] winealsa: support up to 6 channels
by Chris Robinson 02 Jan '15

02 Jan '15

On 12/31/2014 01:34 PM, Mark Harmstone wrote: > Needed for surround sound. ALSA uses a different channel mapping for 5.1 than Windows. Windows wants: front-left, front-right, front-center, lfe, back-left*, back-right* while ALSA wants: front-left, front-right, back-left*, back-right*, front-center, lfe So you can't just pass the samples through without swapping them. * This is complicated by the fact that some 5.1 setups use the side channels instead of the back channels, and with the … [View More]

2 1

Re: [PATCH] msvcr120: Fixed bugs in Concurrency::critical_section.
by Piotr Caban 02 Jan '15

02 Jan '15

Hi, the tests are failing on both wine and windows with following message: msvcr120.c:303: Test failed: execution timed out, critical section probably not functioning correctly msvcr120: 155 tests executed (0 marked as todo, 1 failure), 0 skipped. It takes ~14 seconds to run the tests here. You also left "#include "stdio.h" line in the tests. The change in critical_section class implementation looks good for me. Cheers, Piotr

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