zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

user32: Don't use server data types in clipboard.c.

Browse source
This commit is contained in:
Alexandre Julliard 2024-11-19 13:24:05 +01:00
parent 95bab1b106
commit 94ab547404
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/user32/clipboard.c
View file

@ -29,7 +29,6 @@
#include "winnls.h" #include "winnls.h"
#include "objidl.h" #include "objidl.h"
#include "shlobj.h" #include "shlobj.h"
#include "wine/server.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(clipboard); WINE_DEFAULT_DEBUG_CHANNEL(clipboard);
@ -164,7 +163,7 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size )
{ {
char *ptr; char *ptr;
if (!(size = GlobalSize( handle ))) return 0; if (!(size = GlobalSize( handle ))) return 0;
if ((data_size_t)size != size) return 0; if ((UINT)size != size) return 0;
if (size < sizeof(WCHAR)) return 0; if (size < sizeof(WCHAR)) return 0;
if (!(ptr = GlobalLock( handle ))) return 0; if (!(ptr = GlobalLock( handle ))) return 0;
/* enforce nul-termination the Windows way: ignoring alignment */ /* enforce nul-termination the Windows way: ignoring alignment */
@ -178,7 +177,7 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size )
{ {
char *ptr; char *ptr;
if (!(size = GlobalSize( handle ))) return 0; if (!(size = GlobalSize( handle ))) return 0;
if ((data_size_t)size != size) return 0; if ((UINT)size != size) return 0;
if (!(ptr = GlobalLock( handle ))) return 0; if (!(ptr = GlobalLock( handle ))) return 0;
ptr[size - 1] = 0; /* enforce null-termination */ ptr[size - 1] = 0; /* enforce null-termination */
GlobalUnlock( handle ); GlobalUnlock( handle );
@ -187,14 +186,14 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size )
} }
default: default:
if (!(size = GlobalSize( handle ))) return 0; if (!(size = GlobalSize( handle ))) return 0;
if ((data_size_t)size != size) return 0; if ((UINT)size != size) return 0;
*ret_size = size; *ret_size = size;
return handle; return handle;
} }
} }
/* rebuild the target handle from the data received in GetClipboardData */ /* rebuild the target handle from the data received in GetClipboardData */
static HANDLE unmarshal_data( UINT format, void *data, data_size_t size ) static HANDLE unmarshal_data( UINT format, void *data, UINT size )
{ {
HANDLE handle = GlobalReAlloc( data, size, GMEM_MOVEABLE ); /* release unused space */ HANDLE handle = GlobalReAlloc( data, size, GMEM_MOVEABLE ); /* release unused space */