diff --git a/windows/keyboard.c b/windows/keyboard.c index 591faf2a1d7..09b38b5cf8c 100644 --- a/windows/keyboard.c +++ b/windows/keyboard.c @@ -25,11 +25,10 @@ #include "callback.h" #include "builtin16.h" #include "debugtools.h" -#include "struct32.h" #include "winerror.h" -DEFAULT_DEBUG_CHANNEL(keyboard) -DECLARE_DEBUG_CHANNEL(event) +DEFAULT_DEBUG_CHANNEL(keyboard); +DECLARE_DEBUG_CHANNEL(event); /**********************************************************************/ diff --git a/windows/struct32.c b/windows/struct32.c index 69fe9fda91c..853ab1fafbf 100644 --- a/windows/struct32.c +++ b/windows/struct32.c @@ -69,28 +69,6 @@ void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16* from, WINDOWPOS* to ) to->flags = (UINT)from->flags; } -void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS* from, - NCCALCSIZE_PARAMS16* to, int validRects ) -{ - CONV_RECT32TO16( &from->rgrc[0], &to->rgrc[0] ); - if (validRects) - { - CONV_RECT32TO16( &from->rgrc[1], &to->rgrc[1] ); - CONV_RECT32TO16( &from->rgrc[2], &to->rgrc[2] ); - } -} - -void STRUCT32_NCCALCSIZE16to32Flat( const NCCALCSIZE_PARAMS16* from, - NCCALCSIZE_PARAMS* to, int validRects ) -{ - CONV_RECT16TO32( &from->rgrc[0], &to->rgrc[0] ); - if (validRects) - { - CONV_RECT32TO16( &from->rgrc[1], &to->rgrc[1] ); - CONV_RECT32TO16( &from->rgrc[2], &to->rgrc[2] ); - } -} - /* The strings are not copied */ void STRUCT32_CREATESTRUCT32Ato16( const CREATESTRUCTA* from, CREATESTRUCT16* to ) diff --git a/windows/struct32.h b/windows/struct32.h index ca70f9242be..50c15e1ed04 100644 --- a/windows/struct32.h +++ b/windows/struct32.h @@ -11,12 +11,6 @@ extern void STRUCT32_MINMAXINFO32to16( const MINMAXINFO*, MINMAXINFO16* ); extern void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16*, MINMAXINFO* ); extern void STRUCT32_WINDOWPOS32to16( const WINDOWPOS*, WINDOWPOS16* ); extern void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16*, WINDOWPOS* ); -extern void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS *from, - NCCALCSIZE_PARAMS16 *to, - int validRects ); -extern void STRUCT32_NCCALCSIZE16to32Flat( const NCCALCSIZE_PARAMS16* from, - NCCALCSIZE_PARAMS* to, - int validRects ); void STRUCT32_MSG16to32(const MSG16 *msg16,MSG *msg32); void STRUCT32_MSG32to16(const MSG *msg32,MSG16 *msg16);