November 2023 - Wine-commits

Alex Henrie : include: Annotate MIDL_user_allocate with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: f27ac1bb777aa74c82d91203a06591299e6fef3d URL: https://gitlab.winehq.org/wine/wine/-/commit/f27ac1bb777aa74c82d91203a06591… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:50:55 2023 -0600 include: Annotate MIDL_user_allocate with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/rpcndr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 498aa4ddd40..2d836726a15 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -82,8 +82,8 @@ typedef unsigned char boolean; #define midl_user_free MIDL_user_free #define midl_user_allocate MIDL_user_allocate -void * __RPC_USER MIDL_user_allocate(SIZE_T); void __RPC_USER MIDL_user_free(void *); +void * __RPC_USER MIDL_user_allocate(SIZE_T) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(MIDL_user_free) __WINE_MALLOC; #define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8) #define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), \

1 0

Alexandre Julliard : opengl32: Make the GL driver function table const.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: c48a3bd349ebead5f7e3a8aa1f30d6dfddfe697c URL: https://gitlab.winehq.org/wine/wine/-/commit/c48a3bd349ebead5f7e3a8aa1f30d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 13:40:19 2023 +0100 opengl32: Make the GL driver function table const. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/unix_private.h | 4 ++-- dlls/opengl32/unix_wgl.c | 14 +++++++------- dlls/win32u/dc.c | 2 +- include/wine/wgl_driver.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index b1161632f81..6ea8c2b016e 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -920,7 +920,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER; diff --git a/dlls/opengl32/unix_private.h b/dlls/opengl32/unix_private.h index f2a9477f990..693c916ddaa 100644 --- a/dlls/opengl32/unix_private.h +++ b/dlls/opengl32/unix_private.h @@ -43,9 +43,9 @@ 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 ) +static inline const struct opengl_funcs *get_dc_funcs( HDC hdc ) { - struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); + const struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); if (!funcs) RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); else if (funcs == (void *)-1) funcs = &null_opengl_funcs; return funcs; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 4cf12893541..f97e3147c15 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -77,7 +77,7 @@ struct opengl_context struct wgl_handle { UINT handle; - struct opengl_funcs *funcs; + const struct opengl_funcs *funcs; union { struct opengl_context *context; /* for HANDLE_CONTEXT */ @@ -117,7 +117,7 @@ static struct wgl_handle *get_handle_ptr( HANDLE handle, enum wgl_handle_type ty return NULL; } -static HANDLE alloc_handle( enum wgl_handle_type type, struct opengl_funcs *funcs, void *user_ptr ) +static HANDLE alloc_handle( enum wgl_handle_type type, const struct opengl_funcs *funcs, void *user_ptr ) { HANDLE handle = 0; struct wgl_handle *ptr = NULL; @@ -647,7 +647,7 @@ static HGLRC wrap_wglCreateContext( HDC hdc ) HGLRC ret = 0; struct wgl_context *drv_ctx; struct opengl_context *context; - struct opengl_funcs *funcs = get_dc_funcs( hdc ); + const struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs) return 0; if (!(drv_ctx = funcs->wgl.p_wglCreateContext( hdc ))) return 0; @@ -679,7 +679,7 @@ static BOOL wrap_wglMakeCurrent( TEB *teb, HDC hdc, HGLRC hglrc ) teb->glReserved1[0] = hdc; teb->glReserved1[1] = hdc; teb->glCurrentRC = hglrc; - teb->glTable = ptr->funcs; + teb->glTable = (void *)ptr->funcs; } } else @@ -751,7 +751,7 @@ static HGLRC wrap_wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *a struct wgl_context *drv_ctx; struct wgl_handle *share_ptr = NULL; struct opengl_context *context; - struct opengl_funcs *funcs = get_dc_funcs( hdc ); + const struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs) { @@ -796,7 +796,7 @@ static HPBUFFERARB wrap_wglCreatePbufferARB( HDC hdc, int format, int width, int { HPBUFFERARB ret; struct wgl_pbuffer *pbuffer; - struct opengl_funcs *funcs = get_dc_funcs( hdc ); + const struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs || !funcs->ext.p_wglCreatePbufferARB) return 0; if (!(pbuffer = funcs->ext.p_wglCreatePbufferARB( hdc, format, width, height, attribs ))) return 0; @@ -842,7 +842,7 @@ static BOOL wrap_wglMakeContextCurrentARB( TEB *teb, HDC draw_hdc, HDC read_hdc, teb->glReserved1[0] = draw_hdc; teb->glReserved1[1] = read_hdc; teb->glCurrentRC = hglrc; - teb->glTable = ptr->funcs; + teb->glTable = (void *)ptr->funcs; } } else diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 0ff624068cb..2b8a56de5bd 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1490,7 +1490,7 @@ BOOL WINAPI __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WC /*********************************************************************** * __wine_get_wgl_driver (win32u.@) */ -struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) +const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) { BOOL is_display, is_memdc; DC *dc; diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index ed11d8caa0e..daaddf9567d 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -3405,6 +3405,6 @@ struct opengl_funcs USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) -extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ); +extern const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Alexandre Julliard : odbc32: Make the Unix function table const.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 30dc5d28d199a9232a7d14943d0b59f7ee25d4c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/30dc5d28d199a9232a7d14943d0b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 13:45:17 2023 +0100 odbc32: Make the Unix function table const. --- dlls/odbc32/unixlib.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 7 deletions(-)

