October 2012 - Wine-commits

Piotr Caban : msvcrt: Fixed tmpfile implementation.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: c00702cd6e5110202a02434a69efbacf6152ffdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00702cd6e5110202a02434a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 16 17:23:04 2012 +0200 msvcrt: Fixed tmpfile implementation. --- dlls/msvcrt/file.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 59b7eb8..d9ce987 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3754,16 +3754,20 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) MSVCRT_FILE* file = NULL; LOCK_FILES(); - fd = MSVCRT__open(filename, MSVCRT__O_CREAT | MSVCRT__O_BINARY | MSVCRT__O_RDWR | MSVCRT__O_TEMPORARY); + fd = MSVCRT__open(filename, MSVCRT__O_CREAT | MSVCRT__O_BINARY | MSVCRT__O_RDWR | MSVCRT__O_TEMPORARY, + MSVCRT__S_IREAD | MSVCRT__S_IWRITE); if (fd != -1 && (file = msvcrt_alloc_fp())) { - if (msvcrt_init_fp(file, fd, MSVCRT__O_RDWR) == -1) + if (msvcrt_init_fp(file, fd, MSVCRT__IORW) == -1) { file->_flag = 0; file = NULL; } else file->_tmpfname = MSVCRT__strdup(filename); } + + if(fd != -1 && !file) + MSVCRT__close(fd); UNLOCK_FILES(); return file; }

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_texldl().
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 82a44af25998ef83b3883c1dc5484780043f16b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a44af25998ef83b3883c1dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:17 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_texldl(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f6e3d8d..ff3c7e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3491,7 +3491,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4] - && shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) + && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { /* Plain GLSL only supports Lod sampling functions in vertex shaders. * However, the NVIDIA drivers allow them in fragment shaders as well,

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_mov().
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 347dda068f9a4fdb12607f6d337d0dffa5c6b01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=347dda068f9a4fdb12607f6d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:18 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_mov(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff3c7e4..388f438 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2314,7 +2314,7 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) /* In vs_1_1 WINED3DSIO_MOV can write to the address register. In later * shader versions WINED3DSIO_MOVA is used for this. */ if (ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX && ins->dst[0].reg.type == WINED3DSPR_ADDR) { /* This is a simple floor() */

1 0

Henri Verbeet : wined3d: Recognise the SM4 "primID" register type.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 59bdd6ae9715d143b84e669c59be7e5841bd36ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bdd6ae9715d143b84e669c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:19 2012 +0200 wined3d: Recognise the SM4 "primID" register type. --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9c70f08..b735b77 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -992,6 +992,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("cb"); break; + case WINED3DSPR_PRIMID: + TRACE("primID"); + break; + case WINED3DSPR_NULL: TRACE("null"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b69ba82..1159d6e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -131,6 +131,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_NULL = 0xd, }; @@ -269,7 +270,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* UNKNOWN */ 0, /* UNKNOWN */ 0, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56bdbad..06f75de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -320,6 +320,7 @@ enum wined3d_shader_register_type WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, + WINED3DSPR_PRIMID, WINED3DSPR_NULL, WINED3DSPR_RESOURCE, }; @@ -2678,6 +2679,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ + case WINED3DSPR_PRIMID: /* primID */ return TRUE; case WINED3DSPR_MISCTYPE:

1 0

Henri Verbeet : ddraw: Get rid of some fallback code in CreateSurface().
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 4a5ed44d7962b36401852e12dd2443f8b5b8dbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5ed44d7962b36401852e12d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:20 2012 +0200 ddraw: Get rid of some fallback code in CreateSurface(). --- dlls/ddraw/ddraw.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f34888d..1ef06d0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2772,35 +2772,10 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, copy_to_surfacedesc2(&desc2, DDSD); desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */ - /* Get the video mode from WineD3D - we will need it */ if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); - - switch (ddraw->orig_bpp) - { - case 8: - mode.format_id = WINED3DFMT_P8_UINT; - break; - - case 15: - mode.format_id = WINED3DFMT_B5G5R5X1_UNORM; - break; - - case 16: - mode.format_id = WINED3DFMT_B5G6R5_UNORM; - break; - - case 24: - mode.format_id = WINED3DFMT_B8G8R8_UNORM; - break; - - case 32: - mode.format_id = WINED3DFMT_B8G8R8X8_UNORM; - break; - } - mode.width = ddraw->orig_width; - mode.height = ddraw->orig_height; + return hr; } /* No pixelformat given? Use the current screen format */

