wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Francois Gouget : oleaut32: Standardize the heap_xxx() functions.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 78ee7f57fa45957eed1e7335a5f1822cb0745174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ee7f57fa45957eed1e7335a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 18:38:02 2017 +0100 oleaut32: Standardize the heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 24 ------------------------ dlls/oleaut32/typelib.h | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3df9631..1c00d71 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1600,30 +1600,6 @@ static void TLB_abort(void) DebugBreak(); } -void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(unsigned size) -{ - void *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!ret) ERR("cannot allocate memory\n"); - return ret; -} - -void* __WINE_ALLOC_SIZE(1) heap_alloc(unsigned size) -{ - void *ret = HeapAlloc(GetProcessHeap(), 0, size); - if (!ret) ERR("cannot allocate memory\n"); - return ret; -} - -void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, unsigned size) -{ - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); -} - -void heap_free(void *ptr) -{ - HeapFree(GetProcessHeap(), 0, ptr); -} - /* returns the size required for a deep copy of a typedesc into a * flat buffer */ static SIZE_T TLB_SizeTypeDesc( const TYPEDESC *tdesc, BOOL alloc_initial_space ) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 31c9ab9..d977dfb 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -596,11 +596,25 @@ WORD typeofarray #include "poppack.h" -/* heap allocation helpers */ -extern void* heap_alloc_zero(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); -extern void* heap_alloc(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); -extern void* heap_realloc(void *ptr, unsigned size) DECLSPEC_HIDDEN; -extern void heap_free(void *ptr) 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( LPVOID mem, SIZE_T size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN;

1 0

Francois Gouget : schedsvc: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 223ea1312be779843dcca7b07cc954720240a219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223ea1312be779843dcca7b07… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:56:06 2017 +0100 schedsvc: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc_private.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 4138aa0..3abce07 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -23,22 +23,19 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -static void *heap_alloc_zero(SIZE_T size) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T size) { - void *ptr = MIDL_user_allocate(size); - if (ptr) memset(ptr, 0, size); - return ptr; + return MIDL_user_allocate(size); } -static void *heap_alloc(SIZE_T size) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T size) { - return MIDL_user_allocate(size); + void *ptr = MIDL_user_allocate(size); + if (ptr) memset(ptr, 0, size); + return ptr; } -static void *heap_realloc(void *ptr, SIZE_T size) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc(void *ptr, SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, SIZE_T size) { return HeapReAlloc(GetProcessHeap(), 0, ptr, size); }

1 0

Francois Gouget : wmp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 97fa31eef22507057ce74abc904d6fb0105c44c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fa31eef22507057ce74abc9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:56 2017 +0100 wmp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/wmp_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 91e8465..a44aa35 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -46,12 +46,12 @@ void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

Francois Gouget : scrrun: Add a __WINE_ALLOC_SIZE attribute to heap_alloc( ).
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 0d8d0b9f183392290e3c82aa47f53af963a4b318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8d0b9f183392290e3c82aa4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:10 2017 +0100 scrrun: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/scrrun_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index e2023f9..3312876 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -46,7 +46,7 @@ struct provideclassinfo { extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); }

1 0

Francois Gouget : ole32: Add a __WINE_ALLOC_SIZE attribute to heap_alloc() .
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 93a8ede0e854cb954d81c43c5220481f917189d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a8ede0e854cb954d81c43c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:00 2017 +0100 ole32: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 7ceee2c..b9d1e85 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -320,7 +320,7 @@ extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); }

1 0

Francois Gouget : appwiz.cpl: Add __WINE_ALLOC_SIZE attributes to heap_xxx () functions.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 71aa8ee1a2b854405851fc92054d330698b81653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71aa8ee1a2b854405851fc920… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:52:14 2017 +0100 appwiz.cpl: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 77636ae..1e60daf 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -27,12 +27,12 @@ BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); }

1 0

Bruno Jesus : wlanapi: Semi-stub WlanEnumInterfaces.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 6bb8ca1e25a9cfc66f396b2ae6bc423a8057929c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb8ca1e25a9cfc66f396b2ae… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 7 16:05:40 2017 -0200 wlanapi: Semi-stub WlanEnumInterfaces. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 24 ++++++++++++++++++++++-- dlls/wlanapi/tests/wlanapi.c | 5 ----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 3fae765..6955245 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -63,8 +63,28 @@ static HANDLE handle_new(struct wine_wlan **entry) DWORD WINAPI WlanEnumInterfaces(HANDLE handle, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) { - FIXME("(%p, %p, %p) stub\n", handle, reserved, interface_list); - return ERROR_CALL_NOT_IMPLEMENTED; + struct wine_wlan *wlan; + WLAN_INTERFACE_INFO_LIST *ret_list; + + FIXME("(%p, %p, %p) semi-stub\n", handle, reserved, interface_list); + + if (!handle || reserved || !interface_list) + return ERROR_INVALID_PARAMETER; + + wlan = handle_index(handle); + if (!wlan) + return ERROR_INVALID_HANDLE; + + ret_list = WlanAllocateMemory(sizeof(WLAN_INTERFACE_INFO_LIST)); + if (!ret_list) + return ERROR_NOT_ENOUGH_MEMORY; + + memset(&ret_list->InterfaceInfo[0], 0, sizeof(WLAN_INTERFACE_INFO)); + ret_list->dwNumberOfItems = 0; + ret_list->dwIndex = 0; /* unused in this function */ + *interface_list = ret_list; + + return ERROR_SUCCESS; } DWORD WINAPI WlanCloseHandle(HANDLE handle, void *reserved) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index e0c55f6..882aa82 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -134,24 +134,19 @@ static void test_WlanEnumInterfaces(void) /* invalid parameters */ ret = WlanEnumInterfaces(NULL, NULL, &list); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, &reserved, &list); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, NULL, NULL); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); /* good tests */ list = NULL; ret = WlanEnumInterfaces(handle, NULL, &list); -todo_wine ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); -todo_wine ok(list != NULL, "bad interface list\n"); if (!list || !list->dwNumberOfItems) {

1 0

Ken Thomases : winemac: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 02c6e4530246f510f5683b44d9d50bea445dfdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c6e4530246f510f5683b44d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 8 09:30:13 2017 -0600 winemac: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index f25b06d..67e0dce 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -206,7 +206,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) DWORD size, ret; value[0] = 0; - size = sizeof(value) / sizeof(WCHAR); + size = sizeof(value); ret = RegQueryValueExW(key, name, NULL, NULL, (BYTE *)value, &size); RegCloseKey(key); if (!ret)

1 0

Henri Verbeet : wined3d: Disallow upload conversion from compressed formats in surface_convert_format ().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 5a6efe632918fd18758897c39910d52791d46053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6efe632918fd18758897c39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:36 2017 +0100 wined3d: Disallow upload conversion from compressed formats in surface_convert_format(). The underlying issue is that glCompressedTexSubImage2D() needs the upload format to match the texture's internal format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 222159b..628c83a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1521,7 +1521,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized || !is_identity_fixup(src_format->color_fixup) || src_format->convert - || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert)) + || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert + || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED))) { FIXME("Cannot find a conversion function from format %s to %s.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id));

1 0

Henri Verbeet : wined3d: Allow decompression blits on system memory resources in ffp_blit_supported ().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 807733f1c99e2cf2dede66af8381685e35c8b277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807733f1c99e2cf2dede66af8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:35 2017 +0100 wined3d: Allow decompression blits on system memory resources in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b4e2025..222159b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2930,7 +2930,11 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + BOOL decompress; + + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM)) { TRACE("Source or destination is in system memory.\n"); return FALSE;

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
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 February 2017