November 2023 - Wine-commits

Alexandre Julliard : winemac.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: fcd587a80e4d312247af614f3f2d915a31682efd URL: https://gitlab.winehq.org/wine/wine/-/commit/fcd587a80e4d312247af614f3f2d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:51:19 2023 +0100 winemac.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/winemac.drv/cocoa_event.h | 4 +- dlls/winemac.drv/macdrv.h | 264 ++++++++++++++++++++-------------------- dlls/winemac.drv/macdrv_cocoa.h | 230 +++++++++++++++++----------------- dlls/winemac.drv/macdrv_dll.h | 8 +- 4 files changed, 247 insertions(+), 259 deletions(-)

1 0

Alexandre Julliard : winewayland.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: d18e32c8697f004d11f3c0b3d83d34ce26f9aec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d18e32c8697f004d11f3c0b3d83d34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:51:50 2023 +0100 winewayland.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/winewayland.drv/waylanddrv.h | 78 +++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 383c79a23fe..2ab2c3e8e28 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -48,7 +48,7 @@ * Globals */ -extern struct wayland process_wayland DECLSPEC_HIDDEN; +extern struct wayland process_wayland; /********************************************************************** * Definitions for wayland types @@ -207,74 +207,74 @@ struct wayland_shm_buffer * Wayland initialization */ -BOOL wayland_process_init(void) DECLSPEC_HIDDEN; -void wayland_init_display_devices(BOOL force) DECLSPEC_HIDDEN; +BOOL wayland_process_init(void); +void wayland_init_display_devices(BOOL force); /********************************************************************** * Wayland output */ -BOOL wayland_output_create(uint32_t id, uint32_t version) DECLSPEC_HIDDEN; -void wayland_output_destroy(struct wayland_output *output) DECLSPEC_HIDDEN; -void wayland_output_use_xdg_extension(struct wayland_output *output) DECLSPEC_HIDDEN; +BOOL wayland_output_create(uint32_t id, uint32_t version); +void wayland_output_destroy(struct wayland_output *output); +void wayland_output_use_xdg_extension(struct wayland_output *output); /********************************************************************** * Wayland surface */ -struct wayland_surface *wayland_surface_create(HWND hwnd) DECLSPEC_HIDDEN; -void wayland_surface_destroy(struct wayland_surface *surface) DECLSPEC_HIDDEN; -void wayland_surface_make_toplevel(struct wayland_surface *surface) DECLSPEC_HIDDEN; -void wayland_surface_clear_role(struct wayland_surface *surface) DECLSPEC_HIDDEN; +struct wayland_surface *wayland_surface_create(HWND hwnd); +void wayland_surface_destroy(struct wayland_surface *surface); +void wayland_surface_make_toplevel(struct wayland_surface *surface); +void wayland_surface_clear_role(struct wayland_surface *surface); void wayland_surface_attach_shm(struct wayland_surface *surface, struct wayland_shm_buffer *shm_buffer, - HRGN surface_damage_region) DECLSPEC_HIDDEN; -struct wayland_surface *wayland_surface_lock_hwnd(HWND hwnd) DECLSPEC_HIDDEN; -BOOL wayland_surface_reconfigure(struct wayland_surface *surface) DECLSPEC_HIDDEN; + HRGN surface_damage_region); +struct wayland_surface *wayland_surface_lock_hwnd(HWND hwnd); +BOOL wayland_surface_reconfigure(struct wayland_surface *surface); BOOL wayland_surface_config_is_compatible(struct wayland_surface_config *conf, int width, int height, - enum wayland_surface_config_state state) DECLSPEC_HIDDEN; + enum wayland_surface_config_state state); void wayland_surface_coords_from_window(struct wayland_surface *surface, int window_x, int window_y, - int *surface_x, int *surface_y) DECLSPEC_HIDDEN; + int *surface_x, int *surface_y); void wayland_surface_coords_to_window(struct wayland_surface *surface, double surface_x, double surface_y, - int *window_x, int *window_y) DECLSPEC_HIDDEN; -struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface *surface) DECLSPEC_HIDDEN; -BOOL wayland_client_surface_release(struct wayland_client_surface *client) DECLSPEC_HIDDEN; -void wayland_surface_ensure_contents(struct wayland_surface *surface) DECLSPEC_HIDDEN; + int *window_x, int *window_y); +struct wayland_client_surface *wayland_surface_get_client(struct wayland_surface *surface); +BOOL wayland_client_surface_release(struct wayland_client_surface *client); +void wayland_surface_ensure_contents(struct wayland_surface *surface); /********************************************************************** * Wayland SHM buffer */ struct wayland_shm_buffer *wayland_shm_buffer_create(int width, int height, - enum wl_shm_format format) DECLSPEC_HIDDEN; -void wayland_shm_buffer_ref(struct wayland_shm_buffer *shm_buffer) DECLSPEC_HIDDEN; -void wayland_shm_buffer_unref(struct wayland_shm_buffer *shm_buffer) DECLSPEC_HIDDEN; + enum wl_shm_format format); +void wayland_shm_buffer_ref(struct wayland_shm_buffer *shm_buffer); +void wayland_shm_buffer_unref(struct wayland_shm_buffer *shm_buffer); /********************************************************************** * Wayland window surface */ -struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect) DECLSPEC_HIDDEN; +struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect); void wayland_window_surface_update_wayland_surface(struct window_surface *surface, - struct wayland_surface *wayland_surface) DECLSPEC_HIDDEN; -void wayland_window_flush(HWND hwnd) DECLSPEC_HIDDEN; + struct wayland_surface *wayland_surface); +void wayland_window_flush(HWND hwnd); /********************************************************************** * Wayland Keyboard */ -void wayland_keyboard_init(struct wl_keyboard *wl_keyboard) DECLSPEC_HIDDEN; -void wayland_keyboard_deinit(void) DECLSPEC_HIDDEN; +void wayland_keyboard_init(struct wl_keyboard *wl_keyboard); +void wayland_keyboard_deinit(void); /********************************************************************** * Wayland pointer */ -void wayland_pointer_init(struct wl_pointer *wl_pointer) DECLSPEC_HIDDEN; -void wayland_pointer_deinit(void) DECLSPEC_HIDDEN; +void wayland_pointer_init(struct wl_pointer *wl_pointer); +void wayland_pointer_deinit(void); /********************************************************************** * Helpers @@ -294,26 +294,26 @@ static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE); } -RGNDATA *get_region_data(HRGN region) DECLSPEC_HIDDEN; +RGNDATA *get_region_data(HRGN region); /********************************************************************** * USER driver functions */ -LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; -void WAYLAND_DestroyWindow(HWND hwnd) DECLSPEC_HIDDEN; -void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor) DECLSPEC_HIDDEN; -LRESULT WAYLAND_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) DECLSPEC_HIDDEN; +LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); +void WAYLAND_DestroyWindow(HWND hwnd); +void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor); +LRESULT WAYLAND_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam); BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, - BOOL force, void *param) DECLSPEC_HIDDEN; -LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; + BOOL force, void *param); +LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, const RECT *valid_rects, - struct window_surface *surface) DECLSPEC_HIDDEN; + struct window_surface *surface); BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, - RECT *visible_rect, struct window_surface **surface) DECLSPEC_HIDDEN; -const struct vulkan_funcs *WAYLAND_wine_get_vulkan_driver(UINT version) DECLSPEC_HIDDEN; + RECT *visible_rect, struct window_surface **surface); +const struct vulkan_funcs *WAYLAND_wine_get_vulkan_driver(UINT version); #endif /* __WINE_WAYLANDDRV_H */

