- wine-devel - winehq.org

Re: [v7 03/10] d3d9: Call wined3d_device_copy_sub_resource_region() instead of wined3d_device_update_surface() in d3d9_device_UpdateSurface().
by Henri Verbeet 13 Nov '15

13 Nov '15

On 10 November 2015 at 14:09, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index 16b27e5..3dca920 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -1227,16 +1227,32 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, > struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); > struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); > struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); > + struct wined3d_box src_box; > HRESULT hr; > > TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", > iface, src_surface, src_rect, dst_surface, dst_point); > > + if (src_rect) > + { > + src_box.left = src_rect->left; > + src_box.top = src_rect->top; > + src_box.right = src_rect->right; > + src_box.bottom = src_rect->bottom; > + src_box.front = 0; > + src_box.back = 1; > + } > + > wined3d_mutex_lock(); > - hr = wined3d_device_update_surface(device->wined3d_device, src->wined3d_surface, src_rect, > - dst->wined3d_surface, dst_point); > + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, > + wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, > + dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), > + src->sub_resource_idx, src_rect ? &src_box : NULL); > wined3d_mutex_unlock(); This is fine. > + if (FAILED(hr)) > + return D3DERR_INVALIDCALL; > + > return hr; Is this needed? I.e., would just "return hr;" also work? > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index 365629b..0f64469 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -3888,14 +3888,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev > return WINED3DERR_INVALIDCALL; > } > > - if (src_resource->type != dst_resource->type) > - { > - WARN("Resource types (%s / %s) don't match.\n", > - debug_d3dresourcetype(dst_resource->type), > - debug_d3dresourcetype(src_resource->type)); > - return WINED3DERR_INVALIDCALL; > - } > - > if (src_resource->format->id != dst_resource->format->id) > { > WARN("Resource formats (%s / %s) don't match.\n", > @@ -3904,9 +3896,11 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev > return WINED3DERR_INVALIDCALL; > } > > - if (dst_resource->type != WINED3D_RTYPE_TEXTURE) > + if ((dst_resource->type != WINED3D_RTYPE_TEXTURE && dst_resource->type != WINED3D_RTYPE_CUBE_TEXTURE) > + || (src_resource->type != WINED3D_RTYPE_TEXTURE && src_resource->type != WINED3D_RTYPE_CUBE_TEXTURE)) > { > - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); > + FIXME("Not implemented for %s to %s resources.\n", > + debug_d3dresourcetype(src_resource->type), debug_d3dresourcetype(dst_resource->type)); > return WINED3DERR_INVALIDCALL; > } > This is really a separate change. I'd prefer something like the following: enum wined3d_resource_type src_resource_type, dst_resource_type; ... src_resource_type = src_resource->type; if (src_resource_type == WINED3D_RTYPE_CUBE_TEXTURE) src_resource_type = WINED3D_RTYPE_TEXTURE; ... if (src_resource_type != dst_resource_type) { ... } ...

2 2

Re: [v7 01/10] d3d11: Handle NULL source box in d3d10_device_CopySubresourceRegion().
by Henri Verbeet 13 Nov '15

13 Nov '15

On 10 November 2015 at 14:09, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > Also modified wined3d_device_copy_sub_resource_region() accordingly. > This patch and the next one are probably fine. Do you have tests?

2 2

Start of code freeze
by Alexandre Julliard 13 Nov '15

13 Nov '15

Folks, Now that release 1.7.55 is out, it's time to start code freeze towards the stable 1.8 release. This means that from now on, new features or code redesigns won't be accepted; only targeted bug fixes that don't look too dangerous will be allowed in. The freeze will get increasingly more strict as we progress towards release. I know that git makes it easy for everybody to keep working on new things on their own branch, but I'd ask that we all take time to concentrate on fixing bugs, and particularly regressions. I'm hoping that we can make the number of regressions drop significantly, like we did for the previous stable releases. I will be making release candidates every Friday until we run out of bugs that can be reasonably fixed. Based on previous experience, the code freeze should last between 4 and 8 weeks. This is also an opportunity to polish things like translations, documentation, web site etc. so there is plenty to do even for non-developers. And most importantly, we need help with retesting as many applications as possible... Thank you all for your help! -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/5] d3d11: Implement d3d11_immediate_context_RSGetViewports().
by Henri Verbeet 13 Nov '15

13 Nov '15

On 13 November 2015 at 02:23, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -1516,7 +1516,30 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon > static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, > UINT *viewport_count, D3D11_VIEWPORT *viewports) > { > - FIXME("iface %p, viewport_count %p, viewports %p stub!\n", iface, viewport_count, viewports); > + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); > + struct wined3d_viewport wined3d_vp; > + > + TRACE("iface %p, viewport_count %p, viewports %p.\n", iface, viewport_count, viewports); > + > + if (!viewports) > + { > + *viewport_count = 1; > + return; > + } > + > + wined3d_mutex_lock(); > + wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); > + wined3d_mutex_unlock(); > + > + viewports[0].TopLeftX = wined3d_vp.x; > + viewports[0].TopLeftY = wined3d_vp.y; > + viewports[0].Width = wined3d_vp.width; > + viewports[0].Height = wined3d_vp.height; > + viewports[0].MinDepth = wined3d_vp.min_z; > + viewports[0].MaxDepth = wined3d_vp.max_z; > + > + if (*viewport_count > 1) > + memset(&viewports[1], 0, (*viewport_count - 1) * sizeof(*viewports)); > } > Are you sure this is correct? (I.e., that calling the function with an invalid viewports pointer and 0 *viewport_count should crash.)

2 1

Re: [PATCH 10/11] ddraw/tests: Port test_shademode() to ddraw1.
by Marvin 12 Nov '15

12 Nov '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=18194 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2186: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw1.c:2931: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2933: Test failed: Got unexpected screen width 1024. ddraw1.c:2935: Test failed: Got unexpected screen height 768. ddraw1.c:2948: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2950: Test failed: Got unexpected screen width 1024. ddraw1.c:2952: Test failed: Got unexpected screen height 768. ddraw1.c:2956: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2958: Test failed: Got unexpected screen width 1024. ddraw1.c:2960: Test failed: Got unexpected screen height 768. ddraw1.c:2979: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2981: Test failed: Got unexpected screen width 1024. ddraw1.c:2983: Test failed: Got unexpected screen height 768. ddraw1.c:2987: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2989: Test failed: Got unexpected screen width 1024. ddraw1.c:2991: Test failed: Got unexpected screen height 768. ddraw1.c:3011: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3013: Test failed: Got unexpected screen width 1024. ddraw1.c:3015: Test failed: Got unexpected screen height 768. ddraw1.c:3020: Test failed: Got unexpected screen width 1024. ddraw1.c:3022: Test failed: Got unexpected screen height 768. ddraw1.c:3035: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3037: Test failed: Got unexpected screen width 1024. ddraw1.c:3039: Test failed: Got unexpected screen height 768. ddraw1.c:3043: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3045: Test failed: Got unexpected screen width 1024. ddraw1.c:3047: Test failed: Got unexpected screen height 768. ddraw1.c:3055: Test failed: Got unexpected screen width 1024. ddraw1.c:3057: Test failed: Got unexpected screen height 768. ddraw1.c:3069: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3071: Test failed: Got unexpected screen width 1024. ddraw1.c:3073: Test failed: Got unexpected screen height 768. ddraw1.c:4122: Test failed: Failed to set display mode, hr 0x80004001.

1 0

Re: [PATCH 09/11] ddraw/tests: Port test_shademode() to ddraw2.
by Marvin 12 Nov '15

12 Nov '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=18193 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2337: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw2.c:3193: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3195: Test failed: Got unexpected screen width 1024. ddraw2.c:3197: Test failed: Got unexpected screen height 768. ddraw2.c:3210: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3212: Test failed: Got unexpected screen width 1024. ddraw2.c:3214: Test failed: Got unexpected screen height 768. ddraw2.c:3218: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3220: Test failed: Got unexpected screen width 1024. ddraw2.c:3222: Test failed: Got unexpected screen height 768. ddraw2.c:3241: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3243: Test failed: Got unexpected screen width 1024. ddraw2.c:3245: Test failed: Got unexpected screen height 768. ddraw2.c:3249: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3251: Test failed: Got unexpected screen width 1024. ddraw2.c:3253: Test failed: Got unexpected screen height 768. ddraw2.c:3273: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3275: Test failed: Got unexpected screen width 1024. ddraw2.c:3277: Test failed: Got unexpected screen height 768. ddraw2.c:3282: Test failed: Got unexpected screen width 1024. ddraw2.c:3284: Test failed: Got unexpected screen height 768. ddraw2.c:3297: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3299: Test failed: Got unexpected screen width 1024. ddraw2.c:3301: Test failed: Got unexpected screen height 768. ddraw2.c:3305: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3307: Test failed: Got unexpected screen width 1024. ddraw2.c:3309: Test failed: Got unexpected screen height 768. ddraw2.c:3317: Test failed: Got unexpected screen width 1024. ddraw2.c:3319: Test failed: Got unexpected screen height 768. ddraw2.c:3331: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3333: Test failed: Got unexpected screen width 1024. ddraw2.c:3335: Test failed: Got unexpected screen height 768. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3552: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3565: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3581: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3600: Test failed: Display mode restored after ddraw1-ddraw2 SetCooperativeLevel() call sequence ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:4757: Test failed: Failed to set display mode, hr 0x80004001.

1 0

Re: [PATCH 08/11] ddraw/tests: Port test_shademode() to ddraw4.
by Marvin 12 Nov '15

12 Nov '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=18192 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2522: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw4.c:3363: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3365: Test failed: Got unexpected screen width 1024. ddraw4.c:3367: Test failed: Got unexpected screen height 768. ddraw4.c:3380: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3382: Test failed: Got unexpected screen width 1024. ddraw4.c:3384: Test failed: Got unexpected screen height 768. ddraw4.c:3388: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3390: Test failed: Got unexpected screen width 1024. ddraw4.c:3392: Test failed: Got unexpected screen height 768. ddraw4.c:3411: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3413: Test failed: Got unexpected screen width 1024. ddraw4.c:3415: Test failed: Got unexpected screen height 768. ddraw4.c:3419: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3421: Test failed: Got unexpected screen width 1024. ddraw4.c:3423: Test failed: Got unexpected screen height 768. ddraw4.c:3443: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3445: Test failed: Got unexpected screen width 1024. ddraw4.c:3447: Test failed: Got unexpected screen height 768. ddraw4.c:3452: Test failed: Got unexpected screen width 1024. ddraw4.c:3454: Test failed: Got unexpected screen height 768. ddraw4.c:3467: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3469: Test failed: Got unexpected screen width 1024. ddraw4.c:3471: Test failed: Got unexpected screen height 768. ddraw4.c:3475: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3477: Test failed: Got unexpected screen width 1024. ddraw4.c:3479: Test failed: Got unexpected screen height 768. ddraw4.c:3487: Test failed: Got unexpected screen width 1024. ddraw4.c:3489: Test failed: Got unexpected screen height 768. ddraw4.c:3501: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3503: Test failed: Got unexpected screen width 1024. ddraw4.c:3505: Test failed: Got unexpected screen height 768. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4392: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4405: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4421: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4440: Test failed: Display mode restored after ddraw1-ddraw4 SetCooperativeLevel() call sequence ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:6081: Test failed: Failed to set display mode, hr 0x80004001.

1 0

Re: [PATCH 07/11] ddraw/tests: Port test_shademode() to ddraw7.
by Marvin 12 Nov '15

12 Nov '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=18191 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2183: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3024: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3026: Test failed: Got unexpected screen width 1024. ddraw7.c:3028: Test failed: Got unexpected screen height 768. ddraw7.c:3041: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3043: Test failed: Got unexpected screen width 1024. ddraw7.c:3045: Test failed: Got unexpected screen height 768. ddraw7.c:3049: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3051: Test failed: Got unexpected screen width 1024. ddraw7.c:3053: Test failed: Got unexpected screen height 768. ddraw7.c:3072: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3074: Test failed: Got unexpected screen width 1024. ddraw7.c:3076: Test failed: Got unexpected screen height 768. ddraw7.c:3080: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3082: Test failed: Got unexpected screen width 1024. ddraw7.c:3084: Test failed: Got unexpected screen height 768. ddraw7.c:3104: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3106: Test failed: Got unexpected screen width 1024. ddraw7.c:3108: Test failed: Got unexpected screen height 768. ddraw7.c:3113: Test failed: Got unexpected screen width 1024. ddraw7.c:3115: Test failed: Got unexpected screen height 768. ddraw7.c:3128: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3130: Test failed: Got unexpected screen width 1024. ddraw7.c:3132: Test failed: Got unexpected screen height 768. ddraw7.c:3136: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3138: Test failed: Got unexpected screen width 1024. ddraw7.c:3140: Test failed: Got unexpected screen height 768. ddraw7.c:3148: Test failed: Got unexpected screen width 1024. ddraw7.c:3150: Test failed: Got unexpected screen height 768. ddraw7.c:3162: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3164: Test failed: Got unexpected screen width 1024. ddraw7.c:3166: Test failed: Got unexpected screen height 768. ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4021: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4034: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4050: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4069: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5877: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000

1 0

Re: wininet: Create file with correct file name in test_trailing_slash tests
by Marvin 12 Nov '15

