November 2022 - Wine-Commits

Alexandre Julliard : openal32: Remove dll.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 45eca854c4fab7e864deebf9a51c74147884ebc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/45eca854c4fab7e864deebf9a51c74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 16:15:00 2022 +0100 openal32: Remove dll. It's not part of Windows, so applications have to ship the native version anyway. --- configure | 101 ----- configure.ac | 21 - dlls/openal32/Makefile.in | 7 - dlls/openal32/openal.c | 1029 ------------------------------------------- dlls/openal32/openal32.spec | 97 ---- include/config.h.in | 9 - 6 files changed, 1264 deletions(-)

1 0

Jacek Caban : winevulkan: Always fill output in fill_luid_property.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 52ae9be12af9de7123d4ab6a76928343faf8a2c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/52ae9be12af9de7123d4ab6a769283… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 12:36:34 2022 +0100 winevulkan: Always fill output in fill_luid_property. --- dlls/winevulkan/loader.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 20bd9d38c27..cddcd0360ac 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -414,26 +414,26 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) { device_luid_valid = VK_TRUE; device_node_mask = 1; - - if (id) - { - memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); - id->deviceLUIDValid = device_luid_valid; - id->deviceNodeMask = device_node_mask; - } - - if (vk11) - { - memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); - vk11->deviceLUIDValid = device_luid_valid; - vk11->deviceNodeMask = device_node_mask; - } break; } } SetupDiDestroyDeviceInfoList(devinfo); release_display_device_init_mutex(mutex); + if (id) + { + if (device_luid_valid) memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); + id->deviceLUIDValid = device_luid_valid; + id->deviceNodeMask = device_node_mask; + } + + if (vk11) + { + if (device_luid_valid) memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); + vk11->deviceLUIDValid = device_luid_valid; + vk11->deviceNodeMask = device_node_mask; + } + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08lx:%08lx deviceNodeMask:%#x.\n", properties2->properties.deviceName, device_luid_valid, luid.HighPart, luid.LowPart, device_node_mask);

1 0

