August 2013 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Make stateblock_unbind_resources() work with a wined3d_state structure instead.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 4e755d263f65b571e34c851c803b0216ed886af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e755d263f65b571e34c851c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:38 2013 +0200 wined3d: Make stateblock_unbind_resources() work with a wined3d_state structure instead. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 5 ++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0becf8..a0db7c7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1285,7 +1285,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (device->logo_surface) wined3d_surface_decref(device->logo_surface); - stateblock_unbind_resources(device->stateBlock); + state_unbind_resources(&device->stateBlock->state); /* Unload resources */ LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) @@ -4917,7 +4917,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } if (reset_state) - stateblock_unbind_resources(device->stateBlock); + state_unbind_resources(&device->stateBlock->state); if (device->fb.render_targets) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e6a867a..3685a2e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -467,9 +467,8 @@ ULONG CDECL wined3d_stateblock_incref(struct wined3d_stateblock *stateblock) return refcount; } -void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) +void state_unbind_resources(struct wined3d_state *state) { - struct wined3d_state *state = &stateblock->state; struct wined3d_vertex_declaration *decl; struct wined3d_sampler *sampler; struct wined3d_texture *texture; @@ -599,7 +598,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { int counter; - stateblock_unbind_resources(stateblock); + state_unbind_resources(&stateblock->state); for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a586f91..e0ceb7e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2446,7 +2446,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void stateblock_init_default_state(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; -void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; + +void state_unbind_resources(struct wined3d_state *state) 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

1 0

Dmitry Timoshkov : kernel32: Add a trace to ClearCommError.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 31727e812842012ce0951d18c0fcbd575c9027ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=31727e812842012ce0951d18c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 26 16:36:46 2013 +0900 kernel32: Add a trace to ClearCommError. --- dlls/kernel32/comm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 30fd44f..c6a8ec2 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -664,6 +664,9 @@ BOOL WINAPI ClearCommError(HANDLE handle, LPDWORD errors, LPCOMSTAT lpStat) &ss, sizeof(ss), &dwBytesReturned, NULL)) return FALSE; + TRACE("=> status %#x,%#x, in %u, out %u, eof %d, wait %d\n", ss.Errors, ss.HoldReasons, + ss.AmountInInQueue, ss.AmountInOutQueue, ss.EofReceived, ss.WaitForImmediate); + if (errors) { *errors = 0;

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW().
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 34c70247906ca8fe965ced1e02c72f519e73eb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c70247906ca8fe965ced1e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:41 2013 +0200 d3dx9: Simplify D3DXCreateEffectCompilerFromResourceW(). --- dlls/d3dx9_36/effect.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2be1900..3c252e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5704,26 +5704,19 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); - - resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + TRACE("srcmodule %p, srcresource %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + srcmodule, debugstr_w(srcresource), defines, include, flags, effectcompiler, parseerrors); - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(srcmodule, srcresource, (const WCHAR *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); } HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly)

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectCompilerFromResourceA().
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 1be05ff731aa2657d527d9e56441dadae4160eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be05ff731aa2657d527d9e56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:40 2013 +0200 d3dx9: Simplify D3DXCreateEffectCompilerFromResourceA(). --- dlls/d3dx9_36/effect.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c349acf..2be1900 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5684,26 +5684,19 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, const ch ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); - - resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + TRACE("srcmodule %p, srcresource %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + srcmodule, debugstr_a(srcresource), defines, include, flags, effectcompiler, parseerrors); - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceA(srcmodule, srcresource, (const char *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); } HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WCHAR *srcresource,

1 0

Henri Verbeet : wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: f02a5f45d46cc58449504c41e6f08a061918c5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02a5f45d46cc58449504c41e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 26 09:23:37 2013 +0200 wined3d: Replace the "updateStateBlock" wined3d_device field with a "update_state" field. --- dlls/wined3d/device.c | 295 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 8 +- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 152 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f02a5f45d46cc58449504…

1 0

Frédéric Delanoy : winedev: Update wine multimedia chapter.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: docs Branch: master Commit: 45f6426a3413f0ae2d476f083f73e63acc5aa466 URL: http://source.winehq.org/git/docs.git/?a=commit;h=45f6426a3413f0ae2d476f083… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 22 19:05:41 2013 +0200 winedev: Update wine multimedia chapter. --- en/winedev-multimedia.sgml | 180 ++++++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=45f6426a3413f0ae2d476…

1 0

Frédéric Delanoy : makefiles: Don' t duplicate files lists in every makefile.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: docs Branch: master Commit: 244227520f2c883662397540914009bb6632ea76 URL: http://source.winehq.org/git/docs.git/?a=commit;h=244227520f2c8836623975409… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 20 22:34:45 2013 +0200 makefiles: Don't duplicate files lists in every makefile. --- Make.rules.in | 31 +++++++++++++++++++++++++++++++ en/Makefile.in | 30 ------------------------------ fr/Makefile.in | 16 ---------------- 3 files changed, 31 insertions(+), 46 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index fda8e81..7538144 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -16,6 +16,37 @@ DB2PS = @DB2PS@ DB2TXT = @DB2TXT@ PO4ADIR = $(TOPSRCDIR)/po4a PO4AENV = PERLLIB=$(PO4ADIR)/lib +SGMLDIR = $(TOPSRCDIR)/en + +WINEUSR_SRCS = \ + $(SGMLDIR)/wineusr-bugs.sgml \ + $(SGMLDIR)/wineusr-configuring.sgml \ + $(SGMLDIR)/wineusr-getting.sgml \ + $(SGMLDIR)/wineusr-glossary.sgml \ + $(SGMLDIR)/wineusr-introduction.sgml \ + $(SGMLDIR)/wineusr-running.sgml + +WINELIB_SRCS = \ + $(SGMLDIR)/winelib-bindlls.sgml \ + $(SGMLDIR)/winelib-intro.sgml \ + $(SGMLDIR)/winelib-mfc.sgml \ + $(SGMLDIR)/winelib-porting.sgml \ + $(SGMLDIR)/winelib-toolkit.sgml + +WINEDEV_SRCS = \ + $(SGMLDIR)/winedev-architecture.sgml \ + $(SGMLDIR)/winedev-ddraw.sgml \ + $(SGMLDIR)/winedev-debugger.sgml \ + $(SGMLDIR)/winedev-debugging.sgml \ + $(SGMLDIR)/winedev-documentation.sgml \ + $(SGMLDIR)/winedev-multimedia.sgml \ + $(SGMLDIR)/winedev-ole.sgml \ + $(SGMLDIR)/winedev-opengl.sgml \ + $(SGMLDIR)/winedev-testing.sgml \ + $(SGMLDIR)/winedev-coding.sgml \ + $(SGMLDIR)/winedev-kernel.sgml \ + $(SGMLDIR)/winedev-otherdebug.sgml \ + $(SGMLDIR)/winedev-windowing.sgml all: $(SUBDIRS) diff --git a/en/Makefile.in b/en/Makefile.in index 6d11868..50d7c6e 100644 --- a/en/Makefile.in +++ b/en/Makefile.in @@ -4,36 +4,6 @@ VPATH = @srcdir@ DOCLOCALE = en -WINEUSR_SRCS = \ - wineusr-bugs.sgml \ - wineusr-configuring.sgml \ - wineusr-getting.sgml \ - wineusr-glossary.sgml \ - wineusr-introduction.sgml \ - wineusr-running.sgml - -WINEDEV_SRCS = \ - winedev-architecture.sgml \ - winedev-ddraw.sgml \ - winedev-debugger.sgml \ - winedev-debugging.sgml \ - winedev-documentation.sgml \ - winedev-multimedia.sgml \ - winedev-ole.sgml \ - winedev-opengl.sgml \ - winedev-testing.sgml \ - winedev-coding.sgml \ - winedev-kernel.sgml \ - winedev-otherdebug.sgml \ - winedev-windowing.sgml - -WINELIB_SRCS = \ - winelib-bindlls.sgml \ - winelib-intro.sgml \ - winelib-mfc.sgml \ - winelib-porting.sgml \ - winelib-toolkit.sgml - ALLBOOKS = \ winedev-guide \ wineusr-guide \ diff --git a/fr/Makefile.in b/fr/Makefile.in index 4269ab4..2a5c670 100644 --- a/fr/Makefile.in +++ b/fr/Makefile.in @@ -3,24 +3,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ DOCLOCALE = fr -SGMLDIR = $(TOPSRCDIR)/en MIN_TRANS = 1 -WINEUSR_SRCS = \ - $(SGMLDIR)/wineusr-bugs.sgml \ - $(SGMLDIR)/wineusr-configuring.sgml \ - $(SGMLDIR)/wineusr-getting.sgml \ - $(SGMLDIR)/wineusr-glossary.sgml \ - $(SGMLDIR)/wineusr-introduction.sgml \ - $(SGMLDIR)/wineusr-running.sgml - -WINELIB_SRCS = \ - $(SGMLDIR)/winelib-bindlls.sgml \ - $(SGMLDIR)/winelib-intro.sgml \ - $(SGMLDIR)/winelib-mfc.sgml \ - $(SGMLDIR)/winelib-porting.sgml \ - $(SGMLDIR)/winelib-toolkit.sgml - ALLBOOKS = \ wineusr-guide \ winelib-guide

1 0

Stefan Dösinger : wined3d: Free volume sysmem after upload.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 5ff1237563bdb8723c368ceca63385fe1227cf55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff1237563bdb8723c368ceca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 23:22:46 2013 +0200 wined3d: Free volume sysmem after upload. --- dlls/wined3d/volume.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index e2adf05..d95fd91 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -113,6 +113,26 @@ static void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DW } /* Context activation is done by the caller. */ +static void wined3d_volume_download_data(struct wined3d_volume *volume, + const struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format *format = volume->resource.format; + + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, volume->texture_level, + format->glFormat, format->glType, volume->resource.allocatedMemory); + checkGLcall("glGetTexImage"); +} + +static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) +{ + wined3d_resource_free_sysmem(volume->resource.heap_memory); + volume->resource.heap_memory = NULL; + volume->resource.allocatedMemory = NULL; + wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); +} + +/* Context activation is done by the caller. */ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) { @@ -160,6 +180,10 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, return; } wined3d_volume_validate_location(volume, WINED3D_LOCATION_TEXTURE_RGB); + + if (volume->resource.pool == WINED3D_POOL_MANAGED && volume->download_count < 10) + wined3d_volume_evict_sysmem(volume); + break; case WINED3D_LOCATION_SYSMEM: @@ -174,6 +198,12 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, TRACE("Volume previously discarded, nothing to do.\n"); wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_DISCARDED); } + else if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB) + { + volume_bind_and_dirtify(volume, context); + volume->download_count++; + wined3d_volume_download_data(volume, context); + } else { FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a09ee80..0bc84bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2067,6 +2067,7 @@ struct wined3d_volume DWORD flags, locations; GLint texture_level; + DWORD download_count; }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)

