June 2006 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Replace PeekMessage loops in the PeekMessage test by explicit calls.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 2827e7bbb67576ce69820bc825c7fbfd23bbde70 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2827e7bbb67576ce69820bc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jun 2 01:40:14 2006 +0900 user32: Replace PeekMessage loops in the PeekMessage test by explicit calls. Replace all 'while (PeekMessage()) DispatchMessage();' loops in the PeekMessage test by explicit calls to PeekMessage(), check queue status and processed messages after each call to see what is going on behind the scene. --- dlls/user/tests/msg.c | 186 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 147 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2827e7bbb67576ce698…

1 0

Huw Davies : gdi32: FreeType's idea of metrics has changed for bitmap fonts .
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: bae6d23c5cfee3794fbd78ea19ba9d60a363e142 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bae6d23c5cfee3794fbd78e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 1 15:12:30 2006 +0100 gdi32: FreeType's idea of metrics has changed for bitmap fonts. --- dlls/gdi/freetype.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index abb33f9..9f52e60 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -928,7 +928,7 @@ static void DumpFontList(void) face = LIST_ENTRY(face_elem_ptr, Face, entry); TRACE("\t%s\t%08lx", debugstr_w(face->StyleName), face->fs.fsCsb[0]); if(!face->scalable) - TRACE(" %ld", face->size.y_ppem >> 6); + TRACE(" %d", face->size.height); TRACE("\n"); } } @@ -2440,12 +2440,12 @@ found: if(face->scalable) break; if(height > 0) - newdiff = height - (signed int)(face->size.y_ppem >> 6); + newdiff = height - (signed int)(face->size.height); else - newdiff = -height - ((signed int)(face->size.y_ppem >> 6) - face->size.internal_leading); + newdiff = -height - ((signed int)(face->size.height) - face->size.internal_leading); if(!best || (diff > 0 && newdiff < diff && newdiff >= 0) || (diff < 0 && newdiff > diff)) { - TRACE("%ld is better for %d diff was %d\n", face->size.y_ppem >> 6, height, diff); + TRACE("%d is better for %d diff was %d\n", face->size.height, height, diff); diff = newdiff; best = face; if(diff == 0) @@ -2464,12 +2464,12 @@ found: if(face->scalable) break; if(height > 0) - newdiff = height - (signed int)(face->size.y_ppem >> 6); + newdiff = height - (signed int)(face->size.height); else - newdiff = -height - ((signed int)(face->size.y_ppem >> 6) - face->size.internal_leading); + newdiff = -height - ((signed int)(face->size.height) - face->size.internal_leading); if(!best || (diff > 0 && newdiff < diff && newdiff >= 0) || (diff < 0 && newdiff > diff)) { - TRACE("%ld is better for %d diff was %d\n", face->size.y_ppem >> 6, height, diff); + TRACE("%d is better for %d diff was %d\n", face->size.height, height, diff); diff = newdiff; best = face; if(diff == 0)

1 0

Robert Shearman : widl: Only write one procformat string and one typeformat string per file.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 6f85f989f5b9264787b4eb432d8d49bc158ee205 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f85f989f5b9264787b4eb4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jun 1 15:40:10 2006 +0100 widl: Only write one procformat string and one typeformat string per file. --- tools/widl/client.c | 42 +++++------- tools/widl/server.c | 42 +++++------- tools/widl/typegen.c | 168 +++++++++++++++++++++++++++++------------------- tools/widl/typegen.h | 8 +- tools/widl/widltypes.h | 8 ++ 5 files changed, 150 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6f85f989f5b9264787b…

1 0

Robert Shearman : widl: Properly size the return value procformat.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 90decb631cef75e946e124eec8285cf71ed85498 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90decb631cef75e946e124e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jun 1 15:40:22 2006 +0100 widl: Properly size the return value procformat. --- tools/widl/typegen.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2a56989..19e4664 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1892,8 +1892,13 @@ size_t get_size_procformatstring(const i } } + var = func->def; /* return value size */ - size += 2; /* FIXME: determine real size */ + if (is_void(var->type, NULL)) + size += 2; + else + size += get_size_procformatstring_var(var); + func = PREV_LINK(func); } }

1 0

Robert Shearman : widl: Fix a typo in the man page.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: d7e7242af649289cda52a99dc64af744dfebe241 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7e7242af649289cda52a99… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jun 1 15:40:31 2006 +0100 widl: Fix a typo in the man page. --- tools/widl/widl.man.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 267f1fe..2d9ac80 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -39,7 +39,7 @@ The default filename is infile.tlb. Generate client stub. .IP "\fB-C \fIfile\fR" Name of client stub file (default is infile_c.c) -.IP "\fB-c\fR" +.IP "\fB-p\fR" Generate proxy. .IP "\fB-P \fIfile\fR" Name of proxy file (default is infile_p.c)

1 0

Alexandre Julliard : winecoreaudio: Fixed the FSF address.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: ea50196447f65ee927a5599ee3dc35ab373f957d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea50196447f65ee927a5599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 13:15:54 2006 +0200 winecoreaudio: Fixed the FSF address. --- dlls/winmm/winecoreaudio/audio.c | 2 +- dlls/winmm/winecoreaudio/audiounit.c | 2 +- dlls/winmm/winecoreaudio/coreaudio.c | 3 +-- dlls/winmm/winecoreaudio/coreaudio.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 8b232a5..50ae0be 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" diff --git a/dlls/winmm/winecoreaudio/audiounit.c b/dlls/winmm/winecoreaudio/audiounit.c index b548025..fe1c7ec 100644 --- a/dlls/winmm/winecoreaudio/audiounit.c +++ b/dlls/winmm/winecoreaudio/audiounit.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" diff --git a/dlls/winmm/winecoreaudio/coreaudio.c b/dlls/winmm/winecoreaudio/coreaudio.c index 63a9aca..1b815f0 100644 --- a/dlls/winmm/winecoreaudio/coreaudio.c +++ b/dlls/winmm/winecoreaudio/coreaudio.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ @@ -111,4 +111,3 @@ #endif return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } } - diff --git a/dlls/winmm/winecoreaudio/coreaudio.h b/dlls/winmm/winecoreaudio/coreaudio.h index 5c93235..312ba0e 100644 --- a/dlls/winmm/winecoreaudio/coreaudio.h +++ b/dlls/winmm/winecoreaudio/coreaudio.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_COREAUDIO_H

1 0

Ken Thomases : winecoreaudio: Don't CFAllocate buffer for port message.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: 1612ce86596ca455b97337f3ea34e122070b6a14 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1612ce86596ca455b97337f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 24 05:45:14 2006 -0500 winecoreaudio: Don't CFAllocate buffer for port message. --- dlls/winmm/winecoreaudio/audio.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index df6bdc8..8b232a5 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -301,31 +301,23 @@ static DWORD WINAPI messageThread(LPVOID static DWORD wodSendDriverCallbackMessage(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { CFDataRef data; - UInt32 *buffer; + UInt32 buffer[4]; SInt32 ret; CFMessagePortRef messagePort; messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MessageThreadPortName); - buffer = CFAllocatorAllocate(NULL, sizeof(UInt32) * 4, 0); - if (!buffer) - return 0; - buffer[0] = (UInt32) wwo->woID; buffer[1] = (UInt32) wMsg; buffer[2] = (UInt32) dwParam1; buffer[3] = (UInt32) dwParam2; - - data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)buffer, sizeof(UInt32) * 4); + + data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)buffer, sizeof(buffer)); if (!data) - { - CFAllocatorDeallocate(NULL, buffer); return 0; - } ret = CFMessagePortSendRequest(messagePort, kWaveOutCallbackMessage, data, 0.0, 0.0, NULL, NULL); CFRelease(data); - CFAllocatorDeallocate(NULL, buffer); CFRelease(messagePort); return (ret == kCFMessagePortSuccess)?1:0;

1 0

Ken Thomases : winecoreaudio: Use unique name for message port.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: fb5a073e462308eeb6a0ba19be91d6fe30a59f22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb5a073e462308eeb6a0ba1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 24 05:43:14 2006 -0500 winecoreaudio: Use unique name for message port. Use a unique port name for the message port to the message thread. Port names are system-global, so using a non-unique constant name prevents the CoreAudio driver from being used in multiple processes simultaneously. --- dlls/winmm/winecoreaudio/audio.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index bc7a47d..df6bdc8 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -171,6 +171,8 @@ typedef struct { static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; +static CFStringRef MessageThreadPortName; + static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); @@ -279,7 +281,7 @@ static DWORD WINAPI messageThread(LPVOID CFRunLoopSourceRef source; Boolean info; - local = CFMessagePortCreateLocal(kCFAllocatorDefault, CFSTR("WaveMessagePort"), + local = CFMessagePortCreateLocal(kCFAllocatorDefault, MessageThreadPortName, &wodMessageHandler, NULL, &info); source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, local, (CFIndex)0); @@ -290,6 +292,8 @@ static DWORD WINAPI messageThread(LPVOID CFRunLoopSourceInvalidate(source); CFRelease(source); CFRelease(local); + CFRelease(MessageThreadPortName); + MessageThreadPortName = NULL; return 0; } @@ -301,7 +305,7 @@ static DWORD wodSendDriverCallbackMessag SInt32 ret; CFMessagePortRef messagePort; - messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, CFSTR("WaveMessagePort")); + messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MessageThreadPortName); buffer = CFAllocatorAllocate(NULL, sizeof(UInt32) * 4, 0); if (!buffer) @@ -525,6 +529,15 @@ LONG CoreAudio_WaveInit(void) pthread_mutexattr_destroy(&mutexattr); /* create mach messages handler */ + srandomdev(); + MessageThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, + CFSTR("WaveMessagePort.%d.%lu"), getpid(), (unsigned long)random()); + if (!MessageThreadPortName) + { + ERR("Can't create message thread port name\n"); + return 1; + } + hThread = CreateThread(NULL, 0, messageThread, NULL, 0, NULL); if ( !hThread ) { @@ -543,7 +556,7 @@ void CoreAudio_WaveRelease(void) TRACE("()\n"); - messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, CFSTR("WaveMessagePort")); + messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MessageThreadPortName); CFMessagePortSendRequest(messagePort, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); CFRelease(messagePort);

1 0