Alexandre Julliard : ntdll: Don't inline NtCurrentTeb() in Unix libraries.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 988d9ddbf5f2d1d325eb2fadb034503e218ccb5e URL: https://gitlab.winehq.org/wine/wine/-/commit/988d9ddbf5f2d1d325eb2fadb03450… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 13:52:49 2022 +0100 ntdll: Don't inline NtCurrentTeb() in Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 5 +++++ dlls/ntdll/unix/signal_x86_64.c | 5 +++++ include/winnt.h | 14 ++++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 9eef8ff7c69..a9f77f55ba4 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1770,4 +1770,9 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "mov r0, r1\n\t" /* retval */ "bx r2" ) +/********************************************************************** + * NtCurrentTeb (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NtCurrentTeb, "mrc p15, 0, r0, c13, c0, 2; bx lr" ) + #endif /* __arm__ */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ee34da51654..58029602130 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2896,4 +2896,9 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ "jmp *%rdx" ) +/********************************************************************** + * NtCurrentTeb (NTDLL.@) + */ +__ASM_GLOBAL_FUNC( NtCurrentTeb, "movq %gs:0x30,%rax; ret" ) + #endif /* __x86_64__ */ diff --git a/include/winnt.h b/include/winnt.h index 836bd7123e5..3bbeeb96ec2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2223,14 +2223,14 @@ typedef struct _NT_TIB struct _TEB; -#if defined(__i386__) && defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#if defined(__i386__) && defined(__GNUC__) && !defined(WINE_UNIX_LIB) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; __asm__(".byte 0x64\n\tmovl (0x18),%0" : "=r" (teb)); return teb; } -#elif defined(__i386__) && defined(_MSC_VER) +#elif defined(__i386__) && defined(_MSC_VER) && !defined(WINE_UNIX_LIB) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; @@ -2238,33 +2238,35 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm mov teb, eax; return teb; } -#elif defined(__x86_64__) && defined(__GNUC__) +#elif defined(__x86_64__) && defined(__GNUC__) && !defined(WINE_UNIX_LIB) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); return teb; } -#elif defined(__x86_64__) && defined(_MSC_VER) +#elif defined(__x86_64__) && defined(_MSC_VER) && !defined(WINE_UNIX_LIB) unsigned __int64 __readgsqword(unsigned long); #pragma intrinsic(__readgsqword) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } -#elif defined(__arm__) && defined(__GNUC__) +#elif defined(__arm__) && defined(__GNUC__) && !defined(WINE_UNIX_LIB) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; __asm__("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb)); return teb; } -#elif defined(__arm__) && defined(_MSC_VER) +#elif defined(__arm__) && defined(_MSC_VER) && !defined(WINE_UNIX_LIB) #pragma intrinsic(_MoveFromCoprocessor) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)_MoveFromCoprocessor(15, 0, 13, 0, 2); } +#elif defined(__GNUC__) +extern struct _TEB * WINAPI NtCurrentTeb(void) __attribute__((pure)); #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Alexandre Julliard : win32u: Always use the full union for sysparams entries.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 1ebf0f2b31be2e2ca8527ba523754bea9faacdfe URL: https://gitlab.winehq.org/wine/wine/-/commit/1ebf0f2b31be2e2ca8527ba523754b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 14:24:26 2022 +0100 win32u: Always use the full union for sysparams entries. This silences compiler warnings on gcc 12. --- dlls/win32u/sysparams.c | 74 +++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 376487b6a63..85595c0cb9a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -334,7 +334,7 @@ struct sysparam_binary_entry struct sysparam_path_entry { struct sysparam_entry hdr; - WCHAR path[MAX_PATH]; + WCHAR *path; }; struct sysparam_font_entry @@ -348,7 +348,7 @@ struct sysparam_font_entry struct sysparam_pref_entry { struct sysparam_entry hdr; - struct sysparam_binary_entry *parent; + union sysparam_all_entry *parent; UINT offset; UINT mask; }; @@ -3603,7 +3603,7 @@ static BOOL init_font_entry( union sysparam_all_entry *entry ) /* get a user pref parameter in the registry */ static BOOL get_userpref_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param, UINT dpi ) { - union sysparam_all_entry *parent_entry = (union sysparam_all_entry *)entry->pref.parent; + union sysparam_all_entry *parent_entry = entry->pref.parent; BYTE prefs[8]; if (!ptr_param) return FALSE; @@ -3616,7 +3616,7 @@ static BOOL get_userpref_entry( union sysparam_all_entry *entry, UINT int_param, /* set a user pref parameter in the registry */ static BOOL set_userpref_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param, UINT flags ) { - union sysparam_all_entry *parent_entry = (union sysparam_all_entry *)entry->pref.parent; + union sysparam_all_entry *parent_entry = entry->pref.parent; BYTE prefs[8]; parent_entry->hdr.loaded = FALSE; /* force loading it again */ @@ -3645,53 +3645,41 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) return entry->hdr.set( entry, int_param, ptr_param, flags ); } -#define UINT_ENTRY(name,val,base,reg) \ - struct sysparam_uint_entry entry_##name = { { get_uint_entry, set_uint_entry, init_uint_entry, \ - base, reg }, (val) } +#define UINT_ENTRY(name,val,base,reg) union sysparam_all_entry entry_##name = \ + { .uint = { { get_uint_entry, set_uint_entry, init_uint_entry, base, reg }, (val) } } -#define UINT_ENTRY_MIRROR(name,val,base,reg,mirror_base) \ - struct sysparam_uint_entry entry_##name = { { get_uint_entry, set_uint_entry, init_uint_entry, \ - base, reg, mirror_base, reg }, (val) } +#define UINT_ENTRY_MIRROR(name,val,base,reg,mirror_base) union sysparam_all_entry entry_##name = \ + { .uint = { { get_uint_entry, set_uint_entry, init_uint_entry, base, reg, mirror_base, reg }, (val) } } -#define INT_ENTRY(name,val,base,reg) \ - struct sysparam_uint_entry entry_##name = { { get_uint_entry, set_int_entry, init_int_entry, \ - base, reg }, (val) } +#define INT_ENTRY(name,val,base,reg) union sysparam_all_entry entry_##name = \ + { .uint = { { get_uint_entry, set_int_entry, init_int_entry, base, reg }, (val) } } -#define BOOL_ENTRY(name,val,base,reg) \ - struct sysparam_bool_entry entry_##name = { { get_bool_entry, set_bool_entry, init_bool_entry, \ - base, reg }, (val) } +#define BOOL_ENTRY(name,val,base,reg) union sysparam_all_entry entry_##name = \ + { .bool = { { get_bool_entry, set_bool_entry, init_bool_entry, base, reg }, (val) } } -#define BOOL_ENTRY_MIRROR(name,val,base,reg,mirror_base) \ - struct sysparam_bool_entry entry_##name = { { get_bool_entry, set_bool_entry, init_bool_entry, \ - base, reg, mirror_base, reg }, (val) } +#define BOOL_ENTRY_MIRROR(name,val,base,reg,mirror_base) union sysparam_all_entry entry_##name = \ + { .bool = { { get_bool_entry, set_bool_entry, init_bool_entry, base, reg, mirror_base, reg }, (val) } } -#define TWIPS_ENTRY(name,val,base,reg) \ - struct sysparam_uint_entry entry_##name = { { get_twips_entry, set_twips_entry, init_int_entry, \ - base, reg }, (val) } +#define TWIPS_ENTRY(name,val,base,reg) union sysparam_all_entry entry_##name = \ + { .uint = { { get_twips_entry, set_twips_entry, init_int_entry, base, reg }, (val) } } -#define YESNO_ENTRY(name,val,base,reg) \ - struct sysparam_bool_entry entry_##name = { { get_yesno_entry, set_yesno_entry, init_yesno_entry, \ - base, reg }, (val) } +#define YESNO_ENTRY(name,val,base,reg) union sysparam_all_entry entry_##name = \ + { .bool = { { get_yesno_entry, set_yesno_entry, init_yesno_entry, base, reg }, (val) } } -#define DWORD_ENTRY(name,val,base,reg) \ - struct sysparam_dword_entry entry_##name = { { get_dword_entry, set_dword_entry, init_dword_entry, \ - base, reg }, (val) } +#define DWORD_ENTRY(name,val,base,reg) union sysparam_all_entry entry_##name = \ + { .dword = { { get_dword_entry, set_dword_entry, init_dword_entry, base, reg }, (val) } } -#define BINARY_ENTRY(name,data,base,reg) \ - struct sysparam_binary_entry entry_##name = { { get_binary_entry, set_binary_entry, init_binary_entry, \ - base, reg }, data, sizeof(data) } +#define BINARY_ENTRY(name,data,base,reg) union sysparam_all_entry entry_##name = \ + { .bin = { { get_binary_entry, set_binary_entry, init_binary_entry, base, reg }, data, sizeof(data) } } -#define PATH_ENTRY(name,base,reg) \ - struct sysparam_path_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \ - base, reg } } +#define PATH_ENTRY(name,base,reg,buffer) union sysparam_all_entry entry_##name = \ + { .path = { { get_path_entry, set_path_entry, init_path_entry, base, reg }, buffer } } -#define FONT_ENTRY(name,weight,base,reg) \ - struct sysparam_font_entry entry_##name = { { get_font_entry, set_font_entry, init_font_entry, \ - base, reg }, (weight) } +#define FONT_ENTRY(name,weight,base,reg) union sysparam_all_entry entry_##name = \ + { .font = { { get_font_entry, set_font_entry, init_font_entry, base, reg }, (weight) } } -#define USERPREF_ENTRY(name,offset,mask) \ - struct sysparam_pref_entry entry_##name = { { get_userpref_entry, set_userpref_entry }, \ - &entry_USERPREFERENCESMASK, (offset), (mask) } +#define USERPREF_ENTRY(name,offset,mask) union sysparam_all_entry entry_##name = \ + { .pref = { { get_userpref_entry, set_userpref_entry }, &entry_USERPREFERENCESMASK, (offset), (mask) } } static UINT_ENTRY( DRAGWIDTH, 4, DESKTOP_KEY, "DragWidth" ); static UINT_ENTRY( DRAGHEIGHT, 4, DESKTOP_KEY, "DragHeight" ); @@ -3765,8 +3753,10 @@ static DWORD_ENTRY( LOGPIXELS, 0, DESKTOP_KEY, "LogPixels" ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200, DESKTOP_KEY, "ClickLockTime" ); static DWORD_ENTRY( AUDIODESC_LOCALE, 0, AUDIODESC_KEY, "Locale" ); -static PATH_ENTRY( DESKPATTERN, DESKTOP_KEY, "Pattern" ); -static PATH_ENTRY( DESKWALLPAPER, DESKTOP_KEY, "Wallpaper" ); +static WCHAR desk_pattern_path[MAX_PATH]; +static WCHAR desk_wallpaper_path[MAX_PATH]; +static PATH_ENTRY( DESKPATTERN, DESKTOP_KEY, "Pattern", desk_pattern_path ); +static PATH_ENTRY( DESKWALLPAPER, DESKTOP_KEY, "Wallpaper", desk_wallpaper_path ); static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs, DESKTOP_KEY, "UserPreferencesMask" );

