December 2022 - Wine-commits

Eric Pouech : wined3d: Reduce usage of long integral types in surface.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: d73c71098ebf32cb57e20f6e0087d47fd594cba1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d73c71098ebf32cb57e20f6e0087d4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:24:12 2022 +0100 wined3d: Reduce usage of long integral types in surface.c. --- dlls/wined3d/surface.c | 16 +++++++++------- include/wine/wined3d.h | 10 +++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ad854e7f790..4d2ef06be86 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -41,7 +41,7 @@ static void get_color_masks(const struct wined3d_format *format, uint32_t *masks } static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { unsigned short *dst_s; const float *src_f; @@ -61,7 +61,7 @@ static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst, } static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { static const unsigned char convert_5to8[] = { @@ -103,7 +103,7 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, /* We use this for both B8G8R8A8 -> B8G8R8X8 and B8G8R8X8 -> B8G8R8A8, since * in both cases we're just setting the X / Alpha channel to 0xff. */ static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { unsigned int x, y; @@ -127,7 +127,7 @@ static inline BYTE cliptobyte(int x) } static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { int c2, d, e, r2 = 0, g2 = 0, b2 = 0; unsigned int x, y; @@ -169,7 +169,7 @@ static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, } static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, - DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) + unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h) { unsigned int x, y; int c2, d, e, r2 = 0, g2 = 0, b2 = 0; @@ -212,7 +212,9 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, struct d3dfmt_converter_desc { enum wined3d_format_id from, to; - void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); + void (*convert)(const BYTE *src, BYTE *dst, + unsigned int pitch_in, unsigned int pitch_out, + unsigned int w, unsigned int h); }; static const struct d3dfmt_converter_desc converters[] = @@ -968,7 +970,7 @@ do { \ } else { - DWORD masks[3]; + uint32_t masks[3]; get_color_masks(src_format, masks); keymask = masks[0] | masks[1] | masks[2]; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e08650fb69f..6f59cf38869 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1994,15 +1994,15 @@ struct wined3d_caps struct wined3d_color_key { - DWORD color_space_low_value; /* low boundary of color space that is to - * be treated as Color Key, inclusive */ - DWORD color_space_high_value; /* high boundary of color space that is - * to be treated as Color Key, inclusive */ + unsigned int color_space_low_value; /* low boundary of color space that is to + * be treated as Color Key, inclusive */ + unsigned int color_space_high_value; /* high boundary of color space that is + * to be treated as Color Key, inclusive */ }; struct wined3d_blt_fx { - DWORD fx; + uint32_t fx; struct wined3d_color_key dst_color_key; struct wined3d_color_key src_color_key; enum wined3d_format_id resolve_format_id;

1 0

Eric Pouech : wined3d: Enable long types in surface.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: c2075a9fc85211d0cfdec1cbf4d76045c16429de URL: https://gitlab.winehq.org/wine/wine/-/commit/c2075a9fc85211d0cfdec1cbf4d760… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:24:14 2022 +0100 wined3d: Enable long types in surface.c. --- dlls/wined3d/surface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4d2ef06be86..8bee9b6d83b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -25,7 +25,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h"

1 0

Alex Henrie : include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 1a7efafbab61d54595f347527ce06f24593ddedb URL: https://gitlab.winehq.org/wine/wine/-/commit/1a7efafbab61d54595f347527ce06f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 22:01:13 2022 -0700 include: Annotate ILC* functions with __WINE_(DEALLOC|MALLOC). --- include/shlobj.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 20144fbc503..c7452cf5f0a 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1914,17 +1914,17 @@ WINSHELLAPI HRESULT WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWOR #define PID_IS_DESCRIPTION 12 #define PID_IS_COMMENT 13 +WINSHELLAPI void WINAPI ILFree(ITEMIDLIST*); +WINSHELLAPI ITEMIDLIST* WINAPI ILClone(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +WINSHELLAPI ITEMIDLIST* WINAPI ILCloneFirst(const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +WINSHELLAPI ITEMIDLIST* WINAPI ILCreateFromPathA(const char*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +WINSHELLAPI ITEMIDLIST* WINAPI ILCreateFromPathW(const WCHAR*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; +#define ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath) +WINSHELLAPI ITEMIDLIST* WINAPI ILCombine(const ITEMIDLIST*,const ITEMIDLIST*) __WINE_DEALLOC(ILFree) __WINE_MALLOC; WINSHELLAPI LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL); -WINSHELLAPI LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST); -WINSHELLAPI LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST); -WINSHELLAPI LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR); -WINSHELLAPI LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR); -#define ILCreateFromPath WINELIB_NAME_AW(ILCreateFromPath) -WINSHELLAPI LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST,LPCITEMIDLIST); WINSHELLAPI LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST,LPCITEMIDLIST); WINSHELLAPI LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST); -WINSHELLAPI void WINAPI ILFree(LPITEMIDLIST); WINSHELLAPI LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST); WINSHELLAPI UINT WINAPI ILGetSize(LPCITEMIDLIST); WINSHELLAPI BOOL WINAPI ILIsEqual(LPCITEMIDLIST,LPCITEMIDLIST);

1 0

Brendan Shanks : loader: In macOS preloader, set NXArgc, NXArgv, and environ on i386 and x86_64.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: f99eef6847dffad30e3d06942b532a77545eb098 URL: https://gitlab.winehq.org/wine/wine/-/commit/f99eef6847dffad30e3d06942b532a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Dec 6 11:58:12 2022 -0800 loader: In macOS preloader, set NXArgc, NXArgv, and environ on i386 and x86_64. --- loader/preloader_mac.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index bb9336ead2c..5df185d0960 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -640,6 +640,34 @@ static void fixup_stack( void *stack ) memmove(&argv[0], &argv[1], (char *)apple_end - (char *)&argv[1]); } +static void set_program_vars( void *stack, void *mod ) +{ + int *pargc; + char **argv, **env; + int *wine_NXArgc = pdlsym( mod, "NXArgc" ); + char ***wine_NXArgv = pdlsym( mod, "NXArgv" ); + char ***wine_environ = pdlsym( mod, "environ" ); + + pargc = stack; + argv = (char **)pargc + 1; + env = &argv[*pargc-1] + 2; + + if (wine_NXArgc) + *wine_NXArgc = *pargc; + else + wld_printf( "preloader: Warning: failed to set NXArgc\n" ); + + if (wine_NXArgv) + *wine_NXArgv = argv; + else + wld_printf( "preloader: Warning: failed to set NXArgv\n" ); + + if (wine_environ) + *wine_environ = env; + else + wld_printf( "preloader: Warning: failed to set environ\n" ); +} + void *wld_start( void *stack, int *is_unix_thread ) { struct wine_preload_info builtin_dlls = { (void *)0x7a000000, 0x02000000 }; @@ -704,21 +732,14 @@ void *wld_start( void *stack, int *is_unix_thread ) /* decrement argc and "remove" argv[0] */ fixup_stack(stack); -#if defined(__x86_64__) - /* For LC_UNIXTHREAD binaries on Monterey and later, 'environ' is not set and is NULL. - * Set the correct value here. + /* Set NXArgc, NXArgv, and environ in the new binary. + * On different configurations these were either NULL/0 or still had their + * values from this preloader's launch. + * + * In particular, environ was not being updated, resulting in environ[0] being lost. + * And for LC_UNIXTHREAD binaries on Monterey and later, environ was just NULL. */ - if (*is_unix_thread) - { - char **env, ***wine_environ = pdlsym( mod, "environ" ); - - pargc = stack; - argv = (char **)pargc + 1; - env = &argv[*pargc-1] + 2; - - *wine_environ = env; - } -#endif + set_program_vars( stack, mod ); return entry; }

1 0

Jacek Caban : winex11: Remove no longer used declarations.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 1d3bf575e7fb019ddfca04f4e050bef2cb2856a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d3bf575e7fb019ddfca04f4e050be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 17:19:28 2022 +0100 winex11: Remove no longer used declarations. --- dlls/winex11.drv/graphics.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 6365c9a30ad..54e6b9b2084 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1643,18 +1643,6 @@ static char *get_icm_profile( unsigned long *size ) return ret; } -typedef struct -{ - unsigned int unknown[6]; - unsigned int state[5]; - unsigned int count[2]; - unsigned char buffer[64]; -} sha_ctx; - -extern void WINAPI A_SHAInit( sha_ctx * ); -extern void WINAPI A_SHAUpdate( sha_ctx *, const unsigned char *, unsigned int ); -extern void WINAPI A_SHAFinal( sha_ctx *, unsigned char * ); - static const WCHAR mntr_key[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',

1 0

Eric Pouech : wined3d: Enable long integral types in cs.c.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 386414fbdcaf0bcc20fb6381e1d3b06ce32cacc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/386414fbdcaf0bcc20fb6381e1d3b0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 7 10:46:19 2022 +0100 wined3d: Enable long integral types in cs.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/cs.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f5208c6bd9..4579cba27fe 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -15,7 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" @@ -3153,8 +3152,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size = packet_size - header_size; if (packet_size >= WINED3D_CS_QUEUE_SIZE) { - ERR("Packet size %lu >= queue size %u.\n", - (unsigned long)packet_size, WINED3D_CS_QUEUE_SIZE); + ERR("Packet size %Iu >= queue size %u.\n", packet_size, WINED3D_CS_QUEUE_SIZE); return NULL; } @@ -3164,8 +3162,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size_t nop_size = remaining - header_size; struct wined3d_cs_nop *nop; - TRACE("Inserting a nop for %lu + %lu bytes.\n", - (unsigned long)header_size, (unsigned long)nop_size); + TRACE("Inserting a nop for %Iu + %Iu bytes.\n", header_size, nop_size); nop = wined3d_cs_queue_require_space(queue, nop_size, cs); if (nop_size) @@ -3194,8 +3191,8 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size if (new_pos < tail && new_pos) break; - TRACE("Waiting for free space. Head %u, tail %u, packet size %lu.\n", - head, tail, (unsigned long)packet_size); + TRACE("Waiting for free space. Head %lu, tail %lu, packet size %Iu.\n", + head, tail, packet_size); } packet = (struct wined3d_cs_packet *)&queue->data[head];

1 0

Alex Henrie : include: Annotate GdipAlloc with __WINE_(DEALLOC|MALLOC).
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: dfb025c39ea254f270707cfb693dae3b83cb3231 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfb025c39ea254f270707cfb693dae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 22:33:57 2022 -0700 include: Annotate GdipAlloc with __WINE_(DEALLOC|MALLOC). --- include/gdiplusmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/gdiplusmem.h b/include/gdiplusmem.h index fad8ed6772d..896fdf43a03 100644 --- a/include/gdiplusmem.h +++ b/include/gdiplusmem.h @@ -25,8 +25,8 @@ extern "C" { #endif -void* WINGDIPAPI GdipAlloc(SIZE_T) __WINE_ALLOC_SIZE(1); void WINGDIPAPI GdipFree(void*); +void* WINGDIPAPI GdipAlloc(SIZE_T) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(GdipFree) __WINE_MALLOC; #ifdef __cplusplus }

1 0

Alex Henrie : include: Annotate WSDAllocateLinkedMemory with __WINE_(ALLOC_SIZE|MALLOC).
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 803c616f7e9ed99353bc6729627e72c26d59756a URL: https://gitlab.winehq.org/wine/wine/-/commit/803c616f7e9ed99353bc6729627e72… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 7 00:23:57 2022 -0700 include: Annotate WSDAllocateLinkedMemory with __WINE_(ALLOC_SIZE|MALLOC). --- include/wsdutil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wsdutil.h b/include/wsdutil.h index 402a4130bbc..b118fcf7861 100644 --- a/include/wsdutil.h +++ b/include/wsdutil.h @@ -19,7 +19,7 @@ #ifndef WSDUTIL_H #define WSDUTIL_H -void * WINAPI WSDAllocateLinkedMemory(void *pParent, SIZE_T cbSize); +void * WINAPI WSDAllocateLinkedMemory(void *parent, SIZE_T size) __WINE_ALLOC_SIZE(2) __WINE_MALLOC; void WINAPI WSDAttachLinkedMemory(void *pParent, void *pChild); void WINAPI WSDDetachLinkedMemory(void *pVoid); void WINAPI WSDFreeLinkedMemory(void *pVoid);

1 0

Alex Henrie : winhlp32: Use standard C functions for memory allocation.
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: 33ae61d79b4b522b617be2da5485da3655355778 URL: https://gitlab.winehq.org/wine/wine/-/commit/33ae61d79b4b522b617be2da5485da… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 23:55:33 2022 -0700 winhlp32: Use standard C functions for memory allocation. --- programs/winhlp32/hlpfile.c | 140 ++++++++++++++++++++---------------------- programs/winhlp32/macro.c | 35 ++++------- programs/winhlp32/macro.lex.l | 4 +- programs/winhlp32/winhelp.c | 10 +-- 4 files changed, 85 insertions(+), 104 deletions(-)

1 0

Alex Henrie : include: Annotate MFHeapAlloc with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard 07 Dec '22

07 Dec '22

Module: wine Branch: master Commit: b90f54b4b481fbfe407700c9231c0ec06957be43 URL: https://gitlab.winehq.org/wine/wine/-/commit/b90f54b4b481fbfe407700c9231c0e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 6 22:38:23 2022 -0700 include: Annotate MFHeapAlloc with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/mfapi.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/mfapi.h b/include/mfapi.h index 24f2d6dc560..3185fc6944f 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -556,6 +556,10 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromVideoInfoHeader(const KS_VIDEOINFOHEADE IMFVideoMediaType **media_type); #endif +void WINAPI MFHeapFree(void *ptr); +void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type) + __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(MFHeapFree) __WINE_MALLOC; + HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **allocator); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); @@ -563,8 +567,6 @@ HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); HRESULT WINAPI MFEndRegisterWorkQueueWithMMCSS(IMFAsyncResult *result, DWORD *taskid); HRESULT WINAPI MFEndUnregisterWorkQueueWithMMCSS(IMFAsyncResult *result); HRESULT WINAPI MFFrameRateToAverageTimePerFrame(UINT32 numerator, UINT32 denominator, UINT64 *avgtime); -void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); -void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size); HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD format, DWORD width, LONG *stride);

1 0