October 2006 - Wine-commits

Andrew Talbot : crypt32: Cast-qual warnings fix.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: c70841fb36bd3373e8a6518bdeb7e96f1d905883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70841fb36bd3373e8a6518bd… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Oct 23 21:15:58 2006 +0100 crypt32: Cast-qual warnings fix. --- dlls/crypt32/cert.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index fd39ef3..b39c3ca 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -364,7 +364,7 @@ BOOL WINAPI CertGetCertificateContextPro * - rgProvParam[0]... */ static void CRYPT_CopyKeyProvInfo(PCRYPT_KEY_PROV_INFO to, - PCRYPT_KEY_PROV_INFO from) + const CRYPT_KEY_PROV_INFO *from) { DWORD i; LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO); @@ -403,7 +403,7 @@ static void CRYPT_CopyKeyProvInfo(PCRYPT } static BOOL CertContext_SetKeyProvInfoProperty(PCONTEXT_PROPERTY_LIST properties, - PCRYPT_KEY_PROV_INFO info) + const CRYPT_KEY_PROV_INFO *info) { BOOL ret; LPBYTE buf = NULL; @@ -468,7 +468,7 @@ static BOOL WINAPI CertContext_SetProper { if (pvData) { - PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; + const CRYPT_DATA_BLOB *blob = (const CRYPT_DATA_BLOB *)pvData; ret = ContextPropertyList_SetProperty(properties, dwPropId, blob->pbData, blob->cbData); @@ -483,7 +483,7 @@ static BOOL WINAPI CertContext_SetProper case CERT_DATE_STAMP_PROP_ID: if (pvData) ret = ContextPropertyList_SetProperty(properties, dwPropId, - (LPBYTE)pvData, sizeof(FILETIME)); + (const BYTE *)pvData, sizeof(FILETIME)); else { ContextPropertyList_RemoveProperty(properties, dwPropId); @@ -494,7 +494,7 @@ static BOOL WINAPI CertContext_SetProper { if (pvData) { - PCERT_KEY_CONTEXT keyContext = (PCERT_KEY_CONTEXT)pvData; + const CERT_KEY_CONTEXT *keyContext = (const CERT_KEY_CONTEXT *)pvData; ret = ContextPropertyList_SetProperty(properties, dwPropId, (const BYTE *)keyContext, keyContext->cbSize); @@ -509,7 +509,7 @@ static BOOL WINAPI CertContext_SetProper case CERT_KEY_PROV_INFO_PROP_ID: if (pvData) ret = CertContext_SetKeyProvInfoProperty(properties, - (PCRYPT_KEY_PROV_INFO)pvData); + (const CRYPT_KEY_PROV_INFO *)pvData); else { ContextPropertyList_RemoveProperty(properties, dwPropId); @@ -528,7 +528,7 @@ static BOOL WINAPI CertContext_SetProper if (!(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) CryptReleaseContext(keyContext.hCryptProv, 0); if (pvData) - keyContext.hCryptProv = *(HCRYPTPROV *)pvData; + keyContext.hCryptProv = *(const HCRYPTPROV *)pvData; else keyContext.hCryptProv = 0; ret = CertContext_SetProperty(context, CERT_KEY_CONTEXT_PROP_ID,

1 0

Paul Vriens : regedit: Initialize a variable (Coverity).
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 0cf2010f7b3b0075913060e588bdd96357ea0ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2010f7b3b0075913060e58… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Oct 23 21:30:58 2006 +0200 regedit: Initialize a variable (Coverity). --- programs/regedit/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 1741672..a834966 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -246,7 +246,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, { BOOL result = FALSE; LONG lRet = ERROR_SUCCESS; - HKEY retKey; + HKEY retKey = NULL; TCHAR newKey[MAX_NEW_KEY_LEN - 4]; int keyNum; HKEY hKey;

1 0

Eric Pouech : netapi32: Fix the size of allocation for the string returned from NetpGetComputerName .
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: a8e5179d8e59697896c4e39cf848fa4077372beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e5179d8e59697896c4e39cf… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:45 2006 +0200 netapi32: Fix the size of allocation for the string returned from NetpGetComputerName. --- dlls/netapi32/wksta.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 1d22fc6..d89cd1a 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -445,7 +445,7 @@ NET_API_STATUS WINAPI NetpGetComputerNam if (GetComputerNameW(*Buffer, &dwSize)) { NetApiBufferReallocate( - *Buffer, dwSize * sizeof(WCHAR), + *Buffer, (dwSize + 1) * sizeof(WCHAR), (LPVOID *) Buffer); return NERR_Success; }

1 0

Michael Stefaniuc : comctl32/tests: Specify type of function argument and remove unused arguments.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 962e97dbf315474e53341bf93d76499b7287d381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=962e97dbf315474e53341bf93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 23 15:32:38 2006 +0200 comctl32/tests: Specify type of function argument and remove unused arguments. --- dlls/comctl32/tests/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 217874d..7b9697e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -48,7 +48,7 @@ static void MakeButton(TBBUTTON *p, int p->iString = nString; } -LRESULT MyWnd_Notify(hWnd, wParam, lParam) +static LRESULT MyWnd_Notify(LPARAM lParam) { NMHDR *hdr = (NMHDR *)lParam; NMTBHOTITEM *nmhi; @@ -74,7 +74,7 @@ static LRESULT CALLBACK MyWndProc(HWND h switch (msg) { case WM_NOTIFY: - return MyWnd_Notify(hWnd, wParam, lParam); + return MyWnd_Notify(lParam); } return DefWindowProcA(hWnd, msg, wParam, lParam); }

1 0

Eric Pouech : ole32: CoUninitialize: No longer access an object after it' s been freed.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 5c0f35a2aa4c09736aa1a6c920c513bc1282c446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0f35a2aa4c09736aa1a6c92… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:52 2006 +0200 ole32: CoUninitialize: No longer access an object after it's been freed. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1887cf6..db76dbc 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -365,8 +365,8 @@ DWORD apartment_release(struct apartment struct registered_psclsid *registered_psclsid = LIST_ENTRY(cursor, struct registered_psclsid, entry); - HeapFree(GetProcessHeap(), 0, registered_psclsid); list_remove(&registered_psclsid->entry); + HeapFree(GetProcessHeap(), 0, registered_psclsid); } /* if this assert fires, then another thread took a reference to a

1 0

Eric Pouech : ole32: Fixed some wrong conditions in OleFlushClipboard.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: a79fa502806b5855d20ac73c823e012f0d77c8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79fa502806b5855d20ac73c8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:49 2006 +0200 ole32: Fixed some wrong conditions in OleFlushClipboard. --- dlls/ole32/clipboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 73627b3..89ecfd5 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -914,7 +914,8 @@ static HRESULT OLEClipbrd_RenderFormat(I ILockBytes *ptrILockBytes = 0; HGLOBAL hStorage = 0; - GetClipboardFormatNameA(pFormatetc->cfFormat, szFmtName, MAX_CLIPFORMAT_NAME); + if (!GetClipboardFormatNameA(pFormatetc->cfFormat, szFmtName, MAX_CLIPFORMAT_NAME)) + szFmtName[0] = '\0'; /* If embed source */ if (!strcmp(szFmtName, CF_EMBEDSOURCE))

1 0

Marcus Meissner : iphlpapi: NetBSD needs sys/param.h.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 2c8aeb6db1495e6d9802aca55274b5c954356d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8aeb6db1495e6d9802aca55… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 22 21:15:46 2006 +0200 iphlpapi: NetBSD needs sys/param.h. --- dlls/iphlpapi/ifenum.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 8e7e929..8a9135b 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -39,6 +39,9 @@ #include <unistd.h> #endif #include <sys/types.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h>

1 0

Marcus Meissner : wineoss: On non-OSS systems define MidiExit too.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: d1b2282a9bf001342537be1e5d4765823c0b9a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b2282a9bf001342537be1e5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 22 21:58:47 2006 +0200 wineoss: On non-OSS systems define MidiExit too. --- dlls/winmm/wineoss/midi.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 66601e0..6b9cdf8 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -1678,9 +1678,17 @@ #else /* HAVE_OSS_MIDI */ LRESULT OSS_MidiInit(void) { + TRACE("()\n"); return FALSE; } +LRESULT OSS_MidiExit(void) +{ + TRACE("()\n"); + return 0; +} + + #endif /* HAVE_OSS_MIDI */ /*======================================================================*

1 0

Eric Pouech : winex11.drv: As the min keycode is always greater or equal to 8, we
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 54ac76a387142ee1f0003bffc1f3efd053db84cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ac76a387142ee1f0003bffc… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:07 2006 +0200 winex11.drv: As the min keycode is always greater or equal to 8, we don't need to scan XKeymapEvent.key_vector from 0 but from 8. --- dlls/winex11.drv/keyboard.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 534e197..7768151 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1283,7 +1283,10 @@ void X11DRV_KeymapNotify( HWND hwnd, XEv DWORD time = GetCurrentTime(); alt = control = shift = 0; - for (i = 0; i < 32; i++) + /* the minimum keycode is always greater or equal to 8, so we can + * skip the first 8 values, hence start at 1 + */ + for (i = 1; i < 32; i++) { if (!event->xkeymap.key_vector[i]) continue; for (j = 0; j < 8; j++)

1 0

Eric Pouech : gdi32: Better error handling in enhanced metafile.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: bc7df7ad80af9822a7d22d77289d9a13a63bc588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7df7ad80af9822a7d22d772… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 22 21:48:19 2006 +0200 gdi32: Better error handling in enhanced metafile. --- dlls/gdi32/enhmfdrv/graphics.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 13b4a06..cf4603b 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -756,18 +756,19 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT for (i = 0; i < count; i++) { textWidth += lpDx[i]; } - GetTextExtentPoint32W(physDev->hdc, str, count, &strSize); - textHeight = strSize.cy; + if (GetTextExtentPoint32W(physDev->hdc, str, count, &strSize)) + textHeight = strSize.cy; } else { UINT i; INT *dx = (INT *)((char*)pemr + pemr->emrtext.offDx); SIZE charSize; for (i = 0; i < count; i++) { - GetTextExtentPoint32W(physDev->hdc, str + i, 1, &charSize); - dx[i] = charSize.cx; - textWidth += charSize.cx; - textHeight = max(textHeight, charSize.cy); + if (GetTextExtentPoint32W(physDev->hdc, str + i, 1, &charSize)) { + dx[i] = charSize.cx; + textWidth += charSize.cx; + textHeight = max(textHeight, charSize.cy); + } } } @@ -791,7 +792,8 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT switch (textAlign & (TA_TOP | TA_BOTTOM | TA_BASELINE)) { case TA_BASELINE: { TEXTMETRICW tm; - GetTextMetricsW(physDev->hdc, &tm); + if (!GetTextMetricsW(physDev->hdc, &tm)) + tm.tmDescent = 0; /* Play safe here... it's better to have a bounding box */ /* that is too big than too small. */ pemr->rclBounds.top = y - textHeight - 1;

1 0