[libwin32] r547 committed - Silence (most) size-mismatch warnings

1 view

Skip to first unread message

libw...@googlecode.com

unread,

Jan 17, 2011, 7:31:31 PM1/17/11

to libwin32...@googlegroups.com

Revision: 547
Author: j...@jandubois.com
Date: Mon Jan 17 16:31:18 2011
Log: Silence (most) size-mismatch warnings
http://code.google.com/p/libwin32/source/detail?r=547

Modified:
/trunk/Win32-Daemon/CCallbackTimer.cpp
/trunk/Win32-Daemon/Daemon.h
/trunk/Win32-Daemon/Daemon.xs
/trunk/Win32-Daemon/ServiceThread.cpp
/trunk/Win32-Daemon/constant.h

=======================================
--- /trunk/Win32-Daemon/CCallbackTimer.cpp Sun Nov 29 01:00:41 2009
+++ /trunk/Win32-Daemon/CCallbackTimer.cpp Mon Jan 17 16:31:18 2011
@@ -111,7 +111,7 @@
if( -1 < iNewTimerValue )
{
Stop();
- m_TimerValue = (UINT_PTR) iNewTimerValue;
+ m_TimerValue = (UINT)iNewTimerValue;
//
// Only start again if we were previously in the
// started state.
=======================================
--- /trunk/Win32-Daemon/Daemon.h Sun Nov 29 16:54:20 2009
+++ /trunk/Win32-Daemon/Daemon.h Mon Jan 17 16:31:18 2011
@@ -197,7 +197,7 @@

DWORD gdwServiceType = SERVICE_WIN32_OWN_PROCESS
| SERVICE_INTERACTIVE_PROCESS;
-DWORD ghTimer = 0;
+UINT_PTR ghTimer = 0;
DWORD gdwHandlerTimeout = DEFAULT_HANDLER_TIMEOUT_VALUE;
DWORD gdwLastControlMessage = SERVICE_START_PENDING;
OSVERSIONINFO gsOSVerInfo;
=======================================
--- /trunk/Win32-Daemon/Daemon.xs Mon Jan 17 16:12:27 2011
+++ /trunk/Win32-Daemon/Daemon.xs Mon Jan 17 16:31:18 2011
@@ -745,7 +745,7 @@
// so update the service's state. Specify waithint value of 0
// and error value of 0xFFFFFFFF to use defaults.
//
- DWORD dwNewState = SvIV( pSvReturn );
+ DWORD dwNewState = (DWORD)SvIV( pSvReturn );
UpdateServiceStatus( dwNewState, 0, 0xFFFFFFFF );
}

@@ -1259,7 +1259,7 @@
if( 1 < items )
{
// Get the callback timer value...
- uintCallbackTimerValue = SvIV( ST( 1 ) );
+ uintCallbackTimerValue =
(int)SvIV( ST( 1 ) );
}

SV *pSv = ST( 0 );
@@ -1377,7 +1377,7 @@
//
// Set the callback timer
//
- gCallbackTimer = SvIV( ST( 0 ) );
+ gCallbackTimer = (int)SvIV( ST( 0 ) );

//
// If we were already stopped then we need to manually start
@@ -1545,17 +1545,17 @@

if( HASH_KEY_EXISTS( pHv, KEYWORD_SERVICE_TYPE ) )
{
- dwServiceType = HASH_GET_IV( pHv, KEYWORD_SERVICE_TYPE );
+ dwServiceType = (DWORD)HASH_GET_IV( pHv,
KEYWORD_SERVICE_TYPE );
}

if( HASH_KEY_EXISTS( pHv, KEYWORD_SERVICE_START_TYPE ) )
{
- dwStartType = HASH_GET_IV( pHv, KEYWORD_SERVICE_START_TYPE );
+ dwStartType = (DWORD)HASH_GET_IV( pHv,
KEYWORD_SERVICE_START_TYPE );
}

if( HASH_KEY_EXISTS( pHv, KEYWORD_SERVICE_ERROR_CONTROL ) )
{
- dwErrorControl = HASH_GET_IV( pHv, KEYWORD_SERVICE_ERROR_CONTROL );
+ dwErrorControl = (DWORD)HASH_GET_IV( pHv,
KEYWORD_SERVICE_ERROR_CONTROL );
}

OPEN_SERVICE_CONTROL_MANAGER( pszMachine )
@@ -1777,23 +1777,23 @@