1 0

Henri Verbeet : ddraw: Just implement ddraw7_RestoreDisplayMode() on top of wined3d_set_adapter_display_mode().
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 1fab14af9e2ecdc26c9cf7b72b28c74b1f98ad6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fab14af9e2ecdc26c9cf7b72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:21 2012 +0200 ddraw: Just implement ddraw7_RestoreDisplayMode() on top of wined3d_set_adapter_display_mode(). --- dlls/ddraw/ddraw.c | 155 +++++++++++++++++++------------------------- dlls/ddraw/ddraw_private.h | 4 +- 2 files changed, 68 insertions(+), 91 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1ef06d0..9d2a78a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1003,79 +1003,6 @@ static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window } /***************************************************************************** - * - * Helper function for SetDisplayMode and RestoreDisplayMode - * - * Implements DirectDraw's SetDisplayMode, but ignores the value of - * ForceRefreshRate, since it is already handled by - * ddraw7_SetDisplayMode. RestoreDisplayMode can use this function - * without worrying that ForceRefreshRate will override the refresh rate. For - * argument and return value documentation, see - * ddraw7_SetDisplayMode. - * - *****************************************************************************/ -static HRESULT ddraw_set_display_mode(struct ddraw *ddraw, DWORD Width, DWORD Height, - DWORD BPP, DWORD RefreshRate, DWORD Flags) -{ - struct wined3d_display_mode mode; - enum wined3d_format_id format; - HRESULT hr; - - TRACE("ddraw %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", ddraw, Width, - Height, BPP, RefreshRate, Flags); - - wined3d_mutex_lock(); - if( !Width || !Height ) - { - ERR("Width %u, Height %u, what to do?\n", Width, Height); - /* It looks like Need for Speed Porsche Unleashed expects DD_OK here */ - wined3d_mutex_unlock(); - return DD_OK; - } - - switch(BPP) - { - case 8: format = WINED3DFMT_P8_UINT; break; - case 15: format = WINED3DFMT_B5G5R5X1_UNORM; break; - case 16: format = WINED3DFMT_B5G6R5_UNORM; break; - case 24: format = WINED3DFMT_B8G8R8_UNORM; break; - case 32: format = WINED3DFMT_B8G8R8X8_UNORM; break; - default: format = WINED3DFMT_UNKNOWN; break; - } - - /* Check the exclusive mode - if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) - return DDERR_NOEXCLUSIVEMODE; - * This is WRONG. Don't know if the SDK is completely - * wrong and if there are any conditions when DDERR_NOEXCLUSIVE - * is returned, but Half-Life 1.1.1.1 (Steam version) - * depends on this - */ - - mode.width = Width; - mode.height = Height; - mode.refresh_rate = RefreshRate; - mode.format_id = format; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - - /* TODO: The possible return values from msdn suggest that - * the screen mode can't be changed if a surface is locked - * or some drawing is in progress - */ - - /* TODO: Lose the primary surface */ - hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode); - - wined3d_mutex_unlock(); - - switch(hr) - { - case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; - default: return hr; - } -} - -/***************************************************************************** * IDirectDraw7::SetDisplayMode * * Sets the display screen resolution, color depth and refresh frequency @@ -1097,22 +1024,67 @@ static HRESULT ddraw_set_display_mode(struct ddraw *ddraw, DWORD Width, DWORD He * DD_OK on success * *****************************************************************************/ -static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD Width, DWORD Height, - DWORD BPP, DWORD RefreshRate, DWORD Flags) +static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DWORD height, + DWORD bpp, DWORD refresh_rate, DWORD flags) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct wined3d_display_mode mode; + enum wined3d_format_id format; + HRESULT hr; TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", - iface, Width, Height, BPP, RefreshRate, Flags); + iface, width, height, bpp, refresh_rate, flags); if (force_refresh_rate != 0) { TRACE("ForceRefreshRate overriding passed-in refresh rate (%u Hz) to %u Hz\n", - RefreshRate, force_refresh_rate); - RefreshRate = force_refresh_rate; + refresh_rate, force_refresh_rate); + refresh_rate = force_refresh_rate; } - return ddraw_set_display_mode(ddraw, Width, Height, BPP, RefreshRate, Flags); + wined3d_mutex_lock(); + + if (!width || !height) + { + /* It looks like Need for Speed Porsche Unleashed expects DD_OK here. */ + wined3d_mutex_unlock(); + return DD_OK; + } + + switch (bpp) + { + case 8: format = WINED3DFMT_P8_UINT; break; + case 15: format = WINED3DFMT_B5G5R5X1_UNORM; break; + case 16: format = WINED3DFMT_B5G6R5_UNORM; break; + case 24: format = WINED3DFMT_B8G8R8_UNORM; break; + case 32: format = WINED3DFMT_B8G8R8X8_UNORM; break; + default: format = WINED3DFMT_UNKNOWN; break; + } + + /* Check the exclusive mode. + * if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + * return DDERR_NOEXCLUSIVEMODE; + * This is WRONG. Don't know if the SDK is completely wrong and if there + * are any conditions when DDERR_NOEXCLUSIVE is returned, but Half-Life + * 1.1.1.1 (Steam version) depends on this. */ + mode.width = width; + mode.height = height; + mode.refresh_rate = refresh_rate; + mode.format_id = format; + mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + + /* TODO: The possible return values from msdn suggest that the screen mode + * can't be changed if a surface is locked or some drawing is in progress. */ + /* TODO: Lose the primary surface. */ + hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode); + + wined3d_mutex_unlock(); + + switch (hr) + { + case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; + default: return hr; + } } static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, DWORD height, @@ -1170,10 +1142,17 @@ static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWO static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + HRESULT hr; TRACE("iface %p.\n", iface); - return ddraw_set_display_mode(ddraw, ddraw->orig_width, ddraw->orig_height, ddraw->orig_bpp, 0, 0); + wined3d_mutex_lock(); + + hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &ddraw->original_mode); + + wined3d_mutex_unlock(); + + return hr; } static HRESULT WINAPI ddraw4_RestoreDisplayMode(IDirectDraw4 *iface) @@ -5359,7 +5338,6 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) { HRESULT hr; - HDC hDC; ddraw->IDirectDraw7_iface.lpVtbl = &ddraw7_vtbl; ddraw->IDirectDraw_iface.lpVtbl = &ddraw1_vtbl; @@ -5373,13 +5351,6 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - /* Get the current screen settings. */ - hDC = GetDC(0); - ddraw->orig_bpp = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); - ReleaseDC(0, hDC); - ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); - ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); if (!ddraw->wined3d) { @@ -5387,6 +5358,14 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) return E_OUTOFMEMORY; } + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, + WINED3DADAPTER_DEFAULT, &ddraw->original_mode, NULL))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + wined3d_decref(ddraw->wined3d); + return hr; + } + hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); if (FAILED(hr)) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 563377f..0d15727 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -78,9 +78,7 @@ struct ddraw /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level; - - DWORD orig_width, orig_height; - DWORD orig_bpp; + struct wined3d_display_mode original_mode; /* D3D things */ HWND d3d_window;