1 0

Rémi Bernon : opengl32: Avoid calling back the wglMakeCurrent win32 thunk.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 8c178113127a496fc30481f9e8c8294e4d19466c URL: https://gitlab.winehq.org/wine/wine/-/commit/8c178113127a496fc30481f9e8c829… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 12:20:55 2022 +0200 opengl32: Avoid calling back the wglMakeCurrent win32 thunk. --- dlls/opengl32/unix_wgl.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index ada4dbe5498..159753276bc 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -483,27 +483,6 @@ static HGLRC wrap_wglCreateContext( HDC hdc ) return ret; } -static BOOL wrap_wglDeleteContext( HGLRC hglrc ) -{ - struct wgl_handle *ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ); - - if (!ptr) return FALSE; - - if (ptr->u.context->tid && ptr->u.context->tid != GetCurrentThreadId()) - { - SetLastError( ERROR_BUSY ); - release_handle_ptr( ptr ); - return FALSE; - } - if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); - ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context->drv_ctx ); - HeapFree( GetProcessHeap(), 0, ptr->u.context->disabled_exts ); - HeapFree( GetProcessHeap(), 0, ptr->u.context->extensions ); - HeapFree( GetProcessHeap(), 0, ptr->u.context ); - free_handle_ptr( ptr ); - return TRUE; -} - static BOOL wrap_wglMakeCurrent( HDC hdc, HGLRC hglrc ) { BOOL ret = TRUE; @@ -547,6 +526,27 @@ static BOOL wrap_wglMakeCurrent( HDC hdc, HGLRC hglrc ) return ret; } +static BOOL wrap_wglDeleteContext( HGLRC hglrc ) +{ + struct wgl_handle *ptr = get_handle_ptr( hglrc, HANDLE_CONTEXT ); + + if (!ptr) return FALSE; + + if (ptr->u.context->tid && ptr->u.context->tid != GetCurrentThreadId()) + { + SetLastError( ERROR_BUSY ); + release_handle_ptr( ptr ); + return FALSE; + } + if (hglrc == NtCurrentTeb()->glCurrentRC) wrap_wglMakeCurrent( 0, 0 ); + ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context->drv_ctx ); + HeapFree( GetProcessHeap(), 0, ptr->u.context->disabled_exts ); + HeapFree( GetProcessHeap(), 0, ptr->u.context->extensions ); + HeapFree( GetProcessHeap(), 0, ptr->u.context ); + free_handle_ptr( ptr ); + return TRUE; +} + static BOOL wrap_wglShareLists( HGLRC hglrcSrc, HGLRC hglrcDst ) { BOOL ret = FALSE;

