Fixed ANSI compabillity.
diff --git a/windows/caret.c b/windows/caret.c
index a0b5e6b..9aaae3a 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -29,7 +29,7 @@
{
CARET_OFF = 0,
CARET_ON,
- CARET_TOGGLE,
+ CARET_TOGGLE
} DISPLAY_CARET;
static CARET Caret = { 0, 0, FALSE, 0, 0, 2, 12, 0, 500, 0 };
diff --git a/windows/focus.c b/windows/focus.c
index 50f792d..a0cfb57 100644
--- a/windows/focus.c
+++ b/windows/focus.c
@@ -116,8 +116,8 @@
if( hwnd == hWndFocus )
{
- bRet = 1; // Success
- goto CLEANUP; // Nothing to do
+ bRet = 1; /* Success */
+ goto CLEANUP; /* Nothing to do */
}
/* call hooks */
@@ -151,7 +151,7 @@
FOCUS_SwitchFocus( pCurMsgQ, hWndFocus, hwnd );
}
- bRet = 1; // Success
+ bRet = 1; /* Success */
CLEANUP:
diff --git a/windows/hook.c b/windows/hook.c
index e599677..57b3ef5 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -585,7 +585,11 @@
{
LPCWPSTRUCT16 lpcwp16 = (LPCWPSTRUCT16)PTR_SEG_TO_LIN(lParam);
LPCWPSTRUCT lpcwp32 = (LPCWPSTRUCT)lParamOrig;
- MSGPARAM16 mp16 = { lpcwp16->wParam, lpcwp16->lParam, 0 };
+ MSGPARAM16 mp16;
+
+ mp16.wParam = lpcwp16->wParam;
+ mp16.lParam = lpcwp16->lParam;
+ mp16.lResult = 0;
if (bA) WINPROC_UnmapMsg32ATo16( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
lpcwp32->lParam, &mp16 );
diff --git a/windows/mdi.c b/windows/mdi.c
index 17e8e23..291007e 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -839,7 +839,7 @@
return 0;
}
- // The close button is only present in Win 95 look
+ /* The close button is only present in Win 95 look */
if(TWEAK_WineLook > WIN31_LOOK)
{
AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
@@ -869,17 +869,17 @@
if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
return 0;
- // app button
+ /* app button */
RemoveMenu(frameWnd->wIDmenu,0,MF_BYPOSITION);
if(TWEAK_WineLook > WIN31_LOOK)
{
- // close
- DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+ /* close */
+ DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
}
- // restore
+ /* restore */
DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
- // minimize
+ /* minimize */
DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
DrawMenuBar(frameWnd->hwndSelf);
@@ -1159,7 +1159,12 @@
if( IsWindow(ci->hwndChildMaximized) )
{
WND* child = WIN_FindWndPtr(ci->hwndChildMaximized);
- RECT rect = { 0, 0, LOWORD(lParam), HIWORD(lParam) };
+ RECT rect;
+
+ rect.left = 0;
+ rect.top = 0;
+ rect.right = LOWORD(lParam);
+ rect.bottom = HIWORD(lParam);
AdjustWindowRectEx(&rect, child->dwStyle, 0, child->dwExStyle);
MoveWindow(ci->hwndChildMaximized, rect.left, rect.top,
@@ -1938,7 +1943,7 @@
*/
void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam)
{
- return ScrollChildren( hWnd, uMsg, wParam, lParam );
+ ScrollChildren( hWnd, uMsg, wParam, lParam );
}
diff --git a/windows/scroll.c b/windows/scroll.c
index 2418384..803530d 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -156,7 +156,7 @@
{
GetRgnBox( hrgn, rcUpdate );
- //Put the rcUpdate in logical coordinate
+ /* Put the rcUpdate in logical coordinate */
DPtoLP( hdc, (LPPOINT)rcUpdate, 2 );
}
if (!hrgnUpdate) DeleteObject( hrgn );
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index f4351c2..8648324 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -1034,8 +1034,13 @@
winpos.flags |= SWP_NOSIZE;
else
{
- RECT rect = { 0, 0, pWnd->rectWindow.right - pWnd->rectWindow.left,
- pWnd->rectWindow.bottom - pWnd->rectWindow.top };
+ RECT rect;
+
+ rect.left = 0;
+ rect.top = 0;
+ rect.right = pWnd->rectWindow.right - pWnd->rectWindow.left;
+ rect.bottom = pWnd->rectWindow.bottom - pWnd->rectWindow.top;
+
DCE_InvalidateDCE( pWnd, &rect );
}