1 0

Nikolay Sivov : ole32: Cleanup IMarshal interface of proxy manager.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 21a04f56216eef04a156b361cdce8b9af5d22f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a04f56216eef04a156b361c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 23:23:36 2012 -0400 ole32: Cleanup IMarshal interface of proxy manager. --- dlls/ole32/marshal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 8612b30..9403789 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -56,7 +56,7 @@ extern const CLSID CLSID_DfMarshal; struct proxy_manager { IMultiQI IMultiQI_iface; - const IMarshalVtbl *lpVtblMarshal; + IMarshal IMarshal_iface; const IClientSecurityVtbl *lpVtblCliSec; struct apartment *parent; /* owning apartment (RO) */ struct list entry; /* entry in apartment (CS parent->cs) */ @@ -75,7 +75,7 @@ struct proxy_manager static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) { - return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblMarshal)); + return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface); } static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface ) @@ -755,7 +755,7 @@ static HRESULT proxy_manager_construct( } This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; - This->lpVtblMarshal = &ProxyMarshal_Vtbl; + This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl; This->lpVtblCliSec = &ProxyCliSec_Vtbl; list_init(&This->entry); @@ -875,8 +875,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, } if (IsEqualIID(riid, &IID_IMarshal)) { - *ppv = &This->lpVtblMarshal; - IUnknown_AddRef((IUnknown *)*ppv); + *ppv = &This->IMarshal_iface; + IMarshal_AddRef(&This->IMarshal_iface); return S_OK; } if (IsEqualIID(riid, &IID_IClientSecurity))