1 0

Alexandre Julliard : include: Make sure that Unix function tables are always const.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 1771716528d2a863e1146e5e98efefa4b5cf14e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1771716528d2a863e1146e5e98efef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 15:34:00 2023 +0100 include: Make sure that Unix function tables are always const. --- dlls/win32u/syscall.c | 2 +- include/wine/unixlib.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5a20409437e..13a15f8c6dc 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -465,7 +465,7 @@ static NTSTATUS init( void *dispatcher ) return ntdll_init_syscalls( &syscall_table, dispatcher ); } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { init, }; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 8a9522ec532..935baa0d5ba 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -29,6 +29,9 @@ typedef UINT64 unixlib_handle_t; typedef NTSTATUS (*unixlib_entry_t)( void *args ); +extern const unixlib_entry_t __wine_unix_call_funcs[]; +extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; + /* some useful helpers from ntdll */ extern const char *ntdll_get_build_dir(void); extern const char *ntdll_get_data_dir(void);

1 0

Alexandre Julliard : include: Use NTSYSAPI for all ntdll exports.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 1f769067a3f45e2f51ab597b46bd041120d1f413 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f769067a3f45e2f51ab597b46bd04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 15:15:18 2023 +0100 include: Use NTSYSAPI for all ntdll exports. --- include/ddk/wdm.h | 2 +- include/ip2string.h | 35 ++++++++++++++++------------------- include/wine/debug.h | 2 +- include/wine/server.h | 6 +++--- include/wine/unixlib.h | 26 +++++++++++++------------- include/winnt.h | 4 ++-- include/winternl.h | 2 +- 7 files changed, 37 insertions(+), 40 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for win32u functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 7999f40b38d26837fcb4098035f742621f22389b URL: https://gitlab.winehq.org/wine/wine/-/commit/7999f40b38d26837fcb4098035f742… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:33:59 2023 +0100 include: Use proper dllimports for win32u functions. --- dlls/opengl32/make_opengl | 2 - dlls/opengl32/unix_private.h | 1 + dlls/win32u/Makefile.in | 2 +- dlls/win32u/font.c | 2 +- dlls/winevulkan/make_vulkan | 2 - dlls/winevulkan/vulkan.c | 1 + include/ntgdi.h | 496 ++++++++++++++++++++------------------- include/ntuser.h | 546 ++++++++++++++++++++++--------------------- include/wine/gdi_driver.h | 6 +- include/wine/vulkan_driver.h | 2 - include/wine/wgl_driver.h | 2 - 11 files changed, 537 insertions(+), 525 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for dbghelp functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: f6d808477bdc34063667e56b7a97ac3e1e649167 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6d808477bdc34063667e56b7a97ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:05:26 2023 +0100 include: Use proper dllimports for dbghelp functions. --- include/dbghelp.h | 368 +++++++++++++-------------- include/imagehlp.h | 731 +++++++++++++---------------------------------------- 2 files changed, 359 insertions(+), 740 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for iphlpapi functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 6a863965562dda37c1ec2b9f2cbf511f3f44b9ab URL: https://gitlab.winehq.org/wine/wine/-/commit/6a863965562dda37c1ec2b9f2cbf51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:16:29 2023 +0100 include: Use proper dllimports for iphlpapi functions. --- dlls/iphlpapi/iphlpapi_main.c | 1 + include/iphlpapi.h | 200 +++++++++++++++--------------------------- include/netioapi.h | 56 ++++++------ 3 files changed, 100 insertions(+), 157 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for setupapi functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 897098c9945cf95947dc55b97bfcc3e47cdcbebf URL: https://gitlab.winehq.org/wine/wine/-/commit/897098c9945cf95947dc55b97bfcc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:23:55 2023 +0100 include: Use proper dllimports for setupapi functions. --- dlls/setupapi/Makefile.in | 1 + include/setupapi.h | 883 +++++++++++++++++++++++----------------------- 2 files changed, 443 insertions(+), 441 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for uxtheme functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: bc5ae2faa84e6cf09d00cb9df8e7788ded4d8773 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc5ae2faa84e6cf09d00cb9df8e778… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:25:19 2023 +0100 include: Use proper dllimports for uxtheme functions. --- dlls/uxtheme/Makefile.in | 1 + include/uxtheme.h | 161 +++++++++++++++++++++++------------------------ 2 files changed, 81 insertions(+), 81 deletions(-)

1 0