Commit 209fe1ec authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

wineoss.drv: Sign-compare warnings fix.

parent c3b27ceb
...@@ -701,7 +701,8 @@ static void OSS_Info(int fd) ...@@ -701,7 +701,8 @@ static void OSS_Info(int fd)
static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev)
{ {
int rc,arg; int rc,arg;
int f,c,r; int f,c;
unsigned int r;
BOOL has_mixer = FALSE; BOOL has_mixer = FALSE;
TRACE("(%p) %s\n", ossdev, ossdev->dev_name); TRACE("(%p) %s\n", ossdev, ossdev->dev_name);
...@@ -876,7 +877,8 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) ...@@ -876,7 +877,8 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev)
static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev) static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev)
{ {
int rc,arg; int rc,arg;
int f,c,r; int f,c;
unsigned int r;
TRACE("(%p) %s\n", ossdev, ossdev->dev_name); TRACE("(%p) %s\n", ossdev, ossdev->dev_name);
if (OSS_OpenDevice(ossdev, O_RDONLY, NULL, 0,-1,-1,-1) != 0) if (OSS_OpenDevice(ossdev, O_RDONLY, NULL, 0,-1,-1,-1) != 0)
...@@ -1004,7 +1006,8 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev) ...@@ -1004,7 +1006,8 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev)
static void OSS_WaveFullDuplexInit(OSS_DEVICE* ossdev) static void OSS_WaveFullDuplexInit(OSS_DEVICE* ossdev)
{ {
int rc,arg; int rc,arg;
int f,c,r; int f,c;
unsigned int r;
int caps; int caps;
BOOL has_mixer = FALSE; BOOL has_mixer = FALSE;
TRACE("(%p) %s\n", ossdev, ossdev->dev_name); TRACE("(%p) %s\n", ossdev, ossdev->dev_name);
...@@ -1149,7 +1152,7 @@ static char* StrDup(const char* str, const char* def) ...@@ -1149,7 +1152,7 @@ static char* StrDup(const char* str, const char* def)
LRESULT OSS_WaveInit(void) LRESULT OSS_WaveInit(void)
{ {
char* str; char* str;
int i; unsigned int i;
/* FIXME: Remove unneeded members of WOutDev and WInDev */ /* FIXME: Remove unneeded members of WOutDev and WInDev */
TRACE("()\n"); TRACE("()\n");
...@@ -1172,9 +1175,9 @@ LRESULT OSS_WaveInit(void) ...@@ -1172,9 +1175,9 @@ LRESULT OSS_WaveInit(void)
for (i = 1; i < MAX_WAVEDRV; ++i) for (i = 1; i < MAX_WAVEDRV; ++i)
{ {
WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11); WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11);
sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%d", i); sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i);
WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13); WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13);
sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%d", i); sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i);
} }
} }
...@@ -1213,13 +1216,13 @@ LRESULT OSS_WaveInit(void) ...@@ -1213,13 +1216,13 @@ LRESULT OSS_WaveInit(void)
TRACE("%d wave out devices\n", numOutDev); TRACE("%d wave out devices\n", numOutDev);
for (i = 0; i < numOutDev; i++) { for (i = 0; i < numOutDev; i++) {
TRACE("%d: %s, %s, %s\n", i, WOutDev[i].ossdev.dev_name, TRACE("%u: %s, %s, %s\n", i, WOutDev[i].ossdev.dev_name,
WOutDev[i].ossdev.mixer_name, WOutDev[i].ossdev.interface_name); WOutDev[i].ossdev.mixer_name, WOutDev[i].ossdev.interface_name);
} }
TRACE("%d wave in devices\n", numInDev); TRACE("%d wave in devices\n", numInDev);
for (i = 0; i < numInDev; i++) { for (i = 0; i < numInDev; i++) {
TRACE("%d: %s, %s, %s\n", i, WInDev[i].ossdev.dev_name, TRACE("%u: %s, %s, %s\n", i, WInDev[i].ossdev.dev_name,
WInDev[i].ossdev.mixer_name, WInDev[i].ossdev.interface_name); WInDev[i].ossdev.mixer_name, WInDev[i].ossdev.interface_name);
} }
......
...@@ -317,7 +317,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions( ...@@ -317,7 +317,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions(
} }
if (TRACE_ON(dscapture)) { if (TRACE_ON(dscapture)) {
int i; DWORD i;
for (i=0;i<howmuch;i++) for (i=0;i<howmuch;i++)
TRACE("notify at %d to 0x%08lx\n", TRACE("notify at %d to 0x%08lx\n",
notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify); notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify);
......
...@@ -303,7 +303,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions( ...@@ -303,7 +303,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions(
} }
if (TRACE_ON(wave)) { if (TRACE_ON(wave)) {
int i; DWORD i;
for (i=0;i<howmuch;i++) for (i=0;i<howmuch;i++)
TRACE("notify at %d to 0x%08lx\n", TRACE("notify at %d to 0x%08lx\n",
notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify); notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment