February 2018 - Wine-commits

Michael Stefaniuc : qcap: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 1a9c63fe9f05fa628b5347e611237eb72eae1f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9c63fe9f05fa628b5347e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:51 2018 +0100 qcap: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 1 + dlls/qcap/qcap_main.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 0287271..32f3b56 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -29,6 +29,7 @@ #include "qcap_main.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index f4684c1..69d94bf 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -59,19 +59,4 @@ enum YUV_Format { void YUV_Init(void) DECLSPEC_HIDDEN; void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* _QCAP_MAIN_H_DEFINED */

1 0

Michael Stefaniuc : sapi: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 6a21434a7553fa807419446e83428a90cd23ea6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a21434a7553fa807419446e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:52 2018 +0100 sapi: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/sapi_private.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 5f78d12..b069222 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -18,22 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : schedsvc: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: f3b18e68a52a0bd8f921cd4b7e3f259d1a693bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b18e68a52a0bd8f921cd4b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:53 2018 +0100 schedsvc: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index b426078..4404486 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -19,30 +19,11 @@ #ifndef __WINE_SCHEDSVC_PRIVATE_H__ #define __WINE_SCHEDSVC_PRIVATE_H__ +#include "wine/heap.h" #include "wine/unicode.h" void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW(const WCHAR *src) { WCHAR *dst;

1 0

Michael Stefaniuc : scrrun: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 4b0b149a06e05f8f681d38bf1a7bb6fd7a7a3af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0b149a06e05f8f681d38bf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:54 2018 +0100 scrrun: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 1 + dlls/scrrun/filesystem.c | 1 + dlls/scrrun/scrrun_private.h | 10 ---------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 7ebf4a4..681274e 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2acef84..228a5e9 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 3312876..5083d30 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -46,14 +46,4 @@ struct provideclassinfo { extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif

1 0

Michael Stefaniuc : oledb32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: f9ddf9ad6d8bf2e0f93f77a64f4b07be04f7cf1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9ddf9ad6d8bf2e0f93f77a6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:56 2018 +0100 oledb32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 1 + dlls/oledb32/datainit.c | 1 + dlls/oledb32/dslocator.c | 1 + dlls/oledb32/errorinfo.c | 1 + dlls/oledb32/oledb_private.h | 20 -------------------- dlls/oledb32/rowpos.c | 1 + 6 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 22609ae..5bad105 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -31,6 +31,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 650c220..7d78e9f 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -29,6 +29,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index f530d2e..d397e47 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -33,6 +33,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index e1c3204..f1c9cd1 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -32,6 +32,7 @@ #include "oledb_private.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 6f2bf76..4e285b5 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -26,27 +26,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c1cee12..46904d3 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -28,6 +28,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb);

1 0

Michael Stefaniuc : taskschd: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: d186f681fba5542fd2a202db3d5479a78b636c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d186f681fba5542fd2a202db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:59 2018 +0100 taskschd: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/taskschd_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index ee7e59e..6c7f916 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -20,6 +20,7 @@ #define __WINE_TASKSCHD_PRIVATE_H__ #include "wine/unicode.h" +#include "wine/heap.h" HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskDefinition_create(ITaskDefinition **obj) DECLSPEC_HIDDEN; @@ -31,26 +32,6 @@ HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollec WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW(const WCHAR *src) { WCHAR *dst;

1 0

Thomas Faber : user32: Handle HeapReAlloc failure in RemoveMenu.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 7ee4588c0a919e28d1e29baaf327c8492c89b1e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee4588c0a919e28d1e29baa… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 3 10:47:01 2018 +0100 user32: Handle HeapReAlloc failure in RemoveMenu. The array size is being decreased so failure is not critical here, but it can still happen, e.g. when DPH is in use. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 38deaef..f4194ed 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3989,14 +3989,16 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) } else { + MENUITEM *new_items; while(nPos < menu->nItems) { *item = *(item+1); item++; nPos++; } - menu->items = HeapReAlloc( GetProcessHeap(), 0, menu->items, - menu->nItems * sizeof(MENUITEM) ); + new_items = HeapReAlloc( GetProcessHeap(), 0, menu->items, + menu->nItems * sizeof(MENUITEM) ); + if (new_items) menu->items = new_items; } return TRUE; }

1 0

Michael Stefaniuc : msxml3: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 82825d9cfc7d60f00ba9a1f86b5836dbf88ffc02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82825d9cfc7d60f00ba9a1f8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:53 2018 +0100 msxml3: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/msxml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1c05215..94ef66b 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -24,6 +24,7 @@ #include "dispex.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #ifndef __WINE_CONFIG_H @@ -164,31 +165,11 @@ const IID *get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Henri Verbeet : wined3d: Replace the CPU access flags in struct wined3d_buffer_desc with resource access flags.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 8623bd3b6b03b298866ad25ae5f02ae40c95ead7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8623bd3b6b03b298866ad25a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:53 2018 +0330 wined3d: Replace the CPU access flags in struct wined3d_buffer_desc with resource access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 4 +++- dlls/wined3d/buffer.c | 5 +---- include/wine/wined3d.h | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index ffa95a1..544e5a8 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -452,7 +452,9 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.byte_width = buffer->desc.ByteWidth; wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage); wined3d_desc.bind_flags = buffer->desc.BindFlags; - wined3d_desc.cpu_access_flags = buffer->desc.CPUAccessFlags; + if (~buffer->desc.CPUAccessFlags & (D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ)) + FIXME("Ignoring CPU access flags %#x.\n", buffer->desc.CPUAccessFlags); + wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; wined3d_desc.misc_flags = buffer->desc.MiscFlags; wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4baa123..53462a6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1426,11 +1426,8 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - FIXME("Ignoring access flags (pool).\n"); - if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, - WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP, - desc->bind_flags, data, parent, parent_ops))) + desc->access, desc->bind_flags, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c27cf48..72168e5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1969,9 +1969,9 @@ struct wined3d_blt_fx struct wined3d_buffer_desc { unsigned int byte_width; - DWORD usage; + unsigned int usage; unsigned int bind_flags; - unsigned int cpu_access_flags; + unsigned int access; unsigned int misc_flags; unsigned int structure_byte_stride; };

1 0

Henri Verbeet : wined3d: Implement wined3d_buffer_create_vb() on top of wined3d_buffer_create().
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 1377e7a6088b269bb7a90717a70e02d0a8d204d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1377e7a6088b269bb7a90717… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:54 2018 +0330 wined3d: Implement wined3d_buffer_create_vb() on top of wined3d_buffer_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 53462a6..12e4396 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1464,8 +1464,7 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { - struct wined3d_buffer *object; - HRESULT hr; + struct wined3d_buffer_desc desc; TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", device, size, usage, pool, parent, parent_ops, buffer); @@ -1479,25 +1478,14 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return WINED3DERR_INVALIDCALL; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *buffer = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } - - if (FAILED(hr = buffer_init(object, device, size, usage, WINED3DFMT_UNKNOWN, - resource_access_from_pool(pool), WINED3D_BIND_VERTEX_BUFFER, NULL, parent, parent_ops))) - { - WARN("Failed to initialize buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + desc.byte_width = size; + desc.usage = usage; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = resource_access_from_pool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - TRACE("Created buffer %p.\n", object); - *buffer = object; - - return WINED3D_OK; + return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); } HRESULT CDECL wined3d_buffer_create_ib(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool,

1 0