wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Dmitry Timoshkov : shlwapi/tests: Add a read/ write test for IStream on files.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 75fc26f680a99ecdb25713fda9709942aaf0116f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc26f680a99ecdb25713fda… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 16 17:26:20 2013 +0900 shlwapi/tests: Add a read/write test for IStream on files. --- dlls/shlwapi/tests/istream.c | 71 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index f525d7c..204854a 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -191,6 +191,71 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) } +static void test_stream_read_write(IStream *stream, DWORD mode) +{ + static const LARGE_INTEGER start; + HRESULT ret; + unsigned char buf[16]; + DWORD written, count; + + /* IStream_Read/Write from the COBJMACROS is undefined by shlwapi.h */ + + written = 0xdeadbeaf; + ret = stream->lpVtbl->Write(stream, "\x5e\xa7", 2, &written); + if (mode == STGM_WRITE || mode == STGM_READWRITE) + { + ok(ret == S_OK, "IStream_Write error %#x (access %#x)\n", ret, mode); + ok(written == 2, "expected 2, got %u\n", written); + } + else + { + ok(ret == STG_E_ACCESSDENIED || broken(ret == S_OK) /* win2000 */, "expected STG_E_ACCESSDENIED, got %#x (access %#x)\n", ret, mode); + ok(written == 0xdeadbeaf || broken(written == 2) /* win2000 */, "expected 0xdeadbeaf, got %#x\n", written); + written = 0; + if (ret == S_OK) return; /* no point in further testing */ + } + + ret = stream->lpVtbl->Seek(stream, start, STREAM_SEEK_SET, NULL); + ok(ret == S_OK, "Seek error %#x\n", ret); + + count = 0xdeadbeaf; + ret = stream->lpVtbl->Read(stream, buf, 2, &count); + if (written != 0) + { + /* FIXME: Remove once Wine is fixed */ + if (mode == STGM_WRITE) +todo_wine + ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + else + ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + if (mode == STGM_WRITE || mode == STGM_READWRITE) + { + /* FIXME: Remove once Wine is fixed */ + if (mode == STGM_WRITE) + { +todo_wine + ok(count == 2, "expected 2, got %u\n", count); +todo_wine + ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); + } + else + { + ok(count == 2, "expected 2, got %u\n", count); + ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); + } + } + else + ok(count == 0, "expected 0, got %u\n", count); + } + else + { +todo_wine + ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n", ret, mode, written); + ok(count == 0, "expected 0, got %u\n", count); + } + +} + static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) { IStream * stream; @@ -282,6 +347,8 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) if (stream) { BOOL delret; + + test_stream_read_write(stream, mode); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -392,6 +459,8 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) if (stream) { BOOL delret; + + test_stream_read_write(stream, mode); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -616,7 +685,7 @@ START_TEST(istream) int i, j, k; - hShlwapi = GetModuleHandleA("shlwapi.dll"); + hShlwapi = LoadLibrary("shlwapi.dll"); pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); pSHCreateStreamOnFileW = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileW");

1 0

