October 2007 - Wine-Commits

Vincent Pelletier : user32: Implement SPI_GETMOUSESPEED in SystemParametersInfoW.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: d62da81251486b61c86417f2eda0d76bb3a8ed86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62da81251486b61c86417f2e… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sun Oct 14 11:59:41 2007 +0200 user32: Implement SPI_GETMOUSESPEED in SystemParametersInfoW. --- dlls/user32/sysparams.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c5de419..a72108a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2095,7 +2095,15 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, WINE_SPI_FIXME(SPI_GETSHOWIMEUI); /* 110 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETSHOWIMEUI); /* 111 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETMOUSESPEED); /* 112 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + + case SPI_GETMOUSESPEED: /* 112 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + { + int buf[3]; + ret = SystemParametersInfoW (SPI_GETMOUSE, 0, buf, fWinIni); + *(INT *)pvParam = buf[2]; + break; + } + WINE_SPI_FIXME(SPI_SETMOUSESPEED); /* 113 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ case SPI_GETSCREENSAVERRUNNING:

1 0

Juan Lang : iphlpapi: Use route table to find an adapter' s default gateway in GetAdaptersInfo.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 519e8db1f38f877128b86af544f7d62efd0c01b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519e8db1f38f877128b86af54… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 13 16:21:20 2007 -0700 iphlpapi: Use route table to find an adapter's default gateway in GetAdaptersInfo. --- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index eaccf83..858437d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -678,9 +678,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) else { InterfaceIndexTable *table = NULL; PMIB_IPADDRTABLE ipAddrTable = NULL; + PMIB_IPFORWARDTABLE routeTable = NULL; ret = getIPAddrTable(&ipAddrTable, GetProcessHeap(), 0); if (!ret) + ret = getRouteTable(&routeTable, GetProcessHeap(), 0); + if (!ret) table = getNonLoopbackInterfaceIndexTable(); if (table) { size = sizeof(IP_ADAPTER_INFO) * table->numIndexes; @@ -753,6 +756,14 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) } } } + /* Find first router through this interface, which we'll assume + * is the default gateway for this adapter */ + for (i = 0; i < routeTable->dwNumEntries; i++) + if (routeTable->table[i].dwForwardIfIndex == ptr->Index + && routeTable->table[i].dwForwardType == + MIB_IPROUTE_TYPE_INDIRECT) + toIPAddressString(routeTable->table[i].dwForwardNextHop, + ptr->GatewayList.IpAddress.String); if (winsEnabled) { ptr->HaveWins = TRUE; memcpy(ptr->PrimaryWinsServer.IpAddress.String, @@ -771,6 +782,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) } else ret = ERROR_OUTOFMEMORY; + HeapFree(GetProcessHeap(), 0, routeTable); HeapFree(GetProcessHeap(), 0, ipAddrTable); } }

1 0

