Fixed some warnings.
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 4bb1b53..90c3d01 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -316,6 +316,7 @@
*/
/* IUnknown methods */
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_QueryInterface(
LPDIRECTSOUND3DBUFFER iface, REFIID riid, LPVOID *ppobj)
{
@@ -324,14 +325,18 @@
TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
return E_FAIL;
}
-
+#endif
+
+#ifdef USE_DSOUND3D
static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(LPDIRECTSOUND3DBUFFER iface)
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
This->ref++;
return This->ref;
}
+#endif
+#ifdef USE_DSOUND3D
static ULONG WINAPI IDirectSound3DBufferImpl_Release(LPDIRECTSOUND3DBUFFER iface)
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
@@ -351,8 +356,10 @@
return 0;
}
+#endif
/* IDirectSound3DBuffer methods */
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetAllParameters(
LPDIRECTSOUND3DBUFFER iface,
LPDS3DBUFFER lpDs3dBuffer)
@@ -360,7 +367,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeAngles(
LPDIRECTSOUND3DBUFFER iface,
LPDWORD lpdwInsideConeAngle,
@@ -369,7 +378,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOrientation(
LPDIRECTSOUND3DBUFFER iface,
LPD3DVECTOR lpvConeOrientation)
@@ -377,7 +388,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetConeOutsideVolume(
LPDIRECTSOUND3DBUFFER iface,
LPLONG lplConeOutsideVolume)
@@ -385,7 +398,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMaxDistance(
LPDIRECTSOUND3DBUFFER iface,
LPD3DVALUE lpfMaxDistance)
@@ -393,7 +408,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMinDistance(
LPDIRECTSOUND3DBUFFER iface,
LPD3DVALUE lpfMinDistance)
@@ -401,7 +418,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetMode(
LPDIRECTSOUND3DBUFFER iface,
LPDWORD lpdwMode)
@@ -409,7 +428,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetPosition(
LPDIRECTSOUND3DBUFFER iface,
LPD3DVECTOR lpvPosition)
@@ -417,7 +438,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_GetVelocity(
LPDIRECTSOUND3DBUFFER iface,
LPD3DVECTOR lpvVelocity)
@@ -425,7 +448,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetAllParameters(
LPDIRECTSOUND3DBUFFER iface,
LPCDS3DBUFFER lpcDs3dBuffer,
@@ -434,7 +459,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeAngles(
LPDIRECTSOUND3DBUFFER iface,
DWORD dwInsideConeAngle,
@@ -444,7 +471,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOrientation(
LPDIRECTSOUND3DBUFFER iface,
D3DVALUE x, D3DVALUE y, D3DVALUE z,
@@ -453,7 +482,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetConeOutsideVolume(
LPDIRECTSOUND3DBUFFER iface,
LONG lConeOutsideVolume,
@@ -462,7 +493,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMaxDistance(
LPDIRECTSOUND3DBUFFER iface,
D3DVALUE fMaxDistance,
@@ -471,7 +504,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMinDistance(
LPDIRECTSOUND3DBUFFER iface,
D3DVALUE fMinDistance,
@@ -480,7 +515,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetMode(
LPDIRECTSOUND3DBUFFER iface,
DWORD dwMode,
@@ -491,7 +528,9 @@
This->ds3db.dwMode = dwMode;
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(
LPDIRECTSOUND3DBUFFER iface,
D3DVALUE x, D3DVALUE y, D3DVALUE z,
@@ -500,7 +539,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static HRESULT WINAPI IDirectSound3DBufferImpl_SetVelocity(
LPDIRECTSOUND3DBUFFER iface,
D3DVALUE x, D3DVALUE y, D3DVALUE z,
@@ -509,7 +550,9 @@
FIXME("stub\n");
return DS_OK;
}
+#endif
+#ifdef USE_DSOUND3D
static ICOM_VTABLE(IDirectSound3DBuffer) ds3dbvt =
{
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -537,6 +580,7 @@
IDirectSound3DBufferImpl_SetPosition,
IDirectSound3DBufferImpl_SetVelocity,
};
+#endif
#ifdef USE_DSOUND3D
static int DSOUND_Create3DBuffer(IDirectSoundBufferImpl* dsb)
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 29d735d..6ca163a 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -978,12 +978,12 @@
*/
HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16 hInst, LPSTR lpIconPath, LPWORD lpiIcon)
{ HICON16 hIcon;
- DWORD dwDummyIcon = 0;
+ WORD wDummyIcon = 0;
TRACE("\n");
if(lpiIcon == NULL)
- lpiIcon = &dwDummyIcon;
+ lpiIcon = &wDummyIcon;
hIcon = ExtractIcon16(hInst, lpIconPath, *lpiIcon);
diff --git a/dlls/winaspi/aspi.c b/dlls/winaspi/aspi.c
index 3e67ef2..f809e98 100644
--- a/dlls/winaspi/aspi.c
+++ b/dlls/winaspi/aspi.c
@@ -43,8 +43,10 @@
static void
SCSI_GetProcinfo();
+#ifdef linux
static void
SCSI_MapHCtoController();
+#endif
/* Exported functions */
void
@@ -52,7 +54,9 @@
{
/* For now we just call SCSI_GetProcinfo */
SCSI_GetProcinfo();
+#ifdef linux
SCSI_MapHCtoController();
+#endif
}
int
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 0a2fbe5..27d052e 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -25,7 +25,9 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#include <sys/mman.h>
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
#include "windef.h"
#include "wingdi.h"
#include "winerror.h"
