wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Henri Verbeet : wined3d: Remove COM from the buffer implementation.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: a27ee75ed2069f697fa5bcd5c9ade24086f05f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27ee75ed2069f697fa5bcd5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:09 2011 +0100 wined3d: Remove COM from the buffer implementation. --- dlls/d3d10core/buffer.c | 9 +- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/view.c | 2 +- dlls/d3d8/buffer.c | 44 ++-- dlls/d3d8/d3d8_private.h | 18 +-- dlls/d3d8/device.c | 12 +- dlls/d3d9/buffer.c | 44 ++-- dlls/d3d9/d3d9_private.h | 15 +- dlls/d3d9/device.c | 12 +- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 33 ++-- dlls/ddraw/vertexbuffer.c | 21 +- dlls/wined3d/buffer.c | 418 ++++++++++++++++-------------------- dlls/wined3d/device.c | 53 +++-- dlls/wined3d/stateblock.c | 12 +- dlls/wined3d/wined3d.spec | 15 ++ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 56 +++--- 18 files changed, 354 insertions(+), 418 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a27ee75ed2069f697fa5b…

1 0

Henri Verbeet : ddraw: Just pass NULL as index buffer parent.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: b7c427b483b9d116e7837dc9a340bed253d8c0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c427b483b9d116e7837dc9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:08 2011 +0100 ddraw: Just pass NULL as index buffer parent. Since the parent is just an opaque pointer instead of a COM object now, it can just be NULL instead of needing IParent hacks. --- dlls/ddraw/device.c | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 73feb38..8dfefdf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -285,17 +285,12 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) */ if (ref == 0) { - IParent *IndexBufferParent; DWORD i; EnterCriticalSection(&ddraw_cs); /* Free the index buffer. */ IWineD3DDevice_SetIndexBuffer(This->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); - IndexBufferParent = IWineD3DBuffer_GetParent(This->indexbuffer); - if (IParent_Release(IndexBufferParent)) - { - ERR(" (%p) Something is still holding the index buffer parent %p\n", This, IndexBufferParent); - } + IWineD3DBuffer_Release(This->indexbuffer); /* There is no need to unset the vertex buffer here, IWineD3DDevice_Uninit3D will do that when * destroying the primary stateblock. If a vertex buffer is destroyed while it is bound @@ -4183,13 +4178,11 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, { UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); IWineD3DBuffer *buffer; - IParentImpl *parent; TRACE("Growing index buffer to %u bytes\n", size); - parent = IWineD3DBuffer_GetParent(This->indexbuffer); hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, size, WINED3DUSAGE_DYNAMIC /* Usage */, - WINED3DPOOL_DEFAULT, parent, &ddraw_null_wined3d_parent_ops, &buffer); + WINED3DPOOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr); @@ -4199,8 +4192,6 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, IWineD3DBuffer_Release(This->indexbuffer); This->indexbuffer = buffer; - - parent->child = (IUnknown *)buffer; } /* copy the index stream into the index buffer. @@ -6781,7 +6772,6 @@ IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *target) { - IParentImpl *index_buffer_parent; HRESULT hr; if (ddraw->cooperative_level & DDSCL_FPUPRESERVE) @@ -6805,27 +6795,15 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->legacyTextureBlending = FALSE; /* Create an index buffer, it's needed for indexed drawing */ - index_buffer_parent = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*index_buffer_parent)); - if (!index_buffer_parent) - { - ERR("Failed to allocate index buffer parent memory.\n"); - ddraw_handle_table_destroy(&device->handle_table); - return DDERR_OUTOFMEMORY; - } - - ddraw_parent_init(index_buffer_parent); - hr = IWineD3DDevice_CreateIndexBuffer(ddraw->wineD3DDevice, 0x40000 /* Length. Don't know how long it should be */, - WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, index_buffer_parent, + WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &device->indexbuffer); if (FAILED(hr)) { ERR("Failed to create an index buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, index_buffer_parent); ddraw_handle_table_destroy(&device->handle_table); return hr; } - index_buffer_parent->child = (IUnknown *)device->indexbuffer; /* This is for convenience. */ device->wineD3DDevice = ddraw->wineD3DDevice; @@ -6836,7 +6814,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi if (FAILED(hr)) { ERR("Failed to set render target, hr %#x.\n", hr); - IParent_Release((IParent *)index_buffer_parent); + IWineD3DBuffer_Release(device->indexbuffer); ddraw_handle_table_destroy(&device->handle_table); return hr; }

1 0

Henri Verbeet : wined3d: Pass gl_info to surface_bind().
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 39aa477e4c57811bbbbfd7deb409e88d60d80aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39aa477e4c57811bbbbfd7deb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:07 2011 +0100 wined3d: Pass gl_info to surface_bind(). --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 28 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6c4814d..abff521 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5499,7 +5499,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* Make sure the surface is loaded and up to date */ surface_internal_preload(dst_impl, SRGB_RGB); - surface_bind(dst_impl, FALSE); + surface_bind(dst_impl, gl_info, FALSE); src_w = src_impl->currentDesc.Width; src_h = src_impl->currentDesc.Height; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7f0a42c..4304963 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -694,14 +694,13 @@ void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) } /* Context activation is done by the caller. */ -void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) +void surface_bind(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) { - TRACE("surface %p, srgb %#x.\n", surface, srgb); + TRACE("surface %p, gl_info %p, srgb %#x.\n", surface, gl_info, srgb); if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { IWineD3DBaseTextureImpl *texture = surface->container.u.texture; - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; TRACE("Passing to container (%p).\n", texture); texture->baseTexture.texture_ops->texture_bind(texture, gl_info, srgb); @@ -746,7 +745,10 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) } /* Context activation is done by the caller. */ -static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { +static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *surface, + const struct wined3d_gl_info *gl_info, BOOL srgb) +{ + IWineD3DDeviceImpl *device = surface->resource.device; DWORD active_sampler; /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. @@ -764,13 +766,13 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { ENTER_GL(); glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); LEAVE_GL(); - active_sampler = This->resource.device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; + active_sampler = device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; if (active_sampler != WINED3D_UNMAPPED_STAGE) { - IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_SAMPLER(active_sampler)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(active_sampler)); } - surface_bind(This, srgb); + surface_bind(surface, gl_info, srgb); } /* This function checks if the primary render target uses the 8bit paletted format. */ @@ -1703,7 +1705,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) gl_info = context->gl_info; surface_prepare_texture(This, gl_info, srgb); - surface_bind_and_dirtify(This, srgb); + surface_bind_and_dirtify(This, gl_info, srgb); TRACE("Reading back offscreen render target %p.\n", This); @@ -1735,7 +1737,7 @@ static void surface_prepare_texture_internal(IWineD3DSurfaceImpl *surface, if (convert != NO_CONVERSION || format.convert) surface->flags |= SFLAG_CONVERTED; else surface->flags &= ~SFLAG_CONVERTED; - surface_bind_and_dirtify(surface, srgb); + surface_bind_and_dirtify(surface, gl_info, srgb); surface_allocate_surface(surface, gl_info, &format, srgb); surface->flags |= alloc_flag; } @@ -2102,13 +2104,13 @@ static void surface_release_client_storage(IWineD3DSurfaceImpl *surface) glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); if (surface->texture_name) { - surface_bind_and_dirtify(surface, FALSE); + surface_bind_and_dirtify(surface, context->gl_info, FALSE); glTexImage2D(surface->texture_target, surface->texture_level, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } if (surface->texture_name_srgb) { - surface_bind_and_dirtify(surface, TRUE); + surface_bind_and_dirtify(surface, context->gl_info, TRUE); glTexImage2D(surface->texture_target, surface->texture_level, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } @@ -4425,7 +4427,7 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE if (!device->isInDraw) context = context_acquire(device, NULL); - surface_bind_and_dirtify(surface, !(surface->flags & SFLAG_INTEXTURE)); + surface_bind_and_dirtify(surface, gl_info, !(surface->flags & SFLAG_INTEXTURE)); surface_download_data(surface, gl_info); if (context) context_release(context); @@ -4571,7 +4573,7 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE if (!device->isInDraw) context = context_acquire(device, NULL); surface_prepare_texture(surface, gl_info, srgb); - surface_bind_and_dirtify(surface, srgb); + surface_bind_and_dirtify(surface, gl_info, srgb); if (surface->CKeyFlags & WINEDDSD_CKSRCBLT) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 709ffc5..e8fa71a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2173,7 +2173,7 @@ static inline GLuint surface_get_texture_name(IWineD3DSurfaceImpl *surface, } void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) DECLSPEC_HIDDEN; +void surface_bind(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN;

1 0

Rico Schüller : d3dcompiler: Add debug helper for shader variable type.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 7832577ad7a73f4436259c9ddd6b7aaf8dc4850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7832577ad7a73f4436259c9dd… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Mar 3 21:44:02 2011 +0100 d3dcompiler: Add debug helper for shader variable type. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/reflection.c | 3 +- dlls/d3dcompiler_43/utils.c | 56 +++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 6b8e103..4ac8966 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -42,6 +42,7 @@ /* TRACE helper functions */ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; +const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; /* ID3DBlob */ struct d3dcompiler_blob diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7a63503..006dc40 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1212,7 +1212,8 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type read_dword(&ptr, &temp); desc->Class = temp & 0xffff; desc->Type = temp >> 16; - TRACE("Class %s, Type %x\n", debug_d3dcompiler_shader_variable_class(desc->Class), desc->Type); + TRACE("Class %s, Type %s\n", debug_d3dcompiler_shader_variable_class(desc->Class), + debug_d3dcompiler_shader_variable_type(desc->Type)); read_dword(&ptr, &temp); desc->Rows = temp & 0xffff; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d47258d..5727183 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -47,6 +47,62 @@ const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) } } +const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) +{ + switch (t) + { + WINE_D3DCOMPILER_TO_STR(D3D_SVT_VOID); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BOOL); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_INT); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_FLOAT); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_STRING); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE1D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE3D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURECUBE); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_SAMPLER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_PIXELSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_VERTEXSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_UINT); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_UINT8); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_GEOMETRYSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RASTERIZER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DEPTHSTENCIL); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BLEND); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_CBUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TBUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE1DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RENDERTARGETVIEW); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DEPTHSTENCILVIEW); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2DMS); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2DMSARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURECUBEARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_HULLSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DOMAINSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_INTERFACE_POINTER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_COMPUTESHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DOUBLE); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE1D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE1DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE2D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE2DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE3D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWBUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BYTEADDRESS_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWBYTEADDRESS_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_STRUCTURED_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWSTRUCTURED_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_APPEND_STRUCTURED_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_CONSUME_STRUCTURED_BUFFER); + default: + FIXME("Unrecognized D3D_SHADER_VARIABLE_TYPE %#x.\n", t); + return "unrecognized"; + } +} + const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) { switch(part)

1 0

Rico Schüller : d3dcompiler: Add debug helper for shader variable class.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 525dee0778506167f6da342b9c9fbf38fca9be6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=525dee0778506167f6da342b9… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Mar 3 21:44:00 2011 +0100 d3dcompiler: Add debug helper for shader variable class. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/reflection.c | 2 +- dlls/d3dcompiler_43/utils.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 788f396..6b8e103 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -41,6 +41,7 @@ /* TRACE helper functions */ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; +const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; /* ID3DBlob */ struct d3dcompiler_blob diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7db18d0..7a63503 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1212,7 +1212,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type read_dword(&ptr, &temp); desc->Class = temp & 0xffff; desc->Type = temp >> 16; - TRACE("Class %x, Type %x\n", desc->Class, desc->Type); + TRACE("Class %s, Type %x\n", debug_d3dcompiler_shader_variable_class(desc->Class), desc->Type); read_dword(&ptr, &temp); desc->Rows = temp & 0xffff; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 362479a..d47258d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -29,6 +29,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); #define WINE_D3DCOMPILER_TO_STR(x) case x: return #x +const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) +{ + switch (c) + { + WINE_D3DCOMPILER_TO_STR(D3D_SVC_SCALAR); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_VECTOR); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_MATRIX_ROWS); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_MATRIX_COLUMNS); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_OBJECT); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_STRUCT); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_INTERFACE_CLASS); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_INTERFACE_POINTER); + default: + FIXME("Unrecognized D3D_SHADER_VARIABLE_CLASS %#x.\n", c); + return "unrecognized"; + } +} + const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) { switch(part)

