mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 23:57:16 +00:00
Comment out/ifdef out unused code and variables.
This commit is contained in:
parent
4589a07499
commit
5f30ee0651
|
@ -815,8 +815,10 @@ int is_OpenGL_dx3(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevi
|
||||||
{
|
{
|
||||||
if (!memcmp(&IID_D3DDEVICE_OpenGL,rguid,sizeof(IID_D3DDEVICE_OpenGL))) {
|
if (!memcmp(&IID_D3DDEVICE_OpenGL,rguid,sizeof(IID_D3DDEVICE_OpenGL))) {
|
||||||
mesa_d3dd_private *odev;
|
mesa_d3dd_private *odev;
|
||||||
|
#if 0 /* See below */
|
||||||
int attributeList[]={ GLX_RGBA, GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, None };
|
int attributeList[]={ GLX_RGBA, GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, None };
|
||||||
XVisualInfo *xvis;
|
XVisualInfo *xvis;
|
||||||
|
#endif
|
||||||
|
|
||||||
*device = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DDeviceImpl));
|
*device = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirect3DDeviceImpl));
|
||||||
(*device)->private = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(mesa_d3dd_private));
|
(*device)->private = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(mesa_d3dd_private));
|
||||||
|
|
|
@ -195,6 +195,9 @@ err:
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* FIXME: Not used for now */
|
||||||
|
|
||||||
static HRESULT CAudioRendererImpl_waveOutPause( CAudioRendererImpl* This )
|
static HRESULT CAudioRendererImpl_waveOutPause( CAudioRendererImpl* This )
|
||||||
{
|
{
|
||||||
if ( !This->m_fWaveOutInit )
|
if ( !This->m_fWaveOutInit )
|
||||||
|
@ -212,6 +215,7 @@ static HRESULT CAudioRendererImpl_waveOutRun( CAudioRendererImpl* This )
|
||||||
return QUARTZ_HRESULT_From_MMRESULT( waveOutRestart(
|
return QUARTZ_HRESULT_From_MMRESULT( waveOutRestart(
|
||||||
This->m_hWaveOut ) );
|
This->m_hWaveOut ) );
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static
|
static
|
||||||
WAVEHDR* CAudioRendererImpl_waveOutGetBuffer(
|
WAVEHDR* CAudioRendererImpl_waveOutGetBuffer(
|
||||||
|
@ -296,6 +300,9 @@ HRESULT CAudioRendererImpl_waveOutFlush(
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* FIXME: Not used for now */
|
||||||
|
|
||||||
static
|
static
|
||||||
HRESULT CAudioRendererImpl_waveOutGetVolume(
|
HRESULT CAudioRendererImpl_waveOutGetVolume(
|
||||||
CAudioRendererImpl* This,
|
CAudioRendererImpl* This,
|
||||||
|
@ -337,6 +344,7 @@ HRESULT CAudioRendererImpl_waveOutSetVolume(
|
||||||
This->m_hWaveOut, dwVol );
|
This->m_hWaveOut, dwVol );
|
||||||
return QUARTZ_HRESULT_From_MMRESULT( mr );
|
return QUARTZ_HRESULT_From_MMRESULT( mr );
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
*
|
*
|
||||||
|
@ -348,7 +356,7 @@ HRESULT CAudioRendererImpl_waveOutSetVolume(
|
||||||
static HRESULT CAudioRendererImpl_OnActive( CBaseFilterImpl* pImpl )
|
static HRESULT CAudioRendererImpl_OnActive( CBaseFilterImpl* pImpl )
|
||||||
{
|
{
|
||||||
CAudioRendererImpl_THIS(pImpl,basefilter);
|
CAudioRendererImpl_THIS(pImpl,basefilter);
|
||||||
HRESULT hr;
|
/* HRESULT hr; */
|
||||||
|
|
||||||
FIXME( "(%p)\n", This );
|
FIXME( "(%p)\n", This );
|
||||||
|
|
||||||
|
|
|
@ -32,13 +32,13 @@ HRESULT QUARTZ_IMediaSample_GetProperties(
|
||||||
IMediaSample* pSample,
|
IMediaSample* pSample,
|
||||||
AM_SAMPLE2_PROPERTIES* pProp )
|
AM_SAMPLE2_PROPERTIES* pProp )
|
||||||
{
|
{
|
||||||
|
#if 0 /* not yet */
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
AM_SAMPLE2_PROPERTIES prop;
|
AM_SAMPLE2_PROPERTIES prop;
|
||||||
IMediaSample2* pSample2 = NULL;
|
IMediaSample2* pSample2 = NULL;
|
||||||
|
|
||||||
ZeroMemory( &prop, sizeof(AM_SAMPLE2_PROPERTIES) );
|
ZeroMemory( &prop, sizeof(AM_SAMPLE2_PROPERTIES) );
|
||||||
|
|
||||||
#if 0 /* not yet */
|
|
||||||
hr = IMediaSample_QueryInterface( pSample, &IID_IMediaSample2, (void**)&pSample2 );
|
hr = IMediaSample_QueryInterface( pSample, &IID_IMediaSample2, (void**)&pSample2 );
|
||||||
if ( hr == S_OK )
|
if ( hr == S_OK )
|
||||||
{
|
{
|
||||||
|
@ -82,7 +82,9 @@ HRESULT QUARTZ_IMediaSample_SetProperties(
|
||||||
{
|
{
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
AM_SAMPLE2_PROPERTIES prop;
|
AM_SAMPLE2_PROPERTIES prop;
|
||||||
|
#if 0 /* not yet */
|
||||||
IMediaSample2* pSample2 = NULL;
|
IMediaSample2* pSample2 = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
memcpy( &prop, pProp, sizeof(AM_SAMPLE2_PROPERTIES) );
|
memcpy( &prop, pProp, sizeof(AM_SAMPLE2_PROPERTIES) );
|
||||||
prop.cbData = sizeof(AM_SAMPLE2_PROPERTIES);
|
prop.cbData = sizeof(AM_SAMPLE2_PROPERTIES);
|
||||||
|
|
|
@ -200,31 +200,33 @@ DWORD WINAPI WsControl(DWORD protocoll,
|
||||||
*/
|
*/
|
||||||
IFEntry *IntInfo = (IFEntry *) pResponseInfo;
|
IFEntry *IntInfo = (IFEntry *) pResponseInfo;
|
||||||
char ifName[512];
|
char ifName[512];
|
||||||
|
#if defined(SIOCGIFHWADDR) || defined(SIOCGENADDR)
|
||||||
struct ifreq ifInfo;
|
struct ifreq ifInfo;
|
||||||
|
#endif
|
||||||
SOCKET sock;
|
SOCKET sock;
|
||||||
|
|
||||||
|
|
||||||
if (!WSCNTL_GetInterfaceName(pcommand->toi_entity.tei_instance, ifName))
|
if (!WSCNTL_GetInterfaceName(pcommand->toi_entity.tei_instance, ifName))
|
||||||
{
|
{
|
||||||
ERR ("Unable to parse /proc filesystem!\n");
|
ERR ("Unable to parse /proc filesystem!\n");
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get a socket so that we can use ioctl */
|
/* Get a socket so that we can use ioctl */
|
||||||
if ( (sock = socket(AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET)
|
if ( (sock = socket(AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET)
|
||||||
{
|
{
|
||||||
ERR ("Error creating socket!\n");
|
ERR ("Error creating socket!\n");
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 0 out return structure first */
|
/* 0 out return structure first */
|
||||||
memset (IntInfo, 0, sizeof(IFEntry));
|
memset (IntInfo, 0, sizeof(IFEntry));
|
||||||
|
|
||||||
/* Interface ID */
|
/* Interface ID */
|
||||||
IntInfo->if_index = pcommand->toi_entity.tei_instance;
|
IntInfo->if_index = pcommand->toi_entity.tei_instance;
|
||||||
|
|
||||||
/* MAC Address - Let's try to do this in a cross-platform way... */
|
/* MAC Address - Let's try to do this in a cross-platform way... */
|
||||||
#if defined(SIOCGIFHWADDR) /* Linux */
|
#if defined(SIOCGIFHWADDR) /* Linux */
|
||||||
strcpy(ifInfo.ifr_name, ifName);
|
strcpy(ifInfo.ifr_name, ifName);
|
||||||
if (ioctlsocket(sock, SIOCGIFHWADDR, (ULONG*)&ifInfo) < 0)
|
if (ioctlsocket(sock, SIOCGIFHWADDR, (ULONG*)&ifInfo) < 0)
|
||||||
{
|
{
|
||||||
|
@ -238,7 +240,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
|
||||||
memcpy(IntInfo->if_physaddr, ifInfo.ifr_hwaddr.sa_data, 6);
|
memcpy(IntInfo->if_physaddr, ifInfo.ifr_hwaddr.sa_data, 6);
|
||||||
IntInfo->if_physaddrlen=6;
|
IntInfo->if_physaddrlen=6;
|
||||||
}
|
}
|
||||||
#elif defined(SIOCGENADDR) /* Solaris */
|
#elif defined(SIOCGENADDR) /* Solaris */
|
||||||
if (ioctlsocket(sock, SIOCGENADDR, (ULONG*)&ifInfo) < 0)
|
if (ioctlsocket(sock, SIOCGENADDR, (ULONG*)&ifInfo) < 0)
|
||||||
{
|
{
|
||||||
ERR ("Error obtaining MAC Address!\n");
|
ERR ("Error obtaining MAC Address!\n");
|
||||||
|
@ -248,19 +250,19 @@ DWORD WINAPI WsControl(DWORD protocoll,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* FIXME: Is it correct to assume size of 6? */
|
/* FIXME: Is it correct to assume size of 6? */
|
||||||
memcpy(IntInfo->if_physaddr, ifInfo.ifr_enaddr, 6);
|
memcpy(IntInfo->if_physaddr, ifInfo.ifr_enaddr, 6);
|
||||||
IntInfo->if_physaddrlen=6;
|
IntInfo->if_physaddrlen=6;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
memset (IntInfo->if_physaddr, 0, 6);
|
memset (IntInfo->if_physaddr, 0, 6);
|
||||||
ERR ("Unable to determine MAC Address on your platform!\n");
|
ERR ("Unable to determine MAC Address on your platform!\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Interface name and length */
|
/* Interface name and length */
|
||||||
strcpy (IntInfo->if_descr, ifName);
|
strcpy (IntInfo->if_descr, ifName);
|
||||||
IntInfo->if_descrlen= strlen (IntInfo->if_descr);
|
IntInfo->if_descrlen= strlen (IntInfo->if_descr);
|
||||||
|
|
||||||
/* Obtain bytes transmitted/received for interface */
|
/* Obtain bytes transmitted/received for interface */
|
||||||
if ( (WSCNTL_GetTransRecvStat(pcommand->toi_entity.tei_instance,
|
if ( (WSCNTL_GetTransRecvStat(pcommand->toi_entity.tei_instance,
|
||||||
&IntInfo->if_inoctets, &IntInfo->if_outoctets)) < 0)
|
&IntInfo->if_inoctets, &IntInfo->if_outoctets)) < 0)
|
||||||
|
@ -269,11 +271,11 @@ DWORD WINAPI WsControl(DWORD protocoll,
|
||||||
closesocket(sock);
|
closesocket(sock);
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* FIXME: How should the below be properly calculated? ******************/
|
/* FIXME: How should the below be properly calculated? ******************/
|
||||||
IntInfo->if_type = 0x6; /* Ethernet (?) */
|
IntInfo->if_type = 0x6; /* Ethernet (?) */
|
||||||
IntInfo->if_speed = 1000000; /* Speed of interface (bits per second?) */
|
IntInfo->if_speed = 1000000; /* Speed of interface (bits per second?) */
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
closesocket(sock);
|
closesocket(sock);
|
||||||
|
|
|
@ -875,6 +875,7 @@ static int symbol_cmp(const void *left, const void *right)
|
||||||
*
|
*
|
||||||
* Free resources used by DLL
|
* Free resources used by DLL
|
||||||
*/
|
*/
|
||||||
|
/* FIXME: Not used yet
|
||||||
static void dll_close (void)
|
static void dll_close (void)
|
||||||
{
|
{
|
||||||
dll_symbol* ds;
|
dll_symbol* ds;
|
||||||
|
@ -887,6 +888,7 @@ static void dll_close (void)
|
||||||
free (dll_symbols);
|
free (dll_symbols);
|
||||||
dll_symbols = NULL;
|
dll_symbols = NULL;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
static void do_grab_sym(void)
|
static void do_grab_sym(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue