Module: wine Branch: master Commit: 22684cc767825299a151eb9f6cb26a366510a496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22684cc767825299a151eb9f6c...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Jan 9 00:39:49 2007 +0100
janitorial: Remove stray '' at end of lines.
---
dlls/avifil32/tmpfile.c | 2 +- dlls/dmband/dmutils.c | 2 +- dlls/dmime/dmutils.c | 2 +- dlls/dmloader/debug.c | 2 +- dlls/dmstyle/dmutils.c | 2 +- dlls/dmusic/collection.c | 2 +- dlls/dplayx/dplayx_messages.c | 2 +- dlls/kernel32/cpu.c | 2 +- dlls/msrle32/msrle32.c | 4 ++-- dlls/ntdll/tests/om.c | 2 +- dlls/user32/tests/msg.c | 6 +++--- programs/oleview/oleview.c | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 6d6c5d1..2dfcc95 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -112,7 +112,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int n { register DWORD tmp;
- tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), \ + tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000); if (tmpFile->fInfo.dwLength < tmp) tmpFile->fInfo.dwLength = tmp; diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 64c9f5d..4c4ca43 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -123,7 +123,7 @@ static const char *debugstr_filetime (LP
FileTimeToSystemTime (time, &sysTime);
- return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", \ + return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 84bf8bb..7078b21 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -276,7 +276,7 @@ static const char *debugstr_filetime (LP FileTimeToSystemTime (time, &sysTime); - return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", \ + return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index b71376f..7dba67d 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -90,7 +90,7 @@ const char *debugstr_filetime (LPFILETIM FileTimeToSystemTime (time, &sysTime); - return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", \ + return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index c732b56..d894015 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -290,7 +290,7 @@ static const char *debugstr_filetime (LP FileTimeToSystemTime (time, &sysTime); - return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", \ + return wine_dbg_sprintf ("'%02i. %s %04i %02i:%02i:%02i'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 82c1622..e8d52fb 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -715,7 +715,7 @@ static HRESULT WINAPI IDirectMusicCollec if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, \ + TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); if (This->pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 5677b20..b47928b 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -437,7 +437,7 @@ void DP_MSG_ReplyReceived( IDirectPlay2A * avoid problems. */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_REMOVE_ENTRY( This->dp2->replysExpected, replysExpected, replyExpected.wExpectedReply,\ + DPQ_REMOVE_ENTRY( This->dp2->replysExpected, replysExpected, replyExpected.wExpectedReply, ==, wCommandId, lpReplyList ); LeaveCriticalSection( &This->unk->DP_lock );
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 2d9b13e..9f21132 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -618,7 +618,7 @@ VOID WINAPI GetSystemInfo( cachedsi.wProcessorLevel = 6; break; default: - FIXME("unknown FreeBSD cpu family %d, please report! (-> setting to 386)\n", \ + FIXME("unknown FreeBSD cpu family %d, please report! (-> setting to 386)\n", (regs2[0] >> 8)&0xf); break; } diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index c1e5463..96a0807 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -101,12 +101,12 @@ static BOOL isSupportedMRLE(LPCBITMAPINF /* pre-conditions */ assert(lpbi != NULL);
- if (lpbi->biSize < sizeof(BITMAPINFOHEADER) || \ + if (lpbi->biSize < sizeof(BITMAPINFOHEADER) || lpbi->biPlanes != 1) return FALSE;
if (lpbi->biCompression == BI_RLE4) { - if (lpbi->biBitCount != 4 || \ + if (lpbi->biBitCount != 4 || (lpbi->biWidth % 2) != 0) return FALSE; } else if (lpbi->biCompression == BI_RLE8) { diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e2c5f6c..557ee41 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -333,7 +333,7 @@ void test_directory(void) /* Can't use symlinks as a directory */ pRtlCreateUnicodeStringFromAsciiz(&str, "\BaseNamedObjects\Local"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr);\ + status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr); ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0933c56..7e63e73 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8231,17 +8231,17 @@ static void test_TrackMouseEvent(void) ok(ret, "TrackMouseEvent(TME_HOVER | TME_CANCEL) error %d\n", GetLastError())
default_hover_time = 0xdeadbeef; - SetLastError(0xdeadbeef); \ + SetLastError(0xdeadbeef); ret = SystemParametersInfo(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); ok(ret, "SystemParametersInfo(SPI_GETMOUSEHOVERTIME) error %u\n", GetLastError()); if (!ret) default_hover_time = 400; trace("SPI_GETMOUSEHOVERTIME returned %u ms\n", default_hover_time);
- SetLastError(0xdeadbeef); \ + SetLastError(0xdeadbeef); ret = SystemParametersInfo(SPI_GETMOUSEHOVERWIDTH, 0, &hover_width, 0); ok(ret, "SystemParametersInfo(SPI_GETMOUSEHOVERWIDTH) error %u\n", GetLastError()); if (!ret) hover_width = 4; - SetLastError(0xdeadbeef); \ + SetLastError(0xdeadbeef); ret = SystemParametersInfo(SPI_GETMOUSEHOVERHEIGHT, 0, &hover_height, 0); ok(ret, "SystemParametersInfo(SPI_GETMOUSEHOVERHEIGHT) error %u\n", GetLastError()); if (!ret) hover_height = 4; diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 88ce725..b66c5a1 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -380,7 +380,7 @@ int MenuCommand(WPARAM wParam, HWND hWnd
memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - CreateProcess(NULL, wszRegEdit, NULL, NULL, FALSE, 0,\ + CreateProcess(NULL, wszRegEdit, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); CloseHandle(pi.hProcess); CloseHandle(pi.hThread);
-
Alexandre Julliard