wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Matteo Bruni : d3d8/tests: Fix some error messages.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 8e522b7fb8adf83679fe8ffdfc9629fe68c66419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e522b7fb8adf83679fe8ffdf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 25 16:47:59 2011 +0200 d3d8/tests: Fix some error messages. --- dlls/d3d8/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 2c04ce7..595b6bb 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -397,13 +397,13 @@ static void fog_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(hr == D3D_OK, "Turning on fog calculations returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xFF00FF00 /* A nice green */); - ok(hr == D3D_OK, "Turning on fog calculations returned %#08x\n", hr); + ok(hr == D3D_OK, "Setting fog color returned %#08x\n", hr); /* First test: Both table fog and vertex fog off */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok(hr == D3D_OK, "Turning off table fog returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "Turning off table fog returned %#08x\n", hr); + ok(hr == D3D_OK, "Turning off vertex fog returned %#08x\n", hr); /* Start = 0, end = 1. Should be default, but set them */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); @@ -423,7 +423,7 @@ static void fog_test(IDirect3DDevice8 *device) /* That makes it use the Z value */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "Turning off table fog returned %#08x\n", hr); + ok(hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %#08x\n", hr); /* Untransformed, vertex fog != none (or table fog != none): * Use the Z value as input into the equation */

1 0

Matteo Bruni : d3d8/tests: Rename a variable.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 94750652737fffcf318f2886e44e140c9a37968e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94750652737fffcf318f2886e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 25 16:47:39 2011 +0200 d3d8/tests: Rename a variable. --- dlls/d3d8/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ae8276d..2c04ce7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -358,14 +358,14 @@ static void fog_test(IDirect3DDevice8 *device) float start = 0.0, end = 1.0; /* Gets full z based fog with linear fog, no fog with specular color */ - struct sVertex unstransformed_1[] = { + struct sVertex untransformed_1[] = { {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, }; /* Ok, I am too lazy to deal with transform matrices */ - struct sVertex unstransformed_2[] = { + struct sVertex untransformed_2[] = { {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, @@ -417,8 +417,8 @@ static void fog_test(IDirect3DDevice8 *device) ok( hr == D3D_OK, "SetVertexShader returned %#08x\n", hr); /* Untransformed, vertex fog = NONE, table fog = NONE: Read the fog weighting from the specular color */ hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_1, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_1, + sizeof(untransformed_1[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); /* That makes it use the Z value */ @@ -428,8 +428,8 @@ static void fog_test(IDirect3DDevice8 *device) * Use the Z value as input into the equation */ hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_2, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_2, + sizeof(untransformed_2[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); /* transformed verts */

1 0

Frédéric Delanoy : cmd/tests: Test multiple params rmdir.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 414bd437a9ae9feb557c654a650f4deddbc8e54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=414bd437a9ae9feb557c654a6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 24 22:11:36 2011 +0200 cmd/tests: Test multiple params rmdir. --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e4bce29..2062a9d 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -430,6 +430,18 @@ if not exist foo ( rd foo\bar rd foo ) +rem multiples directories at once +mkdir foobaz & cd foobaz +mkdir foo +mkdir bar\baz +mkdir foobar +rd /s/q foo bar foobar +if not exist foo (echo foo removed) else echo foo not removed! +if not exist bar (echo bar removed) else echo bar not removed! +if not exist foobar (echo foobar removed) else echo foobar not removed! +if not exist bar\baz (echo bar\baz removed) else echo bar\baz not removed! +cd .. +rd /s/q foobaz echo ------------ Testing CALL -------------- mkdir foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2d79793..d939ec5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -210,6 +210,10 @@ non-empty dir not removed non-empty dir not removed recursive rmdir succeeded recursive rmdir succeeded +foo removed +bar removed +foobar removed +bar\baz removed ------------ Testing CALL -------------- foo foo 8

1 0

Frédéric Delanoy : cmd/tests: Test multiple params mkdir.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 9e57a09bb5bad2fc830aa5a866ec8f7ab9f1dca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e57a09bb5bad2fc830aa5a86… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 24 22:11:35 2011 +0200 cmd/tests: Test multiple params mkdir. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 8e2539c..e4bce29 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -367,6 +367,15 @@ if not exist foo ( cd .. rmdir foo ) +rem multiples directories at once +mkdir foobaz & cd foobaz +mkdir foo bar\baz foobar +if exist foo (echo foo created) else echo foo not created! +if exist bar (echo bar created) else echo bar not created! +if exist foobar (echo foobar created) else echo foobar not created! +if exist bar\baz (echo bar\baz created) else echo bar\baz not created! +cd .. +rd /s/q foobaz echo ----------- Testing rmdir ----------- call :setError 0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 267f83e..2d79793 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -192,6 +192,10 @@ dir created @todo_wine@ok, foo created @todo_wine@1 @todo_wine@ok, foo\bar created +foo created +@todo_wine@bar created +@todo_wine@foobar created +@todo_wine@bar\baz created ----------- Testing rmdir ----------- 0 dir removed

1 0

Alexandre Julliard : makefiles: Still generate makefile rule for disabled dlls that have an import lib.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 2844991f7ea687fba6b1c122c3ffefdc295fc8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2844991f7ea687fba6b1c122c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 22:05:51 2011 +0200 makefiles: Still generate makefile rule for disabled dlls that have an import lib. --- aclocal.m4 | 4 +++- configure | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 83ed0ad..948dd7f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -290,7 +290,9 @@ wine_fn_config_dll () AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too - [test "$ac_enable" != enable_win16 || return 0], + [test "$ac_enable" != enable_win16 || return 0 + wine_fn_has_flag implib $ac_flags && wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules], + [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir: __builddeps__ manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile diff --git a/configure b/configure index cf880f3..caad79e 100755 --- a/configure +++ b/configure @@ -14358,6 +14358,7 @@ wine_fn_config_dll () if eval test \"x\$"$ac_enable"\" = x"no"; then : test "$ac_enable" != enable_win16 || return 0 + wine_fn_has_flag implib $ac_flags && wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir: __builddeps__

1 0

Henri Verbeet : wrc: Don't include gettext-po.h if we don' t have the corresponding library.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 6c0e6df1b757e50fb81cb96ad60639353afd8f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0e6df1b757e50fb81cb96ad… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Jul 25 21:58:11 2011 +0200 wrc: Don't include gettext-po.h if we don't have the corresponding library. --- tools/wrc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 450b218..3efd208 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -26,7 +26,7 @@ #include <stdarg.h> #include <assert.h> #include <ctype.h> -#ifdef HAVE_GETTEXT_PO_H +#ifdef HAVE_LIBGETTEXTPO #include <gettext-po.h> #endif

1 0

Henri Verbeet : wined3d: Release the onscreen depth / stencil reference on reset.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 11955307951540b0c51d3517ef01364038cf96b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11955307951540b0c51d3517e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 25 20:45:10 2011 +0200 wined3d: Release the onscreen depth / stencil reference on reset. No need to save the contents, after a reset it's all undefined anyway. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2db0e3f..d3ee3f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5638,6 +5638,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { wined3d_device_set_texture(device, i, NULL); } + if (device->onscreen_depth_stencil) + { + wined3d_surface_decref(device->onscreen_depth_stencil); + device->onscreen_depth_stencil = NULL; + } LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) {

1 0

Henri Verbeet : wined3d: Unbind all textures in wined3d_device_reset().
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 27b20bac43a1cc54037d2daec81f90d3f3479473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b20bac43a1cc54037d2daec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 25 20:45:09 2011 +0200 wined3d: Unbind all textures in wined3d_device_reset(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9fd82b5..2db0e3f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5634,7 +5634,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { wined3d_device_set_stream_source(device, i, NULL, 0, 0); } - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { wined3d_device_set_texture(device, i, NULL); }

1 0

Henri Verbeet : wined3d: Unbind resources inside wined3d_device_reset().
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 44e109debea3f1b26d908273f384260dc3fedb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e109debea3f1b26d908273f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 25 20:45:08 2011 +0200 wined3d: Unbind resources inside wined3d_device_reset(). --- dlls/d3d8/device.c | 10 ---------- dlls/d3d9/device.c | 10 ---------- dlls/wined3d/device.c | 11 +++++++++++ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 074b1ac..5c4568d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -564,20 +564,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(IDirect3DDevice8 *iface, IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); WINED3DPRESENT_PARAMETERS localParameters; HRESULT hr; - UINT i; TRACE("iface %p, present_parameters %p.\n", iface, pPresentationParameters); wined3d_mutex_lock(); - wined3d_device_set_index_buffer(This->wined3d_device, NULL, WINED3DFMT_UNKNOWN); - for (i = 0; i < 16; ++i) - { - wined3d_device_set_stream_source(This->wined3d_device, i, NULL, 0, 0); - } - for (i = 0; i < 16; ++i) - { - wined3d_device_set_texture(This->wined3d_device, i, NULL); - } localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; localParameters.BackBufferHeight = pPresentationParameters->BackBufferHeight; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bdfa85e..74d8383 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -552,7 +552,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevi IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); WINED3DPRESENT_PARAMETERS localParameters; HRESULT hr; - UINT i; TRACE("iface %p, present_parameters %p.\n", iface, pPresentationParameters); @@ -565,15 +564,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevi * below fails, the device is considered "lost", and _Reset and _Release are the only allowed calls */ wined3d_mutex_lock(); - wined3d_device_set_index_buffer(This->wined3d_device, NULL, WINED3DFMT_UNKNOWN); - for (i = 0; i < 16; ++i) - { - wined3d_device_set_stream_source(This->wined3d_device, i, NULL, 0, 0); - } - for (i = 0; i < 16; ++i) - { - wined3d_device_set_texture(This->wined3d_device, i, NULL); - } localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; localParameters.BackBufferHeight = pPresentationParameters->BackBufferHeight; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e411cea..9fd82b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5624,10 +5624,21 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_swapchain *swapchain; BOOL DisplayModeChanged = FALSE; WINED3DDISPLAYMODE mode; + unsigned int i; HRESULT hr; TRACE("device %p, present_parameters %p.\n", device, present_parameters); + wined3d_device_set_index_buffer(device, NULL, WINED3DFMT_UNKNOWN); + for (i = 0; i < MAX_STREAMS; ++i) + { + wined3d_device_set_stream_source(device, i, NULL, 0, 0); + } + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + wined3d_device_set_texture(device, i, NULL); + } + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { TRACE("Enumerating resource %p.\n", resource);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_enum_resources().
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: c84112f86fd336c4813e4b6c677492604481d0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84112f86fd336c4813e4b6c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 25 20:45:07 2011 +0200 wined3d: Get rid of wined3d_device_enum_resources(). --- dlls/wined3d/device.c | 71 +++++++++++++++++---------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 - 3 files changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89dfb6c..e411cea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1372,17 +1372,9 @@ err_out: return hr; } -static HRESULT WINAPI device_unload_resource(struct wined3d_resource *resource, void *data) -{ - TRACE("Unloading resource %p.\n", resource); - - resource->resource_ops->resource_unload(resource); - - return S_OK; -} - HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { + struct wined3d_resource *resource, *cursor; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_surface *surface; @@ -1406,7 +1398,12 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_surface_decref(device->logo_surface); /* Unload resources */ - wined3d_device_enum_resources(device, device_unload_resource, NULL); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + + resource->resource_ops->resource_unload(resource); + } TRACE("Deleting high order patches\n"); for(i = 0; i < PATCHMAP_SIZE; i++) { @@ -5382,24 +5379,23 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) return oldVisible; } -static HRESULT WINAPI evict_managed_resource(struct wined3d_resource *resource, void *data) +HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { - TRACE("checking resource %p for eviction\n", resource); + struct wined3d_resource *resource, *cursor; - if (resource->pool == WINED3DPOOL_MANAGED) - { - TRACE("Evicting %p.\n", resource); - resource->resource_ops->resource_unload(resource); - } + TRACE("device %p.\n", device); - return S_OK; -} + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Checking resource %p for eviction.\n", resource); -HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) -{ - TRACE("device %p.\n", device); + if (resource->pool == WINED3DPOOL_MANAGED) + { + TRACE("Evicting %p.\n", resource); + resource->resource_ops->resource_unload(resource); + } + } - wined3d_device_enum_resources(device, evict_managed_resource, NULL); /* Invalidate stream sources, the buffer(s) may have been evicted. */ device_invalidate_state(device, STATE_STREAMSRC); @@ -5499,6 +5495,7 @@ static BOOL is_display_mode_supported(struct wined3d_device *device, const WINED /* Do not call while under the GL lock. */ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { + struct wined3d_resource *resource, *cursor; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_shader *shader; @@ -5506,7 +5503,13 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d context = context_acquire(device, NULL); gl_info = context->gl_info; - wined3d_device_enum_resources(device, device_unload_resource, NULL); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + + resource->resource_ops->resource_unload(resource); + } + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); @@ -6058,26 +6061,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("Resource released.\n"); } -HRESULT CDECL wined3d_device_enum_resources(struct wined3d_device *device, - D3DCB_ENUMRESOURCES callback, void *data) -{ - struct wined3d_resource *resource, *cursor; - - TRACE("device %p, callback %p, data %p.\n", device, callback, data); - - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("enumerating resource %p.\n", resource); - if (callback(resource, data) == S_FALSE) - { - TRACE("Canceling enumeration.\n"); - break; - } - } - - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_get_surface_from_dc(struct wined3d_device *device, HDC dc, struct wined3d_surface **surface) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index fd3809e..fedee3c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -60,7 +60,6 @@ @ cdecl wined3d_device_draw_tri_patch(ptr long ptr ptr) @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_end_stateblock(ptr ptr) -@ cdecl wined3d_device_enum_resources(ptr ptr ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_back_buffer(ptr long long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 211b945..0a09ec6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2107,7 +2107,6 @@ struct wined3d_device_parent_ops WINED3DPRESENT_PARAMETERS *present_parameters, struct wined3d_swapchain **swapchain); }; -typedef HRESULT (__stdcall *D3DCB_ENUMRESOURCES)(struct wined3d_resource *resource, void *pData); typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resource); void __stdcall wined3d_mutex_lock(void); @@ -2205,7 +2204,6 @@ HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UIN const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); -HRESULT __cdecl wined3d_device_enum_resources(struct wined3d_device *device, D3DCB_ENUMRESOURCES callback, void *data); HRESULT __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx,

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
84
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 July 2011