if( HASH_KEY_EXISTS( pHv, KEYWORD_SERVICE_TAG_ID ) )
{
- dwTagId = HASH_GET_IV( pHv, KEYWORD_SERVICE_TAG_ID );
+ dwTagId = (DWORD)HASH_GET_IV( pHv,
KEYWORD_SERVICE_TAG_ID );
pdwTagId = &dwTagId;
}

if( HASH_KEY_EXISTS( pHv, KEYWORD_SERVICE_TYPE ) )
{
- dwServiceType = HASH_GET_IV( pHv, KEYWORD_SERVICE_TYPE );
+ dwServiceType = (DWORD)HASH_GET_IV( pHv,
KEYWORD_SERVICE_TYPE );
}

if( HASH_KEY_EXISTS( pHv, KEYWORD_SERVICE_START_TYPE ) )
{
- dwStartType = HASH_GET_IV( pHv, KEYWORD_SERVICE_START_TYPE );
+ dwStartType = (DWORD)HASH_GET_IV( pHv,
KEYWORD_SERVICE_START_TYPE );
}

OPEN_SERVICE_CONTROL_MANAGER( pszMachine )
@@ -2067,24 +2067,24 @@
{
if( HASH_KEY_EXISTS( pHv, KEYWORD_STATE_STATE ) )
{
- dwState = HASH_GET_IV( pHv, KEYWORD_STATE_STATE );
+ dwState =
(DWORD)HASH_GET_IV( pHv, KEYWORD_STATE_STATE );
}
if( HASH_KEY_EXISTS( pHv, KEYWORD_STATE_WAIT_HINT ) )
{
- dwWaitHint = HASH_GET_IV( pHv, KEYWORD_STATE_WAIT_HINT );
+ dwWaitHint =
(DWORD)HASH_GET_IV( pHv, KEYWORD_STATE_WAIT_HINT );
}
if( HASH_KEY_EXISTS( pHv, KEYWORD_STATE_ERROR ) )
{
- dwError = HASH_GET_IV( pHv, KEYWORD_STATE_ERROR );
+ dwError =
(DWORD)HASH_GET_IV( pHv, KEYWORD_STATE_ERROR );
}
}
else
{
- dwState = SvIV( pSv );
+ dwState = (DWORD)SvIV( pSv );
if( 2 == items )
{
// Assume that the hint was in milliseconds
- dwWaitHint = SvIV( ST( 1 ) );
+ dwWaitHint = (DWORD)SvIV(
ST( 1 ) );
}
}

@@ -2206,7 +2206,7 @@

if( items )
{
- gdwHandlerTimeout = SvIV( ST( 0 ) );
+ gdwHandlerTimeout = (DWORD)SvIV( ST( 0 ) );
}
RETVAL = gdwHandlerTimeout;
}
@@ -2246,7 +2246,7 @@

if( 0 < items )
{
- gdwControlsAccepted = SvIV( ST( 0 ) );
+ gdwControlsAccepted = (DWORD)SvIV( ST( 0 ) );
}
RETVAL = gdwControlsAccepted;
}
=======================================
--- /trunk/Win32-Daemon/ServiceThread.cpp Mon Jan 17 16:12:27 2011
+++ /trunk/Win32-Daemon/ServiceThread.cpp Mon Jan 17 16:31:18 2011
@@ -145,7 +145,7 @@

case WM_USER_SET_TIMER:
ALERT( "ServiceMain: Setting timer" );
- ghTimer = ::SetTimer( NULL, SERVICE_THREAD_TIMER_ID,
Message.wParam * DEFAULT_HANDLER_TIMEOUT_SCALE, (TIMERPROC)TimerHandler );
+ ghTimer = ::SetTimer( NULL, SERVICE_THREAD_TIMER_ID,
(UINT)Message.wParam * DEFAULT_HANDLER_TIMEOUT_SCALE,
(TIMERPROC)TimerHandler );
break;

case WM_QUIT:
=======================================
--- /trunk/Win32-Daemon/constant.h Mon Jan 17 16:12:27 2011
+++ /trunk/Win32-Daemon/constant.h Mon Jan 17 16:31:18 2011
@@ -165,7 +165,7 @@
extern DWORD gdwTimeoutState;
extern DWORD gdwServiceType;
extern DWORD gdwControlsAccepted;
-extern DWORD ghTimer;
+extern UINT_PTR ghTimer;
extern DWORD gdwHandlerTimeout;
extern DWORD gdwLastControlMessage;
extern HINSTANCE ghDLL;

Reply all

Reply to author

Forward

0 new messages