Large-scale renaming of all Win32 functions and types to use the
standard Windows names.
diff --git a/win32/struct32.c b/win32/struct32.c
index 6750f58..22d872d 100644
--- a/win32/struct32.c
+++ b/win32/struct32.c
@@ -8,9 +8,9 @@
#include "winerror.h"
#include "debug.h"
-void STRUCT32_MSG16to32(const MSG16 *msg16,MSG32 *msg32)
+void STRUCT32_MSG16to32(const MSG16 *msg16,MSG *msg32)
{
- msg32->hwnd=(HWND32)msg16->hwnd;
+ msg32->hwnd=(HWND)msg16->hwnd;
msg32->message=msg16->message;
msg32->wParam=msg16->wParam;
msg32->lParam=msg16->lParam;
@@ -19,7 +19,7 @@
msg32->pt.y=msg16->pt.y;
}
-void STRUCT32_MSG32to16(const MSG32 *msg32,MSG16 *msg16)
+void STRUCT32_MSG32to16(const MSG *msg32,MSG16 *msg16)
{
msg16->hwnd=(HWND16)msg32->hwnd;
msg16->message=msg32->message;
@@ -30,7 +30,7 @@
msg16->pt.y=msg32->pt.y;
}
-void STRUCT32_MINMAXINFO32to16( const MINMAXINFO32 *from, MINMAXINFO16 *to )
+void STRUCT32_MINMAXINFO32to16( const MINMAXINFO *from, MINMAXINFO16 *to )
{
CONV_POINT32TO16( &from->ptReserved, &to->ptReserved );
CONV_POINT32TO16( &from->ptMaxSize, &to->ptMaxSize );
@@ -39,7 +39,7 @@
CONV_POINT32TO16( &from->ptMaxTrackSize, &to->ptMaxTrackSize );
}
-void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16 *from, MINMAXINFO32 *to )
+void STRUCT32_MINMAXINFO16to32( const MINMAXINFO16 *from, MINMAXINFO *to )
{
CONV_POINT16TO32( &from->ptReserved, &to->ptReserved );
CONV_POINT16TO32( &from->ptMaxSize, &to->ptMaxSize );
@@ -48,7 +48,7 @@
CONV_POINT16TO32( &from->ptMaxTrackSize, &to->ptMaxTrackSize );
}
-void STRUCT32_WINDOWPOS32to16( const WINDOWPOS32* from, WINDOWPOS16* to )
+void STRUCT32_WINDOWPOS32to16( const WINDOWPOS* from, WINDOWPOS16* to )
{
to->hwnd = (HWND16)from->hwnd;
to->hwndInsertAfter = (HWND16)from->hwndInsertAfter;
@@ -59,18 +59,18 @@
to->flags = (UINT16)from->flags;
}
-void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16* from, WINDOWPOS32* to )
+void STRUCT32_WINDOWPOS16to32( const WINDOWPOS16* from, WINDOWPOS* to )
{
- to->hwnd = (HWND32)from->hwnd;
- to->hwndInsertAfter = (HWND32)from->hwndInsertAfter;
- to->x = (INT32)from->x;
- to->y = (INT32)from->y;
- to->cx = (INT32)from->cx;
- to->cy = (INT32)from->cy;
- to->flags = (UINT32)from->flags;
+ to->hwnd = (HWND)from->hwnd;
+ to->hwndInsertAfter = (HWND)from->hwndInsertAfter;
+ to->x = (INT)from->x;
+ to->y = (INT)from->y;
+ to->cx = (INT)from->cx;
+ to->cy = (INT)from->cy;
+ to->flags = (UINT)from->flags;
}
-void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS32* from,
+void STRUCT32_NCCALCSIZE32to16Flat( const NCCALCSIZE_PARAMS* from,
NCCALCSIZE_PARAMS16* to, int validRects )
{
CONV_RECT32TO16( &from->rgrc[0], &to->rgrc[0] );
@@ -82,7 +82,7 @@
}
void STRUCT32_NCCALCSIZE16to32Flat( const NCCALCSIZE_PARAMS16* from,
- NCCALCSIZE_PARAMS32* to, int validRects )
+ NCCALCSIZE_PARAMS* to, int validRects )
{
CONV_RECT16TO32( &from->rgrc[0], &to->rgrc[0] );
if (validRects)
@@ -93,7 +93,7 @@
}
/* The strings are not copied */
-void STRUCT32_CREATESTRUCT32Ato16( const CREATESTRUCT32A* from,
+void STRUCT32_CREATESTRUCT32Ato16( const CREATESTRUCTA* from,
CREATESTRUCT16* to )
{
to->lpCreateParams = from->lpCreateParams;
@@ -109,22 +109,22 @@
}
void STRUCT32_CREATESTRUCT16to32A( const CREATESTRUCT16* from,
- CREATESTRUCT32A *to )
+ CREATESTRUCTA *to )
{
to->lpCreateParams = from->lpCreateParams;
- to->hInstance = (HINSTANCE32)from->hInstance;
- to->hMenu = (HMENU32)from->hMenu;
- to->hwndParent = (HWND32)from->hwndParent;
- to->cy = (INT32)from->cy;
- to->cx = (INT32)from->cx;
- to->y = (INT32)from->y;
- to->x = (INT32)from->x;
+ to->hInstance = (HINSTANCE)from->hInstance;
+ to->hMenu = (HMENU)from->hMenu;
+ to->hwndParent = (HWND)from->hwndParent;
+ to->cy = (INT)from->cy;
+ to->cx = (INT)from->cx;
+ to->y = (INT)from->y;
+ to->x = (INT)from->x;
to->style = from->style;
to->dwExStyle = from->dwExStyle;
}
/* The strings are not copied */
-void STRUCT32_MDICREATESTRUCT32Ato16( const MDICREATESTRUCT32A* from,
+void STRUCT32_MDICREATESTRUCT32Ato16( const MDICREATESTRUCTA* from,
MDICREATESTRUCT16* to )
{
to->hOwner = (HINSTANCE16)from->hOwner;
@@ -137,13 +137,13 @@
}
void STRUCT32_MDICREATESTRUCT16to32A( const MDICREATESTRUCT16* from,
- MDICREATESTRUCT32A *to )
+ MDICREATESTRUCTA *to )
{
- to->hOwner = (HINSTANCE32)from->hOwner;
- to->x = (INT32)from->x;
- to->y = (INT32)from->y;
- to->cx = (INT32)from->cx;
- to->cy = (INT32)from->cy;
+ to->hOwner = (HINSTANCE)from->hOwner;
+ to->x = (INT)from->x;
+ to->y = (INT)from->y;
+ to->cx = (INT)from->cx;
+ to->cy = (INT)from->cy;
to->style = from->style;
to->lParam = from->lParam;
}