Ken Thomases : winecoreaudio: 8-bit Linear PCM data is unsigned.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: a1e6989a9b75fba67e13740133c5994331029099 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1e6989a9b75fba67e13740… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 24 05:41:28 2006 -0500 winecoreaudio: 8-bit Linear PCM data is unsigned. --- dlls/winmm/winecoreaudio/audio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index e27e0d6..bc7a47d 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -674,13 +674,13 @@ static DWORD wodOpen(WORD wDevID, LPWAVE dwFlags &= ~WAVE_DIRECTSOUND; streamFormat.mFormatID = kAudioFormatLinearPCM; - + streamFormat.mFormatFlags = kLinearPCMFormatFlagIsPacked; /* FIXME check for 32bits float -> kLinearPCMFormatFlagIsFloat */ - streamFormat.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger + if (lpDesc->lpFormat->wBitsPerSample != 8) + streamFormat.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; # ifdef WORDS_BIGENDIAN - | kLinearPCMFormatFlagIsBigEndian /* FIXME Wave format is little endian */ + streamFormat.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; /* FIXME Wave format is little endian */ # endif - | kLinearPCMFormatFlagIsPacked; streamFormat.mSampleRate = lpDesc->lpFormat->nSamplesPerSec; streamFormat.mChannelsPerFrame = lpDesc->lpFormat->nChannels;

1 0

Ken Thomases : winecoreaudio: Keep processing wavehdrs to satisfy AudioUnit data request.
by Alexandre Julliard 01 Jun '06

01 Jun '06

Module: wine Branch: refs/heads/master Commit: 178f9fecd95692e55c9b433bda1b7795f81dab3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=178f9fecd95692e55c9b433… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 24 05:38:16 2006 -0500 winecoreaudio: Keep processing wavehdrs to satisfy AudioUnit data request. When fulfilling the output AudioUnit's request for audio data, don't stop when the current wavehdr is exhausted; advance to the next. This addresses the buzzy quality of the sound. --- dlls/winmm/winecoreaudio/audio.c | 79 +++++++++++++++++++++++--------------- 1 files changed, 47 insertions(+), 32 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 771bdb6..e27e0d6 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -1376,51 +1376,66 @@ OSStatus CoreAudio_woAudioUnitIOProc(voi UInt32 inNumberFrames, AudioBufferList *ioData) { - UInt32 channel; + UInt32 buffer; WINE_WAVEOUT *wwo = (WINE_WAVEOUT *) inRefCon; int nextPtr = 0; int needNotify = 0; - - pthread_mutex_lock(&wwo->lock); - if(wwo->state == WINE_WS_PLAYING) + + unsigned int dataNeeded = ioData->mBuffers[0].mDataByteSize; + unsigned int dataProvided = 0; + + while (dataNeeded > 0) { - unsigned int available; - unsigned int count = ioData->mBuffers[0].mDataByteSize; - - available = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset; - - for (channel = 0; channel < ioData->mNumberBuffers; channel++) + pthread_mutex_lock(&wwo->lock); + + if (wwo->state == WINE_WS_PLAYING && wwo->lpPlayPtr) { - if ( available >= count) - { - memcpy(ioData->mBuffers[channel].mData, wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, count); - wwo->dwPartialOffset += count; - wwo->dwPlayedTotal += count; - } + unsigned int available = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset; + unsigned int toCopy; + + if (available >= dataNeeded) + toCopy = dataNeeded; else + toCopy = available; + + if (toCopy > 0) { - int s; - memcpy(ioData->mBuffers[channel].mData, wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, available); - wwo->dwPartialOffset += available; - wwo->dwPlayedTotal += available; - - /* Fill with silence */ - for (s = available; s < count; s++) - ((int *)ioData->mBuffers[channel].mData)[s] = 0; - - nextPtr = 1; + memcpy((char*)ioData->mBuffers[0].mData + dataProvided, + wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, toCopy); + wwo->dwPartialOffset += toCopy; + wwo->dwPlayedTotal += toCopy; + dataProvided += toCopy; + dataNeeded -= toCopy; + available -= toCopy; } + + if (available == 0) + nextPtr = 1; + + needNotify = 1; + } + else + { + memset((char*)ioData->mBuffers[0].mData + dataProvided, 0, dataNeeded); + dataProvided += dataNeeded; + dataNeeded = 0; + } + + pthread_mutex_unlock(&wwo->lock); + + if (nextPtr) + { + wodHelper_PlayPtrNext(wwo); + nextPtr = 0; } - needNotify = 1; } - else + + /* We only fill buffer 0. Set any others that might be requested to 0. */ + for (buffer = 1; buffer < ioData->mNumberBuffers; buffer++) { - for (channel = 0; channel < ioData->mNumberBuffers; channel++) - memset(ioData->mBuffers[channel].mData, 0, ioData->mBuffers[channel].mDataByteSize); + memset(ioData->mBuffers[buffer].mData, 0, ioData->mBuffers[buffer].mDataByteSize); } - pthread_mutex_unlock(&wwo->lock); - if (nextPtr) wodHelper_PlayPtrNext(wwo); if (needNotify) wodHelper_NotifyCompletions(wwo, FALSE); return noErr; }

1 0