wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Michael Stefaniuc : dplayx/tests: Fix typo in ok() message.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: e22d33e683d727b76ca7dcf2c5314f1d44967ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22d33e683d727b76ca7dcf2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 27 00:26:32 2013 +0200 dplayx/tests: Fix typo in ok() message. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 17ab59d..44c9b50 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6470,7 +6470,7 @@ static void test_COM_dplobby(void) &IID_IUnknown, (void**)&dpl); ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlayLobby create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dp4 = %p\n", dpl); + ok(!dpl || dpl == (IDirectPlayLobby*)0xdeadbeef, "dpl = %p\n", dpl); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlayLobby, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay,

1 0

Henri Verbeet : d3dx9: Get rid of the SPRITEVERTEX typedef.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: be2e845cb316979e07ea89de09aca8843274656c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2e845cb316979e07ea89de0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:17 2013 +0200 d3dx9: Get rid of the SPRITEVERTEX typedef. --- dlls/d3dx9_36/sprite.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index f0e6718..580289f 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -25,11 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /* the combination of all possible D3DXSPRITE flags */ #define D3DXSPRITE_FLAGLIMIT 511 -typedef struct _SPRITEVERTEX { +struct sprite_vertex +{ D3DXVECTOR3 pos; DWORD col; D3DXVECTOR2 tex; -} SPRITEVERTEX; +}; typedef struct _SPRITE { IDirect3DTexture9 *texture; @@ -315,7 +316,7 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often) set_states(This); IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); - IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(SPRITEVERTEX)); + IDirect3DDevice9_SetStreamSource(This->device, 0, NULL, 0, sizeof(struct sprite_vertex)); IDirect3DDevice9_SetIndices(This->device, NULL); IDirect3DDevice9_SetTexture(This->device, 0, NULL); @@ -398,7 +399,7 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) { struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface); - SPRITEVERTEX *vertices; + struct sprite_vertex *vertices; int i, count=0, start; TRACE("iface %p.\n", iface); @@ -407,7 +408,7 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) if(!This->sprite_count) return D3D_OK; /* TODO: use of a vertex buffer here */ - vertices=HeapAlloc(GetProcessHeap(), 0, sizeof(SPRITEVERTEX)*6*This->sprite_count); + vertices = HeapAlloc(GetProcessHeap(), 0, sizeof(*vertices) * 6 * This->sprite_count); for(start=0;start<This->sprite_count;start+=count,count=0) { i=start; @@ -444,9 +445,8 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) vertices[6*i+4]=vertices[6*i]; vertices[6*i+5]=vertices[6*i+2]; - D3DXVec3TransformCoordArray(&vertices[6*i].pos, sizeof(SPRITEVERTEX), - &vertices[6*i].pos, sizeof(SPRITEVERTEX), - &This->sprites[i].transform, 6); + D3DXVec3TransformCoordArray(&vertices[6 * i].pos, sizeof(*vertices), + &vertices[6 * i].pos, sizeof(*vertices), &This->sprites[i].transform, 6); count++; i++; } @@ -454,7 +454,8 @@ static HRESULT WINAPI d3dx9_sprite_Flush(ID3DXSprite *iface) IDirect3DDevice9_SetTexture(This->device, 0, (struct IDirect3DBaseTexture9 *)This->sprites[start].texture); IDirect3DDevice9_SetVertexDeclaration(This->device, This->vdecl); - IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLELIST, 2*count, vertices+6*start, sizeof(SPRITEVERTEX)); + IDirect3DDevice9_DrawPrimitiveUP(This->device, D3DPT_TRIANGLELIST, + 2 * count, vertices + 6 * start, sizeof(*vertices)); } HeapFree(GetProcessHeap(), 0, vertices);

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXFileDataImpl typedef.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: be1dbc0dbb41176c4b840ae36a5c4ffa767ee254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1dbc0dbb41176c4b840ae36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:16 2013 +0200 d3dx9: Get rid of the ID3DXFileDataImpl typedef. --- dlls/d3dx9_36/xfile.c | 182 +++++++++++++++++++++++-------------------------- 1 files changed, 85 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be1dbc0dbb41176c4b840…