1 0

Juan Lang : include: Add some missing definitions.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: e71a23505846b51224fd799f717b0eec6cfb6a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71a23505846b51224fd799f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:25:55 2011 -0800 include: Add some missing definitions. --- include/winineti.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/winineti.h b/include/winineti.h index f1eb880..6419204 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -84,6 +84,26 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOW DECL_WINELIB_TYPE_AW(INTERNET_CACHE_CONFIG_INFO) DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_CONFIG_INFO) +typedef enum { + WININET_SYNC_MODE_NEVER = 0, + WININET_SYNC_MODE_ON_EXPIRY, + WININET_SYNC_MODE_ONCE_PER_SESSION, + WININET_SYNC_MODE_ALWAYS, + WININET_SYNC_MODE_AUTOMATIC, + WININET_SYNC_MODE_DEFAULT = WININET_SYNC_MODE_AUTOMATIC +} WININET_SYNC_MODE; + +/* Flags for GetUrlCacheConfigInfoA/W and SetUrlCacheConfigInfoA/W */ +#define CACHE_CONFIG_FORCE_CLEANUP_FC 0x00000020 +#define CACHE_CONFIG_DISK_CACHE_PATHS_FC 0x00000040 +#define CACHE_CONFIG_SYNC_MODE_FC 0x00000080 +#define CACHE_CONFIG_CONTENT_PATHS_FC 0x00000100 +#define CACHE_CONFIG_COOKIES_PATHS_FC 0x00000200 +#define CACHE_CONFIG_HISTORY_PATHS_FC 0x00000400 +#define CACHE_CONFIG_QUOTA_FC 0x00000800 +#define CACHE_CONFIG_USER_MODE_FC 0x00001000 +#define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 +#define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 #ifdef __cplusplus extern "C" {