Stefan Dösinger : wined3d: Store the instance count in the context structure.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: bbfca4863c73616768f2f88195f2b6af3005fc95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfca4863c73616768f2f8819… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:20 2013 +0200 wined3d: Store the instance count in the context structure. --- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/state.c | 12 +++++------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 81d2aba..3c9a780 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -676,8 +676,8 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co } stream_info = &context->stream_info; - if (device->instance_count) - instance_count = device->instance_count; + if (context->instance_count) + instance_count = context->instance_count; if (indexed) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 59c03a2..8ffd3e2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4060,13 +4060,12 @@ static void unload_numbered_arrays(struct wined3d_context *context) static void load_numbered_arrays(struct wined3d_context *context, const struct wined3d_stream_info *stream_info, const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; int i; /* Default to no instancing */ - device->instance_count = 0; + context->instance_count = 0; for (i = 0; i < MAX_ATTRIBS; i++) { @@ -4085,8 +4084,8 @@ static void load_numbered_arrays(struct wined3d_context *context, if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { - if (!device->instance_count) - device->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; + if (!context->instance_count) + context->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; if (!gl_info->supported[ARB_INSTANCED_ARRAYS]) { @@ -4232,10 +4231,9 @@ static void load_numbered_arrays(struct wined3d_context *context, checkGLcall("Loading numbered arrays"); } -static void load_vertex_data(const struct wined3d_context *context, +static void load_vertex_data(struct wined3d_context *context, const struct wined3d_stream_info *si, const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; const struct wined3d_stream_info_element *e; @@ -4243,7 +4241,7 @@ static void load_vertex_data(const struct wined3d_context *context, TRACE("Using fast vertex array code\n"); /* This is fixed function pipeline only, and the fixed function pipeline doesn't do instancing */ - device->instance_count = 0; + context->instance_count = 0; /* Blend Data ---------------------------------------------- */ if ((si->use_map & (1 << WINED3D_FFP_BLENDWEIGHT)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b1ba42..4928f92 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1098,6 +1098,8 @@ struct wined3d_context DWORD active_texture; DWORD texture_type[MAX_COMBINED_SAMPLERS]; + UINT instance_count; + /* The actual opengl context */ UINT level; HGLRC restore_ctx; @@ -1885,8 +1887,6 @@ struct wined3d_device APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; const struct blit_shader *blitter; - UINT instance_count; - BYTE vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ BYTE bCursorVisible : 1; BYTE d3d_initialized : 1;

1 0

Stefan Dösinger : wined3d: Move device_preload_textures into context.c.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 59e0b841c7ce1f1f09baa38704f3d90883beb11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e0b841c7ce1f1f09baa3870… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:19 2013 +0200 wined3d: Move device_preload_textures into context.c. --- dlls/wined3d/context.c | 50 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 47 ------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a6f27dc..4f8021c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2787,6 +2787,54 @@ static void context_update_stream_info(struct wined3d_context *context, const st } /* Context activation is done by the caller. */ +static void context_preload_texture(struct wined3d_context *context, + const struct wined3d_state *state, unsigned int idx) +{ + struct wined3d_texture *texture; + enum WINED3DSRGB srgb; + + if (!(texture = state->textures[idx])) + return; + + srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; + texture->texture_ops->texture_preload(texture, context, srgb); +} + +/* Context activation is done by the caller. */ +static void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) +{ + unsigned int i; + + if (use_vs(state)) + { + for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + { + if (state->vertex_shader->reg_maps.sampler_type[i]) + context_preload_texture(context, state, MAX_FRAGMENT_SAMPLERS + i); + } + } + + if (use_ps(state)) + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (state->pixel_shader->reg_maps.sampler_type[i]) + context_preload_texture(context, state, i); + } + } + else + { + WORD ffu_map = context->fixed_function_usage_map; + + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (ffu_map & 1) + context_preload_texture(context, state, i); + } + } +} + +/* Context activation is done by the caller. */ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) { const struct wined3d_state *state = &device->state; @@ -2807,7 +2855,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ context_update_tex_unit_map(context, state); - device_preload_textures(device, context); + context_preload_textures(context, state); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); if (state->index_buffer) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e122f9..30dcc06 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -134,53 +134,6 @@ static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_t } } -/* Context activation is done by the caller. */ -static void device_preload_texture(const struct wined3d_state *state, - struct wined3d_context *context, unsigned int idx) -{ - struct wined3d_texture *texture; - enum WINED3DSRGB srgb; - - if (!(texture = state->textures[idx])) return; - srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; - texture->texture_ops->texture_preload(texture, context, srgb); -} - -/* Context activation is done by the caller. */ -void device_preload_textures(const struct wined3d_device *device, struct wined3d_context *context) -{ - const struct wined3d_state *state = &device->state; - unsigned int i; - - if (use_vs(state)) - { - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) - { - if (state->vertex_shader->reg_maps.sampler_type[i]) - device_preload_texture(state, context, MAX_FRAGMENT_SAMPLERS + i); - } - } - - if (use_ps(state)) - { - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) - { - if (state->pixel_shader->reg_maps.sampler_type[i]) - device_preload_texture(state, context, i); - } - } - else - { - WORD ffu_map = context->fixed_function_usage_map; - - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (ffu_map & 1) - device_preload_texture(state, context, i); - } - } -} - BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_context **new_array; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 065183a..9b1ba42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1952,7 +1952,6 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN; -void device_preload_textures(const struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Move tex_unit_map and friends into the context.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 112617f00bb59d71da9113361396c11681564ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112617f00bb59d71da9113361… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:18 2013 +0200 wined3d: Move tex_unit_map and friends into the context. --- dlls/wined3d/arb_program_shader.c | 8 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 236 +++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 231 +--------------------------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 5 +- dlls/wined3d/nvidia_texture_shader.c | 9 +- dlls/wined3d/state.c | 25 ++--- dlls/wined3d/surface.c | 7 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 32 +++--- 12 files changed, 279 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=112617f00bb59d71da911…

1 0

Stefan Dösinger : wined3d: Pass the context to surface_internal_preload.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: f29c24f2de70807d1f4c9c24935ba634e56be276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29c24f2de70807d1f4c9c249… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:17 2013 +0200 wined3d: Pass the context to surface_internal_preload. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/surface.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c7194e4..ec4cb89 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7455,6 +7455,9 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; + /* Activate the destination context, set it up for blitting */ + context = context_acquire(device, dst_surface); + /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) @@ -7470,10 +7473,8 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - surface_internal_preload(src_surface, SRGB_RGB); + surface_internal_preload(src_surface, context, SRGB_RGB); - /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); context_apply_blit_state(context, device); if (!surface_is_offscreen(dst_surface)) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 43befb8..b69a520 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2123,7 +2123,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->render_offscreen) { - surface_internal_preload(rt, SRGB_RGB); + surface_internal_preload(rt, context, SRGB_RGB); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) @@ -2662,8 +2662,8 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d { /* Read the back buffer of the old drawable into the destination texture. */ if (context->current_rt->texture_name_srgb) - surface_internal_preload(context->current_rt, SRGB_SRGB); - surface_internal_preload(context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, context, SRGB_SRGB); + surface_internal_preload(context->current_rt, context, SRGB_RGB); surface_invalidate_location(context->current_rt, SFLAG_INDRAWABLE); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 66587a1..f988af9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2647,6 +2647,7 @@ DWORD CDECL wined3d_surface_get_priority(const struct wined3d_surface *surface) void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { + struct wined3d_context *context; TRACE("surface %p.\n", surface); if (!surface->resource.device->d3d_initialized) @@ -2655,7 +2656,9 @@ void CDECL wined3d_surface_preload(struct wined3d_surface *surface) return; } - surface_internal_preload(surface, SRGB_ANY); + context = context_acquire(surface->resource.device, NULL); + surface_internal_preload(surface, context, SRGB_ANY); + context_release(context); } void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) @@ -3687,16 +3690,12 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } -void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) +/* Context activation is done by the caller */ +void surface_internal_preload(struct wined3d_surface *surface, + struct wined3d_context *context, enum WINED3DSRGB srgb) { - struct wined3d_device *device = surface->resource.device; - struct wined3d_context *context; - TRACE("iface %p, srgb %#x.\n", surface, srgb); - /* TODO: Use already acquired context when possible. */ - context = context_acquire(device, NULL); - if (surface->container) { struct wined3d_texture *texture = surface->container; @@ -3718,7 +3717,6 @@ void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB context->gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &surface->texture_name, &tmp); } } - context_release(context); } /* Read the framebuffer back into the surface */ @@ -4393,7 +4391,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, context, SRGB_RGB); /* Bind the target texture */ context_bind_texture(context, dst_target, dst_surface->texture_name); @@ -4501,14 +4499,14 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, context, SRGB_RGB); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->texture_name) { /* Get it a description */ - surface_internal_preload(src_surface, SRGB_RGB); + surface_internal_preload(src_surface, context, SRGB_RGB); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -4791,14 +4789,15 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, src_rect = *src_rect_in; dst_rect = *dst_rect_in; + context = context_acquire(device, dst_surface); + gl_info = context->gl_info; + /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - surface_internal_preload(src_surface, SRGB_RGB); + surface_internal_preload(src_surface, context, SRGB_RGB); /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); - gl_info = context->gl_info; context_apply_blit_state(context, device); if (!surface_is_offscreen(dst_surface)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 125556e..93f18f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2252,7 +2252,8 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3 HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +void surface_internal_preload(struct wined3d_surface *surface, + struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Pass the context to the internal texture_preload function.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: fe44be5fde5e275cb96d8b2346d87a9d5729a2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe44be5fde5e275cb96d8b234… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:16 2013 +0200 wined3d: Pass the context to the internal texture_preload function. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 20 +++++++++++++------- dlls/wined3d/drawprim.c | 6 ------ dlls/wined3d/surface.c | 14 ++++++-------- dlls/wined3d/texture.c | 34 ++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 6 files changed, 36 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe44be5fde5e275cb96d8…

1 0

Henri Verbeet : dxgi: Avoid LPVOID.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 19f028ce6d0d7d0857454392d9502fa2132da1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f028ce6d0d7d0857454392d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:28 2013 +0200 dxgi: Avoid LPVOID. --- dlls/dxgi/dxgi_main.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index ed5f3a5..8249b88 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -49,19 +49,17 @@ static void dxgi_main_cleanup(void) DeleteCriticalSection(&dxgi_cs); } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) + switch (reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(inst); break; case DLL_PROCESS_DETACH: - if (lpv) break; - dxgi_main_cleanup(); + if (!reserved) + dxgi_main_cleanup(); break; }