Juan Lang : iphlpapi: UINT and DWORD are now equivalent, even in 64-bit compiles, so remove unnecessary complication.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: bceab86d351fbcb37baf9c0ad194b7c4265f151a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bceab86d351fbcb37baf9c0ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 13 16:25:36 2007 -0700 iphlpapi: UINT and DWORD are now equivalent, even in 64-bit compiles, so remove unnecessary complication. --- dlls/iphlpapi/iphlpapi_main.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 858437d..d1ef762 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -722,19 +722,14 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) } for (ndx = 0; ndx < table->numIndexes; ndx++) { PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; - DWORD addrLen = sizeof(ptr->Address), type, i; + DWORD i; PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList; BOOL firstIPAddr = TRUE; /* on Win98 this is left empty, but whatever */ getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); - getInterfacePhysicalByIndex(table->indexes[ndx], &addrLen, - ptr->Address, &type); - /* MS defines address length and type as UINT in some places and - DWORD in others, **sigh**. Don't want to assume that PUINT and - PDWORD are equiv (64-bit?) */ - ptr->AddressLength = addrLen; - ptr->Type = type; + getInterfacePhysicalByIndex(table->indexes[ndx], + &ptr->AddressLength, ptr->Address, &ptr->Type); ptr->Index = table->indexes[ndx]; for (i = 0; i < ipAddrTable->dwNumEntries; i++) { if (ipAddrTable->table[i].dwIndex == ptr->Index) {

1 0

Louis Lenders : advapi32: Improve stub for EnumServicesStatusExA a bit.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 22e9da0dd7365d5c9c31c91e88407d6958015007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e9da0dd7365d5c9c31c91e8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Oct 13 09:17:02 2007 +0100 advapi32: Improve stub for EnumServicesStatusExA a bit. --- dlls/advapi32/service.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3ebcfe4..63fd076 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2162,6 +2162,7 @@ EnumServicesStatusExA(SC_HANDLE hSCManager, SC_ENUM_TYPE InfoLevel, DWORD dwServ FIXME("%p level=%d type=%x state=%x %p %x %p %p %p %s\n", hSCManager, InfoLevel, dwServiceType, dwServiceState, lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned, lpResumeHandle, debugstr_a(pszGroupName)); + *lpServicesReturned = 0; SetLastError (ERROR_ACCESS_DENIED); return FALSE; }

1 0

Andrew Talbot : winmm: Fix some memory leaks.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 11f5ed28cbd625ec6f035848976264fdc5c0e189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f5ed28cbd625ec6f0358489… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 13 13:23:11 2007 +0100 winmm: Fix some memory leaks. --- dlls/winmm/mmsystem.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 02eabef..ec469b3 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -2394,16 +2394,20 @@ static LPWINE_DRIVER DRIVER_OpenDriver16(LPCWSTR fn, LPCWSTR sn, LPARAM lParam2) if (lpDrv->d.d16.hDriver16 == 0) {cause = "Not a 16 bit driver"; goto exit;} lpDrv->dwFlags = WINE_GDF_16BIT; - TRACE("=> %p\n", lpDrv); - return lpDrv; - exit: - HeapFree(GetProcessHeap(), 0, lpDrv); HeapFree(GetProcessHeap(), 0, fnA); HeapFree(GetProcessHeap(), 0, snA); - TRACE("Unable to load 16 bit module %s[%s]: %s\n", - debugstr_w(fn), debugstr_w(sn), cause); - return NULL; + + if (cause) + { + TRACE("Unable to load 16 bit module %s[%s]: %s\n", + debugstr_w(fn), debugstr_w(sn), cause); + HeapFree(GetProcessHeap(), 0, lpDrv); + return NULL; + } + + TRACE("=> %p\n", lpDrv); + return lpDrv; } /******************************************************************

1 0

Dan Hipschman : rpcrt4/tests: Free memory from one of the tests.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: e219087c65c3a4877e8e15941443cc9b3748d82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e219087c65c3a4877e8e15941… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Oct 12 16:24:47 2007 -0700 rpcrt4/tests: Free memory from one of the tests. --- dlls/rpcrt4/tests/server.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6fe1ce5..d8ecff0 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -760,6 +760,7 @@ free_pyramid_doub_carr(doub_carr_t *dc) int i; for (i = 0; i < dc->n; ++i) MIDL_user_free(dc->a[i]); + MIDL_user_free(dc); } static void

1 0

Dmitry Potapov : cmd: copy: Fix "Path not found" error.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: f918d175af89a5d8688bb93f73492197031825bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f918d175af89a5d8688bb93f7… Author: Dmitry Potapov <dpotapov(a)gmail.com> Date: Sat Oct 13 04:07:57 2007 +0400 cmd: copy: Fix "Path not found" error. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 496ec86..43f63f6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -171,7 +171,7 @@ void WCMD_copy (void) { if (outpath[strlenW(outpath) - 1] == '\\') outpath[strlenW(outpath) - 1] = '\0'; attribs = GetFileAttributes(outpath); - if (attribs & FILE_ATTRIBUTE_DIRECTORY) { + if (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY)) { strcatW (outpath, slashW); copyToDir = TRUE; }

1 0

Maarten Lankhorst : winealsa: Use S24_3LE instead of S24_LE.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 61862f9f2d2dd9bc0cca4d9983d9e42680ac2697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61862f9f2d2dd9bc0cca4d998… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Oct 12 19:35:05 2007 +0200 winealsa: Use S24_3LE instead of S24_LE. S24_LE is aligned with 4 bytes instead of the expected 3. --- dlls/winealsa.drv/dscapture.c | 2 +- dlls/winealsa.drv/dsoutput.c | 2 +- dlls/winealsa.drv/wavein.c | 2 +- dlls/winealsa.drv/waveout.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 8c2d9f5..3e6984a 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -597,7 +597,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa { case 8: format = SND_PCM_FORMAT_U8; break; case 16: format = SND_PCM_FORMAT_S16_LE; break; - case 24: format = SND_PCM_FORMAT_S24_LE; break; + case 24: format = SND_PCM_FORMAT_S24_3LE; break; case 32: format = SND_PCM_FORMAT_S32_LE; break; default: FIXME("Unsupported bpp: %d\n", pwfx->wBitsPerSample); return DSERR_GENERIC; } diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index d51e39a..9b76c7d 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -385,7 +385,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx) { case 8: format = SND_PCM_FORMAT_U8; break; case 16: format = SND_PCM_FORMAT_S16_LE; break; - case 24: format = SND_PCM_FORMAT_S24_LE; break; + case 24: format = SND_PCM_FORMAT_S24_3LE; break; case 32: format = SND_PCM_FORMAT_S32_LE; break; default: FIXME("Unsupported bpp: %d\n", pwfx->wBitsPerSample); return DSERR_GENERIC; } diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 2070bdf..d2a5bc8 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -504,7 +504,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) IsEqualGUID(&wwi->format.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) { format = (wwi->format.Format.wBitsPerSample == 8) ? SND_PCM_FORMAT_U8 : (wwi->format.Format.wBitsPerSample == 16) ? SND_PCM_FORMAT_S16_LE : - (wwi->format.Format.wBitsPerSample == 24) ? SND_PCM_FORMAT_S24_LE : + (wwi->format.Format.wBitsPerSample == 24) ? SND_PCM_FORMAT_S24_3LE : (wwi->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_S32_LE : -1; } else if ((wwi->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) && IsEqualGUID(&wwi->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){ diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6a01df3..2cbcd10 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -698,7 +698,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) { format = (wwo->format.Format.wBitsPerSample == 8) ? SND_PCM_FORMAT_U8 : (wwo->format.Format.wBitsPerSample == 16) ? SND_PCM_FORMAT_S16_LE : - (wwo->format.Format.wBitsPerSample == 24) ? SND_PCM_FORMAT_S24_LE : + (wwo->format.Format.wBitsPerSample == 24) ? SND_PCM_FORMAT_S24_3LE : (wwo->format.Format.wBitsPerSample == 32) ? SND_PCM_FORMAT_S32_LE : -1; } else if ((wwo->format.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) && IsEqualGUID(&wwo->format.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){

1 0

Maarten Lankhorst : dsound: Make sure device buflen is initially set to ds_hel_buflen.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 3230ea026a4d09bc08b495c4ae321a2db57c14cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3230ea026a4d09bc08b495c4a… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Sat Oct 13 19:41:05 2007 +0200 dsound: Make sure device buflen is initially set to ds_hel_buflen. --- dlls/dsound/primary.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 8e15cc5..57facf8 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -148,9 +148,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) /* on original windows, the buffer it set to a fixed size, no matter what the settings are. on windows this size is always fixed (tested on win-xp) */ if (!device->buflen) - buflen = ds_hel_buflen; - else /* In case we move from hw accelerated to waveout */ - buflen = device->buflen; + device->buflen = ds_hel_buflen; + buflen = device->buflen; buflen -= buflen % device->pwfx->nBlockAlign; device->buflen = buflen;

1 0

Maarten Lankhorst : dsound: Remove a few null initializations in DirectSoundDevice_Create.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 0595ed39f22dd1d79d6f029b8b4ef066b0242e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0595ed39f22dd1d79d6f029b8… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Thu Oct 11 22:08:17 2007 +0200 dsound: Remove a few null initializations in DirectSoundDevice_Create. The memory is allocated with HEAP_ZERO_MEMORY. --- dlls/dsound/dsound.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7d6dc93..ed6c221 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1166,23 +1166,11 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) } device->ref = 1; - device->driver = NULL; device->priolevel = DSSCL_NORMAL; - device->fraglen = 0; - device->hwbuf = NULL; - device->buffer = NULL; - device->buflen = 0; - device->writelead = 0; device->state = STATE_STOPPED; - device->nrofbuffers = 0; - device->buffers = NULL; - device->primary = NULL; device->speaker_config = DSSPEAKER_STEREO | (DSSPEAKER_GEOMETRY_NARROW << 16); - device->tmp_buffer = NULL; - device->tmp_buffer_len = 0; /* 3D listener initial parameters */ - device->listener = NULL; device->ds3dl.dwSize = sizeof(DS3DLISTENER); device->ds3dl.vPosition.x = 0.0; device->ds3dl.vPosition.y = 0.0; @@ -1200,8 +1188,8 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->ds3dl.flRolloffFactor = DS3D_DEFAULTROLLOFFFACTOR; device->ds3dl.flDopplerFactor = DS3D_DEFAULTDOPPLERFACTOR; - device->prebuf = ds_snd_queue_max; - device->guid = GUID_NULL; + device->prebuf = ds_snd_queue_max; + device->guid = GUID_NULL; /* Set default wave format (may need it for waveOutOpen) */ device->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEFORMATEX));

1 0