June 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 1.6-rc1.
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: 1c81dbd1c2e35e9d4191d3a32a15d3a22fac5525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c81dbd1c2e35e9d4191d3a32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 21:48:24 2013 +0200 Release 1.6-rc1. --- ANNOUNCE | 738 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 399 insertions(+), 359 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c81dbd1c2e35e9d4191d…

1 0

Tag wine-1.6-rc1 : Alexandre Julliard : Release 1.6-rc1
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: refs/tags/wine-1.6-rc1 Tag: 8e19f600d1df68d9f9599b15b8395b290f19e81c URL: http://source.winehq.org/git/wine.git/?a=tag;h=8e19f600d1df68d9f9599b15b839… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 21:48:24 2013 +0200 Release 1.6-rc1

1 0

Ken Thomases : winemac: Add an option to capture the displays for full-screen windows in addition to display mode changes .
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: 220b8b7946397b7605e53d97c8b0d3aafe55d4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220b8b7946397b7605e53d97c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 6 17:43:06 2013 -0500 winemac: Add an option to capture the displays for full-screen windows in addition to display mode changes. Under HKCU\Software\Wine\Mac Driver, set string value CaptureDisplaysForFullscreen to "y" to enable the new behavior. --- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 58 +++++++++++++++++++++++++++++--- dlls/winemac.drv/cocoa_window.h | 3 ++ dlls/winemac.drv/cocoa_window.m | 69 +++++++++++++++++++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 7 ++++ 6 files changed, 120 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=220b8b7946397b7605e53…

1 0

Ken Thomases : winemac: Actually switch Win32 focus away from a window that has lost Cocoa focus.
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: e635952459c9f563860dda729e3a19374a27c7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e635952459c9f563860dda729… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 6 19:44:11 2013 -0500 winemac: Actually switch Win32 focus away from a window that has lost Cocoa focus. --- dlls/winemac.drv/window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 7e0c60e..5328489 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1587,7 +1587,11 @@ void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) TRACE("win %p/%p fg %p\n", hwnd, event->window, GetForegroundWindow()); if (hwnd == GetForegroundWindow()) + { SendMessageW(hwnd, WM_CANCELMODE, 0, 0); + if (hwnd == GetForegroundWindow()) + SetForegroundWindow(GetDesktopWindow()); + } }

1 0

Henri Verbeet : d3d8: Create textures for swapchain surfaces.
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: d97a8b3e8336dad729579a37b543639ffb8ef1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97a8b3e8336dad729579a37b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:51 2013 +0200 d3d8: Create textures for swapchain surfaces. --- dlls/d3d8/device.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5bdf2fd..2f09a4f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -571,6 +571,21 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { struct d3d8_surface *surface; + if (desc.resource_type == WINED3D_RTYPE_TEXTURE) + { + IUnknown *parent = wined3d_resource_get_parent(resource); + IDirect3DBaseTexture8 *texture; + + if (SUCCEEDED(IUnknown_QueryInterface(parent, &IID_IDirect3DBaseTexture8, (void **)&texture))) + { + IDirect3DBaseTexture8_Release(texture); + WARN("Texture %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", texture, resource); + return D3DERR_DEVICELOST; + } + + return D3D_OK; + } + if (desc.resource_type != WINED3D_RTYPE_SURFACE) { WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); @@ -2917,26 +2932,30 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); + struct wined3d_resource_desc texture_desc; struct d3d8_surface *d3d_surface; + struct wined3d_texture *texture; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n", device_parent, container_parent, desc, surface); - if (FAILED(hr = d3d8_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), WINED3D_SURFACE_MAPPABLE, (IDirect3DSurface8 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + texture_desc = *desc; + texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &texture_desc, 1, + WINED3D_SURFACE_MAPPABLE, &device->IDirect3DDevice8_iface, &d3d8_null_wined3d_parent_ops, &texture))) { - WARN("Failed to create surface, hr %#x.\n", hr); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - *surface = d3d_surface->wined3d_surface; + *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); wined3d_surface_incref(*surface); + wined3d_texture_decref(texture); - d3d_surface->container = (IUnknown *)&device->IDirect3DDevice8_iface; - /* Implicit surfaces are created with an refcount of 0 */ - IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); + d3d_surface = wined3d_surface_get_parent(*surface); + d3d_surface->forwardReference = NULL; + d3d_surface->parent_device = &device->IDirect3DDevice8_iface; return hr; }

1 0