1 0

Rémi Bernon : opengl32: Avoid recursively entering WGL critical section.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: d4bed8ed2c1c090d8465af19914ccf740f7039d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4bed8ed2c1c090d8465af19914ccf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 12:08:13 2022 +0200 opengl32: Avoid recursively entering WGL critical section. --- dlls/opengl32/unix_wgl.c | 119 +++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 65 deletions(-)

1 0

Rémi Bernon : opengl32: Use glReserved1[0] and glReserved1[1] for draw and read DCs.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 2e1d5af7023e13f6e3599c6267c23f25bebe6a95 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e1d5af7023e13f6e3599c6267c23f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 11:51:30 2022 +0200 opengl32: Use glReserved1[0] and glReserved1[1] for draw and read DCs. --- dlls/opengl32/opengl_ext.h | 45 ------------------------------------- dlls/opengl32/unix_wgl.c | 56 +++++++++++++++++++++++++++++++++++++++------- dlls/opengl32/wgl.c | 12 ++++------ 3 files changed, 52 insertions(+), 61 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index c668e92fd9b..9cffc5a06f7 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -49,51 +49,6 @@ static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) return funcs; } -#define MAX_WGL_HANDLES 1024 - -/* handle management */ - -enum wgl_handle_type -{ - HANDLE_PBUFFER = 0 << 12, - HANDLE_CONTEXT = 1 << 12, - HANDLE_CONTEXT_V3 = 3 << 12, - HANDLE_TYPE_MASK = 15 << 12 -}; - -struct opengl_context -{ - DWORD tid; /* thread that the context is current in */ - HDC draw_dc; /* current drawing DC */ - HDC read_dc; /* current reading DC */ - void (CALLBACK *debug_callback)( GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *, const void * ); /* debug callback */ - const void *debug_user; /* debug user parameter */ - GLubyte *extensions; /* extension string */ - GLuint *disabled_exts; /* indices of disabled extensions */ - struct wgl_context *drv_ctx; /* driver context */ -}; - -struct wgl_handle -{ - UINT handle; - struct opengl_funcs *funcs; - union - { - struct opengl_context *context; /* for HANDLE_CONTEXT */ - struct wgl_pbuffer *pbuffer; /* for HANDLE_PBUFFER */ - struct wgl_handle *next; /* for free handles */ - } u; -}; - -extern struct wgl_handle wgl_handles[MAX_WGL_HANDLES]; - -/* the current context is assumed valid and doesn't need locking */ -static inline struct wgl_handle *get_current_context_ptr(void) -{ - if (!NtCurrentTeb()->glCurrentRC) return NULL; - return &wgl_handles[LOWORD(NtCurrentTeb()->glCurrentRC) & ~HANDLE_TYPE_MASK]; -} - extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); #endif /* __DLLS_OPENGL32_OPENGL_EXT_H */ diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 159753276bc..8f3fa70556e 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -38,10 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); -struct wgl_handle wgl_handles[MAX_WGL_HANDLES]; -static struct wgl_handle *next_free; -static unsigned int handle_count; - static CRITICAL_SECTION wgl_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -51,6 +47,50 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION wgl_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +/* handle management */ + +enum wgl_handle_type +{ + HANDLE_PBUFFER = 0 << 12, + HANDLE_CONTEXT = 1 << 12, + HANDLE_CONTEXT_V3 = 3 << 12, + HANDLE_TYPE_MASK = 15 << 12 +}; + +struct opengl_context +{ + DWORD tid; /* thread that the context is current in */ + void (CALLBACK *debug_callback)( GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *, const void * ); /* debug callback */ + const void *debug_user; /* debug user parameter */ + GLubyte *extensions; /* extension string */ + GLuint *disabled_exts; /* indices of disabled extensions */ + struct wgl_context *drv_ctx; /* driver context */ +}; + +struct wgl_handle +{ + UINT handle; + struct opengl_funcs *funcs; + union + { + struct opengl_context *context; /* for HANDLE_CONTEXT */ + struct wgl_pbuffer *pbuffer; /* for HANDLE_PBUFFER */ + struct wgl_handle *next; /* for free handles */ + } u; +}; + +#define MAX_WGL_HANDLES 1024 +static struct wgl_handle wgl_handles[MAX_WGL_HANDLES]; +static struct wgl_handle *next_free; +static unsigned int handle_count; + +/* the current context is assumed valid and doesn't need locking */ +static inline struct wgl_handle *get_current_context_ptr(void) +{ + if (!NtCurrentTeb()->glCurrentRC) return NULL; + return &wgl_handles[LOWORD(NtCurrentTeb()->glCurrentRC) & ~HANDLE_TYPE_MASK]; +} + static inline HANDLE next_handle( struct wgl_handle *ptr, enum wgl_handle_type type ) { WORD generation = HIWORD( ptr->handle ) + 1; @@ -498,8 +538,8 @@ static BOOL wrap_wglMakeCurrent( HDC hdc, HGLRC hglrc ) { if (prev) prev->u.context->tid = 0; ptr->u.context->tid = GetCurrentThreadId(); - ptr->u.context->draw_dc = hdc; - ptr->u.context->read_dc = hdc; + NtCurrentTeb()->glReserved1[0] = hdc; + NtCurrentTeb()->glReserved1[1] = hdc; NtCurrentTeb()->glCurrentRC = hglrc; NtCurrentTeb()->glTable = ptr->funcs; } @@ -672,8 +712,8 @@ static BOOL wrap_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hgl { if (prev) prev->u.context->tid = 0; ptr->u.context->tid = GetCurrentThreadId(); - ptr->u.context->draw_dc = draw_hdc; - ptr->u.context->read_dc = read_hdc; + NtCurrentTeb()->glReserved1[0] = draw_hdc; + NtCurrentTeb()->glReserved1[1] = read_hdc; NtCurrentTeb()->glCurrentRC = hglrc; NtCurrentTeb()->glTable = ptr->funcs; } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1492f9b20b1..8a648318a42 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -50,10 +50,8 @@ static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; */ HDC WINAPI wglGetCurrentReadDCARB(void) { - struct wgl_handle *ptr = get_current_context_ptr(); - - if (!ptr) return 0; - return ptr->u.context->read_dc; + if (!NtCurrentTeb()->glCurrentRC) return 0; + return NtCurrentTeb()->glReserved1[1]; } /*********************************************************************** @@ -61,10 +59,8 @@ HDC WINAPI wglGetCurrentReadDCARB(void) */ HDC WINAPI wglGetCurrentDC(void) { - struct wgl_handle *ptr = get_current_context_ptr(); - - if (!ptr) return 0; - return ptr->u.context->draw_dc; + if (!NtCurrentTeb()->glCurrentRC) return 0; + return NtCurrentTeb()->glReserved1[0]; } /***********************************************************************

