wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Henri Verbeet : wined3d: The swapchain should always have a window handle.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: d6bbe90b859f304741a2fbecf081d71b93c0e885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bbe90b859f304741a2fbecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:28 2010 +0100 wined3d: The swapchain should always have a window handle. --- dlls/wined3d/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5dfc560..dc1cf29 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6625,7 +6625,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE IWineD3DDevice_SetDisplayMode(iface, 0, &mode); - if(swapchain->win_handle && !pPresentationParameters->Windowed) { + if (!pPresentationParameters->Windowed) + { if(swapchain->presentParms.Windowed) { /* switch from windowed to fs */ swapchain_setup_fullscreen_window(swapchain, pPresentationParameters->BackBufferWidth, @@ -6636,7 +6637,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight, TRUE); } - } else if(swapchain->win_handle && !swapchain->presentParms.Windowed) { + } + else if (!swapchain->presentParms.Windowed) + { /* Fullscreen -> windowed switch */ swapchain_restore_fullscreen_window(swapchain); }

1 0

Henri Verbeet : wined3d: Use the context' s window handle in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 0ae49c35fbb63e9f3b3d9cbbe3ccb7e60b783f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae49c35fbb63e9f3b3d9cbbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:27 2010 +0100 wined3d: Use the context's window handle in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f5be60..74c84bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3973,8 +3973,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const RECT windowsize; POINT offset = {0,0}; UINT h; - ClientToScreen(dstSwapchain->win_handle, &offset); - GetClientRect(dstSwapchain->win_handle, &windowsize); + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; rect.x1 -= offset.x; rect.x2 -=offset.x; rect.y1 -= offset.y; rect.y2 -=offset.y;

1 0

Henri Verbeet : wined3d: Use the context' s window handle in stretch_rect_fbo().
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 7b0b16fafeb80a9df0e813f07b7c775f56daaa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0b16fafeb80a9df0e813f07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:26 2010 +0100 wined3d: Use the context's window handle in stretch_rect_fbo(). --- dlls/wined3d/device.c | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb10c3e..5dfc560 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5425,19 +5425,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT return WINED3DERR_INVALIDCALL; } -static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) { - HRESULT hr; - IWineD3DSwapChain *swapchain; - - hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); - if (SUCCEEDED(hr)) { - IWineD3DSwapChain_Release((IUnknown *)swapchain); - return swapchain; - } - - return NULL; -} - static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, const WINED3DRECT *rect, const float color[4]) { @@ -5827,7 +5814,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ - IWineD3DSwapChain *src_swapchain, *dst_swapchain; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; GLenum gl_filter; @@ -5857,12 +5843,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); - /* Attach src surface to src fbo */ - src_swapchain = get_swapchain(src_surface); - dst_swapchain = get_swapchain(dst_surface); - - if (src_swapchain) context = context_acquire(This, src_surface, CTXUSAGE_RESOURCELOAD); - else if (dst_swapchain) context = context_acquire(This, dst_surface, CTXUSAGE_RESOURCELOAD); + if (!surface_is_offscreen(src_surface)) context = context_acquire(This, src_surface, CTXUSAGE_RESOURCELOAD); + else if (!surface_is_offscreen(dst_surface)) context = context_acquire(This, dst_surface, CTXUSAGE_RESOURCELOAD); else context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); gl_info = context->gl_info; @@ -5876,8 +5858,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if(buffer == GL_FRONT) { RECT windowsize; UINT h; - ClientToScreen(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &offset); - GetClientRect(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &windowsize); + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; src_rect->x1 -= offset.x; src_rect->x2 -=offset.x; src_rect->y1 = offset.y + h - src_rect->y1; @@ -5912,8 +5894,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if(buffer == GL_FRONT) { RECT windowsize; UINT h; - ClientToScreen(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &offset); - GetClientRect(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &windowsize); + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; dst_rect->x1 -= offset.x; dst_rect->x2 -=offset.x; dst_rect->y1 = offset.y + h - dst_rect->y1;

1 0

Henri Verbeet : wined3d: Store the swapchain instead of the surface in the context.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 18ec2525a438f75a1e961a19b36dfb3a65fd3cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ec2525a438f75a1e961a19b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:25 2010 +0100 wined3d: Store the swapchain instead of the surface in the context. --- dlls/wined3d/arb_program_shader.c | 8 ++-- dlls/wined3d/context.c | 76 ++++++++++++++++++------------------ dlls/wined3d/device.c | 12 ++--- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/swapchain.c | 11 +---- dlls/wined3d/wined3d_private.h | 5 +- 6 files changed, 54 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18ec2525a438f75a1e961…

1 0

Henri Verbeet : wined3d: Add a separate function to set the pixel format in context_create().
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: b281f23efef0b2de3aaee90497814d59777facf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b281f23efef0b2de3aaee9049… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:24 2010 +0100 wined3d: Add a separate function to set the pixel format in context_create(). --- dlls/wined3d/context.c | 81 ++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb7be47..e972721 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -647,6 +647,47 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource } } +static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC dc, int format) +{ + int current = GetPixelFormat(dc); + + if (current == format) return TRUE; + + if (!current) + { + if (!SetPixelFormat(dc, format, NULL)) + { + ERR("Failed to set pixel format %d on device context %p, last error %#x.\n", + format, dc, GetLastError()); + return FALSE; + } + return TRUE; + } + + /* By default WGL doesn't allow pixel format adjustments but we need it + * here. For this reason there's a Wine specific wglSetPixelFormat() + * which allows us to set the pixel format multiple times. Only use it + * when really needed. */ + if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) + { + if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format, NULL))) + { + ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", + format, dc); + return FALSE; + } + return TRUE; + } + + /* OpenGL doesn't allow pixel format adjustments. Print an error and + * continue using the old format. There's a big chance that the old + * format works although with a performance hit and perhaps rendering + * errors. */ + ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", + format, dc, current); + return TRUE; +} + static void context_validate(struct wined3d_context *context) { HWND wnd = WindowFromDC(context->hdc); @@ -1121,7 +1162,6 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface DWORD state; HGLRC ctx; HDC hdc; - int res; TRACE("device %p, target %p, window %p, present parameters %p.\n", This, target, win_handle, pPresentParms); @@ -1205,43 +1245,10 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface } DescribePixelFormat(hdc, pixel_format, sizeof(pfd), &pfd); - res = SetPixelFormat(hdc, pixel_format, NULL); - if (!res) + if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { - int oldPixelFormat = GetPixelFormat(hdc); - - /* By default WGL doesn't allow pixel format adjustments but we need - * it here. For this reason there is a WINE-specific wglSetPixelFormat - * which allows you to set the pixel format multiple times. Only use - * it when it is really needed. */ - - if (oldPixelFormat == pixel_format) - { - /* We don't have to do anything as the formats are the same :) */ - } - else if (oldPixelFormat && gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) - { - res = GL_EXTCALL(wglSetPixelFormatWINE(hdc, pixel_format, NULL)); - - if (!res) - { - ERR("wglSetPixelFormatWINE failed on HDC %p for pixel_format %d.\n", hdc, pixel_format); - goto out; - } - } - else if (oldPixelFormat) - { - /* OpenGL doesn't allow pixel format adjustments. Print an error - * and continue using the old format. There's a big chance that - * the old format works although with a performance hit and perhaps - * rendering errors. */ - ERR("HDC %p is already set to pixel_format %d and OpenGL doesn't allow changes.\n", hdc, oldPixelFormat); - } - else - { - ERR("SetPixelFormat failed on HDC %p for pixel format %d.\n", hdc, pixel_format); - goto out; - } + ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + goto out; } ctx = pwglCreateContext(hdc);