1 0

Dmitry Timoshkov : ntdll/tests: Fix one more place regarding temp path usage.
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: b126d7c7ce1626e8440b7fef83947fa2de5444c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b126d7c7ce1626e8440b7fef8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 13:59:55 2013 +0900 ntdll/tests: Fix one more place regarding temp path usage. --- dlls/ntdll/tests/file.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 240c627..99e769e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -101,10 +101,11 @@ static BOOL create_pipe( HANDLE *read, HANDLE *write, ULONG flags, ULONG size ) static HANDLE create_temp_file( ULONG flags ) { - char buffer[MAX_PATH]; + char path[MAX_PATH], buffer[MAX_PATH]; HANDLE handle; - GetTempFileNameA( ".", "foo", 0, buffer ); + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foo", 0, buffer ); handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, flags | FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );

1 0

Henri Verbeet : d3dx9: Simplify D3DXCreateEffectFromResourceExW().
by Alexandre Julliard Aug. 23, 2013

Aug. 23, 2013

Module: wine Branch: master Commit: 37d67eb629c1d0e7cc7cc698f4a909b4c8eda360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d67eb629c1d0e7cc7cc698f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 23 10:18:18 2013 +0200 d3dx9: Simplify D3DXCreateEffectFromResourceExW(). --- dlls/d3dx9_36/effect.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c4d97a4..c349acf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5571,29 +5571,25 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExW(struct IDirect3DDevice9 *device, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); + TRACE("device %p, srcmodule %p, srcresource %s, defines %p, include %p, skipconstants %s, " + "flags %#x, pool %p, effect %p, compilationerrors %p.\n", + device, srcmodule, debugstr_w(srcresource), defines, include, debugstr_a(skipconstants), + flags, pool, effect, compilationerrors); if (!device) return D3DERR_INVALIDCALL; - resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); - - if (resinfo) - { - LPVOID buffer; - HRESULT ret; - DWORD size; - - ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); - - if (FAILED(ret)) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(srcmodule, srcresource, (const WCHAR *)RT_RCDATA))) + return D3DXERR_INVALIDDATA; - return D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); - } + if (FAILED(load_resource_into_memory(srcmodule, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXCreateEffectEx(device, buffer, size, defines, include, + skipconstants, flags, pool, effect, compilationerrors); } HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,

1 0