12 Nov '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=18188 Your paranoid android. === w7pro64 (64 bit urlcache) === urlcache.c:395: Test failed: GetUrlCacheEntryInfo should have set last error to ERROR_INSUFFICIENT_BUFFER instead of 2 urlcache.c:399: Test failed: GetUrlCacheEntryInfo failed with error 87 urlcache.c:400: Test failed: expected zero ExpireTime urlcache.c:402: Test failed: expected zero LastModifiedTime urlcache.c:404: Test failed: expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got 05000000 urlcache.c:408: Test failed: expected dwExemptDelta 0, got 6292480 urlcache.c:422: Test failed: expected ERROR_INSUFFICIENT_BUFFER, got 2 urlcache.c:426: Test failed: GetUrlCacheEntryInfo failed with error 87 urlcache.c:432: Test failed: expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got 00000000 urlcache.c:437: Test failed: expected headers size 19, got 6311544 urlcache.c:441: Test failed: HitRate not incremented by one on commit urlcache.c:448: Test failed: Fileextension isn't unset: xN` urlcache.c:476: Test failed: RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_DATA instead of 2

1 0

Downloads Site Mirrors
by Jeremy Newman 12 Nov '15

12 Nov '15

We are now mirroring https://ftp.winehq.org, as https://dl.winehq.org/ For faster downloads, if you are using our old ftp site for files, change it to the new dl site. Thanks go out to the fine folks at Fastly for providing this service to Wine. -N

3 5

Re: [PATCH] msvcp120: implement _Cnd_* functions (try 3)
by Piotr Caban 12 Nov '15

12 Nov '15

Hi, The implementation looks good for me. The tests are over complicated. I'm attaching a patch generated on top of yours that simplifies them. If you agree with this changes please just squash both commits and resend. Thanks, Piotr

1 0

Re: [v7 08/10] ddraw: Do refcounting only through wined3d_texture_{inc, dec}ref().
by Henri Verbeet 12 Nov '15

12 Nov '15

This and the next two patches are blocked by previous patches in the series.

1 0

Re: [v7 06/10] ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().
by Henri Verbeet 12 Nov '15

12 Nov '15

On 10 November 2015 at 14:09, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > @@ -4727,13 +4727,8 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO > > TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); > > - wined3d_mutex_lock(); > - if (!surface->wined3d_texture) > - { > - wined3d_mutex_unlock(); > + if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) > return DDERR_NOTONMIPMAPSUBLEVEL; > - } > - wined3d_mutex_unlock(); > This is probably fine, but depends on the test to go in.

1 0

Re: [v7 04/10] d3d9: Replace surface refcounting with parent texture refcounting.
by Henri Verbeet 12 Nov '15

12 Nov '15

This seems fine, but is blocked on the previous patch.

1 0

[PATCH] ntdll: Report valid data for ProcessVmCounters on Linux.
by achurch＠achurch.org 11 Nov '15

11 Nov '15

Forwarded by request from https://bugs.winehq.org/show_bug.cgi?id=35563 (please note that I am not subscribed to the list). This patch modifies NtQueryInformationProcess() to return valid data for ProcessVmCounters on Linux by reading /proc/self/status, so that GetProcessMemoryInfo() reports actual process information rather than all zeros. --Andrew Church http://achurch.org/ diff -urN wine-git-4a1629c-orig/dlls/ntdll/process.c wine-git-4a1629c/dlls/ntdll/process.c --- wine-git-4a1629c-orig/dlls/ntdll/process.c 2015-11-11 20:54:45 +0900 +++ wine-git-4a1629c/dlls/ntdll/process.c 2015-11-11 20:55:30 +0900 @@ -243,6 +243,46 @@ /* FIXME : real data */ memset(&pvmi, 0 , sizeof(VM_COUNTERS)); +#ifdef __linux__ + FILE *f = fopen("/proc/self/status", "r"); + if (f) { + char buf[100]; + int at_bol = 1; + while (fgets(buf, sizeof(buf), f)) { + const int has_eol = (buf[strlen(buf)-1] == '\n'); + if (at_bol) { + const char *tag = buf; + char *s = strchr(buf, ':'); + if (s) { + *s++ = '\0'; + unsigned long value = strtoul(s, NULL, 10); + if (strcmp(tag, "VmPeak") == 0) { + pvmi.PeakVirtualSize = value*1024; + pvmi.PeakPagefileUsage = value*1024; + pvmi.QuotaPeakPagedPoolUsage = value*1024; + } else if (strcmp(tag, "VmSize") == 0) { + pvmi.VirtualSize = value*1024; + pvmi.PagefileUsage = value*1024; + pvmi.QuotaPagedPoolUsage = value*1024; + } else if (strcmp(tag, "VmHWM") == 0) { + pvmi.PeakWorkingSetSize = value*1024; + } else if (strcmp(tag, "VmRSS") == 0) { + pvmi.WorkingSetSize = value*1024; + } + /* We could get QuotaNonPagedPoolUsage from + * the VmLck line, but Linux doesn't give a + * peak value for that, so we just ignore + * it instead of returning a "peak" value + * that might decrease over time. + * FIXME: track the peak value ourselves. */ + } + } + at_bol = has_eol; + } + fclose(f); + } +#endif /* __linux__ */ + len = ProcessInformationLength; if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS);

1 0

Re: [v6 01/13] d3d9: Call wined3d_device_copy_sub_resource_region() instead of wined3d_device_update_surface() in d3d9_device_UpdateSurface().
by Riccardo Bortolato 11 Nov '15

11 Nov '15

Hi, what can I do to improve patches 1 to 6 in order to get them accepted? I will be on IRC for quicker discussion. Ciao, Riccardo 2015-11-05 17:15 GMT+01:00 Marvin <testbot(a)winehq.org>: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch.

2 2

Re: user32: Test layered window focus
by Alexandre Julliard 11 Nov '15

11 Nov '15

Piotr Caban <piotr(a)codeweavers.com> writes: > + hwnd = CreateWindowExA( WS_EX_LAYERED, "MainWindowClass", "layered window", > + WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL ); > + ok( hwnd != 0, "failed to create layered window\n" ); > + > + ok(GetFocus() == hwnd, "GetFocus() = %p, expected %p\n", GetFocus(), hwnd); > + flush_events(TRUE); > + todo_wine ok(GetFocus() == hwnd, "GetFocus() = %p, expected %p\n", GetFocus(), hwnd); What problem are you trying to demonstrate? It works fine here: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so win && touch win.ok win.c:6566: Test succeeded inside todo block: GetFocus() = 0x8200f6, expected 0x8200f6 Makefile:609: recipe for target 'win.ok' failed -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: user32: Test layered window focus
by Marvin 11 Nov '15

11 Nov '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=18123 Your paranoid android. === w8 (32 bit win) === win.c:3467: Test failed: hwnd 00030196 message 0118 === w864 (32 bit win) === win.c:3467: Test failed: hwnd 0003019E message 0118 === w1064 (32 bit win) === win.c:6718: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6740: Test failed: 0x80/0x1010000: window rect 0,0-1024,768 win.c:6718: Test failed: 0x80/0x81c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0x40000/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0x80/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6718: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6740: Test failed: 0x80/0x1050000: window rect 0,0-1024,768 win.c:6718: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6740: Test failed: 0x80/0x1410000: window rect 0,0-1024,768

2 1

Re: server: Only send WM_WINE_CLIPCURSOR for forced clip resets. (resend)
by Ken Thomases 11 Nov '15

11 Nov '15

On Nov 10, 2015, at 10:30 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > > It would be nice if someone familiar with winemac.drv could confirm/test that > removing the duplicate notification doesn't break anything. It shouldn't break anything. The Mac driver works very differently from the X11 driver in this area. Cursor clipping isn't closely related to the delivery of relative mouse movement events. There's nothing like grabbing the pointer or the use of an extra window, etc. Also, the desktop owner doesn't ever present a window (no virtual desktop mode support, yet), so it's never the active Mac process. So, calls or lack of calls to macdrv_ClipCursor() in that process make no difference. All of that said, it seems the problem is specific to the X11 driver and the solution should probably be restricted to there, too. No matter what thread or process receives WM_WINE_CLIPCURSOR, it gets the cursor clipping rectangle and (re)establishes that via the driver. The driver should never do the wrong thing when it receives a request that's appropriate to the current state. The fact that cursor clipping and relative mouse movements are closely intertwined is an artifact of X11. If grab_clipping_window() is going to be used for both, then the X11 driver has to take care not to call ungrab_clipping_window() just because one of those two needs is not currently in effect. -Ken

2 1

Re: [PATCH] mshtml: Make it clear that ATTR_FIX_PX and ATTR_FIX_URL as exclusive (Coverity)
by Jacek Caban 11 Nov '15

11 Nov '15

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> On 11/10/15 20:31, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > Otherwise first allocated val is leaked. Jacek, can you confirm? Well, I don't think this causes a real leak because even if we try to apply both fixups, the attribute would need to be URL and integer at the same time for the leak to happen. However, I don't think there are attributes that could require both fixups, so I'm fine with the patch. Thanks, Jacek

1 0

Re: [resend] dbghelp: Crash fix in module_find_cb on trying to parse non image files.
by Marcus Meissner 11 Nov '15

11 Nov '15

Hi, Patch looks good to me. (doing it in the nested style of this if () if () if() nesting is probably not needed) Ciao, Marcus On Tue, Nov 10, 2015 at 07:22:03PM +0100, Ralf Habacker wrote: > > Bug: https://bugs.winehq.org/show_bug.cgi?id=39568 > > Signed-off-by: Ralf Habacker <ralf.habacker(a)freenet.de> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/dbghelp/path.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > > diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c > index a0e51bd..8c74426 100644 > --- a/dlls/dbghelp/path.c > +++ b/dlls/dbghelp/path.c > @@ -490,7 +490,13 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) > if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) > { > IMAGE_NT_HEADERS* nth = RtlImageNtHeader(mapping); > - > + if (!nth) > + { > + UnmapViewOfFile(mapping); > + CloseHandle(hMap); > + CloseHandle(hFile); > + return FALSE; > + } > matched++; > timestamp = nth->FileHeader.TimeDateStamp; > size = nth->OptionalHeader.SizeOfImage; > >

1 0

Re: [PATCH 1/2] wininet: Free Critical Section (valrind)
by Marvin 11 Nov '15

11 Nov '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=18101 Your paranoid android. === w1064 (32 bit http) === http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1773: Test failed: Expected 2, got 4 http.c:1774: Test failed: Expected CRLF, got ' http.c:2408: Test failed: count was wrong http.c:2409: Test failed: http data wrong, got: Garbage: Header http.c:3072: Test failed: HttpAddRequestHeaders succeeded http.c:3073: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3078: Test failed: code = 200, expected 400 http.c:3078: Test failed: code = 200, expected 400 http.c:3078: Test failed: unexpected status code 200, expected 400 http.c:3078: Test failed: unexpected status code 200, expected 400 http.c:534: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

2 1

Re: [2/2] server: Allow multiple registry notifications per key.
by Sebastian Lackner 11 Nov '15

11 Nov '15

On 10.11.2015 23:01, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > After this patch there are still a couple of remaining problems: [...] > * The WatchSubtree Flag and the filters parameter should be stored somewhere in the > key object itself? It seems like its not possible to change it anymore after > the first notification. I just saw that this was already working fine in the old implementation, which means my patch could cause regressions. :( Please ignore this patch for now. I'll resend 1/2 alone with some more tests.

1 0

Re: ntoskrnl.exe: add CmRegisterCallback/CmUnRegisterCallback stub (5/8)
by Sebastian Lackner 11 Nov '15

11 Nov '15

On 09.11.2015 06:59, Austin English wrote: > +/*********************************************************************** > + * CmRegisterCallback (NTOSKRNL.EXE.@) > + */ > +NTSTATUS CmRegisterCallback(EX_CALLBACK_FUNCTION *function, void *context, LARGE_INTEGER *cookie) You forgot to specify the calling convention. The function should be declared as WINAPI. > +{ > + FIXME("(%p %p %p): stub\n", function, context, cookie); > + return STATUS_NOT_IMPLEMENTED; > +} > + > +/*********************************************************************** > + * CmUnRegisterCallback (NTOSKRNL.EXE.@) > + */ > +NTSTATUS CmUnRegisterCallback(LARGE_INTEGER cookie) Same here. > +{ > + FIXME("%d): stub\n", cookie.u.LowPart); There is a "(" missing at the beginning of the FIXME. Also, I think it would be useful to print the whole value. Either something like: FIXME("(%x%08x): stub\n", cookie.u.HighPart, cookie.u.LowPart); or use wine_dbgstr_longlong: FIXME("(%s): stub\n", wine_dbgstr_longlong(cookie.QuadPart)); > + return STATUS_NOT_IMPLEMENTED; > +}

1 0

Re: ntoskrnl.exe: add RtlInitializeGenericTableAvl/RtlInsertElementGenericTableAvl stubs (resend) (1/8)
by Sebastian Lackner 11 Nov '15

11 Nov '15

On 09.11.2015 06:55, Austin English wrote: > From 8ddf8d4bbdaf8a84b73740495d93035f18a15d20 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Sun, 8 Nov 2015 23:22:31 -0600 > Subject: [PATCH 1/8] ntoskrnl.exe: add > RtlInitializeGenericTableAvl/RtlInsertElementGenericTableAvl stubs (resend) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/ntdll/ntdll.spec | 4 +-- > dlls/ntdll/rtl.c | 16 +++++++++++ > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +-- > include/ddk/ntddk.h | 55 ++++++++++++++++++++++++++++++++++++- > 4 files changed, 74 insertions(+), 5 deletions(-) > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 464b233..f9b31ff 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -683,7 +683,7 @@ > @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) > @ stdcall RtlInitializeCriticalSectionEx(ptr long long) > @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) > -# @ stub RtlInitializeGenericTableAvl > +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) > @ stdcall RtlInitializeHandleTable(long long ptr) > @ stub RtlInitializeRXact > # @ stub RtlInitializeRangeList > @@ -693,7 +693,7 @@ > @ stdcall RtlInitializeSid(ptr ptr long) > # @ stub RtlInitializeStackTraceDataBase > @ stub RtlInsertElementGenericTable > -# @ stub RtlInsertElementGenericTableAvl > +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) > @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) > @ stdcall RtlInt64ToUnicodeString(int64 long ptr) > @ stdcall RtlIntegerToChar(long long long ptr) > diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c > index 8eb3e9f..0ca27c2 100644 > --- a/dlls/ntdll/rtl.c > +++ b/dlls/ntdll/rtl.c > @@ -1595,3 +1595,19 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) > processor->Number = NtGetCurrentProcessorNumber(); > processor->Reserved = 0; > } > + > +/*********************************************************************** > + * RtlInitializeGenericTableAvl (NTOSKRNL.EXE.@) Your implementation is in NTDLL, so it would be better to write that in the comment above. > + */ > +void WINAPI RtlInitializeGenericTableAvl(void *table, void *compare, void *allocate, void *free, void *context) According to MSDN all those parameters are documented. You also added them to the include below, why do you not use them here? We'll need them anyway sooner or later, when someone is going to implement them. > +{ > + FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); > +} > + > +/*********************************************************************** > + * RtlInsertElementGenericTableAvl (NTOSKRNL.EXE.@) NTOSKRNL -> NTDLL, as above. > + */ > +void WINAPI RtlInsertElementGenericTableAvl(void *table, void *buffer, long size, BOOL *element) I would also recommend to use the real types here. Especially "long" should be avoided because it has a different size depending on the architecture. The correct type for the third parameter seems to be CLONG = ULONG. > +{ > + FIXME("%p %p %lu %p: stub\n", table, buffer, size, element); After fixing the types above, you'll have to replace %lu -> %u. > +} > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > index 1957a9a..7690268 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > @@ -1055,12 +1055,12 @@ > @ stdcall RtlInitUnicodeString(ptr wstr) ntdll.RtlInitUnicodeString > @ stdcall RtlInitializeBitMap(ptr long long) ntdll.RtlInitializeBitMap > @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTable > -@ stub RtlInitializeGenericTableAvl > +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTableAvl > @ stub RtlInitializeRangeList > @ stdcall RtlInitializeSid(ptr ptr long) ntdll.RtlInitializeSid > @ stub RtlInitializeUnicodePrefix > @ stub RtlInsertElementGenericTable > -@ stub RtlInsertElementGenericTableAvl > +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) ntdll.RtlInsertElementGenericTableAvl > @ stub RtlInsertElementGenericTableFull > @ stub RtlInsertElementGenericTableFullAvl > @ stub RtlInsertUnicodePrefix > diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h > index bccfd39..6f656a3 100644 > --- a/include/ddk/ntddk.h > +++ b/include/ddk/ntddk.h > @@ -149,6 +149,59 @@ typedef struct _KWAIT_BLOCK { > USHORT WaitType; > } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; > > +typedef struct _RTL_BALANCED_LINKS { > + struct _RTL_BALANCED_LINKS *parent; > + struct _RTL_BALANCED_LINKS *left_child; > + struct _RTL_BALANCED_LINKS *right_child; > + CHAR balance; > + UCHAR reserved[3]; > +} RTL_BALANCED_LINKS; > +typedef RTL_BALANCED_LINKS *PRTL_BALANCED_LINKS; Not sure which headers you are using, but basically all of the information I found says those struct members should be called "Parent", "LeftChild", "RightChild", and so on. Did you rename them? Please note that this doesn't work, the header files should be compatible with Windows. > + > +struct _RTL_AVL_TABLE; > + > +typedef enum _RTL_GENERIC_COMPARE_RESULTS { > + generic_less_than, > + generic_greater_than, > + generic_qual > +} RTL_GENERIC_COMPARE_RESULTS; Same here, it should probably be "GenericLessThan", "GenericGreaterThan", and so on. > + > +RTL_GENERIC_COMPARE_RESULTS WINAPI RTL_AVL_COMPARE_ROUTINE ( > + struct _RTL_AVL_TABLE *table, > + void *struct1, > + void *struct2 > +); There is no need to keep the formatting the same. Something like: RTL_GENERIC_COMPARE_RESULTS WINAPI RTL_AVL_COMPARE_ROUTINE(struct _RTL_AVL_TABLE *, void *, void *); Would also work, for example. You could even merge it with the line below: typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); > + > +typedef enum RTL_AVL_COMPARE_ROUTINE *PRTL_AVL_COMPARE_ROUTINE; RTL_AVL_COMPARE_ROUTINE is not an enumeration. > + > +void WINAPI RTL_AVL_ALLOCATE_ROUTINE ( > + struct _RTL_AVL_TABLE *table, > + LONG size > +); > + > +typedef enum RTL_AVL_ALLOCATE_ROUTINE *PRTL_AVL_ALLOCATE_ROUTINE; > + > +void WINAPI RTL_AVL_FREE_ROUTINE ( > + struct _RTL_AVL_TABLE *table, > + void *buffer > +); > + > +typedef enum RTL_AVL_FREE_ROUTINE *PRTL_AVL_FREE_ROUTINE; > + > +typedef struct _RTL_AVL_TABLE { > + RTL_BALANCED_LINKS balanced_root; > + void *ordered_pointer; > + ULONG which_ordered_element; > + ULONG number_generic_table_elements; > + ULONG tree_depth; > + PRTL_BALANCED_LINKS restart_key; > + ULONG delete_count; > + PRTL_AVL_COMPARE_ROUTINE compare_routine; > + PRTL_AVL_ALLOCATE_ROUTINE allocate_routine; > + PRTL_AVL_FREE_ROUTINE free_routine; > + void *table_context; > +} RTL_AVL_TABLE, *PRTL_AVL_TABLE; The struct members of RTL_AVL_TABLE also don't match my header files. > + > typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); > typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); > typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); > @@ -160,5 +213,5 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ > void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); > NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); > NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); > - > +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE, PRTL_AVL_COMPARE_ROUTINE, PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE, VOID *); Is there any reason why you only add one of both functions? > #endif > -- 2.6.2 > BTW: You could also think about moving all those definitions to winternl.h. It already contains definitions for many other Rtl* functions, and those AVL tree functions are probably also useful for other parts of Wine, in the long term - not just for ntoskrnl.

1 0

Re: [PATCH] hnetcfg: Add Dispatch support to interface INetFwOpenPort
by Nikolay Sivov 10 Nov '15

10 Nov '15

This looks fine to me, it applies on current git. One thing that is wrong is subject - it should say INetFwOpenPorts.

1 0

Attention packagers: New optional dependency on libpulse
by Andrew Eikum 10 Nov '15

10 Nov '15

As you may have noticed, Wine recently integrated the PulseAudio audio backend. This obviously introduces a dependency on libpulse, in 32- and/or 64-bit forms depending on what you're building. Building winepulse will be enabled at configure-time if libpulse is present, otherwise winepulse will not be built. If PulseAudio is not running, or libpulse is not installed, Wine will fall back on another driver. Thanks, Andrew

1 0

Re: [PATCH] crypt32/tests: Added a simple CA test for CertOpenStore.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Qian Hong <qhong(a)codeweavers.com> writes: > Signed-off-by: Qian Hong <qhong(a)codeweavers.com> > --- > dlls/crypt32/tests/cert.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) It fails here: ../../../tools/runtest -q -P wine -T ../../.. -M crypt32.dll -p crypt32_test.exe.so cert && touch cert.ok cert.c:1758: Test succeeded inside todo block: CertEnumCertificatesInStore should have worked cert.c:1762: Test succeeded inside todo block: Expected CRYPT_E_SELF_SIGNED or CRYPT_E_NOT_FOUND, got 80092007 make[1]: *** [cert.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 PATCH 1/4] kernel32: GetLocaleInfoA() doesn't support LOCALE_SSHORTTIME
by Marvin 10 Nov '15

10 Nov '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=18066 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4155: Test failed: IsValidLocaleName should have failed locale.c:4157: Test failed: IsValidLocaleName should have failed locale.c:4522: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4524: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [v2 PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Marvin 10 Nov '15

10 Nov '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=18068 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4152: Test failed: IsValidLocaleName should have failed locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4519: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4521: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [v2 PATCH 2/4] kernel32: EnumTimeFormatsA() doesn't support TIME_NOSECONDS
by Marvin 10 Nov '15

10 Nov '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=18067 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4156: Test failed: IsValidLocaleName should have failed locale.c:4521: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4523: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [v2 PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Dmitry Timoshkov 10 Nov '15

10 Nov '15

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > -BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) > +BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) > { > - WCHAR buf[256]; > + struct enumtimeformats_context ctxt; > > - if (!proc) > + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ > + if (flags & ~LOCALE_USE_CP_ACP) > { > - SetLastError(ERROR_INVALID_PARAMETER); > + SetLastError(ERROR_INVALID_FLAGS); This change doesn't seem to be confirmed by a test case. -- Dmitry.

2 2

test
by André Hentschel 10 Nov '15

10 Nov '15

please ignore, sorry for the noise

1 0

Re: [PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Dmitry Timoshkov 10 Nov '15

10 Nov '15

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) > { > - WCHAR buf[256]; > + struct enumtimeformats_context ctxt; > > - if (!proc) > + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ > + if (flags & ~LOCALE_USE_CP_ACP) > { > - SetLastError(ERROR_INVALID_PARAMETER); > + SetLastError(ERROR_INVALID_FLAGS); Is there any particular reason that you need 3/4 in order to fix something you've added in 2/4? This looks like badly tested code. -- Dmitry.

1 0

Re: [PATCH 3/4] kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation
by Marvin 10 Nov '15

10 Nov '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=18065 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4152: Test failed: IsValidLocaleName should have failed locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4519: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4521: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [PATCH 1/4] kernel32: GetLocaleInfoA() doesn't support LOCALE_SSHORTTIME
by Marvin 10 Nov '15

10 Nov '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=18064 Your paranoid android. === w1064 (32 bit locale) === locale.c:2337: Test failed: LCMapStringEx should fail with bad locale name locale.c:2338: Test failed: unexpected error code -559038737 locale.c:2429: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4155: Test failed: IsValidLocaleName should have failed locale.c:4157: Test failed: IsValidLocaleName should have failed locale.c:4522: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4524: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [v7 07/10] ddraw7/tests: Test SetColorKey() on cubemap surfaces.
by Marvin 10 Nov '15

10 Nov '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=18063 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2243: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3084: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3086: Test failed: Got unexpected screen width 1024. ddraw7.c:3088: Test failed: Got unexpected screen height 768. ddraw7.c:3101: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3103: Test failed: Got unexpected screen width 1024. ddraw7.c:3105: Test failed: Got unexpected screen height 768. ddraw7.c:3109: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3111: Test failed: Got unexpected screen width 1024. ddraw7.c:3113: Test failed: Got unexpected screen height 768. ddraw7.c:3132: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3134: Test failed: Got unexpected screen width 1024. ddraw7.c:3136: Test failed: Got unexpected screen height 768. ddraw7.c:3140: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3142: Test failed: Got unexpected screen width 1024. ddraw7.c:3144: Test failed: Got unexpected screen height 768. ddraw7.c:3164: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3166: Test failed: Got unexpected screen width 1024. ddraw7.c:3168: Test failed: Got unexpected screen height 768. ddraw7.c:3173: Test failed: Got unexpected screen width 1024. ddraw7.c:3175: Test failed: Got unexpected screen height 768. ddraw7.c:3188: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3190: Test failed: Got unexpected screen width 1024. ddraw7.c:3192: Test failed: Got unexpected screen height 768. ddraw7.c:3196: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3198: Test failed: Got unexpected screen width 1024. ddraw7.c:3200: Test failed: Got unexpected screen height 768. ddraw7.c:3208: Test failed: Got unexpected screen width 1024. ddraw7.c:3210: Test failed: Got unexpected screen height 768. ddraw7.c:3222: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3224: Test failed: Got unexpected screen width 1024. ddraw7.c:3226: Test failed: Got unexpected screen height 768. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4081: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4094: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4110: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4129: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5937: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000

1 0

Re: [PATCH 1/2] winemac: Check the window's display link after adding it as a child of another window, which may order it on screen.
by Huw Davies 10 Nov '15

10 Nov '15

On 10 Nov 2015, at 02:31, Ken Thomases wrote: > This fixes a problem where child windows ("owned" windows in Windows parlance) > would never display their contents on OS X 10.8 or earlier. Beginning with > 10.9, Cocoa calls -windowDidChangeOcclusionState: when the window becomes > visible, which is why they display on that version and later. > --- > Reported by Huw Davies. Works great, thanks! Huw.

1 0

Re: [PATCH 1/2] winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate. (try 2)
by Huw Davies 10 Nov '15

10 Nov '15

Thanks Ken, Just confirming that this series now builds for me on 10.7 Huw.

3 3

How to change the ACCESS_MASK of a thread?
by Bruno Jesus 09 Nov '15

09 Nov '15

Hi all. I have a simple question that I could not find an answer after looking for a lot. All I need is to remove the THREAD_SUSPEND_RESUME flag from the ACCESS_MASK to add it again later. info.GrantedAccess = 0; NtQueryObject(GetCurrentThread(), ObjectBasicInformation, &info, sizeof(info), NULL); if (info.GrantedAccess & THREAD_SUSPEND_RESUME) { changed = TRUE; info.GrantedAccess &= ~THREAD_SUSPEND_RESUME; //magic here } This is about fixing bug 3930 where SuspendThread is called from inside a callback deadlocking the game. If I can prevent the SuspendThread from running it will work. Best wishes, Bruno

1 0

Re: [PATCH] msvcp120: implement _Cnd_* functions (try 2)
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/09/15 16:38, Daniel Lehman wrote: > +static int (__cdecl*p__Mtx_init)(_Mtx_t*); This function has different header. > + if (0) /* causes crash in later_Cnd_* calls on Windows */ > + p__Cnd_destroy(&cm.cnd); This is not what I meant. I'm attaching a patch (generated on top of yours with the test I had in mind). It only shows the problem, the test needs more work. > + for(i = 0; i < NUM_THREADS; i++) > + p__Thrd_create(&threads[i], cnd_bcast_thread, (void*)&cm); ... > + p__Mtx_lock(&mtx); > + cm.go = 1; > + p__Mtx_unlock(&mtx); Please add some kind of synchronization to make sure the thread is waiting on condition variable before setting cm.go to 1. > + cm.go = 0; > + p__Thrd_create(&threads[0], cnd_signal_thread, (void*)&cm); > + p__Mtx_lock(&mtx); > + while(!cm.go) { > + r = p__Cnd_wait(&cnd, &mtx); > + ok(!r, "failed to wait\n"); > + } Here's a similar synchronization problem. In most cases p__Cnd_wait will not be called. > + diff = p__Xtime_diff_to_millis2(&after, &before); > + ok(r == 2, "should have timed out\n"); > + ok(diff > 2000 - TIMEDELTA, "got %d\n", diff); This test failed once on my computer (in ~10 runs, diff == 1800). Thanks, Piotr

1 0

Re: [PATCH v2 3/3] msvcp140: Add MSVC 2015 C++ support DLL
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/06/15 13:51, Martin Storsjo wrote: > static void init_cxx_funcs(void) > { > @@ -77,6 +125,11 @@ static void init_cxx_funcs(void) > > if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) ); > > +#if _MSVCP_VER >= 140 > + MSVCRT_operator_new = operator_new; > + MSVCRT_operator_delete = operator_delete; > + MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); > +#else > if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ > { > MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z"); > @@ -113,6 +166,7 @@ static void init_cxx_funcs(void) > #endif > #endif /* _MSVCP_VER >= 110 */ > } > +#endif > } Please also initialize critical_section related functions. Thanks, Piotr

1 0

Re: [PATCH] msvcp120: implement _Cnd_* functions
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/07/15 00:58, Daniel Lehman wrote: > +void __cdecl _Cnd_destroy(_Cnd_t *cnd) > +{ > + MSVCRT_operator_delete(*cnd); > +} What happens when _Cnd_destroy is called while someone waits on condition variable? > +int __cdecl _Cnd_timedwait(_Cnd_t *cnd, _Mtx_t *mtx, const xtime *xt) > +{ > + CONDITION_VARIABLE *cv = &(*cnd)->cv; > + LARGE_INTEGER timeout; > + NTSTATUS status; > + > + InterlockedExchangeAdd( (LONG *)&cv->Ptr, 1 ); > + _Mtx_unlock(mtx); > + > + timeout.QuadPart = (ULONGLONG)_Xtime_diff_to_millis(xt) * -10000; > + status = NtWaitForKeyedEvent(keyed_event, &cv->Ptr, FALSE, &timeout); > + if (status) > + { > + if (!interlocked_dec_if_nonzero( (LONG *)&cv->Ptr )) > + NtWaitForKeyedEvent( keyed_event, &cv->Ptr, FALSE, NULL ); You need to update status here. Thanks, Piotr

2 1

Re: [1/5] gdi32: Fix the advance width in synthetic bold glyphs when using scaling factors. (try 2)
by Alexandre Julliard 09 Nov '15

09 Nov '15

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Try 2: > - Rename the vector normalization function name and returns > calculated value. > - Avoid division by zero. > Thanks Huw and Henri. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/gdi32/freetype.c | 50 ++++++++++++++++++++++++++++++++++--------------- > dlls/gdi32/tests/font.c | 10 ++++++++++ > 2 files changed, 45 insertions(+), 15 deletions(-) It breaks the tests here: ../../../tools/runtest -q -P wine -T ../../.. -M gdi32.dll -p gdi32_test.exe.so font && touch font.ok font.c:389: Test failed: cx 221 != 243 font.c:389: Test failed: cx 221 != 243 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString (try 3)
by Alexandre Julliard 09 Nov '15

09 Nov '15

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Corrected formatting. > Use strlen where approperate. > Improved tests to show that we cannot write directly to the buffer passed in. It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M odbccp32.dll -p odbccp32_test.exe.so misc && touch misc.ok misc.c:273: Test failed: incorrect string 'testing' make[1]: *** [misc.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/5] d3d9/tests: Improve the shade mode test.
by Henri Verbeet 09 Nov '15

09 Nov '15

On 8 November 2015 at 20:25, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > dlls/d3d9/tests/visual.c | 275 ++++++++++++++++++++++++++++++++--------------- > 1 file changed, 191 insertions(+), 84 deletions(-) > I think most of this test would work for d3d8 and ddraw as well. Could you please port it? > + {&novs, &ps_3, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, FALSE, 0x00ff0000, 0x0000ff00}, > + {&novs, &ps_3, D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, FALSE, 0x000dca28, 0x000d45c7}, These fail here on Windows: visual.c:8338: Test failed: Test 14 shading has color0 00ffffff, expected 00ff0000. visual.c:8340: Test failed: Test 14 shading has color1 00ffffff, expected 0000ff00. visual.c:8338: Test failed: Test 15 shading has color0 00ffffff, expected 000dca28. visual.c:8340: Test failed: Test 15 shading has color1 00ffffff, expected 000d45c7. IIRC SM3 vertex and pixel shaders need to be used together, or results are undefined / implementation defined.

2 1

Re: [PATCH 3/9] d3d11/tests: Port test_texture() from d3d10core.
by Henri Verbeet 09 Nov '15

09 Nov '15

On 6 November 2015 at 18:38, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + for (i = 0; i < 4; ++i) > + { > + for (j = 0; j < 4; ++j) > + { > + color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); > + ok(compare_color(color, bitmap_data[j + i * 4], 1), > + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", > + color, j, i, bitmap_data[j + i * 4]); > + } > + } It's not a terribly high priority, but Matteo recently introduced get_rt_readback()/release_surface_readback() in the d3d8/9 tests. We'll want to introduce that interface in the d3d10/11 tests as well.

1 0

Re: [PATCH v4] ucrtbase: Hook up _seh_filter_exe and _seh_filter_dll
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/09/15 12:36, Martin Storsjo wrote: > +@ cdecl _seh_filter_dll(long ptr) __CppXcptFilter > +@ cdecl _seh_filter_exe(long ptr) __CppXcptFilter _seh_filter_dll should behave like __CppXcptFilter and _seh_filter_exe like _XcptFilter. You also need to copy -arch=i386,x86_64,arm parameter. Otherwise you break compilation for other architectures because __CppXcptFilter is not defined there. Thanks, Piotr

2 1

Re: [PATCH 4/4] ntdll: Added NtNotifyChangeMultipleKeys implementation.
by Dmitry Timoshkov 09 Nov '15

09 Nov '15

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 464b233..d9bab90 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -205,7 +205,7 @@ > # @ stub NtModifyBootEntry > @ stdcall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) > @ stdcall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) > -# @ stub NtNotifyChangeMultipleKeys > +@ stdcall NtNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) You forgot to update the Zw* .spec entry. -- Dmitry.

1 0

Re: [PATCH v5] ucrtbase: Hook up _seh_filter_exe and _seh_filter_dll
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/09/15 12:46, Martin Storsjo wrote: > +@ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) __CppXcptFilter > +@ cdecl -arch=i386,x86_64,arm _seh_filter_exe(long ptr) __CppXcptFilter This is still wrong.

2 3

Re: [PATCH v3] ucrtbase: Implement _seh_filter_exe and _seh_filter_dll
by Piotr Caban 09 Nov '15

09 Nov '15

On 11/05/15 13:52, Martin Storsjo wrote: > +int CDECL _seh_filter_dll(MSVCRT_ulong ex, PEXCEPTION_POINTERS ptr) > +{ > + TRACE("(%08x,%p)\n", ex, ptr); > + /* I assume ptr->ExceptionRecord->ExceptionCode is the same as ex */ > + return msvcrt_exception_filter(ptr); > +} This function should behave like __CppXcptFilter. Thanks, Piotr

2 2

Re: [PATCH] oledb32/tests: Add more GetConversionSize tests
by Nikolay Sivov 09 Nov '15

09 Nov '15

On 09.11.2015 12:49, Alistair Leslie-Hughes wrote: > It appears that if the type being converted is of a fixed > size then it returns a constant value of 110. > I don't think it makes sense to have such magic size in tests, until there's an understanding what DataConvert returns as destination in such cases.

1 0

Re: [4/5] gdi32: Embolden width direction only if ppem <= 50. (resend)
by Huw Davies 09 Nov '15

09 Nov '15

On Fri, Nov 06, 2015 at 09:25:11PM +0900, Akihiro Sagawa wrote: > > In other words, avoid increasing the thickness of height direction if > the size is small. This prevents distorting fonts as in Bug 34884. > This feature requires newer FreeType library (2.4.10 and/or later). What does Windows do here? Does it really have a cutoff at 50 ppem? I suspect we should always just stretch in the x-direction irrespective of the ppem (at least in the case where we have FT_Outline_EmboldenXY). Huw.

1 0

Re: [3/5] gdi32: Implement synthesizing bold glyphs for bitmap fonts. (resend)
by Huw Davies 09 Nov '15

09 Nov '15

On Fri, Nov 06, 2015 at 09:25:09PM +0900, Akihiro Sagawa wrote: > @@ -6970,7 +6971,16 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > INT w = min( pitch, (ft_face->glyph->bitmap.width + 7) >> 3 ); > INT h = min( height, ft_face->glyph->bitmap.rows ); > while(h--) { > - memcpy(dst, src, w); > + if (!font->fake_bold) > + memcpy(dst, src, w); > + else { > + INT x; > + dst[0] = 0; > + for (x = 0; x < w; x++) { > + dst[x ] = (dst[x] & 0x80) | (src[x] >> 1) | src[x]; > + dst[x+1] = (src[x] & 0x01) << 7; This could write past the end of dst (and similarly for ones below). Huw.

1 0

Re: [PATCH 3/3] quartz: Fix error code when chekcing circular connection.
by Qian Hong 09 Nov '15

09 Nov '15

Please drop this patch, I find the actual define for 80040217 this time, will resend soon.

1 0

Re: [PATCH] gdi32: Initialize system font link registry.
by Huw Davies 09 Nov '15

09 Nov '15

On Wed, Nov 04, 2015 at 09:40:38PM +0800, Qian Hong wrote: > +static void update_font_system_link_info(UINT current_ansi_codepage) > + if (RegCreateKeyA(HKEY_LOCAL_MACHINE, font_link_reg_key, &hkey) == ERROR_SUCCESS) > + { > + HKEY hsubkey; > + if (RegCreateKeyA(hkey, system_link_subkey, &hsubkey) == ERROR_SUCCESS) > + { You could create this key in one call. Please use the unicode registry functions for both key creation and value setting (yes, I know there are many ansi versions already there, but let's avoid adding more!). You'll find the system link unicode string already defined in 'system_link'. Huw.

2 1

Re: taskschd/tests: Fix memory leaks (Valgrind).
by Marvin 09 Nov '15

09 Nov '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=18033 Your paranoid android. === w1064 (32 bit scheduler) === scheduler.c:159: Test failed: expected ERROR_INVALID_NAME, got 0x80070002 scheduler.c:204: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:354: Test failed: expected ERROR_FILE_NOT_FOUND, got 0 scheduler.c:767: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:773: Test failed: expected ERROR_PATH_NOT_FOUND, got 0x80070002 scheduler.c:941: Test failed: expected ERROR_FILE_NOT_FOUND, got 0

1 0

Re: [PATCH] odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString (try 2)
by Nikolay Sivov 08 Nov '15

08 Nov '15

On 08.11.2015 13:09, Alistair Leslie-Hughes wrote: > + ret = RegOpenKeyW(hkeyfilename, section, &hkeysection); > + RegCloseKey(hkeyfilename); > + > + return hkeysection; I didn't mean that you need to remove error handling completely, last return in previous iteration 'return ret ? ...' was fine.

1 0

Re: include: Add d3dx10.h file (try 3)
by Matteo Bruni 08 Nov '15

08 Nov '15

I know I told you otherwise earlier, but looking again now: please use an unsigned literal for DXGI_FORMAT_FROM_FILE too, the definition of DXGI_FORMAT has a "DXGI_FORMAT_FORCE_UINT" entry so it should use unsigned values. While you're at it, you can drop the parentheses from the 3 defines.

1 0

Re: *.idl: Use correct type for BSTR strings in the defaultvalue() statements.
by Nikolay Sivov 06 Nov '15

06 Nov '15

On 06.11.2015 11:37, Dmitry Timoshkov wrote: > This matches midl/PSDK syntax, and allows to use Wine headers for compiling > applications with a C++ win32/win64 compiler. In order to be usable by C++ > unix compilers widl needs to emit appropriate statically initialized WCHAR > strings, but that's a different problem, currently the generated Wine headers > with default(BSTR) statements can't be used with C++ at all. > Where do you see this? Mshtml.idl from Windows 10 SDK doesn't use this notation, and in fact only fsrm*.idl files do, so it's not a common practice. Generated headers should use L"", like you said. But only in case of empty strings. Also leaving this broken for everything that's not PSDK compiler doesn't sound right.

3 8

Re: [PATCH 1/3] msvcrt: Lock the heap in _callnewh
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/06/15 11:28, Martin Storsjo wrote: > int CDECL _callnewh(MSVCRT_size_t size) > { > + int ret = 0; > + LOCK_HEAP; > if(MSVCRT_new_handler) > - (*MSVCRT_new_handler)(size); > - return 0; > + ret = (*MSVCRT_new_handler)(size); > + UNLOCK_HEAP; > + return ret; > } It doesn't make sense to lock heap cs in this case. Native is not doing it (at least in case of msvcp90.dll). The return value change looks almost correct - the function only returns 0 or 1. Thanks, Piotr

2 3

Re: [PATCH 1/2] winemac: Use CVDisplayLink to limit window redrawing to the display refresh rate.
by Huw Davies 06 Nov '15

06 Nov '15

On Fri, Nov 06, 2015 at 02:47:10AM -0600, Ken Thomases wrote: > dlls/winemac.drv/Makefile.in | 2 +- > dlls/winemac.drv/cocoa_window.h | 2 + > dlls/winemac.drv/cocoa_window.m | 166 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 169 insertions(+), 1 deletion(-) Hi Ken, This doesn't build for me on 10.7: gcc -m32 -c -o cocoa_window.o cocoa_window.m -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wstrict-prototypes \ -Wwrite-strings -Wpointer-arith -gdwarf-2 -fno-omit-frame-pointer -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 cocoa_window.m:161: error: expected specifier-qualifier-list before ‘CVDisplayLinkRef’ cocoa_window.m:174: error: expected ‘)’ before ‘displayLink’ cocoa_window.m: In function ‘-[WineDisplayLink initWithDisplayID:]’: cocoa_window.m:181: warning: implicit declaration of function ‘CVDisplayLinkCreateWithCGDisplay’ cocoa_window.m:181: error: ‘_link’ undeclared (first use in this function) cocoa_window.m:181: error: (Each undeclared identifier is reported only once cocoa_window.m:181: error: for each function it appears in.) cocoa_window.m:185: warning: implicit declaration of function ‘CVDisplayLinkSetOutputCallback’ cocoa_window.m:185: error: ‘WineDisplayLinkCallback’ undeclared (first use in this function) cocoa_window.m: In function ‘-[WineDisplayLink dealloc]’: cocoa_window.m:200: error: ‘_link’ undeclared (first use in this function) cocoa_window.m:202: warning: implicit declaration of function ‘CVDisplayLinkStop’ cocoa_window.m:203: warning: implicit declaration of function ‘CVDisplayLinkRelease’ cocoa_window.m: In function ‘-[WineDisplayLink addWindow:]’: cocoa_window.m:215: warning: implicit declaration of function ‘CVDisplayLinkStart’ cocoa_window.m:215: error: ‘_link’ undeclared (first use in this function) cocoa_window.m: In function ‘-[WineDisplayLink removeWindow:]’: cocoa_window.m:225: error: ‘_link’ undeclared (first use in this function) cocoa_window.m: At top level: cocoa_window.m:242: error: expected ‘)’ before ‘displayLink’ cocoa_window.m: In function ‘+[WineWindow createWindowWithFeatures:windowFrame:hwnd:queue:]’: cocoa_window.m:689: error: request for member ‘autodisplay’ in something not a structure or union cocoa_window.m: In function ‘-[WineWindow orderBelow:orAbove:activate:]’: cocoa_window.m:1310: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m:1310: warning: (Messages without a matching method signature cocoa_window.m:1310: warning: will be assumed to return ‘id’ and accept cocoa_window.m:1310: warning: ‘...’ as arguments.) cocoa_window.m:1329: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m: In function ‘-[WineWindow doOrderOut]’: cocoa_window.m:1370: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1372: warning: ‘WineWindow’ may not respond to ‘-grabDockIconSnapshotFromWindow:force:’ cocoa_window.m:1383: warning: ‘WineWindow’ may not respond to ‘-checkWineDisplayLink’ cocoa_window.m: In function ‘-[WineWindow checkWineDisplayLink]’: cocoa_window.m:1682: warning: ‘WineWindow’ may not respond to ‘-isEmptyShaped’ cocoa_window.m:1689: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1694: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow grabDockIconSnapshotFromWindow:force:]’: cocoa_window.m:1744: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1761: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1774: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1781: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1785: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1788: warning: ISO C90 forbids mixed declarations and code cocoa_window.m:1805: warning: ‘NSImage’ may not respond to ‘-drawInRect:’ cocoa_window.m:1811: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow miniaturize:]’: cocoa_window.m:2031: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow windowWillResize:toSize:]’: cocoa_window.m:2413: warning: ISO C90 forbids mixed declarations and code cocoa_window.m: In function ‘-[WineWindow draggingEntered:]’: cocoa_window.m:2554: warning: ‘WineWindow’ may not respond to ‘-draggingUpdated:’ cocoa_window.m:2554: warning: return makes integer from pointer without a cast make[1]: *** [cocoa_window.o] Error 1 make: *** [dlls/winemac.drv] Error 2

2 5

Re: [PATCH 2/3] msvcrt: Use the right _iob functions in the public msvcrt header for ucrtbase
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/06/15 11:28, Martin Storsjo wrote: > #ifndef _STDIO_DEFINED > -# ifdef __i386__ > -FILE* __cdecl __p__iob(void); > -# define _iob (__p__iob()) > +# ifdef UCRTBASE > +FILE* __cdecl __acrt_iob_func(unsigned); > +# define _iob(x) (__acrt_iob_func(x)) > # else > +# ifdef __i386__ > +FILE* __cdecl __p__iob(void); > +# define _iob(x) (__p__iob() + (x)) > +# else > FILE* __cdecl __iob_func(void); > -# define _iob (__iob_func()) > +# define _iob(x) (__iob_func() + (x)) > +# endif This makes _iob definition incompatible with native headers. It can't be done this way. I don't know how to solve this problem. Maybe adding something like this in msvcp90/ios.c will be acceptable: #if _MSVCP_VER >= 140 FILE* __cdecl __acrt_iob_func(unsigned); #undef stdin #define stdin __acrt_iob_func(STDIN_FILENO) ... #endif Thanks, Piotr

1 0

Re: [RFC PATCH] msvcp140: Add MSVC 2015 C++ support DLL
by Piotr Caban 06 Nov '15

06 Nov '15

On 11/04/15 20:12, Martin Storsjo wrote: > The built DLL links to (and loads function pointers at runtime from) > msvcr120, instead of ucrtbase (which would be more correct). We really need to e.g. share file handles between ucrtbase and msvcp140. We will need to find a way of linking against ucrtbase. It will probably need to be done by defining wrappers around some functions. For example missing _invalid_parameter should be probably worked around by defining following function in msvcp140: void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t arg) { return _invalid_parameter_noinfo(); } Something similar needs to be done with __p__iob (use __acrt_iob_func function). If you have any problems with other function please let me know. Probably some more testing/work will be needed to deal with missing new/delete functions. Thanks, Piotr

2 3

Re: *.idl: Use correct type for BSTR strings in the defaultvalue() statements.
by Marvin 06 Nov '15

06 Nov '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=18008 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (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 === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [2/2 v2] riched20: Implement alignment styles support.
by Huw Davies 06 Nov '15

06 Nov '15

On Fri, Nov 06, 2015 at 10:44:57AM +0800, Jactry Zeng wrote: > --- a/dlls/riched20/editor.h > +++ b/dlls/riched20/editor.h > @@ -213,7 +213,7 @@ void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HID > BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; > void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; > void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; > -void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; > +void ME_SetDefaultParaFormat(DWORD alignStyle, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; Why did you change this? Your last patch had ME_TextEditor* as the first parameter, which was much better. > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -7951,6 +7951,77 @@ static void test_EM_SETFONTSIZE(void) > DestroyWindow(richedit); > } > > + ^ There's a trailing space here. Huw.

2 1

Re: *.idl: Use correct type for BSTR strings in the defaultvalue() statements.
by Marvin 06 Nov '15

06 Nov '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=18007 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (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 === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [resend 3/5] ddraw7/tests: test SetColorKey on cubemap surfaces
by Stefan Dösinger 06 Nov '15

06 Nov '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-11-04 um 19:51 schrieb Riccardo Bortolato: > + hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, > &color_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr > %#x.\n", hr); + color_key.dwColorSpaceLowValue = 0x0000ff00; + > color_key.dwColorSpaceHighValue = 0x0000ff00; + hr = > IDirectDrawSurface7_SetColorKey(mipmap, DDCKEY_SRCBLT, > &color_key); + ok(SUCCEEDED(hr), "Failed to set color key, hr > %#x.\n", hr); One more thing that's interesting to test here: Set a different color key, and after the successful SetColorKey test which one you get back. You might even get DDERR_NOCOLORKEY back after the successful Set. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWO0wKAAoJEN0/YqbEcdMwsn4P/A9Mgwuq+4H0/2atLKdVlX7u RBAx/ZrhNEXT5W0Kzo1eZCUD5RjKf4mnuUi6x6LwX7JczJ9Dxxcz2Xx4gfeb3Wmy d6F2ttzejkKwG+tPkWfzc9AG0oZ0uFxvMuyBEdMqNxRAQXec7sxse9ELlsA7A1Wk snwvheVQ7o6XP6qya9mJBgiyWRH/86VzhW4/P6EluINmcXCVL/UaZKnj7BgYL7Yy pFvFN9r7N92bAspIsIl0MxnmxZ6qbK13qbqr4JJPvjSX8TfKQfoXsHj5BW0ZoZaR uWBvKtTmF0mhcY3rVOr/tQcBtp7xBYB0QiqBwMx0lBS1gZyaoeasEEFcP8s4HROs YHV3WKxG/esYAsqNfVRH+5wWUthTT0bthOv7mUuBwMC53kQOw5eqw9v5WOwW1Omu HRZ6ssDfvMx9YWhw06DIPnaCfyEL2KfxksRHA6TMHWbY8lHNL5nP0cc+tQhKXymc c2QS0awqTX95kjf+K0giBGRhnI/BXJa3jH2Bs9/8YXtyWq8k5UvKOZbjk6IUeeod KVgARsBCQ+3idRRU9nGA4P0OkjRymQFS7U+2DLYofIjv71p/TldvkOPUKKG3y8N4 rMhpCgsyGxEuHKnz4eLTirrjGEp+NPNIy6R7aSqd/j5XjSaHujtZjv84UBuyF60Y Z/UQmUCIFyr8IiIQSFZv =Ktln -----END PGP SIGNATURE-----

2 2

Re: ws2_32/tests: Add WSAPoll() tests
by Marvin 05 Nov '15

05 Nov '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=17995 Your paranoid android. === build (build) === Make failed

1 0

Re: [6/6] oleaut32/tests: Add a bunch of new tests for typelib generation.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/oleaut32/tests/test_tlb.idl | 59 +++++++++ > dlls/oleaut32/tests/typelib.c | 259 ++++++++++++++++++++++++++++++++++++--- > 2 files changed, 298 insertions(+), 20 deletions(-) This is causing build warnings. I understand it may be deliberate in order to test that path, but a standard build should be warning-free so this needs to be done differently. ../../../tools/widl/widl -o test_tlb.tlb -m32 -I. -I../../../include -D__WINESRC__ test_tlb.idl warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753903} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753906} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a75396b} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a75396d} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753970} warning: duplicate uuid {016fe2ec-b2c8-45f8-b23b-39e53a753972} -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [v6 05/13] ddraw7/tests: Test SetColorKey() on cubemap surfaces.
by Marvin 05 Nov '15

05 Nov '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=17994 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2243: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3084: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3086: Test failed: Got unexpected screen width 1024. ddraw7.c:3088: Test failed: Got unexpected screen height 768. ddraw7.c:3101: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3103: Test failed: Got unexpected screen width 1024. ddraw7.c:3105: Test failed: Got unexpected screen height 768. ddraw7.c:3109: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3111: Test failed: Got unexpected screen width 1024. ddraw7.c:3113: Test failed: Got unexpected screen height 768. ddraw7.c:3132: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3134: Test failed: Got unexpected screen width 1024. ddraw7.c:3136: Test failed: Got unexpected screen height 768. ddraw7.c:3140: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3142: Test failed: Got unexpected screen width 1024. ddraw7.c:3144: Test failed: Got unexpected screen height 768. ddraw7.c:3164: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3166: Test failed: Got unexpected screen width 1024. ddraw7.c:3168: Test failed: Got unexpected screen height 768. ddraw7.c:3173: Test failed: Got unexpected screen width 1024. ddraw7.c:3175: Test failed: Got unexpected screen height 768. ddraw7.c:3188: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3190: Test failed: Got unexpected screen width 1024. ddraw7.c:3192: Test failed: Got unexpected screen height 768. ddraw7.c:3196: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3198: Test failed: Got unexpected screen width 1024. ddraw7.c:3200: Test failed: Got unexpected screen height 768. ddraw7.c:3208: Test failed: Got unexpected screen width 1024. ddraw7.c:3210: Test failed: Got unexpected screen height 768. ddraw7.c:3222: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3224: Test failed: Got unexpected screen width 1024. ddraw7.c:3226: Test failed: Got unexpected screen height 768. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4081: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4094: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4110: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4129: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5937: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000

1 0

Re: [1/5] gdi32: Fix the advance width in synthetic bold glyphs when using scaling factors.
by Huw Davies 05 Nov '15

05 Nov '15

On Tue, Nov 03, 2015 at 03:06:24PM +0900, Akihiro Sagawa wrote: > @@ -6297,6 +6299,14 @@ static inline BOOL is_identity_MAT2(const MAT2 *matrix) > return !memcmp(matrix, &identity, sizeof(MAT2)); > } > > +static inline void calc_unit_vector(FT_Vector *vec) > +{ > + FT_Fixed len; > + len = pFT_Vector_Length(vec); > + vec->x = (vec->x << 6) / len; > + vec->y = (vec->y << 6) / len; > +} You need to check for division by zero. Huw.

2 1

Re: [1/5] gdi32: Fix the advance width in synthetic bold glyphs when using scaling factors.
by Henri Verbeet 05 Nov '15

05 Nov '15

> +static inline void calc_unit_vector(FT_Vector *vec) > +{ > + FT_Fixed len; > + len = pFT_Vector_Length(vec); > + vec->x = (vec->x << 6) / len; > + vec->y = (vec->y << 6) / len; > +} For what it's worth, that's usually called normalisation. Given how this is used, there's probably something to be said for not modifying the input vector and just having an output variable instead.

2 1

Re: [resend 3/5] ddraw7/tests: test SetColorKey on cubemap surfaces
by Marvin 05 Nov '15

05 Nov '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=17975 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2243: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3084: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3086: Test failed: Got unexpected screen width 1024. ddraw7.c:3088: Test failed: Got unexpected screen height 768. ddraw7.c:3101: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3103: Test failed: Got unexpected screen width 1024. ddraw7.c:3105: Test failed: Got unexpected screen height 768. ddraw7.c:3109: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3111: Test failed: Got unexpected screen width 1024. ddraw7.c:3113: Test failed: Got unexpected screen height 768. ddraw7.c:3132: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3134: Test failed: Got unexpected screen width 1024. ddraw7.c:3136: Test failed: Got unexpected screen height 768. ddraw7.c:3140: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3142: Test failed: Got unexpected screen width 1024. ddraw7.c:3144: Test failed: Got unexpected screen height 768. ddraw7.c:3164: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3166: Test failed: Got unexpected screen width 1024. ddraw7.c:3168: Test failed: Got unexpected screen height 768. ddraw7.c:3173: Test failed: Got unexpected screen width 1024. ddraw7.c:3175: Test failed: Got unexpected screen height 768. ddraw7.c:3188: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3190: Test failed: Got unexpected screen width 1024. ddraw7.c:3192: Test failed: Got unexpected screen height 768. ddraw7.c:3196: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3198: Test failed: Got unexpected screen width 1024. ddraw7.c:3200: Test failed: Got unexpected screen height 768. ddraw7.c:3208: Test failed: Got unexpected screen width 1024. ddraw7.c:3210: Test failed: Got unexpected screen height 768. ddraw7.c:3222: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3224: Test failed: Got unexpected screen width 1024. ddraw7.c:3226: Test failed: Got unexpected screen height 768. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4081: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4094: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4110: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4129: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:4035: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5937: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000

3 3

Re: [resend 5/5] wined3d: remove wined3d_surface_{inc,dec}ref
by Henri Verbeet 05 Nov '15

05 Nov '15

For what it's worth, this patch seems fine. You should probably move it to the start of the series. It would be nice if you could split it per function that you modify (and used capitalization and punctuation in the subject line), but it's not strictly required.

2 1

Re: [resend 1/5] ddraw: check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority
by Stefan Dösinger 05 Nov '15

05 Nov '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-11-04 um 19:51 schrieb Riccardo Bortolato: > - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) > + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)) > { > WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); > hr = DDERR_INVALIDPARAMS; This will cause a crash if called on a top level cube map that's not the positive X face because the follow-up code assumes that surface->wined3d_texture is there. This could use a test as well, similarly to SetColorKey. It's possible that crashing is the right thing to do. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWO0z2AAoJEN0/YqbEcdMwrhgP/03F5zCAxKbJ738MrKYu2iUk 0azMw0sVdO2trn9KzuAbGKr74HBJCmhnGCBwWvTnn767UmUU73kbuY/VHQ6ZsiMt 9qNwDYQew/VIzXeDPPDOgtwkj+tpFrYeBGZVpPAPqcY2QoCGvS1VXTfUnKHQWnYF BxI1Qwh0xOi30saYG2UVzCI2G1DWH8/FVB4K9k/4FXTBK5AEDO0BeWloZ3bStvWU d188Huk6R+9GFaAJyJ7oV2V1SV3WSRQVvY10YW16fFSWcTARMb6xMbyoAS0WQp7q 6w5cD1sr+rnwmgGmSKhMOrp6dfWzwma7tk66BXcd7zjT8JoI7+7Qniz2LFuG6zgW uIQIpfhdDE9eGShkZriguU8o0ZVojjg3K1ubf9gsmMxvs6yneUYCRS6MjjYAXccS HJALmJIn6YAcS6MBa0lXkHNxBBYHnmWNZjNhsyLuPj+TSh8xM//cayiT6ySURGSb 4/uK8cgkqm8QUBbLZTCN8Lv/S3Kx/o37GyujteJHs+2CLLoAe837dqcu6krPtWpA tPM3a++y5D3c5MpFG0qP2ZXRQkhlZtZJHj1gR2/hRWtRItaLd+n5iDCte+tw5f6T 5ld921LkMPR43ratmvHH6GlsKwPh3pqU7dH8s8viJAR2h4EcxQhxACcAHjpv5ByO Ia/F1xe5TUG0UY9CEBgA =SI7R -----END PGP SIGNATURE-----

2 1

Re: [resend 1/5] ddraw: check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority
by Henri Verbeet 05 Nov '15

05 Nov '15

On 4 November 2015 at 19:51, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) > + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)) Please don't add lines longer than 120 characters. (And aim for about 100.)

2 1

Re: [PATCH 2/5] ddraw: check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority
by Stefan Dösinger 05 Nov '15

05 Nov '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-11-03 um 11:45 schrieb Riccardo Bortolato: > - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) > + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)) This will show different behavior on level 0 Y, Z and negative X cube map surfaces. (Positive X is the actual ddraw root surface). However, I vagely remember that native ddraw also misbehaved here, so the new behior is probably correct. I'll check with my SetColorKey tests and report back. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWOKFcAAoJEN0/YqbEcdMw+58P/2gMcrKJWf0CAQXZ4rATJiwt 5MzyMISpifgcKjmV/YdYz/cJG98QcOCUgOqHCHzBi2iXfDZth1y6PX9qMdR3wT5q OzT++ZiJa+JVYUjn5eNbpV7VUXxghqCS6yyD+je9wkgGAEWIgJaN5txiyXx91qAQ 5Pxe0dUHSJDD/sb2e3UTOzQoQsuE+vQWbho82Los5IJTs2Bl3fOqmwuDIpGdteYM TRsMkWLY7UUeb4XrSjTmDw37eHsWXoEAH2RC/HXTbbY+NDzW5a948Uk0YgHtEDSP sUbiYVJaIw2eM67dKC1mF+g9H3hsNtKw8EhqyUUEoFjl4bq9O8w4K9QaHPEXULEQ dIuUq/tOWGimPIGjMYQqS+aWB28L4H0SER0zC8uX1x/vO8W3+lmLoXgKp2p85K3g AJZmxO6lEZFEHvhDuIUlfWoSOOuc+rlHSDsgII7Qhy3V2wPrI01NNyUTfeLx3z2r Q35tSsi/j4me9tWgcNth0TdYstE7/aDej8bWv7MXj2xo+p3v6y6ppGnadjzHqNsu skKcgQpQIHt+2F4fPX3/xwj/CpvK7i8UwTC5/Zp+nGI3qxdCD1lNNTBQJA8Ajl9Y 8yWOpvR6tjhMc898qBOKp4opXbqW8x2hyIDGF/binGlHlKa2vOfsCl5JY0y4TzpL eDENyDHAisigjU/8qZYJ =ejR9 -----END PGP SIGNATURE-----

3 4

Re: [PATCH] ucrtbase: Implement _seh_filter_exe and _seh_filter_dll
by Piotr Caban 05 Nov '15

05 Nov '15

On 11/04/15 11:19, Martin Storsjo wrote: I was not checking if this patch is correct yet. It causes compilation warnings: ../../../wine_src/dlls/msvcr120/../msvcrt/except.c: In function '_seh_filter_dll': ../../../wine_src/dlls/msvcr120/../msvcrt/except.c:283:159: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'long unsigned int' [-Wformat=] TRACE("(%08x,%p)\n", ex, ptr); ^ ../../../wine_src/dlls/msvcr120/../msvcrt/except.c: In function '_seh_filter_exe': ../../../wine_src/dlls/msvcr120/../msvcrt/except.c:293:159: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'long unsigned int' [-Wformat=] TRACE("(%08x,%p)\n", ex, ptr); Thanks, Piotr

2 1

Re: [resend 2/5] ddraw: check for mipmap sublevel through caps in ddraw_surface7_SetColorKey
by Stefan Dösinger 05 Nov '15

05 Nov '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-11-04 um 19:51 schrieb Riccardo Bortolato: > - wined3d_mutex_lock(); > - if (!surface->wined3d_texture) > - { > - wined3d_mutex_unlock(); > + if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) > return DDERR_NOTONMIPMAPSUBLEVEL; > - } > - wined3d_mutex_unlock(); This is OK, but an fyi: The wined3d lock is also used to protect ddraw data (something we may want to change in the future). DDSCAPS2_MIPMAPSUBLEVEL is not changable after creation (via SetSurfaceDesc), so I don't think we need to worry about the lock here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWO02tAAoJEN0/YqbEcdMwlmsP/297KNeM9NoJ6C6cljdOi3us GixMSJeTHwOmz0xVsu8fHVOpetiKWmn7h0qVn5aGoZNgs6vIHd+f2F+gf5EIlkA0 LxHQWwZUnulbW+unUIh/mj+Z7exjtWn1vn1jFjGyRB+9QgqxiZ9Nm6cz3z5tbtIc +1q5M/VYabvwzEGojV+ZK8cRnFnt3UsFTysxL94s1fz+Mn4IMTXfPejwF/PbylEV QPWOqg8LF+OKULdZw8oxn3APjQ+CFHvTCsCRbaB9wpeVRb4SEaIWyjopXxBQA9F8 WF1WrxmgkHA+WGWhItdxHkJYBbYFyDU7Vy5Up0Z9i0cLOwUT6EtQGyWuojeGkoTk bJah077nAMf6Ua5yqrT/Dl+bPUWovPZQ60umZdnNul4HKCuyJeHvALkZharXYJU4 3P4YYlIzWPqRdk7csaehr1DPkKcQZvKRhdaGkYhzg+NKM89ztgNALeTNs08GmzHP Ta+w8OfSRZM1lwmwT/0Tk8NggMrFe6qX1w7Fu6I3cvcaa5H6e2xhFyXKGWFbUCBQ ieJ5Z0VKuO0WqOiWF2hPsrHqerLDMKCpR9pCCp5B9ciU9qZcmfGT/XKa5U01kah1 qEJ84ejVkM5bwnhbrS8BhmepVC9K7c7/bG/z25ayizU8foKukRNtS+Pz3DGA6OzF nfQeq4wZ/zAush2o+2oJ =aXfg -----END PGP SIGNATURE-----

1 0

Re: riched20: Implement alignment styles.
by Huw Davies 05 Nov '15

05 Nov '15

On Wed, Nov 04, 2015 at 06:12:29PM +0800, Jactry Zeng wrote: > -ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) > +ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10, DWORD align) > { > ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); > int i; > @@ -2804,6 +2804,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) > ed->reOle = NULL; > ed->bEmulateVersion10 = bEmulateVersion10; > ed->styleFlags = 0; > + ed->alignStyle = align; > ITextHost_TxGetPropertyBits(texthost, > (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| > TXTBIT_READONLY|TXTBIT_USEPASSWORD| Rather than add a new param to MakeEditor just explicitly set ed->alignStyle after the call in CreateTextHost. > diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c > index 8cf3d24..88b821f 100644 > --- a/dlls/riched20/para.c > +++ b/dlls/riched20/para.c > @@ -30,7 +30,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) > LOGFONTW lf; > HFONT hf; > ME_TextBuffer *text = editor->pBuffer; > - ME_DisplayItem *para = ME_MakeDI(diParagraph); > + ME_DisplayItem *para = ME_MakeDI(editor, diParagraph); > ME_DisplayItem *run; > ME_Style *style; > int eol_len; I think we need a make_para( ME_TextEditor *editor ). It would call ME_MakeDI (no need for that to get editor) and then do the special case stuff for paragraphs. Huw.

1 0

Re: [PATCH] kernel32/tests: Add test of CreateDirectory with long path.
by Dmitry Timoshkov 05 Nov '15

05 Nov '15

YongHao Hu <christopherwuy(a)gmail.com> wrote: > On Windows, CreateDirectoryA fail when the path's size longer than > MAX_PATH-12(248) while Wine's implementation succeed.[1] > > [1]:https://bugs.winehq.org/show_bug.cgi?id=39552 Is there an application that depends on this very strange implementation detail? Besides, the messages in the ok() calls sometimes are wrong. Also, you shouldn't test against TRUE/FALSE directly. -- Dmitry.

2 2

Re: [PATCH] winex11: Avoid double initialization of variables in OpenGL functions.
by Matteo Bruni 04 Nov '15

04 Nov '15

2015-11-04 20:52 GMT+01:00 Alex Henrie <alexhenrie24(a)gmail.com>: > 2015-11-04 12:22 GMT-07:00 Vincent Povirk <vincent(a)codeweavers.com>: >> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> >> >> Although I don't see anything wrong with 'get_render_type_from_fbconfig' as-is. > > I moved the render_type = 0 assignment into a conditional branch. If > there was not a default case in that function already, it would not > have made a difference, because a jump instruction takes the same > amount of time or more as zeroing out a variable. But since we already > have the conditional, it makes more sense to move the initialization > into that conditional branch to avoid the cost of initializing the > variable unnecessarily. I doubt that actually modifies the generated code, although that's probably true for all the changes in this patch. The other changes at least simplify the code a bit. Anyway, the patch is okay with me FWIW.

1 0

Re: [PATCH] winex11: Avoid double initialization of variables in OpenGL functions.
by Stefan Dösinger 04 Nov '15

04 Nov '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi Alex, Your diff appears to have a huge amount of context around the changes. Is that intentional? Stefan Am 2015-11-04 um 06:15 schrieb Alex Henrie: > Cc: Vincent Povirk <vincent(a)codeweavers.com> > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/winex11.drv/opengl.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index 7b8ba82..99befde 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -947,124 +947,125 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV: > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV: > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV: > case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV: > pop = iWGLAttr[++cur]; > /** cannot be converted, see direct handling on > * - wglGetPixelFormatAttribivARB > * TODO: wglChoosePixelFormat > */ > break ; > case WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT: > pop = iWGLAttr[++cur]; > PUSH2(oGLXAttr, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, pop); > TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop); > break ; > > case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: > pop = iWGLAttr[++cur]; > PUSH2(oGLXAttr, GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT, pop); > TRACE("pAttr[%d] = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: %x\n", cur, pop); > break ; > default: > FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur]); > cur++; > break; > } > ++cur; > } > > /* By default glXChooseFBConfig defaults to GLX_WINDOW_BIT. wglChoosePixelFormatARB searches through > * all formats. Unless drawattrib is set to a non-zero value override it with GLX_DONT_CARE, so that > * pixmap and pbuffer formats appear as well. */ > if (!drawattrib) drawattrib = GLX_DONT_CARE; > PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); > TRACE("pAttr[?] = GLX_DRAWABLE_TYPE: %#x\n", drawattrib); > > /* By default glXChooseFBConfig uses GLX_RGBA_BIT as the default value. Since wglChoosePixelFormatARB > * searches in all formats we have to do the same. For this reason we set GLX_RENDER_TYPE to > * GLX_DONT_CARE unless it is overridden. */ > PUSH2(oGLXAttr, GLX_RENDER_TYPE, pixelattrib); > TRACE("pAttr[?] = GLX_RENDER_TYPE: %#x\n", pixelattrib); > > /* Set GLX_FLOAT_COMPONENTS_NV all the time */ > if (has_extension(WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) { > PUSH2(oGLXAttr, GLX_FLOAT_COMPONENTS_NV, nvfloatattrib); > TRACE("pAttr[?] = GLX_FLOAT_COMPONENTS_NV: %#x\n", nvfloatattrib); > } > > return nAttribs; > } > > static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) > { > - int render_type=0, render_type_bit; > + int render_type, render_type_bit; > pglXGetFBConfigAttrib(display, fbconfig, GLX_RENDER_TYPE, &render_type_bit); > switch(render_type_bit) > { > case GLX_RGBA_BIT: > render_type = GLX_RGBA_TYPE; > break; > case GLX_COLOR_INDEX_BIT: > render_type = GLX_COLOR_INDEX_TYPE; > break; > case GLX_RGBA_FLOAT_BIT: > render_type = GLX_RGBA_FLOAT_TYPE; > break; > case GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT: > render_type = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT; > break; > default: > ERR("Unknown render_type: %x\n", render_type_bit); > + render_type = 0; > } > return render_type; > } > > /* Check whether a fbconfig is suitable for Windows-style bitmap rendering */ > static BOOL check_fbconfig_bitmap_capability(Display *display, GLXFBConfig fbconfig) > { > int dbuf, value; > pglXGetFBConfigAttrib(display, fbconfig, GLX_DOUBLEBUFFER, &dbuf); > pglXGetFBConfigAttrib(gdi_display, fbconfig, GLX_DRAWABLE_TYPE, &value); > > /* Windows only supports bitmap rendering on single buffered formats, further the fbconfig needs to have > * the GLX_PIXMAP_BIT set. */ > return !dbuf && (value & GLX_PIXMAP_BIT); > } > > static void init_pixel_formats( Display *display ) > { > struct wgl_pixel_format *list; > int size = 0, onscreen_size = 0; > int fmt_id, nCfgs, i, run, bmp_formats; > GLXFBConfig* cfgs; > XVisualInfo *visinfo; > > cfgs = pglXGetFBConfigs(display, DefaultScreen(display), &nCfgs); > if (NULL == cfgs || 0 == nCfgs) { > if(cfgs != NULL) XFree(cfgs); > ERR("glXChooseFBConfig returns NULL\n"); > return; > } > > /* Bitmap rendering on Windows implies the use of the Microsoft GDI software renderer. > * Further most GLX drivers only offer pixmap rendering using indirect rendering (except for modern drivers which support 'AIGLX' / composite). > * Indirect rendering can indicate software rendering (on Nvidia it is hw accelerated) > * Since bitmap rendering implies the use of software rendering we can safely use indirect rendering for bitmaps. > * > * Below we count the number of formats which are suitable for bitmap rendering. Windows restricts bitmap rendering to single buffered formats. > */ > for(i=0, bmp_formats=0; i<nCfgs; i++) > { > if(check_fbconfig_bitmap_capability(display, cfgs[i])) > bmp_formats++; > } > TRACE("Found %d bitmap capable fbconfigs\n", bmp_formats); > > list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nCfgs + bmp_formats) * sizeof(*list)); > > /* Fill the pixel format list. Put onscreen formats at the top and offscreen ones at the bottom. > * Do this as GLX doesn't guarantee that the list is sorted */ > for(run=0; run < 2; run++) > { > for(i=0; i<nCfgs; i++) { > pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &fmt_id); > @@ -1737,107 +1738,107 @@ static int glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, > if (TRACE_ON(wgl)) { > dump_PIXELFORMATDESCRIPTOR(ppfd); > } > > return nb_onscreen_formats; > } > > /*********************************************************************** > * glxdrv_wglGetPixelFormat > */ > static int glxdrv_wglGetPixelFormat( HDC hdc ) > { > struct gl_drawable *gl; > int ret = 0; > > if ((gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > { > ret = pixel_format_index( gl->format ); > /* Offscreen formats can't be used with traditional WGL calls. > * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ > if (!is_onscreen_pixel_format( ret )) ret = 1; > release_gl_drawable( gl ); > } > TRACE( "%p -> %d\n", hdc, ret ); > return ret; > } > > /*********************************************************************** > * glxdrv_wglSetPixelFormat > */ > static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) > { > return set_pixel_format(hdc, iPixelFormat, FALSE); > } > > /*********************************************************************** > * glxdrv_wglCopyContext > */ > static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask) > { > TRACE("%p -> %p mask %#x\n", src, dst, mask); > > pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); > > /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ > return TRUE; > } > > /*********************************************************************** > * glxdrv_wglCreateContext > */ > static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) > { > - struct wgl_context *ret = NULL; > + struct wgl_context *ret; > struct gl_drawable *gl; > > if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > { > SetLastError( ERROR_INVALID_PIXEL_FORMAT ); > return NULL; > } > > if ((ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) > { > ret->hdc = hdc; > ret->fmt = gl->format; > ret->vis = pglXGetVisualFromFBConfig(gdi_display, gl->format->fbconfig); > ret->ctx = create_glxcontext(gdi_display, ret, NULL); > list_add_head( &context_list, &ret->entry ); > } > release_gl_drawable( gl ); > TRACE( "%p -> %p\n", hdc, ret ); > return ret; > } > > /*********************************************************************** > * glxdrv_wglDeleteContext > */ > static void glxdrv_wglDeleteContext(struct wgl_context *ctx) > { > TRACE("(%p)\n", ctx); > > EnterCriticalSection( &context_section ); > list_remove( &ctx->entry ); > LeaveCriticalSection( &context_section ); > > if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); > if (ctx->vis) XFree( ctx->vis ); > HeapFree( GetProcessHeap(), 0, ctx ); > } > > /*********************************************************************** > * glxdrv_wglGetProcAddress > */ > static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) > { > if (!strncmp(lpszProc, "wgl", 3)) return NULL; > return pglXGetProcAddressARB((const GLubyte*)lpszProc); > } > > /*********************************************************************** > * glxdrv_wglMakeCurrent > */ > static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) > { > BOOL ret = FALSE; > struct gl_drawable *gl; > @@ -1987,205 +1988,205 @@ static void wglFinish(void) > { > switch (gl->type) > { > case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; > case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; > default: break; > } > sync_context(ctx); > release_gl_drawable( gl ); > } > > pglFinish(); > if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); > } > > static void wglFlush(void) > { > struct x11drv_escape_flush_gl_drawable escape; > struct gl_drawable *gl; > struct wgl_context *ctx = NtCurrentTeb()->glContext; > > escape.code = X11DRV_FLUSH_GL_DRAWABLE; > escape.gl_drawable = 0; > > if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) > { > switch (gl->type) > { > case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; > case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; > default: break; > } > sync_context(ctx); > release_gl_drawable( gl ); > } > > pglFlush(); > if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); > } > > static const GLubyte *wglGetString(GLenum name) > { > if (name == GL_EXTENSIONS && WineGLInfo.glExtensions) > return (const GLubyte *)WineGLInfo.glExtensions; > return pglGetString(name); > } > > /*********************************************************************** > * X11DRV_wglCreateContextAttribsARB > */ > static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *hShareContext, > const int* attribList ) > { > - struct wgl_context *ret = NULL; > + struct wgl_context *ret; > struct gl_drawable *gl; > int err = 0; > > TRACE("(%p %p %p)\n", hdc, hShareContext, attribList); > > if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > { > SetLastError( ERROR_INVALID_PIXEL_FORMAT ); > return NULL; > } > > if ((ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) > { > ret->hdc = hdc; > ret->fmt = gl->format; > ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ > ret->gl3_context = TRUE; > if (attribList) > { > int *pContextAttribList = &ret->attribList[0]; > /* attribList consists of pairs {token, value] terminated with 0 */ > while(attribList[0] != 0) > { > TRACE("%#x %#x\n", attribList[0], attribList[1]); > switch(attribList[0]) > { > case WGL_CONTEXT_MAJOR_VERSION_ARB: > pContextAttribList[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > case WGL_CONTEXT_MINOR_VERSION_ARB: > pContextAttribList[0] = GLX_CONTEXT_MINOR_VERSION_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > case WGL_CONTEXT_LAYER_PLANE_ARB: > break; > case WGL_CONTEXT_FLAGS_ARB: > pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > case WGL_CONTEXT_PROFILE_MASK_ARB: > pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; > pContextAttribList[1] = attribList[1]; > pContextAttribList += 2; > ret->numAttribs++; > break; > default: > ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); > } > attribList += 2; > } > } > > X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); > ret->ctx = create_glxcontext(gdi_display, ret, hShareContext ? hShareContext->ctx : NULL); > XSync(gdi_display, False); > if ((err = X11DRV_check_error()) || !ret->ctx) > { > /* In the future we should convert the GLX error to a win32 one here if needed */ > ERR("Context creation failed (error %x)\n", err); > HeapFree( GetProcessHeap(), 0, ret ); > ret = NULL; > } > else list_add_head( &context_list, &ret->entry ); > } > > release_gl_drawable( gl ); > TRACE( "%p -> %p\n", hdc, ret ); > return ret; > } > > /** > * X11DRV_wglGetExtensionsStringARB > * > * WGL_ARB_extensions_string: wglGetExtensionsStringARB > */ > static const char *X11DRV_wglGetExtensionsStringARB(HDC hdc) > { > TRACE("() returning \"%s\"\n", WineGLInfo.wglExtensions); > return WineGLInfo.wglExtensions; > } > > /** > * X11DRV_wglCreatePbufferARB > * > * WGL_ARB_pbuffer: wglCreatePbufferARB > */ > static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat, int iWidth, int iHeight, > const int *piAttribList ) > { > - struct wgl_pbuffer* object = NULL; > - const struct wgl_pixel_format *fmt = NULL; > + struct wgl_pbuffer* object; > + const struct wgl_pixel_format *fmt; > int attribs[256]; > int nAttribs = 0; > > TRACE("(%p, %d, %d, %d, %p)\n", hdc, iPixelFormat, iWidth, iHeight, piAttribList); > > /* Convert the WGL pixelformat to a GLX format, if it fails then the format is invalid */ > fmt = get_pixel_format(gdi_display, iPixelFormat, TRUE /* Offscreen */); > if(!fmt) { > ERR("(%p): invalid pixel format %d\n", hdc, iPixelFormat); > SetLastError(ERROR_INVALID_PIXEL_FORMAT); > return NULL; > } > > object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); > if (NULL == object) { > SetLastError(ERROR_NO_SYSTEM_RESOURCES); > return NULL; > } > object->width = iWidth; > object->height = iHeight; > object->fmt = fmt; > > PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); > PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight); > while (piAttribList && 0 != *piAttribList) { > int attr_v; > switch (*piAttribList) { > case WGL_PBUFFER_LARGEST_ARB: { > ++piAttribList; > attr_v = *piAttribList; > TRACE("WGL_LARGEST_PBUFFER_ARB = %d\n", attr_v); > PUSH2(attribs, GLX_LARGEST_PBUFFER, attr_v); > break; > } > > case WGL_TEXTURE_FORMAT_ARB: { > ++piAttribList; > attr_v = *piAttribList; > TRACE("WGL_render_texture Attribute: WGL_TEXTURE_FORMAT_ARB as %x\n", attr_v); > if (WGL_NO_TEXTURE_ARB == attr_v) { > object->use_render_texture = 0; > } else { > if (!use_render_texture_emulation) { > SetLastError(ERROR_INVALID_DATA); > goto create_failed; > } > switch (attr_v) { > case WGL_TEXTURE_RGB_ARB: > object->use_render_texture = GL_RGB; > object->texture_bpp = 3; > object->texture_format = GL_RGB; > object->texture_type = GL_UNSIGNED_BYTE; > break; > @@ -2457,213 +2458,213 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut > * WGL_ARB_pbuffer: wglReleasePbufferDCARB > */ > static int X11DRV_wglReleasePbufferDCARB( struct wgl_pbuffer *object, HDC hdc ) > { > struct gl_drawable *gl; > > TRACE("(%p, %p)\n", object, hdc); > > EnterCriticalSection( &context_section ); > > if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) > { > XDeleteContext( gdi_display, (XID)hdc, gl_pbuffer_context ); > free_gl_drawable( gl ); > } > else hdc = 0; > > LeaveCriticalSection( &context_section ); > > return hdc && DeleteDC(hdc); > } > > /** > * X11DRV_wglSetPbufferAttribARB > * > * WGL_ARB_pbuffer: wglSetPbufferAttribARB > */ > static BOOL X11DRV_wglSetPbufferAttribARB( struct wgl_pbuffer *object, const int *piAttribList ) > { > GLboolean ret = GL_FALSE; > > WARN("(%p, %p): alpha-testing, report any problem\n", object, piAttribList); > > if (!object->use_render_texture) { > SetLastError(ERROR_INVALID_HANDLE); > return GL_FALSE; > } > if (use_render_texture_emulation) { > return GL_TRUE; > } > return ret; > } > > /** > * X11DRV_wglChoosePixelFormatARB > * > * WGL_ARB_pixel_format: wglChoosePixelFormatARB > */ > static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, > UINT nMaxFormats, int *piFormats, UINT *nNumFormats ) > { > int attribs[256]; > int nAttribs = 0; > - GLXFBConfig* cfgs = NULL; > + GLXFBConfig* cfgs; > int nCfgs = 0; > int it; > int fmt_id; > int start, end; > UINT pfmt_it = 0; > int run; > int i; > DWORD dwFlags = 0; > > TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats); > if (NULL != pfAttribFList) { > FIXME("unused pfAttribFList\n"); > } > > nAttribs = ConvertAttribWGLtoGLX(piAttribIList, attribs, NULL); > if (-1 == nAttribs) { > WARN("Cannot convert WGL to GLX attributes\n"); > return GL_FALSE; > } > PUSH1(attribs, None); > > /* There is no 1:1 mapping between GLX and WGL formats because we duplicate some GLX formats for bitmap rendering (see get_formats). > * Flags like PFD_SUPPORT_GDI, PFD_DRAW_TO_BITMAP and others are a property of the pixel format. We don't query these attributes > * using glXChooseFBConfig but we filter the result of glXChooseFBConfig later on. > */ > for(i=0; piAttribIList[i] != 0; i+=2) > { > switch(piAttribIList[i]) > { > case WGL_DRAW_TO_BITMAP_ARB: > if(piAttribIList[i+1]) > dwFlags |= PFD_DRAW_TO_BITMAP; > break; > case WGL_ACCELERATION_ARB: > switch(piAttribIList[i+1]) > { > case WGL_NO_ACCELERATION_ARB: > dwFlags |= PFD_GENERIC_FORMAT; > break; > case WGL_GENERIC_ACCELERATION_ARB: > dwFlags |= PFD_GENERIC_ACCELERATED; > break; > case WGL_FULL_ACCELERATION_ARB: > /* Nothing to do */ > break; > } > break; > case WGL_SUPPORT_GDI_ARB: > if(piAttribIList[i+1]) > dwFlags |= PFD_SUPPORT_GDI; > break; > } > } > > /* Search for FB configurations matching the requirements in attribs */ > cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), attribs, &nCfgs); > if (NULL == cfgs) { > WARN("Compatible Pixel Format not found\n"); > return GL_FALSE; > } > > /* Loop through all matching formats and check if they are suitable. > * Note that this function should at max return nMaxFormats different formats */ > for(run=0; run < 2; run++) > { > for (it = 0; it < nCfgs && pfmt_it < nMaxFormats; ++it) > { > if (pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_FBCONFIG_ID, &fmt_id)) > { > ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); > continue; > } > > /* During the first run we only want onscreen formats and during the second only offscreen */ > start = run == 1 ? nb_onscreen_formats : 0; > end = run == 1 ? nb_pixel_formats : nb_onscreen_formats; > > for (i = start; i < end; i++) > { > if (pixel_formats[i].fmt_id == fmt_id && (pixel_formats[i].dwFlags & dwFlags) == dwFlags) > { > piFormats[pfmt_it++] = i + 1; > TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", > it + 1, nCfgs, fmt_id, i + 1); > break; > } > } > } > } > > *nNumFormats = pfmt_it; > /** free list */ > XFree(cfgs); > return GL_TRUE; > } > > /** > * X11DRV_wglGetPixelFormatAttribivARB > * > * WGL_ARB_pixel_format: wglGetPixelFormatAttribivARB > */ > static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int iLayerPlane, > UINT nAttributes, const int *piAttributes, int *piValues ) > { > UINT i; > - const struct wgl_pixel_format *fmt = NULL; > + const struct wgl_pixel_format *fmt; > int hTest; > int tmp; > int curGLXAttr = 0; > > TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues); > > if (0 < iLayerPlane) { > FIXME("unsupported iLayerPlane(%d) > 0, returns FALSE\n", iLayerPlane); > return GL_FALSE; > } > > /* Convert the WGL pixelformat to a GLX one, if this fails then most likely the iPixelFormat isn't supported. > * We don't have to fail yet as a program can specify an invalid iPixelFormat (lets say 0) if it wants to query > * the number of supported WGL formats. Whether the iPixelFormat is valid is handled in the for-loop below. */ > fmt = get_pixel_format(gdi_display, iPixelFormat, TRUE /* Offscreen */); > if(!fmt) { > WARN("Unable to convert iPixelFormat %d to a GLX one!\n", iPixelFormat); > } > > for (i = 0; i < nAttributes; ++i) { > const int curWGLAttr = piAttributes[i]; > TRACE("pAttr[%d] = %x\n", i, curWGLAttr); > > switch (curWGLAttr) { > case WGL_NUMBER_PIXEL_FORMATS_ARB: > piValues[i] = nb_pixel_formats; > continue; > > case WGL_SUPPORT_OPENGL_ARB: > piValues[i] = GL_TRUE; > continue; > > case WGL_ACCELERATION_ARB: > curGLXAttr = GLX_CONFIG_CAVEAT; > if (!fmt) goto pix_error; > if(fmt->dwFlags & PFD_GENERIC_FORMAT) > piValues[i] = WGL_NO_ACCELERATION_ARB; > else if(fmt->dwFlags & PFD_GENERIC_ACCELERATED) > piValues[i] = WGL_GENERIC_ACCELERATION_ARB; > else > piValues[i] = WGL_FULL_ACCELERATION_ARB; > continue; > > case WGL_TRANSPARENT_ARB: > curGLXAttr = GLX_TRANSPARENT_TYPE; > if (!fmt) goto pix_error; > hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp); > if (hTest) goto get_error; > piValues[i] = GL_FALSE; > if (GLX_NONE != tmp) piValues[i] = GL_TRUE; > continue; > > case WGL_PIXEL_TYPE_ARB: > @@ -2979,107 +2980,107 @@ static BOOL X11DRV_wglReleaseTexImageARB( struct wgl_pbuffer *object, int iBuffe > return GL_TRUE; > } > return ret; > } > > /** > * X11DRV_wglGetExtensionsStringEXT > * > * WGL_EXT_extensions_string: wglGetExtensionsStringEXT > */ > static const char *X11DRV_wglGetExtensionsStringEXT(void) > { > TRACE("() returning \"%s\"\n", WineGLInfo.wglExtensions); > return WineGLInfo.wglExtensions; > } > > /** > * X11DRV_wglGetSwapIntervalEXT > * > * WGL_EXT_swap_control: wglGetSwapIntervalEXT > */ > static int X11DRV_wglGetSwapIntervalEXT(void) > { > struct wgl_context *ctx = NtCurrentTeb()->glContext; > struct gl_drawable *gl; > int swap_interval; > > TRACE("()\n"); > > if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) > { > /* This can't happen because a current WGL context is required to get > * here. Likely the application is buggy. > */ > WARN("No GL drawable found, returning swap interval 0\n"); > return 0; > } > > swap_interval = gl->swap_interval; > release_gl_drawable(gl); > > return swap_interval; > } > > /** > * X11DRV_wglSwapIntervalEXT > * > * WGL_EXT_swap_control: wglSwapIntervalEXT > */ > static BOOL X11DRV_wglSwapIntervalEXT(int interval) > { > struct wgl_context *ctx = NtCurrentTeb()->glContext; > struct gl_drawable *gl; > - BOOL ret = TRUE; > + BOOL ret; > > TRACE("(%d)\n", interval); > > /* Without WGL/GLX_EXT_swap_control_tear a negative interval > * is invalid. > */ > if (interval < 0 && !has_swap_control_tear) > { > SetLastError(ERROR_INVALID_DATA); > return FALSE; > } > > if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) > { > SetLastError(ERROR_DC_NOT_FOUND); > return FALSE; > } > > ret = set_swap_interval(gl->drawable, interval); > gl->refresh_swap_interval = FALSE; > if (ret) > gl->swap_interval = interval; > else > SetLastError(ERROR_DC_NOT_FOUND); > > release_gl_drawable(gl); > > return ret; > } > > /** > * X11DRV_wglSetPixelFormatWINE > * > * WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE > * This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times. > */ > static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) > { > return set_pixel_format(hdc, format, TRUE); > } > > /** > * glxRequireVersion (internal) > * > * Check if the supported GLX version matches requiredVersion. > */ > static BOOL glxRequireVersion(int requiredVersion) > { > /* Both requiredVersion and glXVersion[1] contains the minor GLX version */ > if(requiredVersion <= WineGLInfo.glxVersion[1]) > return TRUE; > > return FALSE; > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWOdT4AAoJEN0/YqbEcdMwrKMP/3A3YDS+Z8D9DryqO0M+uGFb dpXvi5pCXIir7VK12bO57tj3NTZ0i9R+COfmwFTb883e6MdcIDsMd3+w8o0A/vj0 7U5yZuxE0gWkFL2veP2L7q+nx7NInYEaWuKmm/Ilu0vDQV0Azr3oyETyih2VZdxE WqXvh/V90JeFBXf6QtyrPRczXdjcP5BMlI3LW7xLTg4lrxGv3E6r/2wOFl87Ezo1 zHQ8ZF+BWtK2m5vz6OZBoyvPD0XMB+3NJaxfqZ5JI37bJfnO8nu5WyyZEx/6ilxN TuFacVAewVth53Uo9svNOodvZ3hsIP1JILQ4KAOBUbo6/31GIufxGjHdXfzEpRmX Xf3+rBdVPtZO/fwbIJnoMMBZbUB3ysOf+WSsH341fa4XmUgppG0enyLve19HcnUV ZV1yyX+veAdjEjF/bu72XMowPH9yQNR72buwqdxfbVOckeUuIOuyeRjT+VloGQCv Y3FrstuvoCEJCedSGm96zSHhN2sRNeHvCxoRECuivdoo2e8iCXhC+otkKyoH4zN1 cGXVraN+oabyiwe+K2ItWGeiNKp0Es+eQtckYbna7SmbpslkFjhWjju7NaDbJJgS wZq+Na9hYC/zN5Ae921DSegHEuTtjbFBA4JmD54oVYGAK0cA5V88qsEFbkBgH+fp WfiGk1hZGePFQvXm7kiN =H5zR -----END PGP SIGNATURE-----

4 3

Re: [PATCH 2/5] ddraw: check if surface is a mipmap sublevel through caps in ddraw_surface7_GetPriority
by Riccardo Bortolato 04 Nov '15

04 Nov '15

Thank you Stefan, I will resubmit with your tests. Ciao, Riccardo 2015-11-04 16:40 GMT+01:00 Marvin <testbot(a)winehq.org>: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch.

1 0

Re: mshtml: Add IHTMLXMLHttpRequest::responseXML() method implementation. (try 2)
by Nikolay Sivov 04 Nov '15

04 Nov '15

I don't know if it's terribly important in practice or not, but it could be better to always initialize out pointer to NULL. > + hres = IXMLDOMDocument_QueryInterface(xmldoc, &IID_IObjectSafety, (void**)&safety); > + if(SUCCEEDED(hres)) { > + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, > + INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER, > + INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER); > + IObjectSafety_Release(safety); > + if(FAILED(hres)) { > + ERR("SetInterfaceSafetyOptions(%p) failed: %08x\n", safety, hres); > + IXMLDOMDocument_Release(xmldoc); > + return hres; > + } > + } else { > + ERR("QueryInterface(IID_IObjectSafety) failed: %08x\n", hres); > + IXMLDOMDocument_Release(xmldoc); > + return hres; > + } This looks too complicated to me, I don't think any failure here is critical.

2 2

Re: dinput: Ensure X11 input events are forwarded to wineserver even without message loop.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > This commit basically reverts b22ff8018aca7c365e505f1db7732f7050ae259b. > > Windows does not do that, but our current implementation of winex11 > requires periodic event polling to forward events to the wineserver. > > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > Signed-off-by: Michael Müller <michael(a)fds-team.de> > --- > > NOTES: > > - Breaking the dinput tests is harmless here, because they only work by > "pure accident". I'll add more tests later to show this. Actually they don't fail here: ../../../tools/runtest -q -P wine -T ../../.. -M dinput.dll -p dinput_test.exe.so mouse && touch mouse.ok mouse.c:164: Test succeeded inside todo block: GetDeviceData() failed: 00000000 cnt:1 mouse.c:176: Test succeeded inside todo block: GetDeviceData() failed: 00000000 cnt:1 make: *** [mouse.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll: Block signals while executing system APCs. (v2)
by Alexandre Julliard 04 Nov '15

04 Nov '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Changes in v2: > * Do not delete the still valid comment "Return TRUE if a user APC has been run.". > I still had this deleted from an earlier version of the patchset, where the > return type was changed. > > If a USR1 suspend signal arrives between dequeing a system APC and sending > back the result to the wineserver, a deadlock occurs. To avoid this issue > this patch blocks all signals in server_select(), except while waiting or > processing user APCs. I'm guessing this is for bug 14697? It seems to me you could do that on the server side, by not suspending the thread while system APCs are outstanding. Also a test case demonstrating the bug would be a good first step. -- Alexandre Julliard julliard(a)winehq.org

3 7

Re: [PATCH 1/3] wined3d: Prepare the destination location in surface_load_location.
by Henri Verbeet 04 Nov '15

04 Nov '15

On 3 November 2015 at 23:55, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Instead of its sub-functions. See comments in patch 3 for details about > surface_blt_fbo. > > This fixes bug 39536. surface_load_location didn't prepare the > multisample renderbuffer. > > The next patches will consistently move the responsibility to the caller > of surface_load_location. This isn't necessarily wrong on its own, although I wonder if it's really worth it. I don't think it makes the API easier to use correctly, and I don't think there's going to be much of a performance impact. For fixing bug 39536 this is wrong though. If I'm reading the terminal output there correctly, the issue is that load_location() is called with WINED3D_LOCATION_RB_MULTISAMPLE, which it doesn't know how to handle. This patch will hide the issue by simply always calling prepare_location(). I'd have to check if multisample surfaces are supposed to have defined content after creation and presents, but perhaps what you need to do here is to add proper WINED3D_LOCATION_DISCARDED handling for multisample surfaces, similar to depth stencil surfaces.

2 2

Re: mshtml: Add IHTMLXMLHttpRequest::responseXML() method implementation.
by Nikolay Sivov 04 Nov '15

04 Nov '15

On 04.11.2015 11:13, Zhenbo Li wrote: > + hres = IXMLDOMDocument_loadXML(xmldoc, str, &vbool); > + if(FAILED(hres)) { > + ERR("loadXML(%s) failed: %08x\n", debugstr_w(str), hres); > + IXMLDOMDocument_Release(xmldoc); > + SysFreeString(str); > + return hres; > + } This is not how it works. loadXML() returns S_FALSE on load failure as well, so you have to test strictly for S_OK, or check VARIANT_BOOL argument. You can probably add a test when invalid xml stream is received to see how _get_responseXML() behaves, e.g. does it return S_FALSE and a valid IDispatch or does it fail and return NULL. Also I don't think it's a good idea to trace xml contents.

3 3

Re: riched20: Set pStream->written in ME_StreamOutFlush.
by Huw Davies 04 Nov '15

04 Nov '15

On Thu, Oct 29, 2015 at 01:20:57PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c > index 2c7386a..72a8db5 100644 > --- a/dlls/riched20/writer.c > +++ b/dlls/riched20/writer.c > @@ -63,6 +63,7 @@ ME_StreamOutFlush(ME_OutStream *pStream) > /* Don't resend partial chunks if nWritten < pStream->pos */ > } > pStream->pos = 0; > + pStream->written += nWritten; > return TRUE; > } While this is probably correct, it would be easy to add tests for this. We already have EM_STREAMOUT tests, so just add checks on their return values. Huw.

2 2

Re: dinput: Ensure X11 input events are forwarded to wineserver even without message loop.
by Marvin 04 Nov '15

04 Nov '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=17964 Your paranoid android. === wvistau64 (32 bit mouse) === mouse.c:124: Test failed: IDirectInputDevice_Acquire() failed: 80070005 mouse.c:126: Test failed: IDirectInputDevice_Acquire() should have failed: 80070005 mouse.c:144: Test failed: Acquire() failed: 80070005

1 0

Re: [PATCH] odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString (resend)
by Nikolay Sivov 04 Nov '15

04 Nov '15

On 26.10.2015 11:56, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 182 ++++++++++++++++++++++++++++++++---- > dlls/odbccp32/tests/misc.c | 223 ++++++++++++++++++++++++++++++++++++++++++++- > include/odbcinst.h | 4 +- > 3 files changed, 389 insertions(+), 20 deletions(-) This looks mostly fine. Let me suggest some cleanups. > > -int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, > - LPCWSTR lpszDefault, LPCWSTR RetBuffer, int cbRetBuffer, > - LPCWSTR lpszFilename) > +static HKEY get_privateprofile_sectionkey(LPCWSTR section, LPCWSTR filename) > { > + static const WCHAR odbcW[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\',0}; > + HKEY hkey, hkeyfilename, hkeysection; > + LONG ret; > + > + if (RegOpenKeyW(HKEY_CURRENT_USER, odbcW, &hkey)) > + return NULL; > + > + ret = RegOpenKeyW(hkey, filename, &hkeyfilename); > + RegCloseKey(hkey); > + if (ret) > + return NULL; > + > + ret = RegOpenKeyW(hkeyfilename, section, &hkeysection); > + RegCloseKey(hkeyfilename); > + if (ret) > + return NULL; These 2 lines are redundant, you can remove them, or turn return line to always return hkeysection. > + > + return ret ? NULL : hkeysection; > +} > + > + if (!buff_len) > + return 0; > + > + if(!defvalue) > + buff[0] = 0; Please use consistent formatting, 4 leading spaces, and space after 'if'. > + > + if (!section || !defvalue || !buff) > + return 0; > + > + if (buff) > + buff[0] = 0; > + > + sectionkey = get_privateprofile_sectionkey(section, filename); > + if (sectionkey) > + { > + DWORD type, size; > + > + if(entry) > + { > + size = buff_len * sizeof(*buff); > + if (!RegGetValueW(sectionkey, NULL, entry, RRF_RT_REG_SZ, &type, buff, &size)) > + { > + usedefault = FALSE; > + ret = (size / sizeof(*buff)) - 1; > + } > + } > + else > + { > + WCHAR name[MAX_PATH]; > + DWORD index = 0; > + DWORD namelen; > + > + usedefault = FALSE; > + > + namelen = sizeof(name); > + while (RegEnumValueW(sectionkey, index, name, &namelen, NULL, NULL, NULL, NULL ) == ERROR_SUCCESS) > + { > + if ((ret + namelen+1) > buff_len) > + break; > + > + lstrcpyW(buff+ret, name); > + ret += namelen+1; > + namelen = sizeof(name); > + index++; > + } > + } What I don't understand is why temporary fixed size buffer is needed. This loop immediately copies to return buffer, it should be possible to enumerate directly to this buffer, and if return buffer is not large enough to hold all values it should be identical to this break from the loop you have. Is there a test for test by the way? For consistency it's better to turn RegEnumValueW to !RegEnumValueW, like RegGetValueW does, or the other way around, it depends on which style we use for the rest of dll already. Also not space at the end of parameter list. All of that applies to A-function too. > + > + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 256, "ODBC.INI"); > + ok(ret == 8, "SQLGetPrivateProfileString returned %d\n", ret); > + ok(!strcmp(buffer, "defaultX"), "incorrect string '%s'\n", buffer); > + > + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 4, "ODBC.INI"); > + ok(ret == 3, "SQLGetPrivateProfileString returned %d\n", ret); > + ok(!strcmp(buffer, "def"), "incorrect string '%s'\n", buffer); > + > + ret = SQLGetPrivateProfileString("wineodbc", "testing" , "defaultX", buffer, 8, "ODBC.INI"); > + ok(ret == 7, "SQLGetPrivateProfileString returned %d\n", ret); > + ok(!strcmp(buffer, "default"), "incorrect string '%s'\n", buffer); Please replace all magic numbers with strlen/strlenW/sizeof. > + > + strcpy(buffer, "wine"); > + ret = SQLGetPrivateProfileString("wineodbc", NULL , "", buffer, 256, "abcd.ini"); > + ok(ret == 14, "SQLGetPrivateProfileString returned %d\n", ret); > + if(ret >= 14) > + { > + ok(!strcmp(buffer, "testing"), "incorrect string '%s'\n", buffer); > + ok(!strcmp(buffer+8, "value"), "incorrect string '%s'\n", buffer+8); > + } Why testing this separately? It looks easier to test whole buffer at once, with memcmp if some embedding nulls are expected. With all that fixed, I think it's good to go.

1 0

Re: riched20: Implement superscript/subscript shortcut key.
by Huw Davies 04 Nov '15

04 Nov '15

On Thu, Oct 29, 2015 at 02:02:23PM +0800, Jactry Zeng wrote: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 98c7414..a54c0c7 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -2442,6 +2442,32 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) > return TRUE; > } > break; > + case VK_OEM_PLUS: > + if (ctrl_is_down) > + { > + CHARFORMAT2W fmt; > + > + ZeroMemory(&fmt, sizeof(fmt)); > + fmt.cbSize = sizeof(CHARFORMAT2W); > + SendMessageW(editor->hWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); > + if (shift_is_down) > + { > + if (fmt.dwEffects & CFE_SUBSCRIPT) > + fmt.dwEffects &= ~CFE_SUBSCRIPT; > + fmt.dwMask = CFM_SUPERSCRIPT; > + fmt.dwEffects ^= CFE_SUPERSCRIPT; > + } > + else > + { > + if (fmt.dwEffects & CFE_SUPERSCRIPT) > + fmt.dwEffects &= ~CFE_SUPERSCRIPT; > + fmt.dwMask = CFM_SUBSCRIPT; > + fmt.dwEffects ^= CFE_SUBSCRIPT; > + } > + SendMessageW(editor->hWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); > + return TRUE; > + } > + break; > case VK_ESCAPE: > if (editor->bDialogMode && editor->hwndParent) > PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); > Again, it shouldn't be too hard to add a test for this. We do similar tests by sending WM_KEYDOWN/UP messages to the control. Huw.

2 1

Re: [PATCH v3 2/7] msvcrt: Refactor pf_printf to take options as flags instead of as BOOL parameter
by Piotr Caban 03 Nov '15

03 Nov '15

On 11/03/15 11:12, Martin Storsjo wrote: > From: Piotr Caban <piotr(a)codeweavers.com> I've screwed up sending improved version of the patch without correct "from" header. You're the author of the patch. Please resend it with correct author and without sign-off by me - I'll reply with a sign-off message. Thanks, Piotr

1 0

Re: [PATCH v3 6/7] ucrtbase: Handle the C99 'z' size_t specifier for integers
by Piotr Caban 03 Nov '15

03 Nov '15

On 11/03/15 11:12, Martin Storsjo wrote: > + vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, buf, sizeof(buf), "%zx %d", (size_t) 0x12345678123456, 1); Please avoid adding such long lines without a good reason. Thanks, Piotr

1 0

Re: [PATCH] configure: Fix compilation for systems without libpulse
by Bruno Jesus 03 Nov '15

03 Nov '15

On Tue, Nov 3, 2015 at 9:00 PM, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > Sorry about that, Francois. I think this will fix it. I took your > suggestion to use enable_winepulse_drv instead of PULSE_LIBS in the > later section. Hi, Andrew. I applied the patch and did a new configure && make, configure shows that I don't have Pulseaudio installed [1] but still I get the same problem when it hits winepulse.drv. Then I manually erased the Makefile inside winepulse.drv and did a second configure and make. Make recreated file still have -lpulse. [1] configure: libpulse 32-bit development files not found or too old, Pulse won't be supported. Am I missing something? I really don't understand this make stuff, sorry =/

3 3

Re: [PATCH 6/7] d3d11: Add support for mapping 3D textures. (resend)
by Henri Verbeet 03 Nov '15

03 Nov '15

On 2 November 2015 at 17:12, Józef Kucia <jkucia(a)codeweavers.com> wrote: > - FIXME("Unhandled resource dimension %#x.\n", dimension); > + FIXME("Unhandled resource dimension %u.\n", dimension); I'd prefer to consistently use %#x for enum values. It doesn't make so much of a difference for regular elements here, but %#x is much more readable when you get invalid values like e.g. ~0u in there due to some bug.

1 0

Re: [v3 resend2] d3d9: call wined3d_device_copy_sub_resource_region instead of wined3d_device_update_surface in d3d9_device_UpdateSurface
by Stefan Dösinger 03 Nov '15

03 Nov '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I spotted a few style issues. Not sure if that's what Henri didn't like about it, or if he disagrees with the concept of the patch. Am 2015-11-03 um 08:34 schrieb Riccardo Bortolato: > + if (!(sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx))) > + { > + WARN("no subresource found for texture %p sub_resource_idx %u\n", src->wined3d_texture, src->sub_resource_idx); We usually have a period at the end of wined3d trace messages. > + WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", > + src_surface, dst_surface); > + wined3d_mutex_unlock(); > + return D3DERR_INVALIDCALL; The trace message mentions the wrong return value (WINED3DERR... vs D3DERR...). > + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, > + wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, > + dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), > + src->sub_resource_idx, &src_box); Indentation (8 spaces for the line continuations). Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWOKUmAAoJEN0/YqbEcdMwCaIP/A/V33gPqKBJtBJAXi8UnsEG dENusnecbrxauf6Sc6x5g7cYriBUEph5ndYa96y+lv8qKuOg9jVLeoUkfBHqpE8f V77p3cCnAJJ2XzbFJkqu8jY5GKvaAmoizezOyPRi/lgXa2xydH5yzW5NFu27Rbq8 KeG3kuBIBDzkJ1poSUvYWvSqUTGOeaUEYZBkDttqPegHvjPpYJg6MAzpr33c/F5P s5ttSwhRdPFQJU3iktZKElhuUX2SBZnBwcueR4xAN+/4bRCIAhy2tnPXbQgC8Tih dcQzVWCoQ+qK3nmYjDUrwvvWdEF78D+BOQzVtOOn4kHZwE1XQ7M1paV8en0uV0VS D8Jdx4shCQGkxZncBsfysbEPkqgApukCFJp34JfXWFxlpVbiK6m2Y3DzsdyhGxek Ky30AIY7FadUit5KWehcqDUj9Z8HOFdgcCe0KWqeFpeQn4G6t9gfJiiKYRV3m6TD OxwLT+HcD4lozPARMTq6IT7pV3hOG0xdKNuTKfgji9+8RWRNz5nGa/Ml4WzS49lV YHV06Nnb3ayw1CYTBoK2jwp5hBzAybdghSW7sKNJ6gLy3JFsZOKpKnr2yVxV1WD2 g8E5+tqwPDxgiriDOZrM5tPTc8+QLSaIm+Q59TKE3ScSvWVZArERVMtAk8/vd7BA nAXvxDoQsVBSa7z+zwRC =+ADb -----END PGP SIGNATURE-----

2 2

Re: [PATCH 1/8] Revert "wined3d: Track if a context's private hdc has had its pixel format set, so we don't need to check it."
by Henri Verbeet 03 Nov '15

03 Nov '15

On 2 November 2015 at 21:37, Ken Thomases <ken(a)codeweavers.com> wrote: > This reverts commit f3aa4812382caa459b9b612f66998c6ea8257594. > --- I may have mentioned this the last time this series came up, but if you want me to consider signing off on this it wouldn't hurt to include some text on what the actual issue is, what configurations are affected, why a year and a half isn't enough time to fix it, etc.

3 3

Broken PulseAudio configure check
by Francois Gouget 03 Nov '15

03 Nov '15

The PulseAudio configure check is broken: WINE_PACKAGE_FLAGS(PULSE,[libpulse],,,, [AC_CHECK_HEADERS(pulse/pulseaudio.h, [AC_CHECK_LIB(pulse,pa_stream_is_corked,[:],,[$PULSE_LIBS])])]) [...] test -n "$PULSE_LIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no} WINE_PACKAGE_FLAGS() sets PULSE_LIBS but PULSE_LIBS is not unset even if AC_CHECK_LIB() fails. As a result compilation of winepulse.drv is enabled even if libpulse.so is missing. I don't have the 32-bit libpulse.so library so this resulted in a compilation error here: ../../tools/winegcc/winegcc -o winepulse.drv.so -B../../tools/winebuild -m32 -fasynchronous-unwind-tables -shared winepulse.drv.spec \ mmdevdrv.o -ldxguid -luuid -lwinmm -luser32 -ladvapi32 -lole32 -lwine \ ../../libs/port/libwine_port.a -lpulse -lpthread /usr/bin/ld: cannot find -lpulse collect2: error: ld returned 1 exit status winegcc: gcc failed Makefile:185: recipe for target 'winepulse.drv.so' failed I also find it strange that all these audio modules are enabled/disabled at the end of the configure.ac file instead of where support is checked. Also the 'Check for any sound system' should probably not look into the internals of audio systems (i.e. check for PULSE_LIBS) and instead only rely on the enable_xxx_drv variables which should have been set by then. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Avoid the Gates of Hell - use Linux.

1 0

Re: [2/2] msi: Make sure to reset the 'in_quotes' state in all cases.
by Marvin 03 Nov '15

03 Nov '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=17929 Your paranoid android. === w7u (32 bit install) === The test timed out

1 0

Re: [PATCH v2 4/7] ucrtbase: Implement the new printf corner case behaviour
by Piotr Caban 03 Nov '15

03 Nov '15

On 11/02/15 22:26, Martin Storsjo wrote: > - if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) > - FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); Shouldn't this be changed to: if(options & ~UCRTBASE_PRINTF_MASK) FIXME("...); instead of being removed? Thanks, Piotr

2 2

Re: [PATCH v2 5/7] msvcrt: Interpret 'I' as size_t size specifier for integer conversions
by Piotr Caban 03 Nov '15

03 Nov '15

On 11/02/15 22:26, Martin Storsjo wrote: > + format = "%Ix %d"; > + r = sprintf(buffer,format,0x123456,1); > + ok(!strcmp(buffer,"123456 1"),"Pointer formatted incorrectly\n"); > + ok( r==8, "return count wrong\n"); Please change the test failure message (I would prefer something like ok(!strcmp(...), "buffer = %s\n", buffer)). Thanks, Piotr

2 1

Re: [PATCH v2 4/7] ucrtbase: Implement the new printf corner case behaviour
by Piotr Caban 03 Nov '15

03 Nov '15

On 11/02/15 22:26, Martin Storsjo wrote: > + test_legacy_wide(); > + test_legacy_msvcrt(); > + test_legacy_three_digit_exp(); I also think it would be nicer if this tests are called e.g. test_printf_legacy_wide. Thanks, Piotr

2 1

Re: [6/6] oleaut32/tests: Add a bunch of new tests for typelib generation.
by Marvin 03 Nov '15

03 Nov '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=17920 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77C47740 === w2003std (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77BD85F0 === wvistau64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77189BBD === w2008s64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 74FB9BBD === w7u (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 77598B21 === w7pro64 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 769A8B21 === w8 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 76B0B4BF === w864 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 7748B4BF === w1064 (32 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 16 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 20 got 16 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 12 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 75688E90 === wvistau64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFE804E90 === w2008s64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFF134E90 === w7pro64 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 000007FEFDB35960 === w864 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 00007FFB7B0A11A0 === w1064 (64 bit typelib) === typelib.c:4634: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4598: Test failed: bstrIfName expected "parent_iface" got "g" typelib.c:4602: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4617: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4621: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4622: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7a0001} typelib.c:4598: Test failed: bstrIfName expected "child_iface" got "parent_iface" typelib.c:4621: Test failed: typeattr->cbSizeVft expected 40 got 32 typelib.c:4634: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa001} typelib.c:4653: Test failed: desc->memid expected 1610743808 got 1610678272 typelib.c:4657: Test failed: desc->cParams expected 0 got 1 typelib.c:4659: Test failed: desc->oVft got 24 typelib.c:4667: Test failed: namesTab[i] expected "test2" got "test1" typelib: unhandled exception c0000005 at 00007FF85AA7C510

1 0

Re: [4/6] widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib. Resend.
by Marvin 03 Nov '15

03 Nov '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=17919 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2003std (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === wvistau64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2008s64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7u (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7pro64 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w8 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w864 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w1064 (32 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === wvistau64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w2008s64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w7pro64 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w864 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b === w1064 (64 bit typelib) === typelib.c:4415: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4420: Test failed: got 0x8002802b

1 0

Re: [PATCH 1/5] winepulse: Add initial stub for pulseaudio support
by Alexandre Julliard 03 Nov '15

03 Nov '15

Andrew Eikum <aeikum(a)codeweavers.com> writes: > From: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> > > Includes API compatibility patch by Juergen Tretthahn <orson(a)orson.at>. > > Synchronous static data initialization by Andrew Eikum <aeikum(a)codeweavers.com> > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> I know that this code is not supposed to be used yet, but if I try to use it, it's crashing all over the place. Is that really how it's supposed to be? ../../../tools/runtest -q -P wine -T ../../.. -M mmdevapi.dll -p mmdevapi_test.exe.so capture && touch capture.ok capture.c:247: Test succeeded inside todo block: HPC after ReleaseBuffer(0) 102136526 vs. 102136526 capture.c:310: Test succeeded inside todo block: expect DISCONTINUITY 1 capture.c:316: Test succeeded inside todo block: Position 1323 gap 441 wine: Unhandled page fault on write access to 0x00000004 at address 0x7e468d8d (thread 0009), starting debugger... Unhandled exception: page fault on write access to 0x00000004 in 32-bit code (0x7e468d8d). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7e468d8d ESP:0032fb70 EBP:0032fba8 EFLAGS:00010206( R- -- I - -P- ) EAX:00000000 EBX:7e4741e0 ECX:00000000 EDX:00000000 ESI:00000000 EDI:00125ff0 Stack dump: 0x0032fb70: 7c608058 7e4747f0 0032fba8 7e465a8d 0x0032fb80: 00000001 00000000 7e4747c0 7e4747f0 0x0032fb90: 00125ff0 7e468d0b 0032fbc0 7ed5b16c 0x0032fba0: 00000001 00000000 0032fcb8 7ed40e3e 0x0032fbb0: 00000001 7ed52189 00005b4d 7ed40e3e 0x0032fbc0: 00125ff0 000001b9 00000000 7ed41bc6 Backtrace: =>0 0x7e468d8d AudioClient_Release+0x9d() in winepulse (0x0032fba8) 1 0x7ed40e3e test_audioclient+0xa8d() [/home/julliard/wine/wine/dlls/mmdevapi/tests/../../../include/audioclient.h:365] in mmdevapi_test (0x0032fcb8) 2 0x7ed42e45 func_capture+0x114() [/home/julliard/wine/wine/dlls/mmdevapi/tests/capture.c:1076] in mmdevapi_test (0x0032fd68) 3 0x7ed40014 main+0x393(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/mmdevapi/tests/../../../include/wine/test.h:584] in mmdevapi_test (0x0032fe18) 4 0x7ed5195b __wine_spec_exe_entry+0x4a(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in mmdevapi_test (0x0032fe58) 5 0x7b85bc9c call_process_entry+0xb() in kernel32 (0x0032fe78) 6 0x7b85cc1a start_process+0x59(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1104] in kernel32 (0x0032fea8) 7 0x7bc7eaa0 call_thread_func_wrapper+0xb() in ntdll (0x0032fec8) 8 0x7bc8180f call_thread_func+0xde(entry=0x7b85cbc0, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2732] in ntdll (0x0032ffa8) 9 0x7bc7ea7e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 10 0x7bc53a47 start_process+0x16(kernel_start=0x7b85cbc0) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3040] in ntdll (0x0032ffe8) 11 0xf75c239d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 12 0xf75c2500 wine_switch_to_stack+0x1f(func=0x7bc53a30, arg=0x7b85cbc0, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xffb19868) 13 0x7bc596c1 LdrInitializeThunk+0x1f0(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3094] in ntdll (0xffb198a8) 14 0x7b862849 __wine_kernel_init+0x888() [/home/julliard/wine/wine/dlls/kernel32/process.c:1276] in kernel32 (0xffb1a798) 15 0x7bc5a533 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3303] in ntdll (0xffb1a808) 16 0xf75bfe9b wine_init+0x2ca(argc=0x3, argv=0xffb1ad44, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:959] in libwine.so.1 (0xffb1a858) 17 0x7bf00d6a main+0x79(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:247] in <wine-loader> (0xffb1ac98) 18 0xf73dfa63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x7e468d8d AudioClient_Release+0x9d in winepulse: movl %ecx,0x4(%eax) -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 3/5] winepulse: Add audioclient
by Sebastian Lackner 03 Nov '15

03 Nov '15

I know this patch is already committed, but still... On 29.10.2015 18:04, Andrew Eikum wrote: > } > if (pulse_ml) > pa_mainloop_quit(pulse_ml, 0); > + if (pulse_thread) { > + WaitForSingleObject(pulse_thread, INFINITE); This can't work. You can't wait for a thread while holding the loader lock. > > +static DWORD CALLBACK pulse_mainloop_thread(void *tmp) { > + int ret; > + pulse_ml = pa_mainloop_new(); I might be wrong, but I see a risk here that the pulse_ml conflicts with the use in pulse_test_connect(). Is it guaranteed that pulse_test_connect() is only called once after loading the DLL? Regards, Sebastian

2 1

Re: [2/2] winepulse.drv: Silence the correct buffer.
by Andrew Eikum 03 Nov '15

03 Nov '15

On Tue, Nov 03, 2015 at 01:26:16AM +0100, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > It seems this was a mistake while rebasing. Please note that different > buffers are used (This->tmp_buffer vs This->locked_ptr). > Good eye. I already have a patch to fix this in the sequence, unsent yet. My version adds a silence_buffer() utility method to avoid the duplicate check for the format. It'll be in the next wave. Andrew > dlls/winepulse.drv/mmdevdrv.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c > index 4863bb3..47e9b0d 100644 > --- a/dlls/winepulse.drv/mmdevdrv.c > +++ b/dlls/winepulse.drv/mmdevdrv.c > @@ -1738,18 +1738,17 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( > return AUDCLNT_E_INVALID_SIZE; > } > > - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) { > - if (This->ss.format == PA_SAMPLE_U8) > - memset(This->tmp_buffer, 128, written_bytes); > - else > - memset(This->tmp_buffer, 0, written_bytes); > - } > - > This->locked = 0; > - if (This->locked_ptr) > + if (This->locked_ptr) { > + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) > + memset(This->locked_ptr, This->ss.format == PA_SAMPLE_U8 ? 0x80 : 0, written_bytes); > pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE); > - else > + } else { > + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) > + memset(This->tmp_buffer, This->ss.format == PA_SAMPLE_U8 ? 0x80 : 0, written_bytes); > pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE); > + } > + > This->pad += written_bytes; > This->locked_ptr = NULL; > TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss)); > -- > 2.6.2

1 0

Re: [PATCH 8/8] ddraw: Mark tests which no longer pass due to reverts as todo_wine.
by Marvin 02 Nov '15

02 Nov '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=17911 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2337: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw2.c:3193: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3195: Test failed: Got unexpected screen width 1024. ddraw2.c:3197: Test failed: Got unexpected screen height 768. ddraw2.c:3210: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3212: Test failed: Got unexpected screen width 1024. ddraw2.c:3214: Test failed: Got unexpected screen height 768. ddraw2.c:3218: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3220: Test failed: Got unexpected screen width 1024. ddraw2.c:3222: Test failed: Got unexpected screen height 768. ddraw2.c:3241: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3243: Test failed: Got unexpected screen width 1024. ddraw2.c:3245: Test failed: Got unexpected screen height 768. ddraw2.c:3249: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3251: Test failed: Got unexpected screen width 1024. ddraw2.c:3253: Test failed: Got unexpected screen height 768. ddraw2.c:3273: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3275: Test failed: Got unexpected screen width 1024. ddraw2.c:3277: Test failed: Got unexpected screen height 768. ddraw2.c:3282: Test failed: Got unexpected screen width 1024. ddraw2.c:3284: Test failed: Got unexpected screen height 768. ddraw2.c:3297: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3299: Test failed: Got unexpected screen width 1024. ddraw2.c:3301: Test failed: Got unexpected screen height 768. ddraw2.c:3305: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3307: Test failed: Got unexpected screen width 1024. ddraw2.c:3309: Test failed: Got unexpected screen height 768. ddraw2.c:3317: Test failed: Got unexpected screen width 1024. ddraw2.c:3319: Test failed: Got unexpected screen height 768. ddraw2.c:3331: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3333: Test failed: Got unexpected screen width 1024. ddraw2.c:3335: Test failed: Got unexpected screen height 768. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3552: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3565: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3581: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3600: Test failed: Display mode restored after ddraw1-ddraw2 SetCooperativeLevel() call sequence ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:4757: Test failed: Failed to set display mode, hr 0x80004001. === w1064 (32 bit ddraw1) === ddraw1.c:2186: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw1.c:2931: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2933: Test failed: Got unexpected screen width 1024. ddraw1.c:2935: Test failed: Got unexpected screen height 768. ddraw1.c:2948: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2950: Test failed: Got unexpected screen width 1024. ddraw1.c:2952: Test failed: Got unexpected screen height 768. ddraw1.c:2956: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2958: Test failed: Got unexpected screen width 1024. ddraw1.c:2960: Test failed: Got unexpected screen height 768. ddraw1.c:2979: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2981: Test failed: Got unexpected screen width 1024. ddraw1.c:2983: Test failed: Got unexpected screen height 768. ddraw1.c:2987: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2989: Test failed: Got unexpected screen width 1024. ddraw1.c:2991: Test failed: Got unexpected screen height 768. ddraw1.c:3011: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3013: Test failed: Got unexpected screen width 1024. ddraw1.c:3015: Test failed: Got unexpected screen height 768. ddraw1.c:3020: Test failed: Got unexpected screen width 1024. ddraw1.c:3022: Test failed: Got unexpected screen height 768. ddraw1.c:3035: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3037: Test failed: Got unexpected screen width 1024. ddraw1.c:3039: Test failed: Got unexpected screen height 768. ddraw1.c:3043: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3045: Test failed: Got unexpected screen width 1024. ddraw1.c:3047: Test failed: Got unexpected screen height 768. ddraw1.c:3055: Test failed: Got unexpected screen width 1024. ddraw1.c:3057: Test failed: Got unexpected screen height 768. ddraw1.c:3069: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3071: Test failed: Got unexpected screen width 1024. ddraw1.c:3073: Test failed: Got unexpected screen height 768. ddraw1.c:4122: Test failed: Failed to set display mode, hr 0x80004001. === w1064 (32 bit ddraw7) === ddraw7.c:2183: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw7.c:3024: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3026: Test failed: Got unexpected screen width 1024. ddraw7.c:3028: Test failed: Got unexpected screen height 768. ddraw7.c:3041: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3043: Test failed: Got unexpected screen width 1024. ddraw7.c:3045: Test failed: Got unexpected screen height 768. ddraw7.c:3049: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3051: Test failed: Got unexpected screen width 1024. ddraw7.c:3053: Test failed: Got unexpected screen height 768. ddraw7.c:3072: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3074: Test failed: Got unexpected screen width 1024. ddraw7.c:3076: Test failed: Got unexpected screen height 768. ddraw7.c:3080: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3082: Test failed: Got unexpected screen width 1024. ddraw7.c:3084: Test failed: Got unexpected screen height 768. ddraw7.c:3104: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3106: Test failed: Got unexpected screen width 1024. ddraw7.c:3108: Test failed: Got unexpected screen height 768. ddraw7.c:3113: Test failed: Got unexpected screen width 1024. ddraw7.c:3115: Test failed: Got unexpected screen height 768. ddraw7.c:3128: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3130: Test failed: Got unexpected screen width 1024. ddraw7.c:3132: Test failed: Got unexpected screen height 768. ddraw7.c:3136: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3138: Test failed: Got unexpected screen width 1024. ddraw7.c:3140: Test failed: Got unexpected screen height 768. ddraw7.c:3148: Test failed: Got unexpected screen width 1024. ddraw7.c:3150: Test failed: Got unexpected screen height 768. ddraw7.c:3162: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3164: Test failed: Got unexpected screen width 1024. ddraw7.c:3166: Test failed: Got unexpected screen height 768. ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4021: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4034: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4050: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:4069: Test failed: Display mode restored after ddraw1-ddraw7 SetCooperativeLevel() call sequence ddraw7.c:3975: Test failed: Failed to set display mode, hr 0x80004001. ddraw7.c:5877: Test failed: Failed to set display mode, hr 0x80004001. === w864 (64 bit ddraw7) === ddraw7: unhandled exception c0000005 at 0000000000000000 === w1064 (64 bit ddraw7) === The test timed out === w1064 (32 bit ddraw4) === ddraw4.c:2522: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw4.c:3363: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3365: Test failed: Got unexpected screen width 1024. ddraw4.c:3367: Test failed: Got unexpected screen height 768. ddraw4.c:3380: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3382: Test failed: Got unexpected screen width 1024. ddraw4.c:3384: Test failed: Got unexpected screen height 768. ddraw4.c:3388: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3390: Test failed: Got unexpected screen width 1024. ddraw4.c:3392: Test failed: Got unexpected screen height 768. ddraw4.c:3411: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3413: Test failed: Got unexpected screen width 1024. ddraw4.c:3415: Test failed: Got unexpected screen height 768. ddraw4.c:3419: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3421: Test failed: Got unexpected screen width 1024. ddraw4.c:3423: Test failed: Got unexpected screen height 768. ddraw4.c:3443: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3445: Test failed: Got unexpected screen width 1024. ddraw4.c:3447: Test failed: Got unexpected screen height 768. ddraw4.c:3452: Test failed: Got unexpected screen width 1024. ddraw4.c:3454: Test failed: Got unexpected screen height 768. ddraw4.c:3467: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3469: Test failed: Got unexpected screen width 1024. ddraw4.c:3471: Test failed: Got unexpected screen height 768. ddraw4.c:3475: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3477: Test failed: Got unexpected screen width 1024. ddraw4.c:3479: Test failed: Got unexpected screen height 768. ddraw4.c:3487: Test failed: Got unexpected screen width 1024. ddraw4.c:3489: Test failed: Got unexpected screen height 768. ddraw4.c:3501: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3503: Test failed: Got unexpected screen width 1024. ddraw4.c:3505: Test failed: Got unexpected screen height 768. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4392: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4405: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4421: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4440: Test failed: Display mode restored after ddraw1-ddraw4 SetCooperativeLevel() call sequence ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:6081: Test failed: Failed to set display mode, hr 0x80004001.

2 1

Re: [PATCH 2/4] winex11: Avoid inefficiency and overflow in remove_startup_notification.
by Vincent Povirk 02 Nov '15

02 Nov '15

It seems like you're doing two unrelated things here? I'd expect the process of building the string to send and sending it to be independent. > if ((src = strstr( id, "_TIME" ))) update_user_time( atol( src + 5 )); > > - pos = snprintf(message, sizeof(message), "remove: ID="); > - message[pos++] = '"'; > - for (i = 0; id[i] && pos < sizeof(message) - 2; i++) > + pos = sprintf(message, "remove: ID=\""); > + for (i = 0; id[i]; i++) > { > if (id[i] == '"' || id[i] == '\\') > + { > + if (pos == sizeof(message) - 3) break; > message[pos++] = '\\'; > + } > + if (pos == sizeof(message) - 2) break; > message[pos++] = id[i]; > } > message[pos++] = '"'; > message[pos++] = '\0'; Your use of == instead of > or >= in these checks makes me uncomfortable. Given that a single iteration can increment pos twice, why can't we have a situation where (pos > sizeof(message) - 3), inside the if statement? As for the memset, I didn't examine that as thoroughly, but it's a good policy to not send uninitialized data over the wire. Still, we could move the memset outside the loop and know that won't happen.

2 3

Re: [PATCH 6/6] mmdevapi/tests: Remove todo_wine on some tests for winepulse
by Marvin 02 Nov '15

02 Nov '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=17908 Your paranoid android. === w7u (32 bit capture) === capture.c:329: Test failed: GCP 11200 vs. BufferSize 21996 === w8 (32 bit capture) === capture.c:325: Test failed: Position 3127 gap 1152 capture.c:349: Test failed: Position 4215 expected 3575 capture.c:374: Test failed: Position 5303 expected 4023 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:263: Test failed: Position 2167 expected 1463 capture.c:325: Test failed: Position 3255 gap 1344 capture.c:349: Test failed: Position 4343 expected 3703 capture.c:374: Test failed: Position 4791 expected 4151 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:263: Test failed: Position 2167 expected 1527 capture.c:325: Test failed: Position 4151 gap 2176 capture.c:329: Test failed: GCP 12992 vs. BufferSize 21996 capture.c:349: Test failed: Position 5239 expected 4599 capture.c:350: Test failed: flags 1 capture.c:374: Test failed: Position 5687 expected 5047 === w864 (64 bit capture) === capture.c:329: Test failed: GCP 13888 vs. BufferSize 21996 === w1064 (64 bit capture) === capture.c:329: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:349: Test failed: Position 5239 expected 4663 capture.c:374: Test failed: Position 5687 expected 5111

1 0

Re: [4/4] dlls/ole32: Add more traces to the storage methods. Take 2.
by Vincent Povirk 02 Nov '15

02 Nov '15

> static HRESULT TransactedSnapshotImpl_LockTransaction(StorageBaseImpl *base, BOOL write) > { > + FIXME("stub\n"); > return E_NOTIMPL; > } > > static HRESULT TransactedSnapshotImpl_UnlockTransaction(StorageBaseImpl *base, BOOL write) > { > + FIXME("stub\n"); > return E_NOTIMPL; > } It's the same situation with these two. They are internal functions, and they're not supposed to be implemented.

2 2

Re: [v3 resend] d3d9: call wined3d_device_copy_sub_resource_region instead of wined3d_device_update_surface in d3d9_device_U
by Marvin 02 Nov '15

02 Nov '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=17903 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/7] wined3d: Introduce wined3d_device_map_sub_resource().
by Henri Verbeet 02 Nov '15

02 Nov '15

On 2 November 2015 at 04:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +HRESULT CDECL wined3d_device_map_sub_resource(struct wined3d_device *device, > + struct wined3d_resource *resource, unsigned int sub_resource_idx, > + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) > +{ > + struct wined3d_resource *sub_resource; > + > + TRACE("device %p, resource %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n", > + device, resource, sub_resource_idx, map_desc, box, flags); > + > + if (!(sub_resource = sub_resource_from_resource(resource, sub_resource_idx))) > + { > + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); > + return E_INVALIDARG; > + } > + > + return sub_resource->resource_ops->resource_map(sub_resource, map_desc, box, flags); > +} I suppose in d3d11 this is part of ID3D11DeviceContext because of deferred contexts maps. Perhaps once we have those in wined3d it will end up in the device (although I think it's more likely to become part of some interface on top of wined3d_cs), but right now the "device" parameter isn't even used. I think that for the time being the interface we want is just HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index fd7bbc8..fb296b1 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2156,6 +2156,8 @@ struct wined3d_resource_ops > ULONG (*resource_incref)(struct wined3d_resource *resource); > ULONG (*resource_decref)(struct wined3d_resource *resource); > void (*resource_unload)(struct wined3d_resource *resource); > + HRESULT (*resource_map)(struct wined3d_resource *resource, struct wined3d_map_desc *map_desc, > + const struct wined3d_box *box, DWORD flags); > }; > Here we'll probably want something like HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); That implies having different resource ops for 2D and 3D textures, but that's easy. It also implies returning an error when this is called on a surface or volume. I'm not sure how easy it would be at this point, but we'll probably just want resource ops on sub-resources to print an ERR(). E.g. ideally we'd never call resource_unload() on a surface, but only ever on a texture. But that then means not adding sub-resources to the device's resource list, etc.

2 1

Re: [PATCH 04/10] ucrtbase: Handle the swprintf style termination and return values
by Piotr Caban 02 Nov '15

02 Nov '15

Hi, On 11/02/15 11:08, Martin Storsjo wrote: > @@ -724,12 +724,13 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS > struct _str_ctx_a ctx = {len, str}; > int ret; > > - if (options != UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION && > - options != UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) > + if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) > FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); > - ret = pf_printf_a(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_a : puts_clbk_str_a, > + ret = pf_printf_a(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION ? puts_clbk_str_a : puts_clbk_str_c99_a, > &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); > puts_clbk_str_a(&ctx, 1, &nullbyte); > + if ((options & UCRTBASE_PRINTF_TERMINATION_MASK) == 0 && ret >= len) > + ret = -2; > return ret; > } This code looks like you're trying to make the things other way around. Shouldn't UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR flag impact the callback being used? On the other hand UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION flag should probably only affect terminating NULL related behavior. Maybe following code makes more sense: ret = pf_printf_a(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_a : puts_clbk_str_a, &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); if(puts_clbk_str_a(&ctx, 1, &nullbyte)==-1 && !(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION)) { if(len) str[len-1] = 0; return -2; } return ret; What do you think about it? Thanks, Piotr

3 5

Re: [3/7] widl: Ignore assignment of a duplicate uuid. Resend.
by Huw Davies 02 Nov '15

02 Nov '15

On Sat, Oct 31, 2015 at 02:31:38PM +0800, Dmitry Timoshkov wrote: > diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c > index daa0366..dc8b124 100644 > --- a/tools/widl/write_msft.c > +++ b/tools/widl/write_msft.c > @@ -494,10 +494,22 @@ static int ctl2_alloc_guid( > MSFT_GuidEntry *guid_space; > int hash_key; > > + chat("adding uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", > + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, > + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], > + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); > + > hash_key = ctl2_hash_guid(&guid->guid); > > offset = ctl2_find_guid(typelib, hash_key, &guid->guid); > - if (offset != -1) return offset; > + if (offset != -1) > + { > + warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", > + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, > + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], > + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); > + return -1; > + } > > offset = ctl2_alloc_segment(typelib, MSFT_SEG_GUID, sizeof(MSFT_GuidEntry), 0); This still has problems. For example see the idl below. Also note that this is the cause of the warnings in httpresquest.idl . Huw. import "objidl.idl"; [uuid(12345678-0000-0000-0000-000000000000)] library foo { typedef [uuid(12345678-9ab0-0000-0000-000000000000)] struct f {int x;} f; [uuid(12345678-9abc-0000-0000-000000000000)] interface IMy : IUnknown { HRESULT foo([in]f *ptr); } }

2 1

Re: [PATCH 1/7] wined3d: Introduce wined3d_device_map_sub_resource().
by Stefan Dösinger 02 Nov '15

02 Nov '15

> Am 02.11.2015 um 04:17 schrieb Józef Kucia <jkucia(a)codeweavers.com>: > > +HRESULT CDECL wined3d_device_map_sub_resource(struct wined3d_device *device, > + struct wined3d_resource *resource, unsigned int sub_resource_idx, > + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) > +{ > + struct wined3d_resource *sub_resource; > + > + TRACE("device %p, resource %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n", > + device, resource, sub_resource_idx, map_desc, box, flags); > + > + if (!(sub_resource = sub_resource_from_resource(resource, sub_resource_idx))) > + { > + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); > + return E_INVALIDARG; > + } > + > + return sub_resource->resource_ops->resource_map(sub_resource, map_desc, box, flags); I don't like the idea of calling the sub resource here. I think this should forward to wined3d_texture_map for textures for now and pass the sub resource index to the resource_map callback. In the long run we obviously want wined3d_texture_map and wined3d_buffer_map to be merged together, but for now (surface,volume)->(texture) is tricky enough. I have some patches in the works for that.

1 0

Re: [PATCH 2/6] wined3d: Keep track of FBOs through the GL names (v2).
by Henri Verbeet 02 Nov '15

02 Nov '15

On 28 October 2015 at 15:29, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Version 2: Don't use fbo_entry->d3d_* for logging, plan for it to go > away. The disadvantage is now that we don't know the d3d properties once > we find out that an FBO doesn't work and need a full TRACE log for this > information, but I think that's something we can live with. > > If there is a prettier way to find the texture target of a GL texture > name please advise. I couldn't find any. > I think I'll hold off on this until the regression from 1ca9dfc8ee25f4ae188fdacd4d3d56046cef8003 is resolved, but you can probably split the logging changes into their own patch. > + char name[32]; > + sprintf(name, "Color attachment %u", i); > + context_dump_fbo_attachment(gl_info, target, GL_COLOR_ATTACHMENT0 + i, name); sprintf() is one of those things that's usually best avoided. In this case the string is mostly redundant as well, since you have the attachment enum. > +static inline void context_create_fbo_key(struct wined3d_fbo_entry_key *key, > + struct wined3d_surface **render_targets, struct wined3d_surface *depth_stencil, > + DWORD color_location, DWORD ds_location, UINT color_buffers) The naming is a bit odd. "create" is usually for things that allocate something, "color_buffers" would normally be called e.g. "rt_count". The "inline" seems speculative. I think modern compilers mostly ignore it, but it does make it harder to notice when a function becomes unused. > - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); > - entry->render_targets = HeapAlloc(GetProcessHeap(), 0, gl_info->limits.buffers * sizeof(*entry->render_targets)); > - memcpy(entry->render_targets, render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); > - entry->depth_stencil = depth_stencil; > - entry->color_location = color_location; > - entry->ds_location = ds_location; > + UINT object_count = gl_info->limits.buffers + 1; > + > + entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + FIELD_OFFSET(struct fbo_entry, key.objects[object_count])); > + entry->d3d_render_targets = HeapAlloc(GetProcessHeap(), 0, > + gl_info->limits.buffers * sizeof(*entry->d3d_render_targets)); > + context_create_fbo_key(&entry->key, render_targets, depth_stencil, color_location, ds_location, > + gl_info->limits.buffers); > + memcpy(entry->d3d_render_targets, render_targets, sizeof(*entry->d3d_render_targets) * gl_info->limits.buffers); > + entry->d3d_depth_stencil = depth_stencil; Why HEAP_ZERO_MEMORY? Do we no longer initialize all fields? > + { > + struct wined3d_fbo_resource resource = {0}; > + context_attach_depth_stencil_fbo(context, target, &resource, FALSE, 0, 0); "resource" should probably be static const. > - if (surface == entry->render_targets[i]) > + if (surface->container->texture_rgb.name == entry->key.objects[i].object || > + surface->container->texture_srgb.name == entry->key.objects[i].object) This is different from the usual style.

2 2

Re: [PATCH 02/4 resend] msvcp110: Add tr2_sys__Read_dir implementation.(try 2)
by Piotr Caban 02 Nov '15

02 Nov '15

On 10/31/15 10:29, YongHao Hu wrote: > + TRACE("(%s %p %p)\n", debugstr_a(target), handle, type); Please print the target argument correctly in trace message. Thanks, Piotr

1 0

Re: [v3] d3d9: call wined3d_device_copy_sub_resource_region instead of wined3d_device_update_surface in d3d9_device_UpdateSu
by Marvin 02 Nov '15

02 Nov '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=17891 Your paranoid android. === build (build) === Patch failed to apply

1 0

loader manpages get installed in wrong build step
by Sebastian Lackner 02 Nov '15

02 Nov '15

Hiho, I've noticed another side effect introduced by http://source.winehq.org/git/wine.git/commit/da340169d6518cf42f1cbe169fbf12…, and I'm not sure if its intentional, or if its a bug. For WOW64 builds all manpages were installed in the 64-bit build step before. After the commit, some manpages (those in loader/) also get installed in the 32-bit build step. Here are some logs for comparison: - before: http://repos.wine-staging.com/all/20151021-0141-arch-x64/build.log - after: http://repos.wine-staging.com/all/20151101-0726-arch-x64/build.log (search for "wine.1" for example) When both builds end in the same package (like on Archlinux) this doesn't matter, however there are plenty of distributions which ship the 32-bit and 64-bit parts in different packages. Having a few manpages in one and the rest in the other is at least a bit unusual, but could also lead to package conflicts. Should this be considered a bug, or is it up to package maintainers to workaround this issue? And what would be the preferred solution to fix this? I don't really want to reintroduce install-man-pages just after it was removed... Best regards, Sebastian

3 3

Microsoft shared PDB fileformat
by Marcus Meissner 02 Nov '15

02 Nov '15

Hi, just in from the hell-freezes-over department: https://github.com/Microsoft/microsoft-pdb Ciao, Marcus

3 2

Fwd: steam web browsing on OS X
by Theodore Dubois 02 Nov '15

02 Nov '15

How exactly does Chromium replace the system calls with its own versions? Not quite sure how that works. ~Theodore On Nov 01, 2015, at 07:18 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: On 02.11.2015 04:09, Theodore Dubois wrote: Darn! Forgot to cc the list. Can someone explain exactly why absolute addresses are needed here? I'm new to wine, but eager to learn. The main reasons are: - The code still has to work after Chromium has moved it to a different memory location. A relative jump would not be suitable for that. Also, in our proof of concept patch, we want to avoid huge syscall tables, and instead pass a pointer in %eax. - DRM applications might complain when a function entry point looks too unusual. - In "non-relaxed" mode Chromium refuses to accept the entry point, if it doesn't match exactly the function signature on Windows. I don't think this is used for Steam yet, but its just a matter of time. Regards, Sebastian

1 0

Fwd: steam web browsing on OS X
by Theodore Dubois 02 Nov '15

02 Nov '15

Darn! Forgot to cc the list. Can someone explain exactly why absolute addresses are needed here? I'm new to wine, but eager to learn. ~Theodore On Nov 01, 2015, at 04:29 PM, Jacek Caban <jacek(a)codeweavers.com> wrote: Hi Sebastian, On 10/30/15 5:57 PM, Sebastian Lackner wrote: On 30.10.2015 17:42, Theodore Dubois wrote: Wine Staging includes some patches to fix Steam web browsing, but they are deactivated on Mac because they apparently require special build flags. Does anyone know what this refers to? ~Theodore The staged patchset adds thunk wrappers for ntdll functions, but to be compatible with Windows, they have to contain absolute addresses. This requires text relocations, which are not allowed by default on OSX. Since this issue was discovered shortly before the last release, disabling the patchset on OSX was easier than the necessary configure.ac changes, but I'm working on a solution. Unless we hit some impossible to solve problems Wine Staging 1.7.54 will make the Steam fix also available on OSX. ;) I took a look at this problem and the patchset and I think we should be able to avoid text relocation in this case. I should have a proof of concept patch soon. Thanks, Jacek

2 1

Re: [4/4] dlls/ole32: Add more traces to the storage methods.
by Vincent Povirk 01 Nov '15

01 Nov '15

Whoops, accidentally dropped wine-devel from my reply. On Sun, Nov 1, 2015 at 6:49 AM, Vincent Povirk <madewokherd(a)gmail.com> wrote: > There's no test that calls these directly because they are internal methods. > I could have used any code to signal that the operation does not make sense > for this object. > > We should have tests that open and commit to a non-toplevel storage object, > which would call them. Sorry, that wasn't quite right. It's not enough to commit to a non-toplevel storage object. What you'd have to do is nest transacted storages and commit to the inner one.

1 0

Re: [4/4] dlls/ole32: Add more traces to the storage methods.
by Vincent Povirk 01 Nov '15

01 Nov '15

On Thu, Oct 29, 2015 at 2:41 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > > static HRESULT TransactedSnapshotImpl_GetTransactionSig(StorageBaseImpl *base, > ULONG* result, BOOL refresh) > { > + FIXME("stub\n"); > return E_NOTIMPL; > } This is intentional. We don't need transaction signatures because nothing else can have our snapshot open to commit to it. Anything calling these methods should expect and handle E_NOTIMPL.

2 3

Re: [2/4] dlls/ole32: Zero out returned stats when IEnumSTATSTG::Next reaches end of enumeration.
by Vincent Povirk 01 Nov '15

01 Nov '15

Are you sure we shouldn't be zeroing the entire remaining buffer? And maybe we should put it after the loop, given there are multiple exits.

2 1

Re: [PATCH 4/4] winex11: Make color cubes as big as possible.
by Vincent Povirk 31 Oct '15

31 Oct '15

Sorry, I don't think I'm qualified to review this. There's too much context here that I don't understand.

1 0

Re: [PATCH 01/4] msvcp110: Add tr2_sys__Open_dir implementation.(try 4)
by Piotr Caban 31 Oct '15

31 Oct '15

On 10/29/15 16:28, YongHao Hu wrote: > + char temppath[MAX_PATH+1]; > + TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); > + if(strlen(dest) >= MAX_PATH) { > + *err_code = ERROR_BAD_PATHNAME; > + return NULL; > + } > + strcpy(temppath, dest); > + strcat(temppath, "\\*"); There may still write outside of temppath array in this code. Thanks, Piotr

2 1

Re: [7/7] oleaut32/tests: Add a bunch of new tests for typelib generation.
by Marvin 31 Oct '15

31 Oct '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=17862 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === w2003std (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === wvistau64 (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === w2008s64 (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === w7u (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === w7pro64 (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === w8 (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === w864 (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === w1064 (32 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 20 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 16 typelib: unhandled exception c0000005 at 00420ACA === wvistau64 (64 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4589: Test failed: typeattr->cbSizeInstance expected 4 got 8 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 40 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 32 typelib: unhandled exception c0000005 at 000000000041E933 === w2008s64 (64 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4589: Test failed: typeattr->cbSizeInstance expected 4 got 8 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 40 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 32 typelib: unhandled exception c0000005 at 000000000041E933 === w7pro64 (64 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4589: Test failed: typeattr->cbSizeInstance expected 4 got 8 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 40 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 32 typelib: unhandled exception c0000005 at 000000000041E933 === w864 (64 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4589: Test failed: typeattr->cbSizeInstance expected 4 got 8 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 40 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 32 typelib: unhandled exception c0000005 at 000000000041E933 === w1064 (64 bit typelib) === typelib.c:4570: Test failed: bstrIfName expected "_n" got "child_iface" typelib.c:4574: Test failed: typeattr->typekind expected 1 got 3 typelib.c:4589: Test failed: typeattr->cbSizeInstance expected 4 got 8 typelib.c:4591: Test failed: help_ctx expected 3 got 0 typelib.c:4592: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4593: Test failed: typeattr->cbSizeVft expected 0 got 40 typelib.c:4594: Test failed: typeattr->cFuncs expected 0 got 1 typelib.c:4606: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aa002} typelib.c:4625: Test failed: desc->memid expected 0 got 1610743808 typelib.c:4626: Test failed: desc->funckind expected 0 got 1 typelib.c:4627: Test failed: desc->invkind expected 0 got 1 typelib.c:4628: Test failed: desc->callconv expected 0 got 4 typelib.c:4631: Test failed: desc->oVft got 32 typelib: unhandled exception c0000005 at 000000000041E933

1 0

Release plans
by Alexandre Julliard 31 Oct '15

31 Oct '15

Folks, We've decided at WineConf that there would be a code freeze and release every year in the fall. That means about right now... However, there are a few things I'd like to get in first (*cough* Pulse driver), so my thinking is to do one more development release cycle, and start code freeze after 1.7.55. This should enable us to release 1.8 before the end of the year. So if there are new features you'd like to get into 1.8, you have another two weeks... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: Silently ignore temporary foreground loss (v2).
by Marvin 30 Oct '15

30 Oct '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=17854 Your paranoid android. === w1064 (32 bit win) === win.c:6708: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6730: Test failed: 0x80/0x1010000: window rect 0,0-1024,768 win.c:6708: Test failed: 0x80/0x81c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6708: Test failed: 0/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6708: Test failed: 0x40000/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6708: Test failed: 0x80/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6708: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6730: Test failed: 0x80/0x1050000: window rect 0,0-1024,768 win.c:6708: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6730: Test failed: 0x80/0x1410000: window rect 0,0-1024,768 === w1064 (64 bit win) === win.c:6708: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6730: Test failed: 0x80/0x1050000: window rect 0,0-1024,768

1 0

Re: [PATCH 2/3] msvcp120: implement _Thrd_current
by Piotr Caban 30 Oct '15

30 Oct '15

On 10/29/15 15:50, Daniel Lehman wrote: > +_Thrd_t __cdecl _Thrd_current(void) The __cdecl calling convention is not compatible in this case. You will need to do something similar as is done in _Getcoll implementation. Unless I'm missing something, quick look on _Getcoll shows that it's broken when _MSVCP_VER>=110 and 64-bit wine is compiled. I'll take a look on it. Thanks, Piotr

1 1

Re: [1/2] ole32: Accept TYMED_FILE as a possible source of CF_METAFILEPICT format.
by Huw Davies 30 Oct '15

30 Oct '15

B1;2cOn Fri, Oct 23, 2015 at 06:32:17PM +0800, Dmitry Timoshkov wrote: > diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c > index caabd10..3db0edf 100644 > --- a/dlls/ole32/datacache.c > +++ b/dlls/ole32/datacache.c > @@ -285,7 +285,7 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR > static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) > { > if (!cfFormat || !tymed || > - (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || > + (cfFormat == CF_METAFILEPICT && (tymed == TYMED_MFPICT || tymed == TYMED_FILE)) || > (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || > (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || > (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) This should be easy enough to test. Create a stand-alone data cache ( using CreateDataCache() ), then call IOleCache_Cache with the relevant fmtetc. Huw.

2 2

Re: [PATCH 1/3] msvcp120: implement _Thrd_sleep/yield (try 2)
by Piotr Caban 30 Oct '15

30 Oct '15

On 10/29/15 23:04, Daniel Lehman wrote: > + ok((diff > 2000 - TIMEDELTA) && (diff < 2000 + TIMEDELTA), "got %d", diff); This test is occasionally failing on my Windows 7 box (is most cases diff ~= 2165, biggest value I've seen is diff = 2771). I think that it should be enough to just test diff>2000-TIMEDELTA. New line character is also missing here. Thanks, Piotr

1 0

Re: wldap32: Remove superfluous const in ldap_init declarations.
by Hans Leidekker 30 Oct '15

30 Oct '15

On Sun, 2015-10-18 at 11:08 +0200, Thomas Faber wrote: > diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h > index a19ceb1..8596d1d 100644 > --- a/dlls/wldap32/winldap_private.h > +++ b/dlls/wldap32/winldap_private.h > @@ -361,8 +361,8 @@ PCHAR * CDECL ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); > PWCHAR * CDECL ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); > PBERVAL * CDECL ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR); > PBERVAL * CDECL ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR); > -WLDAP32_LDAP * CDECL ldap_initA(const PCHAR,ULONG); > -WLDAP32_LDAP * CDECL ldap_initW(const PWCHAR,ULONG); > +WLDAP32_LDAP * CDECL ldap_initA(PCHAR,ULONG); > +WLDAP32_LDAP * CDECL ldap_initW(PWCHAR,ULONG); You should make the implementation match the prototype instead.

3 4

Re: d3d8types.h: Convert the D3DVSD_...SHIFT constants to unsigned.
by Gerald Pfeifer 30 Oct '15

30 Oct '15

On Sat, 24 Oct 2015, Gerald Pfeifer wrote: > This avoids potential shift overflows. I only should be necessary > for D3DVSD_TOKENTYPESHIFT, but it makes sense to have this consistent. Correction, this per se does not avoid shift overflows, I sent an older patch. It still may make sense to apply (please advise), but we'd need a different change in addition. I'll have a look. Gerald

2 2

Re: [PATCH] xmllite/tests: Fix memory leak (valgrind)
by Nikolay Sivov 30 Oct '15

30 Oct '15

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0

Re: [PATCH] msctf/tests: Fix memory leaks (valgrind)
by Marvin 30 Oct '15

30 Oct '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=17842 Your paranoid android. === w1064 (32 bit inputprocessor) === inputprocessor.c:791: Test failed: Deactivation came unexpectedly

1 0

Re: [PATCH 1/3] msctf: Add ITfThreadMgrEx stub.
by Alistair Leslie-Hughes 29 Oct '15

29 Oct '15

Hi Matteo, On 29/10/15 08:27, Matteo Bruni wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > This avoids a crash on exit with World of Warships when the OS version > is set to Windows 7. > > dlls/msctf/threadmgr.c | 145 ++++++++++++++++++++++++++++--------------------- > include/msctf.idl | 14 +++++ > 2 files changed, 96 insertions(+), 63 deletions(-) Can you please provide tests? Best Regards Alistair Leslie-Hughes

2 1

Re: [PATCH 2/5] winepulse: Add format and period probing
by Andrew Eikum 29 Oct '15

29 Oct '15

On Tue, Oct 20, 2015 at 12:15:22PM +0900, Alexandre Julliard wrote: > Andrew Eikum <aeikum(a)codeweavers.com> writes: > > > Hm, it works here whether PA is running or not. What's your setup? PA > > is obviously installed. Is it running? What version do you have > > installed? Can you give me a +devenum,+mmdevapi,+pulse,+alsa,+tid,+seh > > log? > > Version 7.0, it's running AFAICT. Log is attached. Note that this is > with only the first patch applied, it also crashes (but not always which > is why I missed it at first). Other sound tests crash as well. > This was seen in my patchset, and not in wine-staging, because we unload the pulse driver after it returns Low priority which is lower than winealsa's Preferred priority. Winepulse misbehaved when it was unloaded. In wine-staging, the Pulse driver is always Preferred and so would never be unloaded. I believe the crash happened because the DLL would be unloaded while the PA mainloop thread was still running. DllMain does call pa_mainloop_quit, but doesn't wait for the thread to actually exit. The mainloop thread would occasionally trigger a callback after the module has been unloaded, before acknowledging the quit status. This is why you didn't always see the crash. This has been remedied in the latest patchset. We now wait for the thread to quit in DllMain, see patch 3/5. Andrew

1 0

Re: [PATCH 3/3] msvcp120: implement _Thrd_create/join
by Piotr Caban 29 Oct '15

29 Oct '15

On 10/29/15 15:50, Daniel Lehman wrote: > +int __cdecl _Thrd_join(_Thrd_t thr, int *unk) > +{ > + DWORD ret; > + > + TRACE("(%p %u %p)\n", thr.hnd, thr.id, unk); > + ret = WaitForSingleObject(thr.hnd, INFINITE); > + if (unk) > + GetExitCodeThread(thr.hnd, (DWORD *)unk); Please rename the unk parameter. You already know that it's a thread exit code. You should probably also exit earlier if WaitForSingleObject fails. It doesn't really make sense call GetExitCodeThread in this case. Probably there's also no need to close the handle if WaitForSingleObject fails. Thanks, Piotr

1 0

Re: [PATCH 04/4] msvcp120/tests: Add tests of tr2_sys__Open_dir, tr2_sys__Read_dir and tr2_sys__Close_dir.(try4)
by Marvin 29 Oct '15

29 Oct '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=17823 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/3] msvcp120: implement _Thrd_create/join
by Marvin 29 Oct '15

29 Oct '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=17817 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/3] msvcp120: implement _Thrd_current
by Marvin 29 Oct '15

29 Oct '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=17816 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/3] msvcp120: implement _Thrd_sleep/yield
by Marvin 29 Oct '15

29 Oct '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=17815 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/3] wined3d: Cleanup extension check for shader model 4 support.
by Henri Verbeet 29 Oct '15

29 Oct '15

On 28 October 2015 at 22:27, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > - if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING] > - && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) > - && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED] > - && gl_info->supported[ARB_TEXTURE_RG] && gl_info->supported[ARB_SAMPLER_OBJECTS]) > + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[ARB_SHADER_BIT_ENCODING] > + && gl_info->supported[ARB_SAMPLER_OBJECTS]) Dropping EXT_gpu_shader4 is fine. Does GLSL 1.50 imply all the other extensions you're dropping here? They're not strictly required for compiling SM4 shaders, but they are for d3d10+ features like e.g. geometry shaders and instanced draws.

2 1

Re: [PATCH 6/6] kernel32/tests: Add tests for GetConsoleFontSize (v2, resend)
by Marvin 29 Oct '15

29 Oct '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=17811 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH 1/6] wineconsole: Add if check to determine whether a font attribute has changed (v2)
by Dmitry Timoshkov 29 Oct '15

29 Oct '15

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > + if (strcmpW(data->curcfg.face_name, cfg->face_name) || data->curcfg.cell_width != cfg->cell_width || > + data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) > { > data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); > } Font names should be tested using a case insensitive check. -- Dmitry.

2 2

Re: [PATCH 6/6] kernel32/tests: Add tests for GetConsoleFontSize (v2, resend)
by Marvin 29 Oct '15

29 Oct '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=17809 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [PATCH] ucrtbase: Implement vsscanf
by Piotr Caban 29 Oct '15

29 Oct '15

On 10/28/15 09:54, Martin Storsjo wrote: > +/********************************************************************* > + * _snscanf_s_l (MSVCRT.@) > + */ > +int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, const char *input, MSVCRT_size_t length, const char *format, MSVCRT__locale_t locale, __ms_va_list valist) > +{ > + return MSVCRT_vsnscanf_l(input, length, format, locale, valist); > +} Shouldn't this function also print some message about ignored options argument? Thanks, Piotr

2 3

Re: [PATCH] shell32: Stop memory leak (valgrind)
by Nikolay Sivov 29 Oct '15

29 Oct '15

On 29.10.2015 12:21, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/shell32/shellitem.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c > index f64c2d0..799c6c0 100644 > --- a/dlls/shell32/shellitem.c > +++ b/dlls/shell32/shellitem.c > @@ -1198,7 +1198,10 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, > { > ret = create_shellitemarray(array, cidl, ppsiItemArray); > if(SUCCEEDED(ret)) > + { > + HeapFree(GetProcessHeap(), 0, array); > return ret; > + } > } > > /* Something failed, clean up. */ > There is another place with same problem, I just sent a complete fix.

1 0

Re: [PATCH 1/6] wineconsole: Add if check to determine whether a font attribute has changed
by Sebastian Lackner 29 Oct '15

29 Oct '15

On 28.10.2015 09:40, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/wineconsole/wineconsole.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c > index e1ee55b..c8e68c1 100644 > --- a/programs/wineconsole/wineconsole.c > +++ b/programs/wineconsole/wineconsole.c > @@ -421,7 +421,8 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf > } > data->curcfg.menu_mask = cfg->menu_mask; > data->curcfg.quick_edit = cfg->quick_edit; > - if (1 /* FIXME: font info has changed */) > + if (data->curcfg.face_name != cfg->face_name || data->curcfg.cell_width != cfg->cell_width || > + data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) > { > data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); > } > It doesn't make sense to compare face_name pointer, this condition will always be true.

2 1

Re: [3/4] gdiplus: Use helper function for HeapReAlloc calls.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -420,12 +420,10 @@ BOOL lengthen_path(GpPath *path, INT len) > while(path->datalen - path->pathdata.Count < len) > path->datalen *= 2; > > - path->pathdata.Points = HeapReAlloc(GetProcessHeap(), 0, > - path->pathdata.Points, path->datalen * sizeof(PointF)); > + path->pathdata.Points = heap_realloc(path->pathdata.Points, path->datalen * sizeof(PointF)); > if(!path->pathdata.Points) return FALSE; > > - path->pathdata.Types = HeapReAlloc(GetProcessHeap(), 0, > - path->pathdata.Types, path->datalen); > + path->pathdata.Types = heap_realloc(path->pathdata.Types, path->datalen); > if(!path->pathdata.Types) return FALSE; > } It's not directly related to your change, but as a follow-up patch, it would be nice to fix this to correctly handle allocation failures. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/2] wined3d: make wined3d_device_copy_sub_resource_region return an error code
by Stefan Dösinger 28 Oct '15

28 Oct '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-10-28 um 15:31 schrieb Riccardo Bortolato: > - if (src_resource->type != dst_resource->type) > - { > - WARN("Resource types (%s / %s) don't match.\n", > - debug_d3dresourcetype(dst_resource->type), > - debug_d3dresourcetype(src_resource->type)); > - return; > + return WINED3DERR_INVALIDCALL; > } This seems like something that should be its own patch. Did you check if a 2D texture -> cube texture copy works, both on Windows (are we required to support it) and in the current implementation? > - if (dst_resource->type != WINED3D_RTYPE_TEXTURE) > + if (dst_resource->type == WINED3D_RTYPE_VOLUME_TEXTURE > + || src_resource->type == WINED3D_RTYPE_VOLUME_TEXTURE) > { I guess your intention is to avoid having a type == TEXTURE || type == CUBE_TEXTURE kind of construct, but technically you'd also have to check for WINED3D_RTYPE_BUFFER. I'd prefer whitelisting known good resource types. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWMOWUAAoJEN0/YqbEcdMwwIsP/3MU73JRdCfxlLTwi7XANeoB w43lxvtcF1N/ZqCsTaGcXB0cln121cDeg5mlSeT4AQMIgc0glOTIKDRRKQ4RMpeE YtXtc9uWp+2oqJ1oXJchCnYEfbdAlNUqqWrgOO1o/4YmknHTjLI4lR5Xore/YFlG pVT9pzrQzK/FFNkJV7mJaW1Vya2jtHxzGt1v/PiDYPjOUo6hODj7L1razouvf5wS xrZAU3SfnlrRZ+SyEWnSQehniN6CH0Nn1Gp7YsThIvSS8KH5kuAtfTY0UGtda/DU 8cb2jJZ3EevrQFIr+kC7Y0EDvMSdjf2dYo1eOc10AYjeF+4cYOTbo+v+n/wkPdy+ 2leDdfggxl8ynb1NzvqoBuZArhyj2lvEG3LBloNOWczAwR1dc/RXpUO84zpLPVLS H9KGyFx5atJUJHvqA8AexRTPAHJ6I8hI8mXEatQwbfGNLd6Erq/tfcKJzAB9SQeE XTE9GkGMP+D8bAp88AwTPDznVva3KxLpHlEK4KS6XPJZRw5JxvaxOz1zLilXNwLu GdCwauQlYTtxg+fJFKWw85udF/tvXw6nF+MkK4xrs37D08kf98GPXnFln1NPCLvd aPQutjmZlLehLcbk3GmFFEuRy2D8vt48nfCltfMIXe03sql+GiNK8SqnQ151+as2 u1oVePmmJt89kdM+hQk/ =gsHT -----END PGP SIGNATURE-----

2 1

Re: msasn1: implement ASN1_CreateModule
by Nikolay Sivov 28 Oct '15

28 Oct '15

On 27.10.2015 23:10, Austin English wrote: > This is based on code from the FreeRDP project, used with permission > of the author, Marc-André Moreau <marcandre.moreau(a)gmail.com> Do you plan to reuse more from there? Is it clean license-wise? And more importantly, how did FreeRDP project came up with that implementation? > > For https://bugs.winehq.org/show_bug.cgi?id=38020 > > + > +ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t version, ASN1encodingrule_e rule, ASN1uint32_t flags, ASN1uint32_t pdu, const ASN1GenericFun_t encoder[], const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freememory[], const ASN1uint32_t size[], ASN1magic_t modulename) arg[] notation seems redundant, *arg is cleaner and more common for Wine. > + ASN1module_t module = NULL; No need to init this. > + if (!((encoder) && (decoder) && (freememory) && (size))) > + return NULL; ... > + module = (ASN1module_t) malloc(sizeof(struct tagASN1module_t)); > + ZeroMemory(module, sizeof(struct tagASN1module_t)); Heap* API please. And you don't need to zero-init it, or use tag* names. All structures seem to be documented well, what's a reason to reuse simple parts like such structure allocations? Can this be tested by directly calling ASN1_* functions? If yes, simple test would be nice to have.

3 2

Re: [v3 signed 1/6] d3d9: improved d3d9_device_UpdateSurface
by Henri Verbeet 28 Oct '15

28 Oct '15

On 22 October 2015 at 12:01, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > enabled previously failing test in device.c > removed wined3d_device_update_surface from wined3d and replaced its usage with surface_upload_from_surface. > This was mentioned in the discussion in the other thread, but just for the record, the options are either wined3d_device_update_sub_resource() or wined3d_device_copy_sub_resource_region().

2 5

Re: mshtml: Fixed more test failures on win10.
by Marvin 28 Oct '15

28 Oct '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=17770 Your paranoid android. === w1064 (32 bit htmldoc) === htmldoc.c:3569: Test failed: unexpected call IsErrorUrl

1 0

Re: [PATCH] vbscript/tests: Show IActiveScriptSite OnScriptError is called on error
by Jacek Caban 28 Oct '15

28 Oct '15

Hi Alistair, On 10/26/15 09:56, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/vbscript/tests/run.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 46 insertions(+), 1 deletion(-) > > diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c > index a86711a..e625136 100644 > --- a/dlls/vbscript/tests/run.c > +++ b/dlls/vbscript/tests/run.c > @@ -100,6 +100,7 @@ DEFINE_EXPECT(Next); > DEFINE_EXPECT(GetWindow); > DEFINE_EXPECT(GetUIBehavior); > DEFINE_EXPECT(EnableModeless); > +DEFINE_EXPECT(on_script_error); Please use OnScriptError for consistency. > #define DISPID_GLOBAL_REPORTSUCCESS 1000 > #define DISPID_GLOBAL_TRACE 1001 > @@ -138,6 +139,7 @@ static const char *test_name = "(null)"; > static int test_counter; > static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; > static IDispatchEx testObj; > +static BOOL overwrite_return = FALSE; How about using HRESULT here... > static BSTR a2bstr(const char *str) > { > @@ -1623,7 +1625,22 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S > > static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) > { > - return E_NOTIMPL; > + HRESULT hr; > + EXCEPINFO ei = {0}; > + > + CHECK_EXPECT(on_script_error); > + > + hr = IActiveScriptError_GetExceptionInfo(pscripterror, &ei); > + ok(hr == S_OK, "GetExceptionInfo %x\n", hr); > + > + if(overwrite_return) > + { > + overwrite_return = FALSE; > + return S_OK; > + } > + > + /* We return the EXCEPINFO error since returning S_OK means we have handled the error */ > + return ei.scode; ... and return it here for simplicity? Thanks, Jacek

2 3

Re: [PATCH 3/3] rpcrt4: Added RpcMgmtIsServerListening tests.
by Marvin 28 Oct '15

28 Oct '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=17748 Your paranoid android. === w8 (32 bit server) === server.c:984: Test failed: get_ranged_enum() returned 1997799427 instead of RE3 === w864 (32 bit server) === server.c:984: Test failed: get_ranged_enum() returned 2009071619 instead of RE3 server.c:984: Test failed: get_ranged_enum() returned 2009071619 instead of RE3 server.c:984: Test failed: get_ranged_enum() returned 2009071619 instead of RE3 === w864 (64 bit server) === server.c:984: Test failed: get_ranged_enum() returned 184549379 instead of RE3 === w1064 (64 bit server) === server.c:984: Test failed: get_ranged_enum() returned 2883587 instead of RE3 server.c:984: Test failed: get_ranged_enum() returned 5767171 instead of RE3

2 1

Re: [PATCH] comctl32/listview: Fix printf format (PVS-Studio)
by Alexandre Julliard 28 Oct '15

28 Oct '15

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -587,7 +587,7 @@ static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo) > int len, size = DEBUG_BUFFER_SIZE; > > if (pScrollInfo == NULL) return "(null)"; > - len = snprintf(buf, size, "{cbSize=%d, ", pScrollInfo->cbSize); > + len = snprintf(buf, size, "{cbSize=%u, ", pScrollInfo->cbSize); That doesn't seem very necessary. I don't mind a few fixes like that, but I'm concerned that there would be a million of them. How many do you expect? -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: dhcpcsvc: add a stub for DhcpRequestParams (try 3)
by Matteo Bruni 28 Oct '15

28 Oct '15

2015-10-27 17:28 GMT+01:00 Austin English <austinenglish(a)gmail.com>: +typedef struct _DHCPAPI_PARAMS_ARRAY That is typoed as "ARARAY" in the header from MS (the one from the 8.1 SDK at least), so this probably needs the same treatment. The "Params" field has additional stuff for the midl case, not sure we care about that though.

1 0

Re: kernel32/tests: Simplify an ok() condition (PVS-Studio)
by Marvin 28 Oct '15

28 Oct '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=17766 Your paranoid android. === wxppro (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 00000770 comm.c:1520: Changing CommMask on the fly for handle 00000770 after timeout 500 === w2003std (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 00000760 comm.c:1520: Changing CommMask on the fly for handle 00000760 after timeout 500 === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1520: Changing CommMask on the fly for handle 000000BC after timeout 500 === w7pro64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1514 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1514 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 00000128 comm.c:1520: Changing CommMask on the fly for handle 00000128 after timeout 500 === wvistau64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1514 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1514 ms for waiting === w7pro64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1514 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1514 ms for waiting

2 1

Re: rsaenh/tests: Mark an old behavior as broken (PVS-Studio)
by Marvin 28 Oct '15

28 Oct '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=17767 Your paranoid android. === w1064 (32 bit rsaenh) === rsaenh.c:2804: Test failed: 80090020

2 1

Re: [PATCH 6/6] kernel32/tests: Add tests for GetConsoleFontSize (v2)
by Marvin 28 Oct '15

28 Oct '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=17765 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244 === w864 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2686924 console.c:1689: Test failed: [13] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [15] Expected output count to be 0, got 2686924 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2686924 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [15] Expected output count to be 0, got 2752460 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2752460 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: quartz: Add stub IAMStreamSelect to MPEG-1 Stream Splitter. (try 3)
by Nikolay Sivov 28 Oct '15

28 Oct '15

On 22.10.2015 19:54, Anton Baskanov wrote: > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > > Fixes crash on in-game video playback in Earth 2150. > > try3: > - better function parameter names > - replaced 'LPVOID' with 'void *' > - renamed StreamSelect_* functions to AMStreamSelect_* > - renamed StreamSelect_Vtbl to AMStreamSelectVtbl > - replaced 'if' with 'else if' in the QueryInterface function > --- > dlls/quartz/mpegsplit.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++- > include/axcore.idl | 39 +++++++++++++++++++ > 2 files changed, 137 insertions(+), 1 deletion(-) > This looks fine to me. I don't know why it's stuck in a queue, maybe it makes sense to add a simple test that only checks if IAMStreamSelect is supported for this filter?

1 0

Re: [RFC PATCH v2] vcruntime140: Add the new MSVC 2015 compiler specific DLL.
by Martin Storsjö 28 Oct '15

28 Oct '15

On Tue, 20 Oct 2015, Martin Storsjo wrote: > Since MSVC 2015/Windows 10, the C runtime has now been split into two > parts, ucrtbase, which is the generic C runtime which is now considered > a system component, and vcruntimeX which is specific to the compiler > version. > > This DLL is built using only a small subset of the msvcrt source > files. In particular, the DLL should not use most of the global > CRT state as a normal msvcrt carries - the only TLS state handled > is for exceptions. > > The functions in main.c are simplified versions of the corresponding > ones from msvcrt. Additionally, two stub functions (relating to telemetry) > are added; they are required for a plain empty exe built with MSVC 2015 > with dynamic C runtime to start up with the builtin vcruntime140.dll. > > Some functions that are available in the full msvcrt, that vcruntime140.dll > should export, are not included since they haven't been split off to be > buildable without the full internals of msvcrt yet. Those functions are: > _CxxThrowException > __AdjustPointer > __RTCastToVoid > __RTDynamicCast > __RTtypeid > _chkesp > _get_unexpected > > Signed-off-by: Martin Storsjo <martin(a)martin.st> > --- > Changed since last version: Moved main-vcruntime.c to the vcruntime140 > directory; skipped the separate memory.c and included all of it in the > vcruntime main.c instead. Removed a leftover commented out statement. > > In this build configuration, some functions use simpler error handling > - instead of calling _amsg_exit, it calls ExitProcess directly. > (_amsg_exit checks the error mode, which is state that lives within > ucrtbase.dll; vcruntime140.dll shouldn't have a separate copy of that > state, and there's no function in ucrtbase.dll that would allow quering it.) > --- > configure.ac | 1 + > dlls/msvcrt/except.c | 4 + > dlls/msvcrt/except_i386.c | 4 + > dlls/vcruntime140/Makefile.in | 12 ++ > dlls/vcruntime140/main.c | 224 ++++++++++++++++++++++++++++++++++++ > dlls/vcruntime140/vcruntime140.spec | 87 ++++++++++++++ > 6 files changed, 332 insertions(+) > create mode 100644 dlls/vcruntime140/Makefile.in > create mode 100644 dlls/vcruntime140/main.c > create mode 100644 dlls/vcruntime140/vcruntime140.spec Piotr asked whether this would make sense as a DLL that only forwards calls down to ucrtbase, instead of a standalone DLL that duplicates the implementation. For i386, this DLL has got 81 exported functions, and all of those except a few do exist in ucrtbase.dll. The ones that are unique to vcruntime140.dll are the following: __C_specific_handler_noexcept __std_terminate __telemetry_main_invoke_trigger __telemetry_main_return_trigger __uncaught_exceptions __vcrt_GetModuleFileNameW __vcrt_GetModuleHandleW __vcrt_InitializeCriticalSectionEx __vcrt_LoadLibraryExW Out of these, the telemetry ones actually are called implicitly even in a plain hello world executable built with MSVC 2015 (but having them as empty stubs seems to work fine so far), the other ones I haven't had reason to look into yet. The real vcruntime140.dll actually also do some calls to ucrtbase.dll (linked via the api-ms-win-crt-* stub dlls), but not all the real functions - it only links to the following ones: terminate abort strcpy_s malloc _free_base free _malloc_base _calloc_base __stdio_common_vsprintf_s atol (Additionally it links to a few symbols from kernel32.dll and one from advapi32.dll.) Given this, I still think this DLL makes sense as a standalone DLL instead of just a stub forwarding to ucrtbase, since that's what the original one does as well. At worst some of the functions may need to have subtly different behaviour in different versions (which I guess is the main reason for the DLL existing in the first place). // Martin

2 2

Re: [PATCH 5/5] kernel32/tests: Add tests for GetConsoleFontSize (v2)
by Marvin 28 Oct '15

28 Oct '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=17764 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [PATCH v3] ucrtbase: Implement some printf functions
by Piotr Caban 27 Oct '15

27 Oct '15

Hi, On 10/26/15 16:53, Martin Storsjo wrote: > --- a/dlls/msvcrt/printf.h > +++ b/dlls/msvcrt/printf.h > +static int FUNC_NAME(puts_clbk_str_c99)(void *ctx, int len, const APICHAR *str) I think that it would be nicer if this function is added in wcs.c. Other callback functions are already added to files that uses them (e.g. file.c defines callbacks for functions printing to files). > /********************************************************************* > + * __stdio_common_vsprintf (MSVCRT.@) > + */ > +int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, > + MSVCRT__locale_t locale, __ms_va_list valist ) > +{ > + static const char nullbyte = '\0'; > + struct _str_ctx_a ctx = {len, str}; > + int ret; > + > + ret = pf_printf_a(options & 2 ? puts_clbk_str_c99_a : puts_clbk_str_a, > + &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); Is there any guarantee that options can only equal 1 or 2? If not please add a FIXME for other values. Thanks, Piotr

2 3

Re: [PATCH 01/4] msvcp110: Add tr2_sys__Open_dir implementation.(try 3)
by Piotr Caban 27 Oct '15

27 Oct '15

Hi, I've missed one more thing in last review. On 10/27/15 07:18, YongHao Hu wrote: > + strcat(temppath, "\\*.*"); Probably the search pattern should be "\\*". Thanks, Piotr

1 0

Re: [PATCH 01/4] msvcp110: Add tr2_sys__Open_dir implementation.(try 3)
by Piotr Caban 27 Oct '15

27 Oct '15

On 10/27/15 07:18, YongHao Hu wrote: > + TRACE("(%s %s %p %p)\n", debugstr_a(target), debugstr_a(dest), err_code, type); target is an output parameter, it contains garbage on call. Please display it as pointer in trace message. Thanks, Piotr

1 0

Re: [PATCH 02/4] msvcp110: Add tr2_sys__Read_dir implementation.(resend)
by Piotr Caban 27 Oct '15

27 Oct '15

On 10/27/15 07:19, YongHao Hu wrote: > + if(!FindNextFileA(handle, &data)) { > + *type = status_unknown; > + return (char*)""; > + } This looks wrong. You should probably set target to "" and return pointer to it. Thanks, Piotr

1 0

Re: [PATCH 04/4] msvcp120/tests: Add tests of tr2_sys__Open_dir, tr2_sys__Read_dir and tr2_sys__Close_dir.(try 3)
by Piotr Caban 27 Oct '15

27 Oct '15

Hi, the tests are failing here: fixme:file:CreateSymbolicLinkA ("tr2_test_dir/f1_link" "tr2_test_dir/f1" 0): stub fixme:file:CreateSymbolicLinkA ("tr2_test_dir/dir_link" "tr2_test_dir" 1): stub msvcp120.c:1179: Test failed: tr2_sys__Open_dir(): expect: regular_file, got 3 Makefile:159: recipe for target 'msvcp120.ok' failed make: *** [msvcp120.ok] Error 1 The tests should not depend on read order of files inside a directory. The patch is also causing compilation warning when 64-bit wine is compiled: ../../../../wine_src/dlls/msvcp120/tests/msvcp120.c: In function 'test_tr2_sys__dir_operation': ../../../../wine_src/dlls/msvcp120/tests/msvcp120.c:1162:5: warning: format '%d' expects argument of type 'int', but argument 3 has type 'size_t' [-Wformat=] ok(strlen(longer_path) == MAX_PATH, "tr2_sys__Open_dir(): expect MAX_PATH, got %d\n", strlen(longer_path)); Thanks, Piotr

1 0

Re: [v3 signed 4/6] wined3d: introduce a new wined3d_rendertarget_view_create_from_sub_resource function
by Henri Verbeet 27 Oct '15

27 Oct '15

On 22 October 2015 at 12:01, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > +HRESULT __cdecl wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, Just use CDECL here. include/wine/wined3d.h should actually use CDECL as well, but currently uses __cdecl for historic reasons. > + sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); > + surface = surface_from_resource(sub_resource); You can't assume the sub-resource is a surface here.

2 1

Re: [v3 signed 3/6] wined3d: introduce new wined3d_texture_{get, release}_dc functions
by Henri Verbeet 27 Oct '15

27 Oct '15

On 22 October 2015 at 12:01, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > +HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc) > +{ > + struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); > + > + return wined3d_surface_getdc(surface_from_resource(sub_resource), dc); > +} I think this should be fairly obvious at this point, but you're missing traces and you need to validate the sub-resource type.

2 1

Re: [v2] krnl386.exe16: Avoid shift overflows in DMA_ioport_in.
by Gerald Pfeifer 27 Oct '15

27 Oct '15

I believe thisi has been obsoleted by Alexandre's patch commit 5767c63ae0edca8635ed70d7071759745997be81 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 17:54:48 2015 +0900 krnl386.exe: Remove some redundant shifts. in case someone is tracking (and since Marvin has not labeled my patch as rejected so far). Gerald On Tue, 20 Oct 2015, Gerald Pfeifer wrote: > Use 0xFFu isntead 0xFF to indicate we are looking at an unsigned > value/constant. > > Gerald, now with... > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/krnl386.exe16/dma.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/dlls/krnl386.exe16/dma.c b/dlls/krnl386.exe16/dma.c > index a0c4050..d01686c 100644 > --- a/dlls/krnl386.exe16/dma.c > +++ b/dlls/krnl386.exe16/dma.c > @@ -360,13 +360,13 @@ BYTE DMA_ioport_in( WORD port ) > case 0x8A: res = (DMA_BaseAddress[7]&(0xFF<<16))>>16; break; > > /* High Page Base Address */ > - case 0x487: res = (DMA_BaseAddress[0]&(0xFF<<24))>>24; break; > - case 0x483: res = (DMA_BaseAddress[1]&(0xFF<<24))>>24; break; > - case 0x481: res = (DMA_BaseAddress[2]&(0xFF<<24))>>24; break; > - case 0x482: res = (DMA_BaseAddress[3]&(0xFF<<24))>>24; break; > - case 0x48B: res = (DMA_BaseAddress[5]&(0xFF<<24))>>24; break; > - case 0x489: res = (DMA_BaseAddress[6]&(0xFF<<24))>>24; break; > - case 0x48A: res = (DMA_BaseAddress[7]&(0xFF<<24))>>24; break; > + case 0x487: res = (DMA_BaseAddress[0]&(0xFFu<<24))>>24; break; > + case 0x483: res = (DMA_BaseAddress[1]&(0xFFu<<24))>>24; break; > + case 0x481: res = (DMA_BaseAddress[2]&(0xFFu<<24))>>24; break; > + case 0x482: res = (DMA_BaseAddress[3]&(0xFFu<<24))>>24; break; > + case 0x48B: res = (DMA_BaseAddress[5]&(0xFFu<<24))>>24; break; > + case 0x489: res = (DMA_BaseAddress[6]&(0xFFu<<24))>>24; break; > + case 0x48A: res = (DMA_BaseAddress[7]&(0xFFu<<24))>>24; break; > > case 0x08: > case 0xD0: >

1 0

Re: [1/4] programs/oleview: Fix compilation with PSDK.
by Francois Gouget 27 Oct '15

27 Oct '15

On Wed, 7 Oct 2015, Dmitry Timoshkov wrote: [...] > diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c > index 21e9d96..d07dd3c 100644 > --- a/programs/oleview/typelib.c > +++ b/programs/oleview/typelib.c > @@ -18,6 +18,8 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#define NONAMELESSUNION > + That this is needed to compile with the PSDK but not with Wine probably indicates a bug in the Wine headers. What was the compilation error? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Linux: Because rebooting is for adding new hardware

2 6

Re: [2/6] widl: Ignore assigment of a duplicate uuid.
by Huw Davies 27 Oct '15

27 Oct '15

On Thu, Oct 15, 2015 at 08:46:46PM +0800, Dmitry Timoshkov wrote: > MSDN KB285146 article describes this behaviour, and the tests in the last > patch confirm that. That article also mentions that the warning doesn't occur when the udt is an enum (and indeed midl doesn't issue a warning in this case). We should do likewise. [Also, while you're at it, please fix the typo in subject: 'assigment'] Huw.

4 10

Re: [PATCH] d3d10_1: Implement D3D10CreateDeviceAndSwapChain1 (try 3)
by Matteo Bruni 27 Oct '15

27 Oct '15

2015-10-26 9:56 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Fixes https://bugs.winehq.org/show_bug.cgi?id=39278 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Please address the feedback from https://www.winehq.org/pipermail/wine-devel/2015-October/109898.html and https://www.winehq.org/pipermail/wine-devel/2015-October/109903.html.

2 1

Re: sfc: add SfcGetNextProtectedFile stub
by Dmitry Timoshkov 27 Oct '15

27 Oct '15

Austin English <austinenglish(a)gmail.com> wrote: > +@ stdcall SfcGetNextProtectedFile(ptr ptr) ... > +BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) I think that it's not the first time when HANDLE is used as a pointer in the .spec file. -- Dmitry.

1 0

Re: dhcpcsvc: add a stub for DhcpRequestParams (try 2)
by Dmitry Timoshkov 27 Oct '15

27 Oct '15

Austin English <austinenglish(a)gmail.com> wrote: > +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, LPDHCPCAPI_CLASSID classid, > + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, > + BYTE *buffer, DWORD *size, WCHAR *requestiddtr ) ... > +@ stdcall DhcpRequestParams(long ptr wstr long long long ptr ptr wstr) It's still wrong for one parameter. -- Dmitry.

1 0

Re: dhcpcsvc: add a stub for DhcpRequestParams
by Dmitry Timoshkov 27 Oct '15

27 Oct '15

Austin English <austinenglish(a)gmail.com> wrote: > + typedef struct _DHCPAPI_PARAMS DHCPCAPI_PARAMS, *PDHCPCAPI_PARAMS, *LPDHCPCAPI_PARAMS; > + > + typedef struct _DHCPCAPI_PARAMS_ARARAY { > + ULONG nParams; > + LPDHCPCAPI_PARAMS Params; > + } DHCPCAPI_PARAMS_ARRAY, *PDHCPCAPI_PARAMS_ARRAY, *LPDHCPCAPI_PARAMS_ARRAY; > + > + typedef struct _DHCPCAPI_CLASSID { > + ULONG Flags; > + LPBYTE Data; > + ULONG nBytesData; > + } DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID; What is the reason of all those leading spaces? Also shouldn't these definitions go into an appropriate header file? > +DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, LPDHCPCAPI_CLASSID classid, > + DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, > + BYTE *buffer, DWORD *size, WCHAR *requestiddtr ) ... > +@ stdcall DhcpRequestParams(long ptr wstr long long long long long wstr) API prototype doesn't match the spec entry for the pointers. -- Dmitry.

1 0

Re: [6/6] oleaut32/tests: Add a bunch of new tests for typelib generation.
by Marvin 27 Oct '15

27 Oct '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=17725 Your paranoid android. === wxppro (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 77C47740 === w2003std (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 77BD85F0 === wvistau64 (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 77189BBD === w2008s64 (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 74FB9BBD === w7u (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 77598B21 === w7pro64 (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 769A8B21 === w8 (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 76B0B4BF === w864 (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 7748B4BF === w1064 (32 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 28 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 32 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 16 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 28 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 75688E90 === wvistau64 (64 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 56 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 64 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 24 got 8 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 56 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 000007FEFE804E90 === w2008s64 (64 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 56 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 64 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 24 got 8 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 56 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 000007FEFF134E90 === w7pro64 (64 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 56 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 64 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 24 got 8 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 56 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 000007FEFDB35960 === w864 (64 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 56 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 64 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 24 got 8 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 56 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 00007FFB7B0A11A0 === w1064 (64 bit typelib) === typelib.c:4516: Test failed: ITypeLib_GetTypeInfoCount(typelib) expected 29 got 28 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x200 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753901} typelib.c:4528: Test failed: bstrIfName expected "n" got "_n" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753903} typelib.c:4528: Test failed: bstrIfName expected "_m" got "_n" typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "m" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x10 got 0x200 typelib.c:4550: Test failed: ((LONG)(((WORD)((DWORD_PTR)(typeattr->wMinorVerNum) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(typeattr->wMajorVerNum) & 0xFFFF))) << 16)) expected 65538 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753904} typelib.c:4569: Test failed: got 0x8002802b typelib.c:4528: Test failed: bstrIfName expected "mm" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 6 got 1 typelib.c:4549: Test failed: help_ctx expected 3 got 0 typelib.c:4528: Test failed: bstrIfName expected "IDualIface" got "mm" typelib.c:4532: Test failed: typeattr->typekind expected 4 got 6 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1040 got 0x0 typelib.c:4549: Test failed: help_ctx expected 0 got 3 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 56 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 8 got 0 typelib.c:4564: Test failed: got wrong guid {016fe2ec-b2c8-45f8-b23b-39e53a753906} typelib.c:4528: Test failed: bstrIfName expected "ISimpleIface" got "_m" typelib.c:4532: Test failed: typeattr->typekind expected 3 got 1 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x1000 got 0x0 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 8 got 4 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 64 got 0 typelib.c:4552: Test failed: typeattr->cFuncs expected 1 got 0 typelib.c:4564: Test failed: got wrong guid {00000000-0000-0000-0000-000000000000} typelib.c:4528: Test failed: bstrIfName expected "test_struct" got "IDualIface" typelib.c:4532: Test failed: typeattr->typekind expected 1 got 4 typelib.c:4533: Test failed: typeattr->wTypeFlags expected 0x0 got 0x1040 typelib.c:4547: Test failed: typeattr->cbSizeInstance expected 24 got 8 typelib.c:4551: Test failed: typeattr->cbSizeVft expected 0 got 56 typelib.c:4552: Test failed: typeattr->cFuncs expected 0 got 8 typelib.c:4564: Test failed: got wrong guid {b14b6bb5-904e-4ff9-b247-bd361f7aaedd} typelib.c:4583: Test failed: desc->memid expected 0 got 1610612736 typelib.c:4584: Test failed: desc->funckind expected 0 got 4 typelib.c:4585: Test failed: desc->invkind expected 0 got 1 typelib.c:4586: Test failed: desc->callconv expected 0 got 4 typelib.c:4587: Test failed: desc->cParams expected 0 got 2 typelib.c:4593: Test failed: desc->wFuncFlags expected 0 got 1 typelib: unhandled exception c0000005 at 00007FF85AA7C510

1 0

assert, NDEBUG and you
by Daniel Santos 26 Oct '15

26 Oct '15

I had been going through life assuming that people who build software for release generally use some variant of -march=<something generic> -O2 -DNDEBUG. Not only was I wrong, but Debian now considers NDEBUG "EBW <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701231>" (which I've learned means "Evil Bad Wrong <https://lists.debian.org/debian-devel/2013/02/msg00351.html>") and strips it even from cmake builds (which define it by default for release builds). From what I can tell, this is a common practice and it means that those asserts that I love to liberally saturate my sources with (even in hot spots) are bloating my code at release. In light of this, I'm thinking that we may need a standard wine macro for asserts that we *really* only want when we're making changes and debugging and are activated by -DDEBUG or some such. Many of the asserts I use aren't something that I would ever expect to fail after development and testing is completed and shouldn't be in release, but can fail when me or somebody else makes a change or uses the function incorrectly. Hot code paths and inline functions are other examples of where such an assert would be useful when developing, but we would not want to pay for it in a release build. Thoughts? Daniel

4 5

Re: msi: Convert 45 initializations of static const WCHAR towards towards using wide strings.
by Nikolay Sivov 26 Oct '15

26 Oct '15

On 24.10.2015 2:25, Gerald Pfeifer wrote: > The u"string" format is easier to write, read, and maintain than > the {'s','t','r','i','n','g'} format. > Wasn't this added with C++11?

2 1

Re: [6/6] oleaut32/tests: Add a bunch of new tests for typelib generation.
by Marvin 26 Oct '15

26 Oct '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=17373 Your paranoid android. === build (build) === Make failed

3 2

Re: d3dx9: Add adjacency generation for D3DXCreateCylinder()
by Matteo Bruni 26 Oct '15

26 Oct '15

2015-10-26 14:33 GMT+01:00 Gediminas Jakutis <gediminas(a)varciai.lt>: > --- > dlls/d3dx9_36/mesh.c | 23 +++++++++++++++++------ > 1 file changed, 17 insertions(+), 6 deletions(-) Please resend with your Signed-off-by tag, preferably via git send-email. Otherwise the patch looks good to me. Some kind of test for the adjacency data would be nice to have, maybe in a followup patch...

2 3

Re: include: Add d3dx10.h file
by Nikolay Sivov 26 Oct '15

26 Oct '15

> +#include "d3dx10.h" This doesn't look right.

2 2

Re: [PATCH 2/6] wined3d: Keep track of FBOs through the GL names.
by Henri Verbeet 26 Oct '15

26 Oct '15

On 22 October 2015 at 23:38, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > The next two patches will improve integration with the fixed up depth > stencil and context_enum_surface_fbo_entries. fbo_entry->d3d_* will > remain for logging in context_check_fbo_status. > I'm not sure that really makes sense. I think it may be better to move the "d3d" parts of the logging like locations and surface pointers to entry creation, and get things like attachment dimensions and sample counts from OpenGL instead.

1 0

Re: [PATCH 1/6] wined3d: Prepare GL resources before looking for an FBO entry.
by Henri Verbeet 26 Oct '15

26 Oct '15

On 22 October 2015 at 23:38, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > It is a bit unfortunate that we have to do this every draw now... > You may not have to, as such. You could just make doing a prepare_location()/load_location() a requirement before calling context_apply_fbo_state(). For things like draws you currently already need to call load_location(), but e.g. full clears depend on context_apply_fbo_state() to call prepare_location(). I think it would make sense to move those to the caller as well.

1 0

Report from wine-presentation at ubucon
by Maik Wagner 26 Oct '15

26 Oct '15

Dear wine-Team, I would like to report on my activities at the ubucon convention in Berlin which took place this weekend. My talk was scheduled at 10 am but due to daylight saving time I could sleep one hour longer. I brought my Slackware 14.1 laptop and presented the latest 1.7.53 and showed some basic stuff as in the forums some people wouldn't know what version they are running. So I showed them how to find out their version with "wine --version" and how to create a prefix, using winecfg to switch between versions and eventually did a test for the AppDB as it's always useful to have new reports and made clear that testing should be done in a clean prefix. In total there were about 130 people coming to Berlin and in my talk we were about eight people who seemed very interested. One of them talked to me afterwards that he really appreciates on what wine is doing and during the talk I mentioned the start of DirectX11 development. Codeweavers supplied me with a polo shirt which I wore during the presentation to make it look more professional. I also mentioned things like reading the World Wine News and when a new version is coming out and that the development has shifted towards time-based releases. Last but not least I showed them some live testing on a demo mentioning that demo versions are very useful. I attached a photo of me which was taken by one of the participants at the beginning using my mobile phone camera. Have a good week, Maik

2 1

Re: [PATCH] mmdevapi: Fix win10 test failures
by Marvin 26 Oct '15

26 Oct '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=17699 Your paranoid android. === w8 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:259: Test failed: Position 2167 expected 1527 capture.c:311: Test failed: GCP 14336 vs. BufferSize 21996 capture.c:316: Test failed: Position 3191 gap 1216 capture.c:336: Test failed: Position 4279 expected 3639 capture.c:361: Test failed: Position 5303 expected 4087 === w864 (32 bit capture) === capture.c:181: Test failed: Position 119 expected 0 capture.c:231: Test failed: Position 2167 expected 567 capture.c:259: Test failed: Position 2167 expected 567 capture.c:316: Test failed: Position 3191 gap 2176 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:259: Test failed: Position 2167 expected 1527 capture.c:311: Test failed: GCP 12992 vs. BufferSize 21996 capture.c:316: Test failed: Position 4151 gap 2176 capture.c:336: Test failed: Position 5239 expected 4599 capture.c:337: Test failed: flags 1 capture.c:361: Test failed: Position 5687 expected 5047 === w864 (64 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:259: Test failed: Position 2167 expected 1463 capture.c:316: Test failed: Position 3191 gap 1280 capture.c:361: Test failed: Position 4727 expected 4087 === w1064 (64 bit capture) === capture.c:311: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:336: Test failed: Position 5239 expected 4663 capture.c:361: Test failed: Position 5687 expected 5111

1 0

Re: [PATCH] ucrtbase: Implement some printf functions
by Martin Storsjö 26 Oct '15

26 Oct '15

On Thu, 15 Oct 2015, Martin Storsjo wrote: > Not all functions are implemented (yet not all variants are > implemented in the normal msvcrt either). > > The new functions are more generalized and are C99 compliant. > They take an options parameter that e.g. for the snprintf > family of functions indicate whether the truncation and return > value should be handled as before or in the standards compliant > way. > > Some rudimentary tests are added (based on the msvcrt printf tests), > testing to make sure the snprintf truncation/return values are > handled correctly. > > These new functions also should support the C99 conversion > specifiers; this is not yet implemented. > > Signed-off-by: Martin Storsjo <martin(a)martin.st> > --- > .../api-ms-win-crt-stdio-l1-1-0.spec | 10 +- > dlls/msvcrt/file.c | 28 +++ > dlls/msvcrt/printf.h | 20 ++ > dlls/msvcrt/wcs.c | 34 +++ > dlls/ucrtbase/tests/Makefile.in | 1 + > dlls/ucrtbase/tests/printf.c | 259 +++++++++++++++++++++ > dlls/ucrtbase/ucrtbase.spec | 10 +- > 7 files changed, 352 insertions(+), 10 deletions(-) > create mode 100644 dlls/ucrtbase/tests/printf.c > > diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h > index 4757931..bd2dbf3 100644 > --- a/dlls/msvcrt/printf.h > +++ b/dlls/msvcrt/printf.h > @@ -64,6 +64,26 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) > return len; > } > > +static int FUNC_NAME(puts_clbk_str_c99)(void *ctx, int len, const APICHAR *str) > +{ > + struct FUNC_NAME(_str_ctx) *out = ctx; > + > + if(!out->buf) > + return len; > + > + if(out->len - 1 < len) { > + memcpy(out->buf, str, (out->len - 1)*sizeof(APICHAR)); > + out->buf += out->len - 1; > + out->len = 1; > + return len; > + } > + > + memcpy(out->buf, str, len*sizeof(APICHAR)); > + out->buf += len; > + out->len -= len; > + return len; > +} > + FWIW, this gives warnings about puts_clbk_str_c99_w being defined but unused. It will be necessary later in case someone wants to implement the wchar versions of the printf functions for ucrtbase, but what should be done in the meantime? Just define this function somewhere else in wcs.c instead? // Martin

2 2

Re: [2/2] user32/tests: Add some tests for WM_MDIGETACTIVE.
by Marvin 26 Oct '15

26 Oct '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=17696 Your paranoid android. === w1064 (32 bit win) === win.c:6703: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6725: Test failed: 0x80/0x1010000: window rect 0,0-1024,768 win.c:6703: Test failed: 0x80/0x81c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6703: Test failed: 0/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6703: Test failed: 0x40000/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6703: Test failed: 0x80/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6703: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6725: Test failed: 0x80/0x1050000: window rect 0,0-1024,768 win.c:6703: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6725: Test failed: 0x80/0x1410000: window rect 0,0-1024,768 === w864 (64 bit win) === win.c:3462: Test failed: hwnd 000000000003019A message 0118 === w1064 (64 bit win) === win.c:6703: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6725: Test failed: 0x80/0x1050000: window rect 0,0-1024,768

1 0

Re: [1/2] user32/tests: Move MDI tests out of the WM_CREATE handler.
by Marvin 26 Oct '15

26 Oct '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=17695 Your paranoid android. === w8 (32 bit win) === win.c:3416: Test failed: hwnd 00030148 message 0118 === w1064 (32 bit win) === win.c:6657: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6679: Test failed: 0x80/0x1010000: window rect 0,0-1024,768 win.c:6657: Test failed: 0x80/0x81c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6657: Test failed: 0/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6657: Test failed: 0x40000/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6657: Test failed: 0x80/0x41c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6657: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6679: Test failed: 0x80/0x1050000: window rect 0,0-1024,768 win.c:6657: Test failed: 0x80/0x1c10000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6679: Test failed: 0x80/0x1410000: window rect 0,0-1024,768 === w864 (64 bit win) === win.c:3416: Test failed: hwnd 00000000000A01A0 message 0118 === w1064 (64 bit win) === win.c:6657: Test failed: 0x80/0x1c50000: window rect 0,0-1024,768 must be in 0,0-1024,728 win.c:6679: Test failed: 0x80/0x1050000: window rect 0,0-1024,768

2 1

Re: [4/6] widl: Attributes of the alias are supposed to replace attributes of a tag in the typelib.
by Huw Davies 26 Oct '15

26 Oct '15

On Thu, Oct 15, 2015 at 08:47:04PM +0800, Dmitry Timoshkov wrote: > diff --git a/tools/widl/parser.y b/tools/widl/parser.y > index db5897e..1bd9565 100644 > --- a/tools/widl/parser.y > +++ b/tools/widl/parser.y > @@ -1893,6 +1893,10 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at > { > if (!type->name) > type->name = gen_name(); > + > + /* replace exisitng attributes when generating a typelib */ > + if (do_typelib) > + type->attrs = attrs; > } > > LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) I think this is actually correct (typedefs in typelibs are just strange). However, it would be more convincing if you could add version and helpcontext attributes to the typedefs and show that the base type gets those too. Something like: [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753901),restricted] struct _n { int n1; }; [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753902),hidden] typedef struct _n n; [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753903),version(1), helpcontext(1)] typedef struct _n nn; struct _n gets both version and helpcontext from nn (which is interesting as you can't set version or helpcontext attributes on a structure). and also: [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753904),restricted] struct _m { int m1; }; [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753905),hidden, version(2)] typedef struct _m m; [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753906),helpcontext(1)] typedef struct _m mm; To show that _m doesn't get a version. i.e. it doesn't get the union of attributes from m and mm, it just gets the attributes from the last typedef to reference it. Huw.

1 0

Re: [PATCH] d3dx9_36: Supplying a AnimationController isn't an error
by Stefan Dösinger 26 Oct '15

26 Oct '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2015-10-26 um 09:56 schrieb Alistair Leslie-Hughes: > + if (anim_controller) { > + *anim_controller = NULL; > + > + FIXME("Animation controller creation not implemented\n"); > + } Do you have an easy way to write this FIXME only if the file has an AnimationSet node? Or maybe even keep returning E_NOTIMPL if the output should be non-NULL? Also the style doesn't follow the general d3d style ('{' goes in its own line). > + ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name); > + D3DXMatrixIdentity(&transform); > + check_matrix(&frame_hier->TransformationMatrix, &transform); It looks like these are the same tests as the ones right above the call. I'd skip them and only have controller-related test. A test input that should result in a non-NULL controller would be helpful as well. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWLfs5AAoJEN0/YqbEcdMwAM4P/1NSVVxBt3HGXPjqeF1Z6o93 6qV+C/MJB/82evJpf34zARYBXd6WzdeL+YbUl9K9G2iDZ/KLKf5l5opMnMD7cL1h 841dtZQu4IA3mJtwSY345+7YLcRV0qfYEHwFxvlO7JVqk9UIcsaE/kp+7tUvrFHD V5IIKSQrN6IhcGJDC51XIwcL2xxhgyco+5UOus6m6kKDBr+mpTxCVYpMOA4O/MjB fXoZl3S4SWkmJQwh8l9azycmRQ3y6xtQA8EksOWXxLv1lPhtdeb2LtP5w14vM4dC 3z3rC0NzDIAC+a5uNlhRbH8jb6SIlcdgInKaCaTSo9s8944eagaEh/ED2K4Q47Ub QaTz7JITa55ZnPuhgzms+Y3W8yW4QaEjgAo3L7/C91bVdBvwkBW0NBxIaMEgUU0M r+ZhjZPA2XsJ700k3SpB3BFHyFVT/qOtYLceNcE3d+8uJlmiqCu5xj6N4hojv1g2 gz8Map0/30mtA4b6IWD/kmnETYIZYYz28bzo8p56q25XFMGT1huArqW3JAlEe5Ic cKCUiNp3Visnzk9XJvmuW8wGVPk2Pta6UzdMCRiCF67Elb8Id8qqZc+GKsOm/FLV kSCvrXMaodeWqjnnyQIyI1QBo7Hoc4Q/V0iKiIVsPqvuY1wbmyTeVBdhqc+yKFw3 0llsQI07wd6TIWXgklAM =Xuvx -----END PGP SIGNATURE-----

1 0

Re: [PATCH 01/3] msvcp110: Add tr2_sys__Open_dir implementation.(try2)
by Piotr Caban 26 Oct '15

26 Oct '15

Hi, On 10/15/15 06:57, YongHao Hu wrote: > + char temppath[MAX_PATH]; > + TRACE("(%s %s %p %p)\n", debugstr_a(target), debugstr_a(dest), err_code, type); > + if(strlen(dest) > MAX_PATH) { > + *err_code = ERROR_BAD_PATHNAME; > + return NULL; > + } > + strcpy(temppath, dest); > + strcat(temppath, "\\*.*"); There's still possible buffer overflow if e.g. strlen(dest)==MAX_PATH-2. Thanks, 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