1 0

Henri Verbeet : wined3d: Use "gl_info" in some more places in context_create().
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 4133a0a4ff77c115648925561a0d2f7804fd6159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4133a0a4ff77c115648925561… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:23 2010 +0100 wined3d: Use "gl_info" in some more places in context_create(). --- dlls/wined3d/context.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c8dcb6e..bb7be47 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1149,9 +1149,9 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface auxBuffers = TRUE; if (color_format_desc->format == WINED3DFMT_B4G4R4X4_UNORM) - color_format_desc = getFormatDescEntry(WINED3DFMT_B4G4R4A4_UNORM, &This->adapter->gl_info); + color_format_desc = getFormatDescEntry(WINED3DFMT_B4G4R4A4_UNORM, gl_info); else if (color_format_desc->format == WINED3DFMT_B8G8R8X8_UNORM) - color_format_desc = getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, &This->adapter->gl_info); + color_format_desc = getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, gl_info); } /* DirectDraw supports 8bit paletted render targets and these are used by @@ -1161,7 +1161,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface * For this reason we require a format with 8bit alpha, so request * A8R8G8B8. */ if (color_format_desc->format == WINED3DFMT_P8_UINT) - color_format_desc = getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, &This->adapter->gl_info); + color_format_desc = getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, gl_info); /* Retrieve the depth stencil format from the present parameters. * The choice of the proper format can give a nice performance boost @@ -1170,7 +1170,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface { TRACE("Auto depth stencil enabled, using format %s.\n", debug_d3dformat(pPresentParms->AutoDepthStencilFormat)); - ds_format_desc = getFormatDescEntry(pPresentParms->AutoDepthStencilFormat, &This->adapter->gl_info); + ds_format_desc = getFormatDescEntry(pPresentParms->AutoDepthStencilFormat, gl_info); } /* D3D only allows multisampling when SwapEffect is set to WINED3DSWAPEFFECT_DISCARD. */ @@ -1271,7 +1271,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface goto out; } - ret->gl_info = &This->adapter->gl_info; + ret->gl_info = gl_info; /* Mark all states dirty to force a proper initialization of the states * on the first use of the context. */