1 0

Juan Lang : wininet: Move creating cache file to a helper function.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 666353d1a67e2a6d21f74a488e12d3ccb9e699c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666353d1a67e2a6d21f74a488… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 2 10:06:37 2011 -0800 wininet: Move creating cache file to a helper function. --- dlls/wininet/http.c | 58 +++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8787ba2..d47ebd6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3843,6 +3843,35 @@ static void HTTP_ProcessExpires(http_request_t *request) } } +static void HTTP_CacheRequest(http_request_t *request) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + WCHAR cacheFileName[MAX_PATH+1]; + BOOL b; + + b = HTTP_GetRequestURL(request, url); + if(!b) { + WARN("Could not get URL\n"); + return; + } + + b = CreateUrlCacheEntryW(url, request->contentLength > 0 ? request->contentLength : 0, NULL, cacheFileName, 0); + if(b) { + HeapFree(GetProcessHeap(), 0, request->cacheFile); + CloseHandle(request->hCacheFile); + + request->cacheFile = heap_strdupW(cacheFileName); + request->hCacheFile = CreateFileW(request->cacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(request->hCacheFile == INVALID_HANDLE_VALUE) { + WARN("Could not create file: %u\n", GetLastError()); + request->hCacheFile = NULL; + } + }else { + WARN("Could not create cache entry: %08x\n", GetLastError()); + } +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -4117,33 +4146,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } while (loop_next); - if(res == ERROR_SUCCESS) { - WCHAR url[INTERNET_MAX_URL_LENGTH]; - WCHAR cacheFileName[MAX_PATH+1]; - BOOL b; - - b = HTTP_GetRequestURL(request, url); - if(!b) { - WARN("Could not get URL\n"); - goto lend; - } - - b = CreateUrlCacheEntryW(url, request->contentLength > 0 ? request->contentLength : 0, NULL, cacheFileName, 0); - if(b) { - HeapFree(GetProcessHeap(), 0, request->cacheFile); - CloseHandle(request->hCacheFile); - - request->cacheFile = heap_strdupW(cacheFileName); - request->hCacheFile = CreateFileW(request->cacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(request->hCacheFile == INVALID_HANDLE_VALUE) { - WARN("Could not create file: %u\n", GetLastError()); - request->hCacheFile = NULL; - } - }else { - WARN("Could not create cache entry: %08x\n", GetLastError()); - } - } + if(res == ERROR_SUCCESS) + HTTP_CacheRequest(request); lend:

1 0

Juan Lang : wininet: Support the Cache-Control max-age directive for setting url cache entry expiration .
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 488c2d0c36bc4e0579f6aa54eb645fdf565b24fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=488c2d0c36bc4e0579f6aa54e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:54:47 2011 -0800 wininet: Support the Cache-Control max-age directive for setting url cache entry expiration. --- dlls/wininet/http.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 649bd17..8787ba2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3761,16 +3761,74 @@ static void HTTP_ProcessExpires(http_request_t *request) BOOL expirationFound = FALSE; int headerIndex; - headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); + /* Look for a Cache-Control header with a max-age directive, as it takes + * precedence over the Expires header. + */ + headerIndex = HTTP_GetCustomHeaderIndex(request, szCache_Control, 0, FALSE); if (headerIndex != -1) { - LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; - FILETIME ft; + LPHTTPHEADERW ccHeader = &request->custHeaders[headerIndex]; + LPWSTR ptr; - if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) + for (ptr = ccHeader->lpszValue; ptr && *ptr; ) { - expirationFound = TRUE; - request->expires = ft; + LPWSTR comma = strchrW(ptr, ','), end, equal; + + if (comma) + end = comma; + else + end = ptr + strlenW(ptr); + for (equal = end - 1; equal > ptr && *equal != '='; equal--) + ; + if (*equal == '=') + { + static const WCHAR max_age[] = { + 'm','a','x','-','a','g','e',0 }; + + if (!strncmpiW(ptr, max_age, equal - ptr - 1)) + { + LPWSTR nextPtr; + unsigned long age; + + age = strtoulW(equal + 1, &nextPtr, 10); + if (nextPtr > equal + 1) + { + LARGE_INTEGER ft; + + NtQuerySystemTime( &ft ); + /* Age is in seconds, FILETIME resolution is in + * 100 nanosecond intervals. + */ + ft.QuadPart += age * (ULONGLONG)1000000; + request->expires.dwLowDateTime = ft.u.LowPart; + request->expires.dwHighDateTime = ft.u.HighPart; + expirationFound = TRUE; + } + } + } + if (comma) + { + ptr = comma + 1; + while (isspaceW(*ptr)) + ptr++; + } + else + ptr = NULL; + } + } + if (!expirationFound) + { + headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); + if (headerIndex != -1) + { + LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; + FILETIME ft; + + if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) + { + expirationFound = TRUE; + request->expires = ft; + } } } if (!expirationFound)