Henri Verbeet : wined3d: Fix a typo in shader_glsl_generate_ffp_fragment_shader().
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: f52d4044eb1bcb4acdab42588d6d2630497ccb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52d4044eb1bcb4acdab42588… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:52 2013 +0200 wined3d: Fix a typo in shader_glsl_generate_ffp_fragment_shader(). --- 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 57f22de..6afc3d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5405,7 +5405,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf shader_addline(buffer, "void main()\n{\n"); if (lowest_disabled_stage < 7 && settings->emul_clipplanes) - shader_addline(buffer, "if (any(lessThan(gl_texCoord[7], vec4(0.0)))) discard;\n"); + shader_addline(buffer, "if (any(lessThan(gl_TexCoord[7], vec4(0.0)))) discard;\n"); /* Generate texture sampling instructions) */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage)

1 0

Henri Verbeet : wined3d: Don't modify the texcoord mask for "projected" cube textures in shader_glsl_tex().
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: e8905e360f047db8af42af64ec08086a5814a1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8905e360f047db8af42af64e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:53 2013 +0200 wined3d: Don't modify the texcoord mask for "projected" cube textures in shader_glsl_tex(). --- dlls/wined3d/glsl_shader.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6afc3d8..0379729 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3515,8 +3515,11 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; mask = WINED3DSP_WRITEMASK_3; } - } else { - if (ins->flags & WINED3DSI_TEXLD_PROJECT) + } + else + { + if ((ins->flags & WINED3DSI_TEXLD_PROJECT) + && ins->ctx->reg_maps->sampler_type[sampler_idx] != WINED3DSTT_CUBE) { /* ps 2.0 texldp instruction always divides by the fourth component. */ sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED;

1 0