1 0

Rob Shearman : rpcrt4: Add support for marshalling/ unmarshalling complex arrays of pointers.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 088c0857c9639b33a6b705c3b6382a4477dd3b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=088c0857c9639b33a6b705c3b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 21:18:46 2010 +0000 rpcrt4: Add support for marshalling/unmarshalling complex arrays of pointers. --- dlls/rpcrt4/ndr_marshall.c | 61 ++++++++++++++++++++++++++++++++++--- dlls/rpcrt4/tests/ndr_marshall.c | 7 ---- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index e594c95..9946bd1 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2711,12 +2711,18 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, safe_copy_to_buffer(pStubMsg, pMemory, sizeof(double)); pMemory += sizeof(double); break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: { unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; TRACE("pointer=%p <= %p\n", *(unsigned char**)pMemory, pMemory); TRACE("pStubMsg->Buffer before %p\n", pStubMsg->Buffer); + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (*pPointer != RPC_FC_RP) ALIGN_POINTER_CLEAR(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; @@ -2738,7 +2744,10 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } TRACE("pStubMsg->Buffer after %p\n", pStubMsg->Buffer); - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void *); break; } @@ -2850,11 +2859,17 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("double=%f => %p\n", *(double*)pMemory, pMemory); pMemory += sizeof(double); break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: { unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; TRACE("pointer => %p\n", pMemory); + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (*pPointer != RPC_FC_RP) ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; @@ -2876,7 +2891,10 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (*pPointer != RPC_FC_RP) safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void *); break; } @@ -2979,7 +2997,13 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_length_increment(pStubMsg, 8); pMemory += 8; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (!pStubMsg->IgnoreEmbeddedPointers) { int saved_buffer_length = pStubMsg->BufferLength; @@ -2996,7 +3020,10 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ALIGN_LENGTH(pStubMsg->BufferLength, 4); safe_buffer_length_increment(pStubMsg, 4); } - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void*); break; case RPC_FC_ALIGNM2: @@ -3082,9 +3109,18 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_DOUBLE: pMemory += 8; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; NdrPointerFree(pStubMsg, *(unsigned char**)pMemory, pPointer); - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void *); break; case RPC_FC_ALIGNM2: @@ -3174,10 +3210,16 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, size += 8; safe_buffer_increment(pStubMsg, 8); break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: { unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (*pPointer != RPC_FC_RP) ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; @@ -3200,7 +3242,10 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, if (*pPointer != RPC_FC_RP) safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; size += sizeof(void *); break; } @@ -3269,8 +3314,14 @@ ULONG ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) case RPC_FC_DOUBLE: size += 8; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: size += sizeof(void *); + if (*pFormat != RPC_FC_POINTER) + pFormat += 4; break; case RPC_FC_ALIGNM2: ALIGN_LENGTH(size, 2); diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2c18bc5..b5987dc 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1997,7 +1997,6 @@ static void test_conf_complex_array(void) win_skip("Tests crash on Win9x, WinMe and NT4\n"); goto cleanup; } -todo_wine ok(StubMsg.BufferLength >= expected_length, "length %d\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ @@ -2013,13 +2012,8 @@ todo_wine #endif ok(ptr == NULL, "ret %p\n", ptr); -todo_wine ok((char*)StubMsg.Buffer == (char*)StubMsg.BufferStart + expected_length, "not at expected length\n"); - /* Skip tests on Wine until the todo_wine is removed */ - if((char*)StubMsg.Buffer == (char*)StubMsg.BufferStart + expected_length) - { - buf = (DWORD *)StubMsg.BufferStart; ok(*buf == memsrc.dim1, "dim1 should have been %d instead of %08x\n", memsrc.dim1, *buf); @@ -2069,7 +2063,6 @@ todo_wine #else NdrSimpleStructFree( &StubMsg, (unsigned char*)mem, &fmtstr_complex_array[32]); #endif - } HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer);

1 0

Rob Shearman : widl: Remove a FIXME comment in write_function_stubs.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: eb4100e91ca62aa24497d6f9303bc150860703a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4100e91ca62aa24497d6f93… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:31:14 2010 +0000 widl: Remove a FIXME comment in write_function_stubs. Clean valgrind runs of tested types and comparison with MIDL-generated code suggests that the existing code written in the finally block for client code is sufficient. --- tools/widl/client.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b683a14..569a18b 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -126,8 +126,6 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) print_client( " struct __frame_%s%s *__frame )\n{\n", prefix_client, get_name(func) ); indent++; - /* FIXME: emit client finally code */ - if (has_full_pointer) write_full_pointer_free(client, indent, func);