1 0

Henri Verbeet : wined3d: Send draw operation through the command stream.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: baf285d46a8d93b673a6368c68f833dbbcbc39f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf285d46a8d93b673a6368c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:15 2013 +0200 wined3d: Send draw operation through the command stream. --- dlls/wined3d/cs.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 988c8d4..cdd7794 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -27,6 +27,7 @@ enum wined3d_cs_op { WINED3D_CS_OP_PRESENT, WINED3D_CS_OP_CLEAR, + WINED3D_CS_OP_DRAW, }; struct wined3d_cs_present @@ -51,6 +52,16 @@ struct wined3d_cs_clear DWORD stencil; }; +struct wined3d_cs_draw +{ + enum wined3d_cs_op opcode; + UINT start_idx; + UINT index_count; + UINT start_instance; + UINT instance_count; + BOOL indexed; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -111,10 +122,35 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * cs->ops->submit(cs); } +static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_draw *op = data; + + draw_primitive(cs->device, op->start_idx, op->index_count, + op->start_instance, op->instance_count, op->indexed); +} + +void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_count, + UINT start_instance, UINT instance_count, BOOL indexed) +{ + struct wined3d_cs_draw *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_DRAW; + op->start_idx = start_idx; + op->index_count = index_count; + op->start_instance = start_instance; + op->instance_count = instance_count; + op->indexed = indexed; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, + /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6722990..6d5f913 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3542,9 +3542,8 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - /* Account for the loading offset due to index buffers. Instead of - * reloading all sources correct it with the startvertex parameter. */ - draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE); + wined3d_cs_emit_draw(device->cs, start_vertex, vertex_count, 0, 0, FALSE); + return WINED3D_OK; } @@ -3577,7 +3576,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - draw_primitive(device, start_idx, index_count, 0, 0, TRUE); + wined3d_cs_emit_draw(device->cs, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK; } @@ -3587,7 +3586,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device { TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE); + wined3d_cs_emit_draw(device->cs, start_idx, index_count, start_instance, instance_count, TRUE); } /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a4ca29..3ffa4da 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2475,6 +2475,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_count, + UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send clear operations through the command stream.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 708b938f64732d23d05606fe2fb08f1e8ce134a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708b938f64732d23d05606fe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:14 2013 +0200 wined3d: Send clear operations through the command stream. --- dlls/wined3d/cs.c | 52 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 8 +---- dlls/wined3d/wined3d_private.h | 5 +++- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5f9bb56..988c8d4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); enum wined3d_cs_op { WINED3D_CS_OP_PRESENT, + WINED3D_CS_OP_CLEAR, }; struct wined3d_cs_present @@ -39,7 +40,18 @@ struct wined3d_cs_present DWORD flags; }; -static void wined3d_cs_exec_present(const void *data) +struct wined3d_cs_clear +{ + enum wined3d_cs_op opcode; + DWORD rect_count; + const RECT *rects; + DWORD flags; + const struct wined3d_color *color; + float depth; + DWORD stencil; +}; + +static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; @@ -69,9 +81,40 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw cs->ops->submit(cs); } -static void (* const wined3d_cs_op_handlers[])(const void *data) = +static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_clear *op = data; + struct wined3d_device *device; + RECT draw_rect; + + device = cs->device; + wined3d_get_draw_rect(&device->state, &draw_rect); + device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, + &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, + op->color, op->depth, op->stencil); +} + +void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, + DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) +{ + struct wined3d_cs_clear *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_CLEAR; + op->rect_count = rect_count; + op->rects = rects; + op->flags = flags; + op->color = color; + op->depth = depth; + op->stencil = stencil; + + cs->ops->submit(cs); +} + +static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, + /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) @@ -94,7 +137,7 @@ static void wined3d_cs_st_submit(struct wined3d_cs *cs) { enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)cs->data; - wined3d_cs_op_handlers[opcode](cs->data); + wined3d_cs_op_handlers[opcode](cs, cs->data); } static const struct wined3d_cs_ops wined3d_cs_st_ops = @@ -103,7 +146,7 @@ static const struct wined3d_cs_ops wined3d_cs_st_ops = wined3d_cs_st_submit, }; -struct wined3d_cs *wined3d_cs_create(void) +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) { struct wined3d_cs *cs; @@ -111,6 +154,7 @@ struct wined3d_cs *wined3d_cs_create(void) return NULL; cs->ops = &wined3d_cs_st_ops; + cs->device = device; cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff23770..6722990 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3466,8 +3466,6 @@ HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - RECT draw_rect; - TRACE("device %p, rect_count %u, rects %p, flags %#x, color {%.8e, %.8e, %.8e, %.8e}, depth %.8e, stencil %u.\n", device, rect_count, rects, flags, color->r, color->g, color->b, color->a, depth, stencil); @@ -3497,9 +3495,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } } - wined3d_get_draw_rect(&device->state, &draw_rect); - device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - &device->fb, rect_count, rects, &draw_rect, flags, color, depth, stencil); + wined3d_cs_emit_clear(device->cs, rect_count, rects, flags, color, depth, stencil); return WINED3D_OK; } @@ -4982,7 +4978,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, state_init_default(&device->state, &adapter->gl_info); device->update_state = &device->state; - if (!(device->cs = wined3d_cs_create())) + if (!(device->cs = wined3d_cs_create(device))) { WARN("Failed to create command stream.\n"); state_cleanup(&device->state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 251de34..5a4ca29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2464,14 +2464,17 @@ struct wined3d_cs_ops struct wined3d_cs { const struct wined3d_cs_ops *ops; + struct wined3d_device *device; size_t data_size; void *data; }; -struct wined3d_cs *wined3d_cs_create(void) DECLSPEC_HIDDEN; +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; +void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, + DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send present operations through a command stream.
by Alexandre Julliard 27 Sep '13

27 Sep '13

Module: wine Branch: master Commit: 602c82bce86db8fff427b146176490db8bf7529d URL: http://source.winehq.org/git/wine.git/?a=commit;h=602c82bce86db8fff427b1461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:13 2013 +0200 wined3d: Send present operations through a command stream. The eventual goal is to have a multithreaded implementation of wined3d_cs_ops and offload some processing to a different thread. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/cs.c | 128 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 25 ++++++-- dlls/wined3d/swapchain.c | 5 +- dlls/wined3d/wined3d_private.h | 24 ++++++++ 5 files changed, 174 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index b1051c2..f77f35d 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ ati_fragment_shader.c \ buffer.c \ context.c \ + cs.c \ device.c \ directx.c \ drawprim.c \ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c new file mode 100644 index 0000000..5f9bb56 --- /dev/null +++ b/dlls/wined3d/cs.c @@ -0,0 +1,128 @@ +/* + * Copyright 2013 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +#define WINED3D_INITIAL_CS_SIZE 4096 + +enum wined3d_cs_op +{ + WINED3D_CS_OP_PRESENT, +}; + +struct wined3d_cs_present +{ + enum wined3d_cs_op opcode; + HWND dst_window_override; + struct wined3d_swapchain *swapchain; + const RECT *src_rect; + const RECT *dst_rect; + const RGNDATA *dirty_region; + DWORD flags; +}; + +static void wined3d_cs_exec_present(const void *data) +{ + const struct wined3d_cs_present *op = data; + struct wined3d_swapchain *swapchain; + + swapchain = op->swapchain; + wined3d_swapchain_set_window(swapchain, op->dst_window_override); + + swapchain->swapchain_ops->swapchain_present(swapchain, + op->src_rect, op->dst_rect, op->dirty_region, op->flags); +} + +void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) +{ + struct wined3d_cs_present *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_PRESENT; + op->dst_window_override = dst_window_override; + op->swapchain = swapchain; + op->src_rect = src_rect; + op->dst_rect = dst_rect; + op->dirty_region = dirty_region; + op->flags = flags; + + cs->ops->submit(cs); +} + +static void (* const wined3d_cs_op_handlers[])(const void *data) = +{ + /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, +}; + +static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) +{ + if (size > cs->data_size) + { + void *new_data; + + if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, cs->data_size * 2))) + return NULL; + + cs->data_size *= 2; + cs->data = new_data; + } + + return cs->data; +} + +static void wined3d_cs_st_submit(struct wined3d_cs *cs) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)cs->data; + + wined3d_cs_op_handlers[opcode](cs->data); +} + +static const struct wined3d_cs_ops wined3d_cs_st_ops = +{ + wined3d_cs_st_require_space, + wined3d_cs_st_submit, +}; + +struct wined3d_cs *wined3d_cs_create(void) +{ + struct wined3d_cs *cs; + + if (!(cs = HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)))) + return NULL; + + cs->ops = &wined3d_cs_st_ops; + + cs->data_size = WINED3D_INITIAL_CS_SIZE; + if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size))) + { + HeapFree(GetProcessHeap(), 0, cs); + return NULL; + } + + return cs; +} + +void wined3d_cs_destroy(struct wined3d_cs *cs) +{ + HeapFree(GetProcessHeap(), 0, cs); +} diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34ceaa7..ff23770 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -485,6 +485,8 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { UINT i; + wined3d_cs_destroy(device->cs); + if (device->recording && wined3d_stateblock_decref(device->recording)) FIXME("Something's still holding the recording stateblock.\n"); device->recording = NULL; @@ -4975,17 +4977,28 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->d3d_info))) { ERR("Failed to initialize device state, hr %#x.\n", hr); - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) - { - HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); - } - wined3d_decref(device->wined3d); - return hr; + goto err; } state_init_default(&device->state, &adapter->gl_info); device->update_state = &device->state; + if (!(device->cs = wined3d_cs_create())) + { + WARN("Failed to create command stream.\n"); + state_cleanup(&device->state); + hr = E_FAIL; + goto err; + } + return WINED3D_OK; + +err: + for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + { + HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); + } + wined3d_decref(device->wined3d); + return hr; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 62827c9..2bab9ed 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -149,9 +149,8 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, return WINED3DERR_INVALIDCALL; } - wined3d_swapchain_set_window(swapchain, dst_window_override); - - swapchain->swapchain_ops->swapchain_present(swapchain, src_rect, dst_rect, dirty_region, flags); + wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, + dst_rect, dst_window_override, dirty_region, flags); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b979dc..251de34 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1939,6 +1939,9 @@ struct wined3d_device UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS]; + /* Command stream */ + struct wined3d_cs *cs; + /* Context management */ struct wined3d_context **contexts; UINT context_count; @@ -2452,6 +2455,27 @@ HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_cs_ops +{ + void *(*require_space)(struct wined3d_cs *cs, size_t size); + void (*submit)(struct wined3d_cs *cs); +}; + +struct wined3d_cs +{ + const struct wined3d_cs_ops *ops; + + size_t data_size; + void *data; +}; + +struct wined3d_cs *wined3d_cs_create(void) DECLSPEC_HIDDEN; +void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; + +void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; + /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d * allows GetData on a created issue, but opengl doesn't

1 0

Jacek Caban : mshtml: Add trailing null byte to post data.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 7bcbb93c5a308c5270dacf265dfc03764a8fd0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcbb93c5a308c5270dacf265… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:35:13 2013 +0200 mshtml: Add trailing null byte to post data. --- dlls/mshtml/navigate.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 539d2c4..be3d1a8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1022,7 +1022,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade if(NS_FAILED(nsres)) return E_FAIL; - post_data = data = GlobalAlloc(0, available); + post_data = data = GlobalAlloc(0, available+1); if(!data) return E_OUTOFMEMORY; @@ -1080,7 +1080,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade }else if(post_data != data) { char *new_data; - new_data = GlobalAlloc(0, data_len); + new_data = GlobalAlloc(0, data_len+1); if(new_data) memcpy(new_data, post_data, data_len); GlobalFree(data); @@ -1089,6 +1089,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade post_data = new_data; } + post_data[data_len] = 0; request_data->post_data = post_data; request_data->post_data_len = data_len; TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len)); @@ -1877,7 +1878,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, } if(post_data) { - ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size); + ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size+1); if(!ret->bsc.request_data.post_data) { release_request_data(&ret->bsc.request_data); IBindStatusCallback_Release(&ret->bsc.IBindStatusCallback_iface); @@ -1885,6 +1886,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, } memcpy(ret->bsc.request_data.post_data, post_data, post_data_size); + ((BYTE*)ret->bsc.request_data.post_data)[post_data_size] = 0; ret->bsc.request_data.post_data_len = post_data_size; }

