April 2009 - Wine-commits - list.winehq.org

Ken Thomases : winecoreaudio: Avoid a race between closing and opening the waveOut device.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 06d705e7dfc3febfbf3592de942a3100dffde5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d705e7dfc3febfbf3592de9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:23 2009 -0500 winecoreaudio: Avoid a race between closing and opening the waveOut device. --- dlls/winecoreaudio.drv/audio.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index e81aa3e..9b55326 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -105,6 +105,7 @@ AudioUnitRender( AudioUnit ci, #define WINE_WS_STOPPED 2 #define WINE_WS_CLOSED 3 #define WINE_WS_OPENING 4 +#define WINE_WS_CLOSING 5 typedef struct tagCoreAudio_Device { char dev_name[32]; @@ -957,14 +958,17 @@ static DWORD wodClose(WORD wDevID) } else { OSStatus err; + AudioUnit audioUnit = wwo->audioUnit; + /* sanity check: this should not happen since the device must have been reset before */ if (wwo->lpQueuePtr || wwo->lpPlayPtr) ERR("out of sync\n"); - wwo->state = WINE_WS_CLOSED; /* mark the device as closed */ + wwo->state = WINE_WS_CLOSING; /* mark the device as closing */ + wwo->audioUnit = NULL; OSSpinLockUnlock(&wwo->lock); - err = AudioUnitUninitialize(wwo->audioUnit); + err = AudioUnitUninitialize(audioUnit); if (err) { ERR("AudioUnitUninitialize return %c%c%c%c\n", (char) (err >> 24), (char) (err >> 16), @@ -973,12 +977,17 @@ static DWORD wodClose(WORD wDevID) return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } - if ( !AudioUnit_CloseAudioUnit(wwo->audioUnit) ) + if ( !AudioUnit_CloseAudioUnit(audioUnit) ) { ERR("Can't close AudioUnit\n"); return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } + OSSpinLockLock(&wwo->lock); + assert(wwo->state == WINE_WS_CLOSING); + wwo->state = WINE_WS_CLOSED; /* mark the device as closed */ + OSSpinLockUnlock(&wwo->lock); + ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } @@ -1332,7 +1341,8 @@ static DWORD wodReset(WORD wDevID) OSSpinLockLock(&wwo->lock); - if (wwo->state == WINE_WS_CLOSED || wwo->state == WINE_WS_OPENING) + if (wwo->state == WINE_WS_CLOSED || wwo->state == WINE_WS_CLOSING || + wwo->state == WINE_WS_OPENING) { OSSpinLockUnlock(&wwo->lock); WARN("resetting a closed device\n"); @@ -1631,8 +1641,8 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, OSSpinLockLock(&wwo->lock); /* We might have been called before wwo has been completely filled out by - * wodOpen. We have to do nothing in that case. The check of wwo->state - * below ensures that. */ + * wodOpen, or while it's being closed in wodClose. We have to do nothing + * in that case. The check of wwo->state below ensures that. */ while (dataNeeded > 0 && wwo->state == WINE_WS_PLAYING && wwo->lpPlayPtr) { unsigned int available = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset;

1 0

Ken Thomases : winecoreaudio: For waveOut, don't use STOPPED state; it' s redundant.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 5c4ed3bcce380b8ff834654f8dbd72bff5302989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4ed3bcce380b8ff834654f8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:27 2009 -0500 winecoreaudio: For waveOut, don't use STOPPED state; it's redundant. The distinction between PLAYING and STOPPED has always been whether lpPlayPtr is NULL, so just use that instead of two states. --- dlls/winecoreaudio.drv/audio.c | 41 ++++++++++++++------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 9b55326..f3a63a4 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -87,22 +87,21 @@ AudioUnitRender( AudioUnit ci, * +---------+-------------+---------------+---------------------------------+ * | state | function | event | new state | * +---------+-------------+---------------+---------------------------------+ -* | | open() | | STOPPED | +* | | open() | | PLAYING | * | PAUSED | write() | | PAUSED | -* | STOPPED | write() | <thrd create> | PLAYING | * | PLAYING | write() | HEADER | PLAYING | * | (other) | write() | <error> | | * | (any) | pause() | PAUSING | PAUSED | -* | PAUSED | restart() | RESTARTING | PLAYING (if no thrd => STOPPED) | -* | (any) | reset() | RESETTING | STOPPED | +* | PAUSED | restart() | RESTARTING | PLAYING | +* | (any) | reset() | RESETTING | PLAYING | * | (any) | close() | CLOSING | CLOSED | * +---------+-------------+---------------+---------------------------------+ */ /* states of the playing device */ -#define WINE_WS_PLAYING 0 +#define WINE_WS_PLAYING 0 /* for waveOut: lpPlayPtr == NULL -> stopped */ #define WINE_WS_PAUSED 1 -#define WINE_WS_STOPPED 2 +#define WINE_WS_STOPPED 2 /* Not used for waveOut */ #define WINE_WS_CLOSED 3 #define WINE_WS_OPENING 4 #define WINE_WS_CLOSING 5 @@ -888,7 +887,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->audioUnit = audioUnit; wwo->streamDescription = streamFormat; - wwo->state = WINE_WS_STOPPED; + wwo->state = WINE_WS_PLAYING; wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); @@ -1101,9 +1100,7 @@ static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo) /* We didn't loop back. Advance to the next wave header */ wwo->lpPlayPtr = wwo->lpPlayPtr->lpNext; - if (!wwo->lpPlayPtr) - wwo->state = WINE_WS_STOPPED; - else + if (wwo->lpPlayPtr) wodHelper_CheckForLoopBegin(wwo); } } @@ -1228,9 +1225,6 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { wwo->lpPlayPtr = lpWaveHdr; - if (wwo->state == WINE_WS_STOPPED) - wwo->state = WINE_WS_PLAYING; - wodHelper_CheckForLoopBegin(wwo); wwo->dwPartialOffset = 0; @@ -1259,9 +1253,9 @@ static DWORD wodPause(WORD wDevID) * the mutex while we make an Audio Unit call. Stop the Audio Unit before * setting the PAUSED state. In wodRestart, the order is reversed. This * guarantees that we can't get into a situation where the state is - * PLAYING or STOPPED but the Audio Unit isn't running. Although we can - * be in PAUSED state with the Audio Unit still running, that's harmless - * because the render callback will just produce silence. + * PLAYING but the Audio Unit isn't running. Although we can be in PAUSED + * state with the Audio Unit still running, that's harmless because the + * render callback will just produce silence. */ status = AudioOutputUnitStop(WOutDev[wDevID].audioUnit); if (status) { @@ -1270,7 +1264,7 @@ static DWORD wodPause(WORD wDevID) } OSSpinLockLock(&WOutDev[wDevID].lock); - if (WOutDev[wDevID].state == WINE_WS_PLAYING || WOutDev[wDevID].state == WINE_WS_STOPPED) + if (WOutDev[wDevID].state == WINE_WS_PLAYING) WOutDev[wDevID].state = WINE_WS_PAUSED; OSSpinLockUnlock(&WOutDev[wDevID].lock); @@ -1293,21 +1287,16 @@ static DWORD wodRestart(WORD wDevID) } /* The order of the following operations is important since we can't hold - * the mutex while we make an Audio Unit call. Set the PLAYING/STOPPED + * the mutex while we make an Audio Unit call. Set the PLAYING * state before starting the Audio Unit. In wodPause, the order is * reversed. This guarantees that we can't get into a situation where - * the state is PLAYING or STOPPED but the Audio Unit isn't running. + * the state is PLAYING but the Audio Unit isn't running. * Although we can be in PAUSED state with the Audio Unit still running, * that's harmless because the render callback will just produce silence. */ OSSpinLockLock(&WOutDev[wDevID].lock); if (WOutDev[wDevID].state == WINE_WS_PAUSED) - { - if (WOutDev[wDevID].lpPlayPtr) - WOutDev[wDevID].state = WINE_WS_PLAYING; - else - WOutDev[wDevID].state = WINE_WS_STOPPED; - } + WOutDev[wDevID].state = WINE_WS_PLAYING; OSSpinLockUnlock(&WOutDev[wDevID].lock); status = AudioOutputUnitStart(WOutDev[wDevID].audioUnit); @@ -1351,7 +1340,7 @@ static DWORD wodReset(WORD wDevID) lpSavedQueuePtr = wwo->lpQueuePtr; wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; - wwo->state = WINE_WS_STOPPED; + wwo->state = WINE_WS_PLAYING; wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; wwo->dwPartialOffset = 0; /* Clear partial wavehdr */

1 0

Ken Thomases : winecoreaudio: Avoid a race between closing and opening the waveIn device.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: dff10db04435c651473615182708f13cbe8677fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff10db04435c651473615182… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Apr 11 07:18:30 2009 -0500 winecoreaudio: Avoid a race between closing and opening the waveIn device. --- dlls/winecoreaudio.drv/audio.c | 70 +++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 26 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index f3a63a4..10b66d0 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1983,6 +1983,7 @@ static DWORD widClose(WORD wDevID) { DWORD ret = MMSYSERR_NOERROR; WINE_WAVEIN* wwi; + OSStatus err; TRACE("(%u);\n", wDevID); @@ -1994,7 +1995,7 @@ static DWORD widClose(WORD wDevID) wwi = &WInDev[wDevID]; OSSpinLockLock(&wwi->lock); - if (wwi->state == WINE_WS_CLOSED) + if (wwi->state == WINE_WS_CLOSED || wwi->state == WINE_WS_CLOSING) { WARN("Device already closed.\n"); ret = MMSYSERR_INVALHANDLE; @@ -2006,36 +2007,50 @@ static DWORD widClose(WORD wDevID) } else { - wwi->state = WINE_WS_CLOSED; + wwi->state = WINE_WS_CLOSING; } OSSpinLockUnlock(&wwi->lock); - if (ret == MMSYSERR_NOERROR) - { - OSStatus err = AudioUnitUninitialize(wwi->audioUnit); - if (err) - { - ERR("AudioUnitUninitialize return %c%c%c%c\n", (char) (err >> 24), - (char) (err >> 16), - (char) (err >> 8), - (char) err); - } + if (ret != MMSYSERR_NOERROR) + return ret; - if (!AudioUnit_CloseAudioUnit(wwi->audioUnit)) - { - ERR("Can't close AudioUnit\n"); - } - /* Dellocate our audio buffers */ - widHelper_DestroyAudioBufferList(wwi->bufferList); - wwi->bufferList = NULL; - HeapFree(GetProcessHeap(), 0, wwi->bufferListCopy); - wwi->bufferListCopy = NULL; + /* Clean up and close the audio unit. This has to be done without + * wwi->lock being held to avoid deadlock. AudioUnitUninitialize will + * grab an internal Core Audio lock while waiting for the device work + * thread to exit. Meanwhile the device work thread may be holding + * that lock and trying to grab the wwi->lock in the callback. */ + err = AudioUnitUninitialize(wwi->audioUnit); + if (err) + { + ERR("AudioUnitUninitialize return %c%c%c%c\n", (char) (err >> 24), + (char) (err >> 16), + (char) (err >> 8), + (char) err); + } - ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + if (!AudioUnit_CloseAudioUnit(wwi->audioUnit)) + { + ERR("Can't close AudioUnit\n"); } + + OSSpinLockLock(&wwi->lock); + assert(wwi->state == WINE_WS_CLOSING); + + /* Dellocate our audio buffers */ + widHelper_DestroyAudioBufferList(wwi->bufferList); + wwi->bufferList = NULL; + HeapFree(GetProcessHeap(), 0, wwi->bufferListCopy); + wwi->bufferListCopy = NULL; + + wwi->audioUnit = NULL; + wwi->state = WINE_WS_CLOSED; + OSSpinLockUnlock(&wwi->lock); + + ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + return ret; } @@ -2069,7 +2084,7 @@ static DWORD widAddBuffer(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) wwi = &WInDev[wDevID]; OSSpinLockLock(&wwi->lock); - if (wwi->state == WINE_WS_CLOSED) + if (wwi->state == WINE_WS_CLOSED || wwi->state == WINE_WS_CLOSING) { WARN("Trying to add buffer to closed device.\n"); ret = MMSYSERR_INVALHANDLE; @@ -2121,7 +2136,7 @@ static DWORD widStart(WORD wDevID) wwi = &WInDev[wDevID]; OSSpinLockLock(&wwi->lock); - if (wwi->state == WINE_WS_CLOSED) + if (wwi->state == WINE_WS_CLOSED || wwi->state == WINE_WS_CLOSING) { WARN("Trying to start closed device.\n"); ret = MMSYSERR_INVALHANDLE; @@ -2180,7 +2195,7 @@ static DWORD widStop(WORD wDevID) OSSpinLockLock(&wwi->lock); - if (wwi->state == WINE_WS_CLOSED) + if (wwi->state == WINE_WS_CLOSED || wwi->state == WINE_WS_CLOSING) { WARN("Trying to stop closed device.\n"); ret = MMSYSERR_INVALHANDLE; @@ -2253,7 +2268,7 @@ static DWORD widReset(WORD wDevID) wwi = &WInDev[wDevID]; OSSpinLockLock(&wwi->lock); - if (wwi->state == WINE_WS_CLOSED) + if (wwi->state == WINE_WS_CLOSED || wwi->state == WINE_WS_CLOSING) { WARN("Trying to reset a closed device.\n"); ret = MMSYSERR_INVALHANDLE; @@ -2441,6 +2456,9 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, lpStorePtr = wwi->lpQueuePtr; + /* We might have been called while the waveIn device is being closed in + * widClose. We have to do nothing in that case. The check of wwi->state + * below ensures that. */ while (dataToStore > 0 && wwi->state == WINE_WS_PLAYING && lpStorePtr) { unsigned int room = lpStorePtr->dwBufferLength - lpStorePtr->dwBytesRecorded;

1 0

Paul Vriens : usp10/tests: Skip some tests on WinME.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 69d27865f688e7827c287f17ee6df72ad84ab35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d27865f688e7827c287f17e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Apr 11 14:17:45 2009 +0200 usp10/tests: Skip some tests on WinME. --- dlls/usp10/tests/usp10.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d485fc8..1eefee0 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1183,6 +1183,12 @@ static void test_digit_substitution(void) for (i = 0; i < sizeof(groups)/sizeof(groups[0]); i++) { ret = pEnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("EnumLanguageGroupLocalesA not implemented on this platform\n"); + break; + } + ok(ret, "EnumLanguageGroupLocalesA failed unexpectedly: %u\n", GetLastError()); } }

1 0

Roderick Colenbrander : wined3d: Update Nvidia driver version information.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: c238541656a7da4e4e102e5b81bf5681f50c1158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c238541656a7da4e4e102e5b8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Apr 12 23:24:26 2009 +0200 wined3d: Update Nvidia driver version information. --- dlls/wined3d/directx.c | 53 +++++++++++++++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 99d3762..d9d6b1b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3949,26 +3949,43 @@ struct driver_version_information { }; static const struct driver_version_information driver_version_table[] = { - /* Nvidia drivers. Geforce6 and newer cards are supported by the current driver (177.x)*/ - /* GeforceFX support is up to 173.x, Geforce2MX/3/4 up to 96.x, TNT/Geforce1/2 up to 71.x */ - /* Note that version numbers >100 lets say 123.45 use >= x.y.11.2345 and not x.y.10.12345 */ + /* Nvidia drivers. Geforce6 and newer cards are supported by the current driver (180.x) + * GeforceFX support is up to 173.x, - driver uses numbering x.y.11.7341 for 173.41 where x is the windows revision (6=2000/xp, 7=vista), y is unknown + * Geforce2MX/3/4 up to 96.x - driver uses numbering 9.6.8.9 for 96.89 + * TNT/Geforce1/2 up to 71.x - driver uses numbering 7.1.8.6 for 71.86 + * + * All version numbers used below are from the Linux nvidia drivers. + */ + {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT, 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT2, 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, 9, 6, 4, 3 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, 7, 15, 11, 8044 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode */ {VENDOR_ATI, CARD_ATI_RADEON_9500, 6, 14, 10, 6764 }, @@ -3978,7 +3995,7 @@ static const struct driver_version_information driver_version_table[] = { {VENDOR_ATI, CARD_ATI_RADEON_HD2600, 6, 14, 10, 6764 }, {VENDOR_ATI, CARD_ATI_RADEON_HD2900, 6, 14, 10, 6764 }, - /* TODO: Add information about legacy nvidia and ATI hardware, Intel and other cards */ + /* TODO: Add information about legacy ATI hardware, Intel and other cards */ }; static void fixup_extensions(WineD3D_GL_Info *gl_info) {

1 0

Roderick Colenbrander : wined3d: Report the driver description as reported by the Windows drivers when a device string is entered in our device table .
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: f2e2e3e49947490368900ef06a92e1df1bc52820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e2e3e49947490368900ef06… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 13 00:09:56 2009 +0200 wined3d: Report the driver description as reported by the Windows drivers when a device string is entered in our device table. --- dlls/wined3d/directx.c | 79 ++++++++++++++++++++++++--------------------- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d9d6b1b..3b46965 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1708,7 +1708,10 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad /* Return the information requested */ TRACE_(d3d_caps)("device/Vendor Name and Version detection using FillGLCaps\n"); strcpy(pIdentifier->Driver, This->adapters[Adapter].driver); - strcpy(pIdentifier->Description, This->adapters[Adapter].description); + if(This->adapters[Adapter].gl_info.driver_description) + strcpy(pIdentifier->Description, This->adapters[Adapter].gl_info.driver_description); + else /* Copy default description "Direct3D HAL" */ + strcpy(pIdentifier->Description, This->adapters[Adapter].description); /* Note dx8 doesn't supply a DeviceName */ if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ @@ -3944,6 +3947,7 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { struct driver_version_information { WORD vendor; /* reported PCI card vendor ID */ WORD card; /* reported PCI card device ID */ + const char *description; /* Description of the card e.g. NVIDIA RIVA TNT */ WORD hipart_hi, hipart_lo; /* driver hiword to report */ WORD lopart_hi, lopart_lo; /* driver loword to report */ }; @@ -3956,44 +3960,44 @@ static const struct driver_version_information driver_version_table[] = { * * All version numbers used below are from the Linux nvidia drivers. */ - {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT2, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT, "NVIDIA RIVA TNT", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT2, "NVIDIA RIVA TNT2/TNT2 Pro", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, "NVIDIA GeForce 256", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, "NVIDIA GeForce2 MX/MX 400", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, "NVIDIA GeForce2 GTS/GeForce2 Pro", 7, 1, 8, 6 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 4, 3 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8044 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode */ - {VENDOR_ATI, CARD_ATI_RADEON_9500, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_X700, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_X1600, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_HD2300, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_HD2600, 6, 14, 10, 6764 }, - {VENDOR_ATI, CARD_ATI_RADEON_HD2900, 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_X700, "ATI Radeon X700 SE", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_X1600, "ATI Radeon X1600 Series", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2300, "ATI Mobility Radeon HD 2300", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2600, "ATI Mobility Radeon HD 2600", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD2900, "ATI Radeon HD 2900 XT", 6, 14, 10, 6764 }, /* TODO: Add information about legacy ATI hardware, Intel and other cards */ }; @@ -4097,6 +4101,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { driver_version_table[i].lopart_lo); gl_info->driver_version_hipart = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, driver_version_table[i].hipart_lo); + strcpy(gl_info->driver_description, driver_version_table[i].description); break; } } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 6fc02dd..cc76035 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3908,6 +3908,7 @@ typedef struct _WineD3D_GL_Info { UINT vidmem; DWORD driver_version; DWORD driver_version_hipart; + CHAR driver_description[255]; CHAR gl_renderer[255]; /** * CAPS Constants

1 0

Dmitry Timoshkov : oleaut32: Add some additional tests for QueryPathOfRegTypeLib, make them pass under Wine.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 69ec6b4c6d74926a2182c5bf9f1ac9e4562f4f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec6b4c6d74926a2182c5bf9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 13 15:14:08 2009 +0900 oleaut32: Add some additional tests for QueryPathOfRegTypeLib, make them pass under Wine. --- dlls/oleaut32/tests/typelib.c | 5 +++++ dlls/oleaut32/typelib.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7c0e2c5..93920c5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -638,6 +638,10 @@ static void test_QueryPathOfRegTypeLib(void) { 3, 22, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, { 3, 37, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, { 3, 40, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, + { 0xffff, 0xffff, S_OK, {'f','a','k','e','_','5','_','3','7','.','d','l','l',0 } }, + { 0xffff, 0, TYPE_E_LIBNOTREGISTERED, { 0 } }, + { 3, 0xffff, TYPE_E_LIBNOTREGISTERED, { 0 } }, + { 5, 0xffff, TYPE_E_LIBNOTREGISTERED, { 0 } }, { 4, 0, TYPE_E_LIBNOTREGISTERED, { 0 } } }; static const WCHAR base[] = {'f','a','k','e',0}; @@ -657,6 +661,7 @@ static void test_QueryPathOfRegTypeLib(void) if (!do_typelib_reg_key(&uid, 3, 0, base, 0)) return; if (!do_typelib_reg_key(&uid, 3, 1, base, 0)) return; if (!do_typelib_reg_key(&uid, 3, 37, base, 0)) return; + if (!do_typelib_reg_key(&uid, 5, 37, base, 0)) return; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 75a30d2..a0af847 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -168,13 +168,13 @@ static void FromLEDWords(void *p_Val, int p_iSize) /* * Find a typelib key which matches a requested maj.min version. */ -static BOOL find_typelib_key( REFGUID guid, WORD wMaj, WORD *wMin ) +static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) { static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; WCHAR buffer[60]; char key_name[16]; DWORD len, i; - INT best_min = -1; + INT best_maj = -1, best_min = -1; HKEY hkey; memcpy( buffer, typelibW, sizeof(typelibW) ); @@ -193,20 +193,40 @@ static BOOL find_typelib_key( REFGUID guid, WORD wMaj, WORD *wMin ) { TRACE("found %s: %x.%x\n", debugstr_w(buffer), v_maj, v_min); - if (wMaj == v_maj) + if (*wMaj == 0xffff && *wMin == 0xffff) { + if (v_maj > best_maj) best_maj = v_maj; + if (v_min > best_min) best_min = v_min; + } + else if (*wMaj == v_maj) + { + best_maj = v_maj; + if (*wMin == v_min) { best_min = v_min; break; /* exact match */ } - if (v_min > best_min) best_min = v_min; + if (*wMin != 0xffff && v_min > best_min) best_min = v_min; } } len = sizeof(key_name); } RegCloseKey( hkey ); - if (best_min >= 0) + + TRACE("found best_maj %d, best_min %d\n", best_maj, best_min); + + if (*wMaj == 0xffff && *wMin == 0xffff) + { + if (best_maj >= 0 && best_min >= 0) + { + *wMaj = best_maj; + *wMin = best_min; + return TRUE; + } + } + + if (*wMaj == best_maj && best_min >= 0) { *wMin = best_min; return TRUE; @@ -295,7 +315,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib( TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); - if (!find_typelib_key( guid, wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; + if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; get_typelib_key( guid, wMaj, wMin, buffer ); res = RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey );

1 0

Kai Blin : secur32: Work around ntlm_auth in Samba 3.0. 28a being broken for cached credentials.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 7788c8ed0d84be2537280c188fb07fb7118b3883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7788c8ed0d84be2537280c188… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 13 22:39:39 2009 +0200 secur32: Work around ntlm_auth in Samba 3.0.28a being broken for cached credentials. Samba 3.0.28a (as shipped with Ubuntu 8.04) seems to break when using cached credentials backed by winbindd, returning a BH error in our test if we still need to provide a password. Handle this and report a more correct error. --- dlls/secur32/ntlm.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 7e44dd7..5e2450a 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -662,8 +662,20 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_NO_CREDENTIALS; goto isc_end; } - else /* Just do a noop on the next run */ + else + { + /* Some versions of Samba have a broken ntlm_auth that can + * return "BH" here. Catch this and abort. */ + if(!strncmp(buffer, "BH", 2)) + { + ERR("ntlm_auth replied 'BH'. This should not happen. " + "Please fix your ntlm_auth install and try again.\n"); + ret = SEC_E_INTERNAL_ERROR; + goto isc_end; + } + /* Otherwise, just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); + } } else {

1 0

Alexandre Julliard : c2man: Fix the array reference syntax and the return value regexps.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 6fb1d752390e359fb2f6b96e7da6e111f4b3ddd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb1d752390e359fb2f6b96e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 19:52:04 2009 +0200 c2man: Fix the array reference syntax and the return value regexps. --- tools/c2man.pl | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 4272b73..b1fd022 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -629,7 +629,7 @@ sub process_comment($) # When the function is exported twice we have the second name below the first # (you see this a lot in ntdll, but also in some other places). - my $first_line = ${@{$comment->{TEXT}}}[1]; + my $first_line = ${$comment->{TEXT}}[1]; if ( $first_line =~ /^(@|[A-Za-z0-9_]+) +($|\[)([A-Za-z0-9_]+)\.(([0-9]+)|@)($|\])$/ ) { @@ -644,14 +644,14 @@ sub process_comment($) my $alt_export = @{$spec_details->{EXPORTS}}[$alt_index]; @$alt_export[4] |= $FLAG_DOCUMENTED; $spec_details->{NUM_DOCS}++; - ${@{$comment->{TEXT}}}[1] = ""; + ${$comment->{TEXT}}[1] = ""; } } if (@{$spec_details->{CURRENT_EXTRA}}) { # We have an extra comment that might be related to this one - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = ${$spec_details->{CURRENT_EXTRA}}[0]; my $current_name = $current_comment->{COMMENT_NAME}; if ($comment->{COMMENT_NAME} =~ /^$current_name/ && $comment->{COMMENT_NAME} ne $current_name) { @@ -822,12 +822,12 @@ sub process_comment($) if ( $prototype =~ /(WINAPIV|WINAPI|__cdecl|PASCAL|CALLBACK|FARPROC16)/ ) { - $prototype =~ s/^(.*?) (WINAPIV|WINAPI|__cdecl|PASCAL|CALLBACK|FARPROC16) (.*?)\( *(.*)/$4/; + $prototype =~ s/^(.*?)\s+(WINAPIV|WINAPI|__cdecl|PASCAL|CALLBACK|FARPROC16)\s+(.*?)\(\s*(.*)/$4/; $comment->{RETURNS} = $1; } else { - $prototype =~ s/^(.*?)([A-Za-z0-9_]+)\( *(.*)/$3/; + $prototype =~ s/^(.*?)([A-Za-z0-9_]+)\s*\(\s*(.*)/$3/; $comment->{RETURNS} = $1; } @@ -988,7 +988,7 @@ sub process_extra_comment($) if (@{$spec_details->{CURRENT_EXTRA}}) { - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = ${$spec_details->{CURRENT_EXTRA}}[0]; if ($opt_verbose > 0) { @@ -1074,7 +1074,7 @@ sub process_index_files() if (@{$spec_details->{CURRENT_EXTRA}}) { # We have an unwritten extra comment, write it - my $current_comment = ${@{$spec_details->{CURRENT_EXTRA}}}[0]; + my $current_comment = ${$spec_details->{CURRENT_EXTRA}}[0]; process_extra_comment($current_comment); @{$spec_details->{CURRENT_EXTRA}} = (); } @@ -1470,7 +1470,7 @@ sub output_api_synopsis($) my $biggest_length = 0; for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = ${$comment->{PROTOTYPE}}[$i]; if ($line =~ /(.+?)([A-Za-z_][A-Za-z_0-9]*)$/) { my $length = length $1; @@ -1484,19 +1484,19 @@ sub output_api_synopsis($) # Now pad the string with blanks for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = ${$comment->{PROTOTYPE}}[$i]; if ($line =~ /(.+?)([A-Za-z_][A-Za-z_0-9]*)$/) { my $pad_len = $biggest_length - length $1; my $padding = " " x ($pad_len); - ${@{$comment->{PROTOTYPE}}}[$i] = $1.$padding.$2; + ${$comment->{PROTOTYPE}}[$i] = $1.$padding.$2; } } for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++) { # Format the parameter name - my $line = ${@{$comment->{PROTOTYPE}}}[$i]; + my $line = ${$comment->{PROTOTYPE}}[$i]; my $comma = ($i == @{$comment->{PROTOTYPE}}-1) ? "" : ","; $line =~ s/(.+?)([A-Za-z_][A-Za-z_0-9]*)$/ $fmt[0]$1$fmt[2]$2$fmt[3]$comma$fmt[1]/; print OUTPUT $line;

1 0

Alexandre Julliard : user32/tests: Fix a couple of test failures on Windows .
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 287d22eba331d16cb46e497cfc994207c2763a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287d22eba331d16cb46e497cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 20:45:08 2009 +0200 user32/tests: Fix a couple of test failures on Windows. --- dlls/user32/tests/win.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4aa3674..1f0420e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2662,7 +2662,10 @@ static void test_keyboard_input(HWND hwnd) ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); keybd_event(VK_SPACE, 0, 0, 0); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + do + { + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + } while (ret && msg.message >= 0xc000); if (!ret) { skip( "keybd_event didn't work, skipping keyboard test\n" ); @@ -4930,7 +4933,10 @@ static void test_GetWindowModuleFileName(void) ok(IsWindow(hwnd), "got invalid desktop window %p\n", hwnd); SetLastError(0xdeadbeef); ret2 = pGetWindowModuleFileNameA(hwnd, buf2, sizeof(buf2)); - ok(!ret2 || ret1 == ret2 /* vista */, "expected 0 or %u, got %u %s\n", ret1, ret2, buf2); + ok(!ret2 || + ret1 == ret2 || /* vista */ + broken(ret2), /* some win98 return user.exe as file name */ + "expected 0 or %u, got %u %s\n", ret1, ret2, buf2); } }

1 0