1 0

Nikolay Sivov : ole32: Cleanup IClientSecurity interface of a proxy manager .
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 90407224d0752354ff3ad4f0ed43dff256721d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90407224d0752354ff3ad4f0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 23:30:40 2012 -0400 ole32: Cleanup IClientSecurity interface of a proxy manager. --- dlls/ole32/marshal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 9403789..a8df28c 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -57,7 +57,7 @@ struct proxy_manager { IMultiQI IMultiQI_iface; IMarshal IMarshal_iface; - const IClientSecurityVtbl *lpVtblCliSec; + IClientSecurity IClientSecurity_iface; struct apartment *parent; /* owning apartment (RO) */ struct list entry; /* entry in apartment (CS parent->cs) */ OXID oxid; /* object exported ID (RO) */ @@ -80,7 +80,7 @@ static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) static inline struct proxy_manager *impl_from_IClientSecurity( IClientSecurity *iface ) { - return (struct proxy_manager *)((char*)iface - FIELD_OFFSET(struct proxy_manager, lpVtblCliSec)); + return CONTAINING_RECORD(iface, struct proxy_manager, IClientSecurity_iface); } static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, @@ -756,7 +756,7 @@ static HRESULT proxy_manager_construct( This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; This->IMarshal_iface.lpVtbl = &ProxyMarshal_Vtbl; - This->lpVtblCliSec = &ProxyCliSec_Vtbl; + This->IClientSecurity_iface.lpVtbl = &ProxyCliSec_Vtbl; list_init(&This->entry); list_init(&This->interfaces); @@ -881,8 +881,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, } if (IsEqualIID(riid, &IID_IClientSecurity)) { - *ppv = &This->lpVtblCliSec; - IUnknown_AddRef((IUnknown *)*ppv); + *ppv = &This->IClientSecurity_iface; + IClientSecurity_AddRef(&This->IClientSecurity_iface); return S_OK; }

1 0

Nikolay Sivov : dwrite: Implement GetMetrics() for IDWriteFont.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 6067df72911b958772a31bfc367e3429d373f0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6067df72911b958772a31bfc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 16 12:56:23 2012 -0400 dwrite: Implement GetMetrics() for IDWriteFont. --- dlls/dwrite/font.c | 69 +++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 100 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 153 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6067df72911b958772a31…

1 0

Daniel Jelinski : comctl32: Do not send TVN_ITEMEXPANDING when expanding item with no children.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 9933f5e44639c5a3ca05c6ebe84032d5884573d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9933f5e44639c5a3ca05c6ebe… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Sep 27 21:06:48 2012 +0200 comctl32: Do not send TVN_ITEMEXPANDING when expanding item with no children. --- dlls/comctl32/tests/treeview.c | 7 ++++++- dlls/comctl32/treeview.c | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index baf0e02..1021648 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1393,6 +1393,11 @@ static void test_expandnotify(void) ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, ret); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hRoot); + todo_wine expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "no collapse notifications", FALSE); + g_get_from_expand = TRUE; /* expand */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1481,7 +1486,7 @@ static void test_expandnotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); expect(FALSE, ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", FALSE); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 032f49e..3f6b457 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3237,10 +3237,10 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, TRACE("TVE_COLLAPSE %p %s\n", item, TREEVIEW_ItemName(item)); - if (!(item->state & TVIS_EXPANDED)) + if (!TREEVIEW_HasChildren(infoPtr, item)) return FALSE; - if (bUser || !(item->state & TVIS_EXPANDEDONCE)) + if (bUser) TREEVIEW_SendExpanding(infoPtr, item, action); if (item->firstChild == NULL) @@ -3248,7 +3248,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, item->state &= ~TVIS_EXPANDED; - if (bUser || !(item->state & TVIS_EXPANDEDONCE)) + if (bUser) TREEVIEW_SendExpanded(infoPtr, item, action); bSetSelection = (infoPtr->selectedItem != NULL @@ -3344,8 +3344,8 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, TRACE("(%p, %p, partial=%d, %d\n", infoPtr, item, partial, user); - if (item->state & TVIS_EXPANDED) - return TRUE; + if (!TREEVIEW_HasChildren(infoPtr, item)) + return FALSE; tmpItem = item; nextItem = NULL; while (tmpItem)

1 0