1 0

Juan Lang : wininet: Default to 10 minutes expiration for cache entries.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 2d323430cbaa2ed9e58220694ca23068b3fd8821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d323430cbaa2ed9e58220694… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:54:07 2011 -0800 wininet: Default to 10 minutes expiration for cache entries. --- dlls/wininet/http.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3254a25..649bd17 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -56,6 +56,7 @@ #include "winbase.h" #include "wininet.h" #include "winerror.h" +#include "winternl.h" #define NO_SHLWAPI_STREAM #define NO_SHLWAPI_REG #define NO_SHLWAPI_STRFCNS @@ -3774,13 +3775,13 @@ static void HTTP_ProcessExpires(http_request_t *request) } if (!expirationFound) { - ULARGE_INTEGER ft; + LARGE_INTEGER t; /* With no known age, default to 10 minutes until expiration. */ - GetSystemTimeAsFileTime((FILETIME *)&ft); - ft.QuadPart += 10 * 60 * 10000000; - request->expires.dwLowDateTime = ft.u.LowPart; - request->expires.dwHighDateTime = ft.u.HighPart; + NtQuerySystemTime( &t ); + t.QuadPart += 10 * 60 * (ULONGLONG)10000000; + request->expires.dwLowDateTime = t.u.LowPart; + request->expires.dwHighDateTime = t.u.HighPart; } }

1 0

Juan Lang : wininet: Default to 10 minutes expiration for cache entries.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: ab16c75c48a79786a7adeb4dd93dc3135faaeb18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab16c75c48a79786a7adeb4dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:54:07 2011 -0800 wininet: Default to 10 minutes expiration for cache entries. --- dlls/wininet/http.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 85484bf..3254a25 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3757,6 +3757,7 @@ static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) static void HTTP_ProcessExpires(http_request_t *request) { + BOOL expirationFound = FALSE; int headerIndex; headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); @@ -3766,7 +3767,20 @@ static void HTTP_ProcessExpires(http_request_t *request) FILETIME ft; if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) + { + expirationFound = TRUE; request->expires = ft; + } + } + if (!expirationFound) + { + ULARGE_INTEGER ft; + + /* With no known age, default to 10 minutes until expiration. */ + GetSystemTimeAsFileTime((FILETIME *)&ft); + ft.QuadPart += 10 * 60 * 10000000; + request->expires.dwLowDateTime = ft.u.LowPart; + request->expires.dwHighDateTime = ft.u.HighPart; } }

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
85
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 2011