January 2023 - Wine-commits

Zebediah Figura : winex11: Make client_foreign_window_proc hidden.
by Alexandre Julliard 30 Jan '23

30 Jan '23

Module: wine Branch: master Commit: 2b0677341704affce04710a633ba9fb5b3a134d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b0677341704affce04710a633ba9f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 15:09:23 2023 -0600 winex11: Make client_foreign_window_proc hidden. --- dlls/winex11.drv/x11drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4997367ce9a..f4f6ba07e07 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -453,7 +453,7 @@ extern int alloc_system_colors DECLSPEC_HIDDEN; extern int xrender_error_base DECLSPEC_HIDDEN; extern char *process_name DECLSPEC_HIDDEN; extern Display *clipboard_display DECLSPEC_HIDDEN; -extern WNDPROC client_foreign_window_proc; +extern WNDPROC client_foreign_window_proc DECLSPEC_HIDDEN; /* atoms */

1 0

Zebediah Figura : winex11: Include x11drv.h in xrandr.c even if compiling without xrandr.
by Alexandre Julliard 30 Jan '23

30 Jan '23

Module: wine Branch: master Commit: c05f5445dc2c330539cfb22fb5b27506061d26b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c05f5445dc2c330539cfb22fb5b275… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 15:28:37 2023 -0600 winex11: Include x11drv.h in xrandr.c even if compiling without xrandr. Make sure we pull in the definition of X11DRV_XRandR_Init(), in particular because it has DECLSPEC_HIDDEN. --- dlls/winex11.drv/xrandr.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index dbd8a721074..2b0ee253cea 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -28,7 +28,11 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION - +#include <assert.h> +#include <X11/Xlib.h> +#include <X11/extensions/Xrandr.h> +#include <dlfcn.h> +#include "x11drv.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); @@ -38,12 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBXRANDR -#include <assert.h> -#include <X11/Xlib.h> -#include <X11/extensions/Xrandr.h> -#include <dlfcn.h> -#include "x11drv.h" - #define VK_NO_PROTOTYPES #define WINE_VK_HOST

1 0

Alexandre Julliard : tools: Make sure that config.h is included.
by Alexandre Julliard 30 Jan '23

30 Jan '23

Module: wine Branch: master Commit: 8772b38494e7e844bcc5546a428a85b5d28dbe50 URL: https://gitlab.winehq.org/wine/wine/-/commit/8772b38494e7e844bcc5546a428a85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 09:31:32 2023 +0100 tools: Make sure that config.h is included. --- tools/tools.h | 4 ++++ tools/winebuild/build.h | 4 ---- tools/winedump/emfspool.c | 1 + tools/wmc/lang.c | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index e5b8c4c64e5..fa459994eb3 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -21,6 +21,10 @@ #ifndef __WINE_TOOLS_H #define __WINE_TOOLS_H +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include <limits.h> #include <stdarg.h> #include <stdio.h> diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index c7d6d0cc964..733cd34e614 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -23,10 +23,6 @@ #ifndef __WINE_BUILD_H #define __WINE_BUILD_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - #include <stdio.h> #include <stdlib.h> #include "../tools.h" diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c index 7d6344facd1..d0c90b2236b 100644 --- a/tools/winedump/emfspool.c +++ b/tools/winedump/emfspool.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include "winedump.h" #define EMFSPOOL_VERSION 0x10000 diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index 7dd80d840e6..ff6fabc915b 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

Alexandre Julliard : include: Add some C99 floating point comparison macros.
by Alexandre Julliard 30 Jan '23

30 Jan '23