1 0

Jacek Caban : mshtml: Use proper BINF flags for form submit.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: fe252319f01085ecfa1fb951cb2d37ea7495158f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe252319f01085ecfa1fb951c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:34:59 2013 +0200 mshtml: Use proper BINF flags for form submit. --- dlls/mshtml/navigate.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4091529..539d2c4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1855,12 +1855,17 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, BOOL is_doc_binding, nsChannelBSC **retval) { nsChannelBSC *ret; + DWORD bindf; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; - init_bscallback(&ret->bsc, &nsChannelBSCVtbl, mon, BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + if(post_data_size) + bindf |= BINDF_FORMS_SUBMIT | BINDF_PRAGMA_NO_CACHE | BINDF_HYPERLINK | BINDF_GETNEWESTVERSION; + + init_bscallback(&ret->bsc, &nsChannelBSCVtbl, mon, bindf); ret->is_doc_channel = is_doc_binding; if(headers) {

1 0

Jacek Caban : mshtml: Added separated structure to store request data.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 29d27ef669349354ef829af24c13c83c45a0f8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d27ef669349354ef829af24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:34:49 2013 +0200 mshtml: Added separated structure to store request data. --- dlls/mshtml/binding.h | 10 ++++-- dlls/mshtml/navigate.c | 83 +++++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index d953541..cfae014 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -49,6 +49,12 @@ typedef struct { struct list request_headers; } nsChannel; +typedef struct { + WCHAR *headers; + HGLOBAL post_data; + ULONG post_data_len; +} request_data_t; + typedef struct BSCallbackVtbl BSCallbackVtbl; struct BSCallback { @@ -61,9 +67,7 @@ struct BSCallback { LONG ref; - LPWSTR headers; - HGLOBAL post_data; - ULONG post_data_len; + request_data_t request_data; ULONG readed; DWORD bindf; BOOL bindinfo_ready; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4e6ed61..4091529 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -228,6 +228,13 @@ static nsProtocolStream *create_nsprotocol_stream(void) return ret; } +static void release_request_data(request_data_t *request_data) +{ + heap_free(request_data->headers); + if(request_data->post_data) + GlobalFree(request_data->post_data); +} + static inline BSCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) { return CONTAINING_RECORD(iface, BSCallback, IBindStatusCallback_iface); @@ -286,15 +293,13 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) TRACE("(%p) ref = %d\n", This, ref); if(!ref) { - if(This->post_data) - GlobalFree(This->post_data); + release_request_data(&This->request_data); if(This->mon) IMoniker_Release(This->mon); if(This->binding) IBinding_Release(This->binding); list_remove(&This->entry); list_init(&This->entry); - heap_free(This->headers); This->vtbl->destroy(This); } @@ -396,15 +401,15 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, memset(pbindinfo, 0, size); pbindinfo->cbSize = size; - pbindinfo->cbstgmedData = This->post_data_len; + pbindinfo->cbstgmedData = This->request_data.post_data_len; pbindinfo->dwCodePage = CP_UTF8; pbindinfo->dwOptions = 0x80000; - if(This->post_data) { + if(This->request_data.post_data_len) { pbindinfo->dwBindVerb = BINDVERB_POST; pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; - pbindinfo->stgmedData.u.hGlobal = This->post_data; + pbindinfo->stgmedData.u.hGlobal = This->request_data.post_data; pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)&This->IBindStatusCallback_iface; IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); } @@ -483,14 +488,14 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, if(hres != S_FALSE) return hres; - if(This->headers) { + if(This->request_data.headers) { DWORD size; - size = (strlenW(This->headers)+1)*sizeof(WCHAR); + size = (strlenW(This->request_data.headers)+1)*sizeof(WCHAR); *pszAdditionalHeaders = CoTaskMemAlloc(size); if(!*pszAdditionalHeaders) return E_OUTOFMEMORY; - memcpy(*pszAdditionalHeaders, This->headers, size); + memcpy(*pszAdditionalHeaders, This->request_data.headers, size); } return S_OK; @@ -1001,7 +1006,8 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) return S_OK; } -static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) +static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_headers, struct list *headers_list, + request_data_t *request_data) { UINT64 available = 0; UINT32 data_len = 0; @@ -1009,10 +1015,10 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) nsresult nsres; HRESULT hres = S_OK; - if(!nschannel->post_data_stream) + if(!stream) return S_OK; - nsres = nsIInputStream_Available(nschannel->post_data_stream, &available); + nsres = nsIInputStream_Available(stream, &available); if(NS_FAILED(nsres)) return E_FAIL; @@ -1020,13 +1026,13 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) if(!data) return E_OUTOFMEMORY; - nsres = nsIInputStream_Read(nschannel->post_data_stream, data, available, &data_len); + nsres = nsIInputStream_Read(stream, data, available, &data_len); if(NS_FAILED(nsres)) { GlobalFree(data); return E_FAIL; } - if(nschannel->post_data_contains_headers) { + if(contains_headers) { if(data_len >= 2 && data[0] == '\r' && data[1] == '\n') { post_data = data+2; data_len -= 2; @@ -1038,21 +1044,23 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) post_data += data_len; for(ptr = data; ptr+4 < data+data_len; ptr++) { if(!memcmp(ptr, "\r\n\r\n", 4)) { - post_data = ptr+4; + ptr += 2; + post_data = ptr+2; break; } } data_len -= post_data-data; - size = MultiByteToWideChar(CP_ACP, 0, data, post_data-data, NULL, 0); + size = MultiByteToWideChar(CP_ACP, 0, data, ptr-data, NULL, 0); headers = heap_alloc((size+1)*sizeof(WCHAR)); if(headers) { - MultiByteToWideChar(CP_ACP, 0, data, post_data-data, headers, size); + MultiByteToWideChar(CP_ACP, 0, data, ptr-data, headers, size); headers[size] = 0; - hres = parse_headers(headers , &nschannel->request_headers); + if(headers_list) + hres = parse_headers(headers, headers_list); if(SUCCEEDED(hres)) - This->bsc.headers = headers; + request_data->headers = headers; else heap_free(headers); }else { @@ -1081,9 +1089,9 @@ static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) post_data = new_data; } - This->bsc.post_data = post_data; - This->bsc.post_data_len = data_len; - TRACE("post_data = %s\n", debugstr_a(This->bsc.post_data)); + request_data->post_data = post_data; + request_data->post_data_len = data_len; + TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len)); return S_OK; } @@ -1399,10 +1407,12 @@ static HRESULT nsChannelBSC_start_binding(BSCallback *bsc) static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); + nsChannel *nschannel = This->nschannel; HRESULT hres; - if(This->nschannel && This->nschannel->post_data_stream) { - hres = read_post_data_stream(This, This->nschannel); + if(nschannel && nschannel->post_data_stream) { + hres = read_post_data_stream(nschannel->post_data_stream, nschannel->post_data_contains_headers, + &nschannel->request_headers, &This->bsc.request_data); if(FAILED(hres)) return hres; } @@ -1854,23 +1864,23 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, ret->is_doc_channel = is_doc_binding; if(headers) { - ret->bsc.headers = heap_strdupW(headers); - if(!ret->bsc.headers) { + ret->bsc.request_data.headers = heap_strdupW(headers); + if(!ret->bsc.request_data.headers) { IBindStatusCallback_Release(&ret->bsc.IBindStatusCallback_iface); return E_OUTOFMEMORY; } } if(post_data) { - ret->bsc.post_data = GlobalAlloc(0, post_data_size); - if(!ret->bsc.post_data) { - heap_free(ret->bsc.headers); + ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size); + if(!ret->bsc.request_data.post_data) { + release_request_data(&ret->bsc.request_data); IBindStatusCallback_Release(&ret->bsc.IBindStatusCallback_iface); return E_OUTOFMEMORY; } - memcpy(ret->bsc.post_data, post_data, post_data_size); - ret->bsc.post_data_len = post_data_size; + memcpy(ret->bsc.request_data.post_data, post_data, post_data_size); + ret->bsc.request_data.post_data_len = post_data_size; } TRACE("created %p\n", ret); @@ -1994,12 +2004,12 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis This->nscontext = context; } - if(This->bsc.headers) { + if(This->bsc.request_data.headers) { HRESULT hres; - hres = parse_headers(This->bsc.headers, &channel->request_headers); - heap_free(This->bsc.headers); - This->bsc.headers = NULL; + hres = parse_headers(This->bsc.request_data.headers, &channel->request_headers); + heap_free(This->bsc.request_data.headers); + This->bsc.request_data.headers = NULL; if(FAILED(hres)) WARN("parse_headers failed: %08x\n", hres); } @@ -2347,7 +2357,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne } if(nschannel) - read_post_data_stream(callback, nschannel); + read_post_data_stream(nschannel->post_data_stream, nschannel->post_data_contains_headers, + &nschannel->request_headers, &callback->bsc.request_data); hres = CreateAsyncBindCtx(0, &callback->bsc.IBindStatusCallback_iface, NULL, &bindctx); if(SUCCEEDED(hres))

1 0

Jacek Caban : mshtml: Call set_current_mon in channelbsc_load_stream.
by Alexandre Julliard 26 Sep '13

26 Sep '13

Module: wine Branch: master Commit: 553eae881bec144e733d62906664e340f9350e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553eae881bec144e733d62906… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:34:40 2013 +0200 mshtml: Call set_current_mon in channelbsc_load_stream. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/navigate.c | 4 +++- dlls/mshtml/persist.c | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 392713b..d953541 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -118,7 +118,7 @@ HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; -HRESULT channelbsc_load_stream(HTMLInnerWindow*,IStream*) DECLSPEC_HIDDEN; +HRESULT channelbsc_load_stream(HTMLInnerWindow*,IMoniker*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2c0666e..4e6ed61 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1953,7 +1953,7 @@ void abort_window_bindings(HTMLInnerWindow *window) } } -HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream) +HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IMoniker *mon, IStream *stream) { nsChannelBSC *bscallback = pending_window->bscallback; HRESULT hres = S_OK; @@ -1967,6 +1967,8 @@ HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream) if(!bscallback->nschannel->content_type) return E_OUTOFMEMORY; + set_current_mon(pending_window->base.outer_window, mon, 0); + bscallback->bsc.window = pending_window; if(stream) hres = read_stream_data(bscallback, stream); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 8f36c75..8c0ad68 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -844,11 +844,12 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - IMoniker_Release(mon); if(FAILED(hres)) return hres; - return channelbsc_load_stream(This->window->pending_window, pStm); + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); + IMoniker_Release(mon); + return hres; } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, @@ -901,11 +902,12 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - IMoniker_Release(mon); if(FAILED(hres)) return hres; - return channelbsc_load_stream(This->window->pending_window, NULL); + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); + IMoniker_Release(mon); + return hres; } static const IPersistStreamInitVtbl PersistStreamInitVtbl = {

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
65
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 September 2013