1 0

Rémi Bernon : opengl32: Use ntdll registry functions to read disabled extensions.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 40bd3b69ede2cd4405c1392adea8aaabc293bcdf URL: https://gitlab.winehq.org/wine/wine/-/commit/40bd3b69ede2cd4405c1392adea8aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 16:26:16 2022 +0100 opengl32: Use ntdll registry functions to read disabled extensions. --- dlls/opengl32/unix_wgl.c | 88 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 9 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 6b3bee89405..db025734b8c 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -223,6 +223,77 @@ static GLuint *filter_extensions_index( const char *disabled ) return disabled_index; } +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static inline UINT asciiz_to_unicode( WCHAR *dst, const char *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return (p - dst) * sizeof(WCHAR); +} + +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + return NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 ) ? 0 : ret; +} + +static HKEY open_hkcu_key( const char *name ) +{ + WCHAR bufferW[256]; + static HKEY hkcu; + + if (!hkcu) + { + char buffer[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + + ascii_to_unicode( bufferW, buffer, len ); + hkcu = reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); + } + + return reg_open_key( hkcu, bufferW, asciiz_to_unicode( bufferW, name ) - sizeof(WCHAR) ); +} + +static ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + static char *heap_strdup( const char *str ) { int len = strlen( str ) + 1; @@ -238,19 +309,18 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui if (!disabled) { - HKEY hkey; - DWORD size; char *str = NULL; + HKEY hkey; /* @@ Wine registry key: HKCU\Software\Wine\OpenGL */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey )) + if ((hkey = open_hkcu_key( "Software\\Wine\\OpenGL" ))) { - if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, NULL, &size )) - { - str = HeapAlloc( GetProcessHeap(), 0, size ); - if (RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (BYTE *)str, &size )) *str = 0; - } - RegCloseKey( hkey ); + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + static WCHAR disabled_extensionsW[] = {'D','i','s','a','b','l','e','d','E','x','t','e','n','s','i','o','n','s',0}; + + if (query_reg_value( hkey, disabled_extensionsW, value, sizeof(buffer) )) str = heap_strdup( buffer ); + NtClose( hkey ); } if (str) {