Module: wine Branch: master Commit: 42b13eff2453a4eca5db8d0ca019b0fb3db7e671 URL: https://gitlab.winehq.org/wine/wine/-/commit/42b13eff2453a4eca5db8d0ca019b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 13:50:14 2023 +0100 include: Add some C99 floating point comparison macros. --- include/msvcrt/math.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index dba2b07be37..26abbae2a59 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -342,6 +342,34 @@ static inline int __signbit(double x) #endif +#ifdef _UCRT + + _ACRTIMP int __cdecl _dpcomp(double, double); + _ACRTIMP int __cdecl _fdpcomp(float, float); + +#define _FP_LT 1 +#define _FP_EQ 2 +#define _FP_GT 4 + +#ifdef __GNUC__ +# define isgreater(x, y) __builtin_isgreater(x, y) +# define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) +# define isless(x, y) __builtin_isless(x, y) +# define islessequal(x, y) __builtin_islessequal(x, y) +# define islessgreater(x, y) __builtin_islessgreater(x, y) +# define isunordered(x, y) __builtin_isunordered(x, y) +#else +# define __FP_COMPARE(x,y) (sizeof(x) == sizeof(float) && sizeof(y) == sizeof(float) ? _fdpcomp(x,y) : _dpcomp(x,y)) +# define isgreater(x, y) ((__FP_COMPARE(x, y) & _FP_GT) != 0) +# define isgreaterequal(x, y) ((__FP_COMPARE(x, y) & (_FP_GT|_FP_EQ)) != 0) +# define isless(x, y) ((__FP_COMPARE(x, y) & _FP_LT) != 0) +# define islessequal(x, y) ((__FP_COMPARE(x, y) & (_FP_LT|_FP_EQ)) != 0) +# define islessgreater(x, y) ((__FP_COMPARE(x, y) & (_FP_LT|_FP_GT)) != 0) +# define isunordered(x, y) (!__FP_COMPARE(x, y)) +#endif + +#endif /* _UCRT */ + #ifdef __cplusplus } #endif

1 0

Alex Henrie : include: Remove __WINE_MALLOC from functions that shouldn't have it.
by Alexandre Julliard 30 Jan '23

30 Jan '23

Module: wine Branch: master Commit: 9716a1a97d1a50c79b881af4e1247fdf6df0b61e URL: https://gitlab.winehq.org/wine/wine/-/commit/9716a1a97d1a50c79b881af4e1247f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 27 15:51:44 2023 -0700 include: Remove __WINE_MALLOC from functions that shouldn't have it. According to the GCC documentation,[1] __attribute__((malloc)) may not be used on functions that return memory that contains one or more valid pointers. [1] https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html --- include/adshlp.h | 2 +- include/threadpoolapiset.h | 12 ++++++------ include/winber.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/adshlp.h b/include/adshlp.h index 5dacbb6b821..7366c077788 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -25,7 +25,7 @@ extern "C" { BOOL WINAPI FreeADsMem(void*); void* WINAPI AllocADsMem(DWORD) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; -void* WINAPI ReallocADsMem(void*,DWORD,DWORD) __WINE_ALLOC_SIZE(3) __WINE_DEALLOC(FreeADsMem) __WINE_MALLOC; +void* WINAPI ReallocADsMem(void*,DWORD,DWORD) __WINE_ALLOC_SIZE(3) __WINE_DEALLOC(FreeADsMem); BOOL WINAPI FreeADsStr(WCHAR*); WCHAR* WINAPI AllocADsStr(WCHAR*) __WINE_DEALLOC(FreeADsStr) __WINE_MALLOC; diff --git a/include/threadpoolapiset.h b/include/threadpoolapiset.h index 6d8ac44a058..73203f413ee 100644 --- a/include/threadpoolapiset.h +++ b/include/threadpoolapiset.h @@ -33,17 +33,17 @@ WINBASEAPI void WINAPI CloseThreadpoolIo(TP_IO*); WINBASEAPI void WINAPI CloseThreadpoolTimer(PTP_TIMER); WINBASEAPI void WINAPI CloseThreadpoolWait(PTP_WAIT); WINBASEAPI void WINAPI CloseThreadpoolWork(PTP_WORK); -WINBASEAPI TP_POOL* WINAPI CreateThreadpool(void*) __WINE_DEALLOC(CloseThreadpool) __WINE_MALLOC; +WINBASEAPI TP_POOL* WINAPI CreateThreadpool(void*) __WINE_DEALLOC(CloseThreadpool); WINBASEAPI TP_CLEANUP_GROUP* WINAPI CreateThreadpoolCleanupGroup(void) - __WINE_DEALLOC(CloseThreadpoolCleanupGroup) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolCleanupGroup); WINBASEAPI TP_IO* WINAPI CreateThreadpoolIo(HANDLE,PTP_WIN32_IO_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolIo) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolIo); WINBASEAPI TP_TIMER* WINAPI CreateThreadpoolTimer(PTP_TIMER_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolTimer) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolTimer); WINBASEAPI TP_WAIT* WINAPI CreateThreadpoolWait(PTP_WAIT_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolWait) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolWait); WINBASEAPI TP_WORK* WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,void*,TP_CALLBACK_ENVIRON*) - __WINE_DEALLOC(CloseThreadpoolWork) __WINE_MALLOC; + __WINE_DEALLOC(CloseThreadpoolWork); WINBASEAPI void WINAPI DisassociateCurrentThreadFromCallback(PTP_CALLBACK_INSTANCE); WINBASEAPI void WINAPI FreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HMODULE); WINBASEAPI BOOL WINAPI IsThreadpoolTimerSet(PTP_TIMER); diff --git a/include/winber.h b/include/winber.h index 83055fa8c72..cb4f8e3ff54 100644 --- a/include/winber.h +++ b/include/winber.h @@ -29,12 +29,12 @@ typedef unsigned int ber_len_t; void CDECL ber_free( BerElement *, int ); void CDECL ber_bvfree( BERVAL * ); -BerElement * CDECL ber_alloc_t( int ) __WINE_DEALLOC(ber_free) __WINE_MALLOC; -BERVAL * CDECL ber_bvdup( BERVAL * ) __WINE_DEALLOC(ber_bvfree) __WINE_MALLOC; +BerElement * CDECL ber_alloc_t( int ) __WINE_DEALLOC(ber_free); +BERVAL * CDECL ber_bvdup( BERVAL * ) __WINE_DEALLOC(ber_bvfree); void CDECL ber_bvecfree( BERVAL ** ); ULONG CDECL ber_first_element( BerElement *, ULONG *, char ** ); int CDECL ber_flatten( BerElement *, BERVAL ** ); -BerElement * CDECL ber_init( BERVAL * ) __WINE_DEALLOC(ber_free) __WINE_MALLOC; +BerElement * CDECL ber_init( BERVAL * ) __WINE_DEALLOC(ber_free); ULONG CDECL ber_next_element( BerElement *, ULONG *, char * ); ULONG CDECL ber_peek_tag( BerElement *, ULONG * ); int WINAPIV ber_printf( BerElement *, char *, ... );