1 0

Henri Verbeet : dxgi: Avoid LPCSTR.
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: e032d013d7b2b9396b233390e685134f90f18b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e032d013d7b2b9396b233390e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:27 2013 +0200 dxgi: Avoid LPCSTR. --- dlls/dxgi/dxgi_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index e9ed482..ed5f3a5 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -131,8 +131,7 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) HMODULE mod; BOOL ret; - ret = GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)d3d10core, &mod); - if (!ret) + if (!(ret = GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const char *)d3d10core, &mod))) { LeaveCriticalSection(&dxgi_cs); return E_FAIL;

1 0

Henri Verbeet : ddraw: Take surface usage into account when checking format capabilities in CreateSurface ().
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: dbdde3bd4b1cde34e5b43eb09610a51ec8ed79a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdde3bd4b1cde34e5b43eb09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:26 2013 +0200 ddraw: Take surface usage into account when checking format capabilities in CreateSurface(). --- dlls/ddraw/ddraw.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3385e0..608804f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3005,6 +3005,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, { enum wined3d_format_id format = wined3dformat_from_ddrawformat(&desc2.u4.ddpfPixelFormat); enum wined3d_resource_type rtype; + DWORD usage = 0; if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) rtype = WINED3D_RTYPE_TEXTURE; @@ -3013,8 +3014,13 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, else rtype = WINED3D_RTYPE_SURFACE; + if (desc2.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + usage = WINED3DUSAGE_DEPTHSTENCIL; + else if (desc2.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + usage = WINED3DUSAGE_RENDERTARGET; + hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL, - mode.format_id, 0, rtype, format); + mode.format_id, usage, rtype, format); if (SUCCEEDED(hr)) desc2.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; else

1 0

Henri Verbeet : wined3d: Pass a resource to wined3d_resource_free_sysmem().
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: d1e44ff77595a0d60c409b22fdaf76771b1e6841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e44ff77595a0d60c409b22f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:25 2013 +0200 wined3d: Pass a resource to wined3d_resource_free_sysmem(). --- dlls/wined3d/buffer.c | 3 +-- dlls/wined3d/resource.c | 12 ++++++------ dlls/wined3d/surface.c | 34 +++++++++------------------------- dlls/wined3d/volume.c | 6 ++---- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 19 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b61c3ce..de06ae8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -198,9 +198,8 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine } else { - wined3d_resource_free_sysmem(This->resource.heap_memory); + wined3d_resource_free_sysmem(&This->resource); This->resource.allocatedMemory = NULL; - This->resource.heap_memory = NULL; } return; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 78f35e9..a24db3c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -138,7 +138,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (size > wined3d_device_get_available_texture_mem(device)) { ERR("Out of adapter memory\n"); - wined3d_resource_free_sysmem(resource->heap_memory); + wined3d_resource_free_sysmem(resource); return WINED3DERR_OUTOFVIDEOMEMORY; } adapter_adjust_memory(device->adapter, size); @@ -172,9 +172,8 @@ void resource_cleanup(struct wined3d_resource *resource) ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } - wined3d_resource_free_sysmem(resource->heap_memory); + wined3d_resource_free_sysmem(resource); resource->allocatedMemory = NULL; - resource->heap_memory = NULL; device_resource_released(resource->device, resource); } @@ -360,14 +359,15 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) return TRUE; } -void wined3d_resource_free_sysmem(void *mem) +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) { - void **p = mem; + void **p = resource->heap_memory; - if (!mem) + if (!p) return; HeapFree(GetProcessHeap(), 0, *(--p)); + resource->heap_memory = NULL; } DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e40a65a..a48d0bf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -566,10 +566,7 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) - { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - } + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = NULL; surface->flags |= SFLAG_PBO; context_release(context); @@ -601,9 +598,8 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) return; - wined3d_resource_free_sysmem(surface->resource.heap_memory); + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = NULL; - surface->resource.heap_memory = NULL; surface_invalidate_location(surface, SFLAG_INSYSMEM); } @@ -1611,8 +1607,7 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) hr = surface_create_dib_section(surface); if (SUCCEEDED(hr)) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } @@ -1671,8 +1666,7 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D ERR("Failed to create dib section, hr %#x.\n", hr); return; } - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -2867,8 +2861,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem if (mem && mem != surface->resource.allocatedMemory) { - void *release = NULL; - /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) { @@ -2881,8 +2873,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem } else if (!(surface->flags & SFLAG_USERPTR)) { - release = surface->resource.heap_memory; - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); } surface->resource.allocatedMemory = mem; surface->flags |= SFLAG_USERPTR; @@ -2894,9 +2885,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem /* For client textures OpenGL has to be notified. */ if (surface->flags & SFLAG_CLIENT) surface_release_client_storage(surface); - - /* Now free the old memory if any. */ - wined3d_resource_free_sysmem(release); } else if (surface->flags & SFLAG_USERPTR) { @@ -3086,8 +3074,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); surface->resource.allocatedMemory = NULL; - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.width = width; surface->resource.height = height; @@ -3583,8 +3570,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) /* Use the DIB section from now on if we are not using a PBO. */ if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -5004,9 +4990,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) { - wined3d_resource_free_sysmem(dst_surface->resource.heap_memory); + wined3d_resource_free_sysmem(&dst_surface->resource); dst_surface->resource.allocatedMemory = NULL; - dst_surface->resource.heap_memory = NULL; } else { @@ -6933,8 +6918,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN if ((usage & WINED3DUSAGE_OWNDC) && !surface->hDC && SUCCEEDED(surface_create_dib_section(surface))) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 62c6ab9..4865c59 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -142,8 +142,7 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&volume->resource); volume->resource.allocatedMemory = NULL; wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); } @@ -702,8 +701,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&volume->resource); volume->resource.allocatedMemory = NULL; volume->flags |= WINED3D_VFLAG_PBO; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbf6e78..07e8c9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1984,8 +1984,6 @@ struct wined3d_resource_ops void (*resource_unload)(struct wined3d_resource *resource); }; -void wined3d_resource_free_sysmem(void *mem) DECLSPEC_HIDDEN; - struct wined3d_resource { LONG ref; @@ -2025,6 +2023,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
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