1 0

Rob Shearman : widl: Simplify write_parameter_conf_or_var_exprs by making use of typegen_detect_type .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: fd96c54641e500952233d0ac5a1a2730f82a60d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd96c54641e500952233d0ac5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:31:10 2010 +0000 widl: Simplify write_parameter_conf_or_var_exprs by making use of typegen_detect_type. Remove the difficult manual walking of the alias tree and make the code easier to read and less likely to break if a new type is added. --- tools/widl/typegen.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e42d657..ca0faf1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3324,15 +3324,10 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char /* get fundamental type for the argument */ for (;;) { - if (is_attr(type->attrs, ATTR_WIREMARSHAL)) - break; - else if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) - break; - else if (type_is_alias(type)) - type = type_alias_get_aliasee(type); - else if (is_array(type)) + switch (typegen_detect_type(type, var->attrs, TDT_IGNORE_STRINGS|TDT_IGNORE_RANGES)) { - if (is_conformance_needed_for_phase(phase) && is_array(type)) + case TGT_ARRAY: + if (is_conformance_needed_for_phase(phase)) { if (type_array_has_conformance(type)) { @@ -3349,18 +3344,16 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char } } break; - } - else if (type_get_type(type) == TYPE_UNION) - { - if (is_conformance_needed_for_phase(phase)) + case TGT_UNION: + if (type_get_type(type) == TYPE_UNION && + is_conformance_needed_for_phase(phase)) { print_file(file, indent, "__frame->_StubMsg.MaxCount = (ULONG_PTR)"); write_expr(file, get_attrp(var->attrs, ATTR_SWITCHIS), 1, 1, NULL, NULL, local_var_prefix); fprintf(file, ";\n\n"); } break; - } - else if (type_get_type(type) == TYPE_INTERFACE || is_void(type)) + case TGT_IFACE_POINTER: { expr_t *iid; @@ -3372,10 +3365,21 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char } break; } - else if (is_ptr(type)) + case TGT_POINTER: type = type_pointer_get_ref(type); - else + continue; + case TGT_INVALID: + case TGT_USER_TYPE: + case TGT_CTXT_HANDLE: + case TGT_CTXT_HANDLE_POINTER: + case TGT_STRING: + case TGT_BASIC: + case TGT_ENUM: + case TGT_STRUCT: + case TGT_RANGE: break; + } + break; } }

1 0

Rob Shearman : widl: Clean up array case in write_remoting_arg.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 82ab9443b87b363a4fba2552dd88760972ee40ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ab9443b87b363a4fba2552d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:31:00 2010 +0000 widl: Clean up array case in write_remoting_arg. Use a switch statement instead of multiple if statements and explicitly write out the fixed array cases. --- tools/widl/typegen.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a241e69..e42d657 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3500,7 +3500,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const case TGT_ARRAY: { unsigned char tc = get_array_fc(type); - const char *array_type = "FixedArray"; + const char *array_type = NULL; /* We already have the size_is expression since it's at the top level, but do checks for multidimensional conformant @@ -3509,19 +3509,25 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const the return value. */ get_size_is_expr(type, var->name); - if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) + switch (tc) { + case RPC_FC_SMFARRAY: + case RPC_FC_LGFARRAY: + array_type = "FixedArray"; + break; + case RPC_FC_SMVARRAY: + case RPC_FC_LGVARRAY: array_type = "VaryingArray"; - } - else if (tc == RPC_FC_CARRAY) - { + break; + case RPC_FC_CARRAY: array_type = "ConformantArray"; - } - else if (tc == RPC_FC_CVARRAY || tc == RPC_FC_BOGUS_ARRAY) - { - array_type = (tc == RPC_FC_BOGUS_ARRAY - ? "ComplexArray" - : "ConformantVaryingArray"); + break; + case RPC_FC_CVARRAY: + array_type = "ConformantVaryingArray"; + break; + case RPC_FC_BOGUS_ARRAY: + array_type = "ComplexArray"; + break; } if (pointer_type != RPC_FC_RP) array_type = "Pointer";

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
92
Older →

Jump to page:

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-commits March 2010