1 0

Zebediah Figura : ntdll: Make fd_set_file_info() static.
by Alexandre Julliard 30 Jan '23

30 Jan '23

Module: wine Branch: master Commit: 4827ae13928259b22e48765be3f14aef5bc26146 URL: https://gitlab.winehq.org/wine/wine/-/commit/4827ae13928259b22e48765be3f14a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:56:02 2023 -0600 ntdll: Make fd_set_file_info() static. --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 957d9f3b801..981b0c57b35 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1618,7 +1618,7 @@ static int fd_set_dos_attrib( int fd, UINT attr ) /* set the stat info and file attributes for a file (by file descriptor) */ -NTSTATUS fd_set_file_info( int fd, UINT attr ) +static NTSTATUS fd_set_file_info( int fd, UINT attr ) { struct stat st;

1 0

Gerald Pfeifer : tools: Include limits.h for PATH_MAX.
by Alexandre Julliard 30 Jan '23

30 Jan '23

Module: wine Branch: master Commit: 004f367725ee8cd385277f100c10e7dc775ec8c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/004f367725ee8cd385277f100c10e7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 28 00:39:39 2023 +0100 tools: Include limits.h for PATH_MAX. PATH_MAX is used in FreeBSD-specific code in get_argv0_dir which otherwise fails. --- tools/tools.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tools.h b/tools/tools.h index 70ef4bd2584..e5b8c4c64e5 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -21,6 +21,7 @@ #ifndef __WINE_TOOLS_H #define __WINE_TOOLS_H +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h>

1 0

James McDonnell : kernel32: Use MoveFileWithProgress() to partially implement MoveFileTransacted(),
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 358c840a86cf396b88f981143c9a4a77abf4f07c URL: https://gitlab.winehq.org/wine/wine/-/commit/358c840a86cf396b88f981143c9a4a… Author: James McDonnell <topgamer7(a)gmail.com> Date: Fri Nov 18 13:46:15 2022 -0800 kernel32: Use MoveFileWithProgress() to partially implement MoveFileTransacted(), --- dlls/kernel32/path.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 2dd3eac3c26..028cf96d8cc 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -143,9 +143,9 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, */ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) { - FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(%s, %s, %p, %p, %ld, %p) semi-stub\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); + + return MoveFileWithProgressA(source, dest, progress, data, flags); } /************************************************************************** @@ -153,9 +153,9 @@ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS */ BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle) { - FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(%s, %s, %p, %p, %ld, %p) semi-stub\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); + + return MoveFileWithProgressW(source, dest, progress, data, flags); } /**************************************************************************