1 0

Rémi Bernon : opengl32: Split opengl_ext.h into private.h and unix_private.h.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: cb4fecc208d4278323d5ffb6cbbd81359affb215 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb4fecc208d4278323d5ffb6cbbd81… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 16:24:08 2022 +0100 opengl32: Split opengl_ext.h into private.h and unix_private.h. --- dlls/opengl32/make_opengl | 8 +++---- dlls/opengl32/opengl_ext.h | 54 -------------------------------------------- dlls/opengl32/private.h | 35 ++++++++++++++++++++++++++++ dlls/opengl32/thunks.c | 3 +-- dlls/opengl32/unix_private.h | 53 +++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unix_thunks.c | 3 +-- dlls/opengl32/unix_wgl.c | 3 +-- dlls/opengl32/wgl.c | 5 ++-- 8 files changed, 98 insertions(+), 66 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 8722b4d786a..3b67d3d9f61 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -868,8 +868,8 @@ print OUT "#include \"windef.h\"\n"; print OUT "#include \"winbase.h\"\n"; print OUT "#include \"wingdi.h\"\n\n"; -print OUT "#include \"unixlib.h\"\n\n"; -print OUT "#include \"opengl_ext.h\"\n\n"; +print OUT "#include \"unixlib.h\"\n"; +print OUT "#include \"private.h\"\n\n"; print OUT "#include \"wine/debug.h\"\n\n"; print OUT "WINE_DEFAULT_DEBUG_CHANNEL(opengl);\n"; @@ -926,8 +926,8 @@ print OUT "#include \"windef.h\"\n"; print OUT "#include \"winbase.h\"\n"; print OUT "#include \"wingdi.h\"\n\n"; -print OUT "#include \"unixlib.h\"\n\n"; -print OUT "#include \"opengl_ext.h\"\n\n"; +print OUT "#include \"unixlib.h\"\n"; +print OUT "#include \"unix_private.h\"\n\n"; foreach (sort keys %wgl_functions) { diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h deleted file mode 100644 index 9cffc5a06f7..00000000000 --- a/dlls/opengl32/opengl_ext.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Typedefs for extensions loading - - Copyright (c) 2000 Lionel Ulmer -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -*/ -#ifndef __DLLS_OPENGL32_OPENGL_EXT_H -#define __DLLS_OPENGL32_OPENGL_EXT_H - -#include <stdarg.h> -#include <stddef.h> - -#include "windef.h" -#include "winbase.h" -#include "winternl.h" -#include "wingdi.h" - -#include "wine/wgl.h" -#include "wine/wgl_driver.h" - -struct registry_entry -{ - const char *name; /* name of the extension */ - const char *extension; /* name of the GL/WGL extension */ -}; - -extern const struct registry_entry extension_registry[] DECLSPEC_HIDDEN; -extern const int extension_registry_size DECLSPEC_HIDDEN; -extern const void *extension_procs[] DECLSPEC_HIDDEN; -extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN; - -static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) -{ - struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); - if (!funcs) SetLastError( ERROR_INVALID_HANDLE ); - else if (funcs == (void *)-1) funcs = &null_opengl_funcs; - return funcs; -} - -extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); - -#endif /* __DLLS_OPENGL32_OPENGL_EXT_H */ diff --git a/dlls/opengl32/private.h b/dlls/opengl32/private.h new file mode 100644 index 00000000000..06a97b43987 --- /dev/null +++ b/dlls/opengl32/private.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2000 Lionel Ulmer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_OPENGL32_PRIVATE_H +#define __WINE_OPENGL32_PRIVATE_H + +#include <stdarg.h> +#include <stddef.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "wingdi.h" + +extern const void *extension_procs[] DECLSPEC_HIDDEN; + +extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); + +#endif /* __WINE_OPENGL32_PRIVATE_H */ diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c index fd2ad53dcf9..aad9330a108 100644 --- a/dlls/opengl32/thunks.c +++ b/dlls/opengl32/thunks.c @@ -10,8 +10,7 @@ #include "wingdi.h" #include "unixlib.h" - -#include "opengl_ext.h" +#include "private.h" #include "wine/debug.h" diff --git a/dlls/opengl32/unix_private.h b/dlls/opengl32/unix_private.h new file mode 100644 index 00000000000..eb8adf00090 --- /dev/null +++ b/dlls/opengl32/unix_private.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2000 Lionel Ulmer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_OPENGL32_UNIX_PRIVATE_H +#define __WINE_OPENGL32_UNIX_PRIVATE_H + +#include <stdarg.h> +#include <stddef.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "wingdi.h" + +#include "wine/wgl.h" +#include "wine/wgl_driver.h" + +struct registry_entry +{ + const char *name; /* name of the extension */ + const char *extension; /* name of the GL/WGL extension */ +}; + +extern const struct registry_entry extension_registry[] DECLSPEC_HIDDEN; +extern const int extension_registry_size DECLSPEC_HIDDEN; + +extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN; + +static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) +{ + struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); + if (!funcs) SetLastError( ERROR_INVALID_HANDLE ); + else if (funcs == (void *)-1) funcs = &null_opengl_funcs; + return funcs; +} + +#endif /* __WINE_OPENGL32_UNIX_PRIVATE_H */ diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 515a765f0a7..1be25db9a5f 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -10,8 +10,7 @@ #include "wingdi.h" #include "unixlib.h" - -#include "opengl_ext.h" +#include "unix_private.h" extern NTSTATUS wgl_wglCopyContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglCreateContext( void *args ) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 8f3fa70556e..cb09fa5993a 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -30,9 +30,8 @@ #include "winreg.h" #include "ntuser.h" -#include "opengl_ext.h" - #include "unixlib.h" +#include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 8a648318a42..76ce3437a97 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -31,9 +31,8 @@ #include "winreg.h" #include "ntuser.h" -#include "opengl_ext.h" - #include "unixlib.h" +#include "private.h" #include "wine/glu.h" #include "wine/debug.h" @@ -866,6 +865,8 @@ static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_mess return TRUE; } +extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN; + /*********************************************************************** * OpenGL initialisation routine */

1 0

Hans Leidekker : netprofm: Use CRT allocation functions.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: b003fa795ee68bb53062f64f53a453f752a8e647 URL: https://gitlab.winehq.org/wine/wine/-/commit/b003fa795ee68bb53062f64f53a453… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 09:12:50 2022 +0100 netprofm: Use CRT allocation functions. --- dlls/netprofm/list.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index eec1f2225d4..3f10bcb8005 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -36,7 +36,6 @@ #include "olectl.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "netprofm_private.h" @@ -200,7 +199,7 @@ static HRESULT WINAPI connection_point_Advise( return CO_E_FAILEDTOOPENTHREADTOKEN; } - sink_entry = heap_alloc( sizeof(*sink_entry) ); + sink_entry = malloc( sizeof(*sink_entry) ); if (!sink_entry) { IUnknown_Release( unk ); @@ -217,7 +216,7 @@ static void sink_entry_release( struct sink_entry *entry ) { list_remove( &entry->entry ); IUnknown_Release( entry->unk ); - heap_free( entry ); + free( entry ); } static HRESULT WINAPI connection_point_Unadvise( @@ -330,7 +329,7 @@ static ULONG WINAPI network_Release( { list_remove( &network->entry ); INetworkListManager_Release( network->mgr ); - heap_free( network ); + free( network ); } return refs; } @@ -554,7 +553,7 @@ static struct network *create_network( const GUID *id ) { struct network *ret; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; ret->INetwork_iface.lpVtbl = &network_vtbl; ret->refs = 1; @@ -738,7 +737,7 @@ static ULONG WINAPI networks_enum_Release( if (!(refs = InterlockedDecrement( &iter->refs ))) { INetworkListManager_Release( &iter->mgr->INetworkListManager_iface ); - heap_free( iter ); + free( iter ); } return refs; } @@ -883,7 +882,7 @@ static HRESULT create_networks_enum( struct networks_enum *iter; *ret = NULL; - if (!(iter = heap_alloc( sizeof(*iter) ))) return E_OUTOFMEMORY; + if (!(iter = calloc( 1, sizeof(*iter) ))) return E_OUTOFMEMORY; iter->IEnumNetworks_iface.lpVtbl = &networks_enum_vtbl; iter->cursor = list_head( &mgr->networks ); @@ -952,7 +951,7 @@ static ULONG WINAPI connections_enum_Release( if (!(refs = InterlockedDecrement( &iter->refs ))) { INetworkListManager_Release( &iter->mgr->INetworkListManager_iface ); - heap_free( iter ); + free( iter ); } return refs; } @@ -1096,7 +1095,7 @@ static HRESULT create_connections_enum( struct connections_enum *iter; *ret = NULL; - if (!(iter = heap_alloc( sizeof(*iter) ))) return E_OUTOFMEMORY; + if (!(iter = calloc( 1, sizeof(*iter) ))) return E_OUTOFMEMORY; iter->IEnumNetworkConnections_iface.lpVtbl = &connections_enum_vtbl; iter->mgr = mgr; @@ -1139,7 +1138,7 @@ static ULONG WINAPI list_manager_Release( { INetwork_Release( &network->INetwork_iface ); } - heap_free( mgr ); + free( mgr ); } return refs; } @@ -1496,7 +1495,7 @@ static ULONG WINAPI connection_Release( { list_remove( &connection->entry ); INetwork_Release( connection->network ); - heap_free( connection ); + free( connection ); } return refs; } @@ -1728,7 +1727,7 @@ static struct connection *create_connection( const GUID *id ) { struct connection *ret; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; ret->INetworkConnection_iface.lpVtbl = &connection_vtbl; ret->INetworkConnectionCost_iface.lpVtbl = &connection_cost_vtbl; @@ -1756,10 +1755,10 @@ static void init_networks( struct list_manager *mgr ) ret = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return; - if (!(buf = heap_alloc( size ))) return; + if (!(buf = malloc( size ))) return; if (GetAdaptersAddresses( AF_UNSPEC, flags, NULL, buf, &size )) { - heap_free( buf ); + free( buf ); return; } @@ -1802,7 +1801,7 @@ static void init_networks( struct list_manager *mgr ) } done: - heap_free( buf ); + free( buf ); } HRESULT list_manager_create( void **obj ) @@ -1811,7 +1810,7 @@ HRESULT list_manager_create( void **obj ) TRACE( "%p\n", obj ); - if (!(mgr = heap_alloc( sizeof(*mgr) ))) return E_OUTOFMEMORY; + if (!(mgr = calloc( 1, sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl;

1 0