Henri Verbeet : ddraw: Rename PixelFormat_DD2WineD3D() to wined3dformat_from_ddrawformat().
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: 86eb211159552bf56c352851127b200e816f9a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86eb211159552bf56c3528511… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:54 2013 +0200 ddraw: Rename PixelFormat_DD2WineD3D() to wined3dformat_from_ddrawformat(). For consistency with the other D3D dlls. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 10 +++++----- dlls/ddraw/utils.c | 16 ++-------------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 674b222..d4fe145 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -552,7 +552,7 @@ struct d3d_vertex_buffer *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVerte (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_id WineD3DFormat) DECLSPEC_HIDDEN; -enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) DECLSPEC_HIDDEN; +enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *format) DECLSPEC_HIDDEN; void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) DECLSPEC_HIDDEN; void dump_D3DMATRIX(const D3DMATRIX *mat) DECLSPEC_HIDDEN; void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9d50e67..4ca02bd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4328,7 +4328,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, if (DDSD->dwFlags & DDSD_PIXELFORMAT) { enum wined3d_format_id current_format_id; - format_id = PixelFormat_DD2WineD3D(&DDSD->u4.ddpfPixelFormat); + format_id = wined3dformat_from_ddrawformat(&DDSD->u4.ddpfPixelFormat); if (format_id == WINED3DFMT_UNKNOWN) { @@ -4336,7 +4336,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } - current_format_id = PixelFormat_DD2WineD3D(&This->surface_desc.u4.ddpfPixelFormat); + current_format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); if (format_id != current_format_id) { TRACE("Surface format changed from %#x to %#x.\n", current_format_id, format_id); @@ -4345,7 +4345,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } else { - format_id = PixelFormat_DD2WineD3D(&This->surface_desc.u4.ddpfPixelFormat); + format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); } if (update_wined3d) @@ -5613,7 +5613,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac else pool = WINED3D_POOL_DEFAULT; - wined3d_desc.format = PixelFormat_DD2WineD3D(&surface->surface_desc.u4.ddpfPixelFormat); + wined3d_desc.format = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = 0; @@ -5753,7 +5753,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; } - format = PixelFormat_DD2WineD3D(&desc->u4.ddpfPixelFormat); + format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); if (format == WINED3DFMT_UNKNOWN) { WARN("Unsupported / unknown pixelformat.\n"); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index a1fb43b..c605c74 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -349,20 +349,8 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i DDRAW_dump_pixelformat(DDPixelFormat); } } -/***************************************************************************** - * PixelFormat_DD2WineD3D - * - * Reads a DDPIXELFORMAT structure and returns the equivalent wined3d - * format ID. - * - * Params: - * DDPixelFormat: The source format - * - * Returns: - * The wined3d format ID equivalent to the DDraw format - * WINED3DFMT_UNKNOWN if a matching format wasn't found - *****************************************************************************/ -enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) + +enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPixelFormat) { TRACE("Convert a DirectDraw Pixelformat to a WineD3D Pixelformat\n"); if(TRACE_ON(ddraw))

1 0

Henri Verbeet : ddraw: Rename PixelFormat_WineD3DtoDD() to ddrawformat_from_wined3dformat().
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: 29c43e2efce2177ce421319157a9ddc805246d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c43e2efce2177ce42131915… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:55 2013 +0200 ddraw: Rename PixelFormat_WineD3DtoDD() to ddrawformat_from_wined3dformat(). --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/device.c | 12 ++++++------ dlls/ddraw/utils.c | 24 +++++++----------------- 4 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index eded430..5096a9c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1375,7 +1375,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 DDSD->u2.dwRefreshRate = 60; DDSD->ddsCaps.dwCaps = 0; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); - PixelFormat_WineD3DtoDD(&DDSD->u4.ddpfPixelFormat, mode.format_id); + ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; if(TRACE_ON(ddraw)) @@ -2115,7 +2115,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, BOOL found = FALSE; unsigned i; - PixelFormat_WineD3DtoDD(&pixelformat, mode.format_id); + ddrawformat_from_wined3dformat(&pixelformat, mode.format_id); if (DDSD) { if (DDSD->dwFlags & DDSD_WIDTH && mode.width != DDSD->dwWidth) @@ -2717,7 +2717,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, desc2.dwFlags |= DDSD_PIXELFORMAT; desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); - PixelFormat_WineD3DtoDD(&desc2.u4.ddpfPixelFormat, mode.format_id); + ddrawformat_from_wined3dformat(&desc2.u4.ddpfPixelFormat, mode.format_id); } /* No Width or no Height? Use the original screen size @@ -4428,7 +4428,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device memset(&pformat, 0, sizeof(pformat)); pformat.dwSize = sizeof(pformat); - PixelFormat_WineD3DtoDD(&pformat, formats[i]); + ddrawformat_from_wined3dformat(&pformat, formats[i]); TRACE("Enumerating wined3d format %#x.\n", formats[i]); hr = callback(&pformat, context); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d4fe145..84f90c4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -551,7 +551,8 @@ struct d3d_vertex_buffer *unsafe_impl_from_IDirect3DVertexBuffer7(IDirect3DVerte #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) -void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_id WineD3DFormat) DECLSPEC_HIDDEN; +void ddrawformat_from_wined3dformat(DDPIXELFORMAT *ddraw_format, + enum wined3d_format_id wined3d_format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *format) DECLSPEC_HIDDEN; void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) DECLSPEC_HIDDEN; void dump_D3DMATRIX(const D3DMATRIX *mat) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 64f5537..8e86f55 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1111,7 +1111,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, memset(&pformat, 0, sizeof(pformat)); pformat.dwSize = sizeof(pformat); - PixelFormat_WineD3DtoDD(&pformat, FormatList[i]); + ddrawformat_from_wined3dformat(&pformat, FormatList[i]); TRACE("Enumerating WineD3DFormat %d\n", FormatList[i]); hr = callback(&pformat, context); @@ -1134,7 +1134,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, memset(&pformat, 0, sizeof(pformat)); pformat.dwSize = sizeof(pformat); - PixelFormat_WineD3DtoDD(&pformat, BumpFormatList[i]); + ddrawformat_from_wined3dformat(&pformat, BumpFormatList[i]); TRACE("Enumerating WineD3DFormat %d\n", BumpFormatList[i]); hr = callback(&pformat, context); @@ -1242,7 +1242,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, sdesc.dwFlags = DDSD_PIXELFORMAT | DDSD_CAPS; sdesc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; sdesc.ddpfPixelFormat.dwSize = sizeof(sdesc.ddpfPixelFormat); - PixelFormat_WineD3DtoDD(&sdesc.ddpfPixelFormat, FormatList[i]); + ddrawformat_from_wined3dformat(&sdesc.ddpfPixelFormat, FormatList[i]); TRACE("Enumerating WineD3DFormat %d\n", FormatList[i]); hr = callback(&sdesc, context); @@ -2463,7 +2463,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, wined3d_resource_get_desc(sub_resource, &desc); ddfmt.dwSize = sizeof(ddfmt); - PixelFormat_WineD3DtoDD(&ddfmt, desc.format); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; } } @@ -2752,7 +2752,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, wined3d_resource_get_desc(sub_resource, &desc); ddfmt.dwSize = sizeof(ddfmt); - PixelFormat_WineD3DtoDD(&ddfmt, desc.format); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; } } @@ -4616,7 +4616,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, wined3d_resource_get_desc(sub_resource, &desc); ddfmt.dwSize = sizeof(ddfmt); - PixelFormat_WineD3DtoDD(&ddfmt, desc.format); + ddrawformat_from_wined3dformat(&ddfmt, desc.format); if (ddfmt.u5.dwRGBAlphaBitMask) tex_alpha = TRUE; } } diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index c605c74..6ab6370 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -30,26 +30,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static void DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf); -/***************************************************************************** - * PixelFormat_WineD3DtoDD - * - * Converts an wined3d format ID into a DDPIXELFORMAT structure - * - * Params: - * DDPixelFormat: Address of the structure to write the pixel format to - * WineD3DFormat: Source format - * - *****************************************************************************/ -void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_id WineD3DFormat) +void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_id wined3d_format) { DWORD Size = DDPixelFormat->dwSize; - TRACE("Converting wined3d format %#x to DDRAW.\n", WineD3DFormat); if(Size==0) return; memset(DDPixelFormat, 0x00, Size); DDPixelFormat->dwSize = Size; - switch(WineD3DFormat) + switch (wined3d_format) { case WINED3DFMT_B8G8R8_UNORM: DDPixelFormat->dwFlags = DDPF_RGB; @@ -247,13 +236,13 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i case WINED3DFMT_YUY2: DDPixelFormat->u1.dwYUVBitCount = 16; DDPixelFormat->dwFlags = DDPF_FOURCC; - DDPixelFormat->dwFourCC = WineD3DFormat; + DDPixelFormat->dwFourCC = wined3d_format; break; case WINED3DFMT_YV12: DDPixelFormat->u1.dwYUVBitCount = 12; DDPixelFormat->dwFlags = DDPF_FOURCC; - DDPixelFormat->dwFourCC = WineD3DFormat; + DDPixelFormat->dwFourCC = wined3d_format; break; case WINED3DFMT_DXT1: @@ -265,7 +254,7 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i case WINED3DFMT_G8R8_G8B8: case WINED3DFMT_R8G8_B8G8: DDPixelFormat->dwFlags = DDPF_FOURCC; - DDPixelFormat->dwFourCC = WineD3DFormat; + DDPixelFormat->dwFourCC = wined3d_format; break; /* Luminance */ @@ -341,7 +330,8 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i break; default: - ERR("Can't translate this Pixelformat %d\n", WineD3DFormat); + FIXME("Unhandled wined3d format %#x.\n", wined3d_format); + break; } if(TRACE_ON(ddraw)) {

1 0

Hans Leidekker : wmiutils: Fix parsing of relative paths.
by Alexandre Julliard 07 Jun '13

07 Jun '13

Module: wine Branch: master Commit: 540370fb03e13ba5bf723a84c4590fd91159ebdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=540370fb03e13ba5bf723a84c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 7 10:30:31 2013 +0200 wmiutils: Fix parsing of relative paths. --- dlls/wmiutils/path.c | 19 +++++++++++-------- dlls/wmiutils/tests/path.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 988d2e6..046f424 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -420,15 +420,18 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) path->flags |= WBEMPATH_INFO_PATH_HAD_SERVER; } p = q; - if (*q && *q != '\\' && *q != '/' && *q != ':') + if (strchrW( p, '\\' ) || strchrW( p, '/' )) { - path->num_namespaces = 1; - q++; - } - while (*q && *q != ':') - { - if (*q == '\\' || *q == '/') path->num_namespaces++; - q++; + if (*q != '\\' && *q != '/' && *q != ':') + { + path->num_namespaces = 1; + q++; + } + while (*q && *q != ':') + { + if (*q == '\\' || *q == '/') path->num_namespaces++; + q++; + } } if (path->num_namespaces) { diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 54c0e9a..ffc3d46 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -161,6 +161,11 @@ static void test_IWbemPath_SetText(void) static void test_IWbemPath_GetText(void) { + static const WCHAR serviceW[] = + {'W','i','n','3','2','_','S','e','r','v','i','c','e','.','N','a','m','e','=', + '\"','S','e','r','v','i','c','e','\"',0}; + static const WCHAR classW[] = + {'W','i','n','3','2','_','C','l','a','s','s',0}; static const WCHAR expected1W[] = {'r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=', @@ -329,6 +334,32 @@ static void test_IWbemPath_GetText(void) ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); IWbemPath_Release( path ); + if (!(path = create_path())) return; + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, serviceW ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf)/sizeof(buf[0]); + memset( buf, 0x55, sizeof(buf) ); + hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, serviceW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( serviceW ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); + if (!(path = create_path())) return; + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, classW ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf)/sizeof(buf[0]); + memset( buf, 0x55, sizeof(buf) ); + hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + + IWbemPath_Release( path ); } static void test_IWbemPath_GetClassName(void)

1 0