1 0

Rémi Bernon : gitlab: Run dinput 64-bit tests in a dedicated job.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 4e5fab6214d9304004369d50b6c73b8d88cf46d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e5fab6214d9304004369d50b6c73b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 8 09:33:58 2022 +0100 gitlab: Run dinput 64-bit tests in a dedicated job. --- tools/gitlab/test.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index da34390bc1f..808c825eae9 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -42,6 +42,18 @@ - wine wineboot.exe -u - wineserver -w +test-linux-64: + extends: .wine-test + variables: + INCLUDE_TESTS: "dinput" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - job: build-linux + script: + - export WINETEST_COLOR=1 + - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS + test-linux-32: extends: .wine-test variables:

1 0

Alexandre Julliard : user32: Copy directly to the buffer in unpack_message().
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: d5756ff8cfb6231cef952f4265bfcf5b2ebb42d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5756ff8cfb6231cef952f4265bfcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 10:23:56 2023 +0100 user32: Copy directly to the buffer in unpack_message(). This avoids compiler warnings. --- dlls/user32/winproc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 6cd41b51435..9fd35e1d24e 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -831,7 +831,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!check_string( str, size )) return FALSE; cs.lpszClass = str; } - memcpy( &ps->cs, &cs, sizeof(cs) ); + memcpy( *buffer, &cs, sizeof(cs) ); break; } case WM_GETTEXT: @@ -865,7 +865,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa dis.hDC = unpack_handle( ps->dis.hDC ); dis.rcItem = ps->dis.rcItem; dis.itemData = (ULONG_PTR)unpack_ptr( ps->dis.itemData ); - memcpy( &ps->dis, &dis, sizeof(dis) ); + memcpy( *buffer, &dis, sizeof(dis) ); break; } case WM_MEASUREITEM: @@ -878,7 +878,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa mis.itemWidth = ps->mis.itemWidth; mis.itemHeight = ps->mis.itemHeight; mis.itemData = (ULONG_PTR)unpack_ptr( ps->mis.itemData ); - memcpy( &ps->mis, &mis, sizeof(mis) ); + memcpy( *buffer, &mis, sizeof(mis) ); break; } case WM_DELETEITEM: @@ -890,7 +890,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa dls.itemID = ps->dls.itemID; dls.hwndItem = unpack_handle( ps->dls.hwndItem ); dls.itemData = (ULONG_PTR)unpack_ptr( ps->dls.itemData ); - memcpy( &ps->dls, &dls, sizeof(dls) ); + memcpy( *buffer, &dls, sizeof(dls) ); break; } case WM_COMPAREITEM: @@ -905,7 +905,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa cis.itemID2 = ps->cis.itemID2; cis.itemData2 = (ULONG_PTR)unpack_ptr( ps->cis.itemData2 ); cis.dwLocaleId = ps->cis.dwLocaleId; - memcpy( &ps->cis, &cis, sizeof(cis) ); + memcpy( *buffer, &cis, sizeof(cis) ); break; } case WM_WINDOWPOSCHANGING: @@ -920,7 +920,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa wp.cx = ps->wp.cx; wp.cy = ps->wp.cy; wp.flags = ps->wp.flags; - memcpy( &ps->wp, &wp, sizeof(wp) ); + memcpy( *buffer, &wp, sizeof(wp) ); break; } case WM_COPYDATA: @@ -1080,7 +1080,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa mnm.hmenuIn = unpack_handle( ps->mnm.hmenuIn ); mnm.hmenuNext = unpack_handle( ps->mnm.hmenuNext ); mnm.hwndNext = unpack_handle( ps->mnm.hwndNext ); - memcpy( &ps->mnm, &mnm, sizeof(mnm) ); + memcpy( *buffer, &mnm, sizeof(mnm) ); break; } case WM_SIZING: @@ -1116,7 +1116,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!check_string( str, size )) return FALSE; mcs.szTitle = str; } - memcpy( &ps->mcs, &mcs, sizeof(mcs) ); + memcpy( *buffer, &mcs, sizeof(mcs) ); break; } case WM_MDIGETACTIVE:

1 0