1 0

Alexandre Julliard : winex11.drv: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: bfeba8d2d175a02b4f447d134732ddf76e61c0da URL: https://gitlab.winehq.org/wine/wine/-/commit/bfeba8d2d175a02b4f447d134732dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:52:04 2023 +0100 winex11.drv: Remove DECLSPEC_HIDDEN usage. --- dlls/winex11.drv/x11drv.h | 492 +++++++++++++++++++++--------------------- dlls/winex11.drv/x11drv_dll.h | 18 +- dlls/winex11.drv/xcomposite.h | 2 +- 3 files changed, 256 insertions(+), 256 deletions(-)

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN definition.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: c14de4c85e79563f5e859765d0015892ae925cd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c14de4c85e79563f5e859765d00158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:53:08 2023 +0100 include: Remove DECLSPEC_HIDDEN definition. --- dlls/dnsapi/dnsapi.h | 2 +- dlls/win32u/ntuser_private.h | 2 +- include/winnt.h | 18 ++++-------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index eff5e3582cf..d2b57b96972 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -97,7 +97,7 @@ static inline char *strdup_ua( const char *src ) return dst; } -extern const char *debugstr_type( unsigned short ) DECLSPEC_HIDDEN; +extern const char *debugstr_type( unsigned short ); struct get_searchlist_params { diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 943384efc30..496d6bab9fe 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -247,7 +247,7 @@ extern void free_dce( struct dce *dce, HWND hwnd ); extern void invalidate_dce( WND *win, const RECT *extra_rect ); /* message.c */ -extern BOOL set_keyboard_auto_repeat( BOOL enable ) DECLSPEC_HIDDEN; +extern BOOL set_keyboard_auto_repeat( BOOL enable ); /* window.c */ HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ); diff --git a/include/winnt.h b/include/winnt.h index 0af765652b7..67fcc010172 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -51,16 +51,16 @@ extern "C" { #define NTAPI __stdcall #define FASTCALL __fastcall -#ifndef MIDL_PASS +#ifndef DECLSPEC_IMPORT # if defined(_MSC_VER) # define DECLSPEC_IMPORT __declspec(dllimport) # elif defined(__MINGW32__) || defined(__CYGWIN__) # define DECLSPEC_IMPORT __attribute__((dllimport)) +# elif defined(__GNUC__) +# define DECLSPEC_IMPORT __attribute__((visibility ("hidden"))) # else -# define DECLSPEC_IMPORT DECLSPEC_HIDDEN +# define DECLSPEC_IMPORT # endif -#else -# define DECLSPEC_IMPORT #endif #ifndef DECLSPEC_NORETURN @@ -193,16 +193,6 @@ extern "C" { # define DECLSPEC_EXPORT #endif -#ifndef DECLSPEC_HIDDEN -# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) || defined(__sun) -# define DECLSPEC_HIDDEN -# elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) -# define DECLSPEC_HIDDEN __attribute__((visibility ("hidden"))) -# else -# define DECLSPEC_HIDDEN -# endif -#endif - #ifndef __has_attribute # define __has_attribute(x) 0 #endif

1 0

Alexandre Julliard : include: Make strict prototypes the default.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: 240e4387e81e0b139138ee2631ac6822acddffbc URL: https://gitlab.winehq.org/wine/wine/-/commit/240e4387e81e0b139138ee2631ac68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 29 20:56:06 2023 +0100 include: Make strict prototypes the default. --- include/mscoree.idl | 2 +- include/rpcndr.h | 2 +- include/vfw.h | 2 +- include/wincrypt.h | 2 +- include/windef.h | 3 +-- include/wine/glu.h | 2 +- include/wine/windef16.h | 6 ------ 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/mscoree.idl b/include/mscoree.idl index d7e3227e6c7..8d3f4d35e52 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -27,7 +27,7 @@ cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") -cpp_quote("#ifdef WINE_STRICT_PROTOTYPES") +cpp_quote("#ifndef WINE_NO_STRICT_PROTOTYPES") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)(void);") cpp_quote("#else") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)();") diff --git a/include/rpcndr.h b/include/rpcndr.h index 4e2a4e1ddb6..75f93b48771 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -356,7 +356,7 @@ typedef struct _MIDL_SYNTAX_INFO typedef void (__RPC_API *STUB_THUNK)( PMIDL_STUB_MESSAGE ); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES typedef LONG (__RPC_API *SERVER_ROUTINE)(void); #else typedef LONG (__RPC_API *SERVER_ROUTINE)(); diff --git a/include/vfw.h b/include/vfw.h index cec5345b01e..762e6af8c1a 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -499,7 +499,7 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags); LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb); HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler); #else HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler); diff --git a/include/wincrypt.h b/include/wincrypt.h index 0da94a31f73..c0e95f636ff 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -793,7 +793,7 @@ typedef struct _CRYPT_SMIME_CAPABILITIES { typedef struct _VTableProvStruc { DWORD Version; -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES BOOL (WINAPI *FuncVerifyImage)(LPCSTR,BYTE*); void (WINAPI *FuncReturnhWnd)(HWND*); #else diff --git a/include/windef.h b/include/windef.h index 78e4f56052c..79a96791151 100644 --- a/include/windef.h +++ b/include/windef.h @@ -248,7 +248,6 @@ typedef unsigned int DWORD, *PDWORD, *LPDWORD; #ifdef __WINESRC__ #define WINE_NO_UNICODE_MACROS 1 -#define WINE_STRICT_PROTOTYPES 1 #endif #ifdef WINE_NO_UNICODE_MACROS @@ -326,7 +325,7 @@ typedef HICON HCURSOR; /* Callback function pointers types */ -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES typedef INT_PTR (CALLBACK *FARPROC)(void); typedef INT_PTR (CALLBACK *NEARPROC)(void); typedef INT_PTR (CALLBACK *PROC)(void); diff --git a/include/wine/glu.h b/include/wine/glu.h index cb8b0934584..c5e2ef101cb 100644 --- a/include/wine/glu.h +++ b/include/wine/glu.h @@ -92,7 +92,7 @@ void APIENTRY gluLoadSamplingMatrices(GLUnurbs *nobj,const GLfloat modelMatrix[1 void APIENTRY gluNurbsProperty(GLUnurbs *nobj,GLenum property,GLfloat value); void APIENTRY gluGetNurbsProperty(GLUnurbs *nobj,GLenum property,GLfloat *value); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES void APIENTRY gluQuadricCallback(GLUquadric *qobj,GLenum which,void (CALLBACK *fn)(void)); void APIENTRY gluTessCallback(GLUtesselator *tess,GLenum which,void (CALLBACK *fn)(void)); void APIENTRY gluNurbsCallback(GLUnurbs *nobj,GLenum which,void (CALLBACK *fn)(void)); diff --git a/include/wine/windef16.h b/include/wine/windef16.h index 40d96ee5706..2d6536fd46e 100644 --- a/include/wine/windef16.h +++ b/include/wine/windef16.h @@ -157,13 +157,7 @@ typedef BOOL16 (CALLBACK *PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16); typedef VOID (CALLBACK *TIMERPROC16)(HWND16,UINT16,UINT16,DWORD); typedef LRESULT (CALLBACK *WNDENUMPROC16)(HWND16,LPARAM); typedef LRESULT (CALLBACK *WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); - -#ifdef WINE_STRICT_PROTOTYPES typedef LRESULT (CALLBACK *FARPROC16)(void); typedef INT16 (CALLBACK *PROC16)(void); -#else -typedef LRESULT (CALLBACK *FARPROC16)(); -typedef INT16 (CALLBACK *PROC16)(); -#endif #endif /* __WINE_WINDEF16_H */

1 0

Alex Henrie : cabarc: Use CRT allocation functions.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: fcddf19498fca9b51baea705f5748b998f4560b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcddf19498fca9b51baea705f5748b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 27 19:57:14 2023 -0700 cabarc: Use CRT allocation functions. --- programs/cabarc/cabarc.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index c4622e43046..1bb8c38153e 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -47,12 +47,12 @@ static WCHAR **opt_files; static void * CDECL cab_alloc( ULONG size ) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return malloc( size ); } static void CDECL cab_free( void *ptr ) { - HeapFree( GetProcessHeap(), 0, ptr ); + free( ptr ); } static WCHAR *strdupAtoW( UINT cp, const char *str ) @@ -61,7 +61,7 @@ static WCHAR *strdupAtoW( UINT cp, const char *str ) if (str) { DWORD len = MultiByteToWideChar( cp, 0, str, -1, NULL, 0 ); - if ((ret = cab_alloc( len * sizeof(WCHAR) ))) + if ((ret = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( cp, 0, str, -1, ret, len ); } return ret; @@ -73,7 +73,7 @@ static char *strdupWtoA( UINT cp, const WCHAR *str ) if (str) { DWORD len = WideCharToMultiByte( cp, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = cab_alloc( len ))) + if ((ret = malloc( len ))) WideCharToMultiByte( cp, 0, str, -1, ret, len, NULL, NULL ); } return ret; @@ -236,21 +236,21 @@ static INT_PTR CDECL fci_get_open_info( char *name, USHORT *date, USHORT *time, { *err = GetLastError(); WINE_ERR( "failed to open %s: error %u\n", wine_dbgstr_w(nameW), *err ); - cab_free( nameW ); + free( nameW ); return -1; } if (!GetFileInformationByHandle( handle, &info )) { *err = GetLastError(); CloseHandle( handle ); - cab_free( nameW ); + free( nameW ); return -1; } FileTimeToDosDateTime( &info.ftLastWriteTime, date, time ); *attribs = info.dwFileAttributes & (_A_RDONLY | _A_HIDDEN | _A_SYSTEM | _A_ARCH); for (p = nameW; *p; p++) if (*p >= 0x80) break; if (*p) *attribs |= _A_NAME_IS_UTF; - cab_free( nameW ); + free( nameW ); return (INT_PTR)handle; } @@ -291,8 +291,7 @@ static void create_directories( const WCHAR *name ) WCHAR *path, *p; /* create the directory/directories */ - path = cab_alloc( (lstrlenW(name) + 1) * sizeof(WCHAR) ); - lstrcpyW(path, name); + path = wcsdup( name ); p = wcschr(path, '\\'); while (p != NULL) @@ -303,7 +302,7 @@ static void create_directories( const WCHAR *name ) *p = '\\'; p = wcschr(p+1, '\\'); } - cab_free( path ); + free( path ); } /* check if file name matches against one of the files specification */ @@ -349,7 +348,7 @@ static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf } wprintf( L"%s\n", nameW ); } - cab_free( nameW ); + free( nameW ); return 0; default: WINE_FIXME( "Unexpected notification type %d.\n", fdint ); @@ -394,7 +393,7 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION if (opt_dest_dir) { - path = cab_alloc( (lstrlenW(opt_dest_dir) + lstrlenW(file) + 1) * sizeof(WCHAR) ); + path = malloc( (wcslen(opt_dest_dir) + wcslen(file) + 1) * sizeof(WCHAR) ); lstrcpyW( path, opt_dest_dir ); lstrcatW( path, file ); } @@ -410,8 +409,8 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION } else ret = 0; - cab_free( nameW ); - if (path != file) cab_free( path ); + free( nameW ); + if (path != file) free( path ); return ret; case fdintCLOSE_FILE_INFO: @@ -464,7 +463,7 @@ static BOOL add_file( HFCI fci, WCHAR *name ) } ret = FCIAddFile( fci, path, filename, FALSE, fci_get_next_cab, fci_status, fci_get_open_info, opt_compression ); - cab_free( path ); + free( path ); return ret; } @@ -475,7 +474,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) WIN32_FIND_DATAW data; BOOL ret = TRUE; - if (!(buffer = cab_alloc( (lstrlenW(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; + if (!(buffer = malloc( (wcslen(dir) + MAX_PATH + 2) * sizeof(WCHAR) ))) return FALSE; lstrcpyW( buffer, dir ); p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; @@ -498,7 +497,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) } while (FindNextFileW( handle, &data )); FindClose( handle ); } - cab_free( buffer ); + free( buffer ); return TRUE; }

1 0

Biswapriyo Nath : include: Update d3d12sdklayers.idl from vkd3d.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: 56e19e2c5e6e8bb3c6d8fc09a7feebf5e282af52 URL: https://gitlab.winehq.org/wine/wine/-/commit/56e19e2c5e6e8bb3c6d8fc09a7feeb… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Nov 29 04:31:45 2023 +0000 include: Update d3d12sdklayers.idl from vkd3d. This corresponds to vkd3d as of a52604da8cae8ce5639eeb20ef263c12bf70e1df commit. --- include/d3d12sdklayers.idl | 176 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl index 59b67ebe830..abfd25c6ffa 100644 --- a/include/d3d12sdklayers.idl +++ b/include/d3d12sdklayers.idl @@ -903,6 +903,68 @@ typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = 0x4, } D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; +typedef enum D3D12_GPU_BASED_VALIDATION_FLAGS +{ + D3D12_GPU_BASED_VALIDATION_FLAGS_NONE = 0x00, + D3D12_GPU_BASED_VALIDATION_FLAGS_DISABLE_STATE_TRACKING = 0x01, +} D3D12_GPU_BASED_VALIDATION_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_FLAGS)") + +typedef enum D3D12_RLDO_FLAGS +{ + D3D12_RLDO_NONE = 0x0, + D3D12_RLDO_SUMMARY = 0x1, + D3D12_RLDO_DETAIL = 0x2, + D3D12_RLDO_IGNORE_INTERNAL = 0x4, +} D3D12_RLDO_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RLDO_FLAGS)") + +typedef enum D3D12_DEBUG_DEVICE_PARAMETER_TYPE +{ + D3D12_DEBUG_DEVICE_PARAMETER_FEATURE_FLAGS, + D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS, + D3D12_DEBUG_DEVICE_PARAMETER_GPU_SLOWDOWN_PERFORMANCE_FACTOR, +} D3D12_DEBUG_DEVICE_PARAMETER_TYPE; + +typedef enum D3D12_DEBUG_FEATURE +{ + D3D12_DEBUG_FEATURE_NONE = 0x00, + D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS = 0x01, + D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING = 0x02, + D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION = 0x04, + D3D12_DEBUG_FEATURE_EMULATE_WINDOWS7 = 0x08, +} D3D12_DEBUG_FEATURE; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEBUG_FEATURE)") + +typedef enum D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS +{ + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_NONE = 0x00, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_TRACKING_ONLY_SHADERS = 0x01, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_UNGUARDED_VALIDATION_SHADERS = 0x02, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_GUARDED_VALIDATION_SHADERS = 0x04, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS_VALID_MASK = 0x07 +} D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS)") + +typedef enum D3D12_MESSAGE_CALLBACK_FLAGS +{ + D3D12_MESSAGE_CALLBACK_FLAG_NONE = 0x00, + D3D12_MESSAGE_CALLBACK_IGNORE_FILTERS = 0x01, +} D3D12_MESSAGE_CALLBACK_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_MESSAGE_CALLBACK_FLAGS)") + +typedef struct D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS +{ + UINT MaxMessagesPerCommandList; + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE DefaultShaderPatchMode; + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS PipelineStateCreateFlags; +} D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS; + +typedef struct D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR +{ + FLOAT SlowdownFactor; +} D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR; + typedef struct D3D12_MESSAGE { D3D12_MESSAGE_CATEGORY Category; @@ -952,6 +1014,104 @@ interface ID3D12Debug1 : IUnknown void SetEnableSynchronizedCommandQueueValidation(BOOL enable); } +[ + uuid(93a665c4-a3b2-4e5d-b692-a26ae14e3374), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug2 : IUnknown +{ + void SetGPUBasedValidationFlags(D3D12_GPU_BASED_VALIDATION_FLAGS flags); +} + +[ + uuid(5cf4e58f-f671-4ff1-a542-3686e3d153d1), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug3 : ID3D12Debug +{ + void SetEnableGPUBasedValidation(BOOL enable); + void SetEnableSynchronizedCommandQueueValidation(BOOL enable); + void SetGPUBasedValidationFlags(D3D12_GPU_BASED_VALIDATION_FLAGS flags); +} + +[ + uuid(014b816e-9ec5-4a2f-a845-ffbe441ce13a), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug4 : ID3D12Debug3 +{ + void DisableDebugLayer(); +} + +[ + uuid(548d6b12-09fa-40e0-9069-5dcd589a52c9), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug5 : ID3D12Debug4 +{ + void SetEnableAutoName(BOOL enable); +} + +[ + uuid(3febd6dd-4973-4787-8194-e45f9e28923e), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice : IUnknown +{ + HRESULT SetFeatureMask(D3D12_DEBUG_FEATURE mask); + D3D12_DEBUG_FEATURE GetFeatureMask(); + HRESULT ReportLiveDeviceObjects(D3D12_RLDO_FLAGS flags); +} + +[ + uuid(a9b71770-d099-4a65-a698-3dee10020f88), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice1 : IUnknown +{ + HRESULT SetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, const void *data, UINT size); + HRESULT GetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, void *data, UINT size); + HRESULT ReportLiveDeviceObjects(D3D12_RLDO_FLAGS flags); +} + +[ + uuid(60eccbc1-378d-4df1-894c-f8ac5ce4d7dd), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice2 : ID3D12DebugDevice +{ + HRESULT SetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, const void *data, UINT size); + HRESULT GetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, void *data, UINT size); +} + +[ + uuid(0adf7d52-929c-4e61-addb-ffed30de66ef), + object, + local, + pointer_default(unique) +] +interface ID3D12SharingContract : IUnknown +{ + void Present(ID3D12Resource *resource, UINT sub_resource, HWND window); + void SharedFenceSignal(ID3D12Fence *fence, UINT64 fence_value); + void BeginCapturableWork(REFGUID guid); + void EndCapturableWork(REFGUID guid); +} + [ uuid(0742a90b-c387-483f-b946-30a7e4e61458), object, @@ -997,3 +1157,19 @@ interface ID3D12InfoQueue : IUnknown void SetMuteDebugOutput([in] BOOL mute); BOOL GetMuteDebugOutput(); } + +typedef void (__stdcall *D3D12MessageFunc)(D3D12_MESSAGE_CATEGORY category, + D3D12_MESSAGE_SEVERITY severity, D3D12_MESSAGE_ID id, const char *description, void *context); + +[ + uuid(2852dd88-b484-4c0c-b6b1-67168500e600), + object, + local, + pointer_default(unique) +] +interface ID3D12InfoQueue1 : ID3D12InfoQueue +{ + HRESULT RegisterMessageCallback([in] D3D12MessageFunc func, + [in] D3D12_MESSAGE_CALLBACK_FLAGS flags, [in] void *context, [in, out] DWORD *cookie); + HRESULT UnregisterMessageCallback([in] DWORD cookie); +}

1 0

Robert Wilhelm : oleaut32: Fix VarR8Round for negative numbers.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: 0d6c905add980db7902164d59576977d41b9230d URL: https://gitlab.winehq.org/wine/wine/-/commit/0d6c905add980db7902164d5957697… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Nov 28 21:28:33 2023 +0100 oleaut32: Fix VarR8Round for negative numbers. Floats with fractional part 0.5000 should be rounded to next even number. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55185 --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/vartype.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 36b04aead81..9426272d7be 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2716,6 +2716,13 @@ static void test_VarR8Round(void) MATHRND(1.4999, 0); EXPECT(1); MATHRND(1.5000, 0); EXPECT(2); MATHRND(1.5001, 0); EXPECT(2); + + MATHRND(-0.4999, 0); EXPECT(0); + MATHRND(-0.5000, 0); EXPECT(0); + MATHRND(-0.5001, 0); EXPECT(-1); + MATHRND(-1.4999, 0); EXPECT(-1); + MATHRND(-1.5000, 0); EXPECT(-2); + MATHRND(-1.5001, 0); EXPECT(-2); } /* diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 7dd6cb8c4a6..d51cee3ee82 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3379,7 +3379,7 @@ HRESULT WINAPI VarR8Round(double dblIn, int nDig, double *pDblOut) else if (fract >= 0.0) dblIn = whole; else if (fract == -0.5) - dblIn = whole - fmod(whole, 2.0); + dblIn = whole + fmod(whole, 2.0); else if (fract > -0.5) dblIn = whole; else

1 0

Piotr Caban : winedump: Fix EMR_EXTTEXTOUTW record dumping when ETO_PDY flag is specified.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: 244b63566a02e1a42e06af8a51cf1d6ec7952928 URL: https://gitlab.winehq.org/wine/wine/-/commit/244b63566a02e1a42e06af8a51cf1d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 28 18:31:26 2023 +0100 winedump: Fix EMR_EXTTEXTOUTW record dumping when ETO_PDY flag is specified. --- tools/winedump/emf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 42b1f9469af..253e7c658c2 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -384,6 +384,7 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) { const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); const int *dx = (const int *)((const BYTE *)etoW + etoW->emrtext.offDx); + int dx_size; printf("%s%-20s %08x\n", pfx, "EMR_EXTTEXTOUTW", length); printf("%sbounds (%s) mode %#x x_scale %f y_scale %f pt (%d,%d) rect (%s) flags %#x, %s\n", @@ -392,10 +393,13 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) debugstr_rect( &etoW->emrtext.rcl ), (UINT)etoW->emrtext.fOptions, debugstr_wn((LPCWSTR)((const BYTE *)etoW + etoW->emrtext.offString), etoW->emrtext.nChars)); printf("%sdx_offset %u {", pfx, (UINT)etoW->emrtext.offDx); - for (i = 0; i < etoW->emrtext.nChars; ++i) + dx_size = etoW->emrtext.nChars; + if (etoW->emrtext.fOptions & ETO_PDY) + dx_size *= 2; + for (i = 0; i < dx_size; ++i) { printf("%d", dx[i]); - if (i != etoW->emrtext.nChars - 1) + if (i != dx_size - 1) putchar(','); } printf("}\n");

1 0

Piotr Caban : msvcrt: Fix string size passed to CompareString in _mbsnbcoll_l.
by Alexandre Julliard 29 Nov '23

29 Nov '23

Module: wine Branch: master Commit: 6a78f71f3c3d6b0298c556858dcd1ff7f2878e14 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a78f71f3c3d6b0298c556858dcd1f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 29 12:06:02 2023 +0100 msvcrt: Fix string size passed to CompareString in _mbsnbcoll_l. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55959 --- dlls/msvcrt/mbcs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2e228d77811..ce8a3115eeb 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1110,7 +1110,9 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si if(!mbcinfo->ismbcodepage) return _strnicoll_l((const char*)str1, (const char*)str2, len, locale); - return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; + return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, + (const char*)str1, strnlen((const char*)str1, len), + (const char*)str2, strnlen((const char*)str2, len)) - CSTR_EQUAL; } /********************************************************************* @@ -1156,7 +1158,9 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz if(!mbcinfo->ismbcodepage) return _strncoll_l((const char*)str1, (const char*)str2, len, locale); - return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; + return CompareStringA(mbcinfo->mblcid, 0, + (const char*)str1, strnlen((const char*)str1, len), + (const char*)str2, strnlen((const char*)str2, len)) - CSTR_EQUAL; } /*********************************************************************

1 0