May 2007 - Wine-commits - list.winehq.org

Detlef Riekenberg : ddraw: Do not crash when Clipper is NULL.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: fb0a9291ea927db4ac4510f3e231cf7b9900369f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0a9291ea927db4ac4510f3e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 28 01:02:38 2007 +0200 ddraw: Do not crash when Clipper is NULL. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 62edb21..d3ebc84 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1981,7 +1981,7 @@ IDirectDrawSurfaceImpl_SetClipper(IDirectDrawSurface7 *iface, if(oldClipper) IDirectDrawClipper_Release(ICOM_INTERFACE(oldClipper, IDirectDrawClipper)); - return IWineD3DSurface_SetClipper(This->WineD3DSurface, This->clipper->wineD3DClipper); + return IWineD3DSurface_SetClipper(This->WineD3DSurface, This->clipper ? This->clipper->wineD3DClipper : NULL); } /*****************************************************************************

1 0

Kai Blin : secur32: Downgrade WARN to TRACE, fix another TRACE.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: c1e724bc881d89bb4b08ae9954fc7e7694f3cdbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e724bc881d89bb4b08ae995… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat May 26 01:11:46 2007 +0200 secur32: Downgrade WARN to TRACE, fix another TRACE. --- dlls/secur32/ntlm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5a00c7a..4c7f3b4 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -608,7 +608,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(pInput->pBuffers[input_token_idx].cbBuffer > max_len) { - TRACE("pInput->pBuffers[0].cbBuffer is: %ld\n", + TRACE("pInput->pBuffers[%d].cbBuffer is: %ld\n", + input_token_idx, pInput->pBuffers[input_token_idx].cbBuffer); ret = SEC_E_INVALID_TOKEN; goto isc_end; @@ -657,7 +658,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if (!pOutput || ((token_idx = ntlm_GetTokenBufferIndex(pOutput)) == -1)) { - WARN("no SECBUFFER_TOKEN buffer could be found\n"); + TRACE("no SECBUFFER_TOKEN buffer could be found\n"); ret = SEC_E_BUFFER_TOO_SMALL; goto isc_end; }

1 0

Kai Blin : ws2_32: Make WS2_send trace more readble.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 29b3a163063a033db30b337fd67197850e3e9a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b3a163063a033db30b337fd… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat May 26 01:11:39 2007 +0200 ws2_32: Make WS2_send trace more readble. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e30e387..3204af3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1293,7 +1293,7 @@ static int WS2_send( int fd, struct iovec* iov, int count, { struct msghdr hdr; int n; - TRACE( "fd %d, iovec %p, count %d addr %s, len %d, flags %x\n", + TRACE( "fd %d, iovec %p, count %d, addr %s, len %d, flags %x\n", fd, iov, count, debugstr_sockaddr(to), tolen, dwFlags); hdr.msg_name = NULL;

1 0

Rob Shearman : setupapi: Add a FIXME in SetupCopyOEMInfW for when we should be copying a catalog file .
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 34556854eda0de9d098968e8d948090d44030d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34556854eda0de9d098968e8d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat May 26 09:05:13 2007 +0100 setupapi: Add a FIXME in SetupCopyOEMInfW for when we should be copying a catalog file. --- dlls/setupapi/misc.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 2a91b17..bc3e764 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -950,9 +950,12 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, DWORD buffer_size, PDWORD required_size, PWSTR *component ) { BOOL ret = FALSE; - WCHAR target[MAX_PATH], *p; + WCHAR target[MAX_PATH], catalog_file[MAX_PATH], *p; static const WCHAR inf[] = { '\\','i','n','f','\\',0 }; + static const WCHAR wszVersion[] = { 'V','e','r','s','i','o','n',0 }; + static const WCHAR wszCatalogFile[] = { 'C','a','t','a','l','o','g','F','i','l','e',0 }; DWORD size; + HINF hinf; TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_w(source), debugstr_w(location), media_type, style, dest, buffer_size, required_size, component); @@ -1036,6 +1039,25 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, } } + hinf = SetupOpenInfFileW( source, NULL, INF_STYLE_WIN4, NULL ); + if (hinf == INVALID_HANDLE_VALUE) return FALSE; + + if (SetupGetLineTextW( NULL, hinf, wszVersion, wszCatalogFile, catalog_file, + sizeof(catalog_file)/sizeof(catalog_file[0]), NULL )) + { + WCHAR source_cat[MAX_PATH]; + strcpyW( source_cat, source ); + + p = strrchrW( source_cat, '\\' ); + if (p) p++; + else p = source_cat; + + strcpyW( p, catalog_file ); + + FIXME("install catalog file %s\n", debugstr_w( source_cat )); + } + SetupCloseInfFile( hinf ); + if (!(ret = CopyFileW( source, target, (style & SP_COPY_NOOVERWRITE) != 0 ))) return ret;

1 0

Juan Lang : crypt32: Remove wrong test and parameter check.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: fa10a299308605a0256c6d590beb1b440ec632f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa10a299308605a0256c6d590… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 24 16:43:49 2007 -0700 crypt32: Remove wrong test and parameter check. --- dlls/crypt32/store.c | 6 ------ dlls/crypt32/tests/store.c | 28 ---------------------------- 2 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 13ac320..30143fe 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1920,12 +1920,6 @@ static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, SetLastError(ERROR_PATH_NOT_FOUND); return NULL; } - if (!(dwFlags & (CERT_FILE_STORE_COMMIT_ENABLE_FLAG | - CERT_STORE_READONLY_FLAG))) - { - SetLastError(ERROR_FILE_NOT_FOUND); - return NULL; - } access = GENERIC_READ; if (dwFlags & CERT_FILE_STORE_COMMIT_ENABLE_FLAG) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index d00adb4..52cf965 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1230,34 +1230,6 @@ static void testFileNameStore(void) checkFileStoreFailure(filename, 0, CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG, E_INVALIDARG); - /* Without an encoding type, these all fail */ - checkFileStoreFailure(filename, 0, 0, ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, 0, CERT_STORE_OPEN_EXISTING_FLAG, - ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, 0, CERT_STORE_CREATE_NEW_FLAG, - ERROR_FILE_NOT_FOUND); - /* Without a message encoding type, these still fail */ - checkFileStoreFailure(filename, X509_ASN_ENCODING, 0, ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, X509_ASN_ENCODING, - CERT_STORE_OPEN_EXISTING_FLAG, ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, X509_ASN_ENCODING, - CERT_STORE_CREATE_NEW_FLAG, ERROR_FILE_NOT_FOUND); - /* Without a cert encoding type, they still fail */ - checkFileStoreFailure(filename, PKCS_7_ASN_ENCODING, 0, - ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, PKCS_7_ASN_ENCODING, - CERT_STORE_OPEN_EXISTING_FLAG, ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, PKCS_7_ASN_ENCODING, - CERT_STORE_CREATE_NEW_FLAG, ERROR_FILE_NOT_FOUND); - /* With both a message and cert encoding type, but without commit enabled, - * they still fail - */ - checkFileStoreFailure(filename, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, - ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - CERT_STORE_OPEN_EXISTING_FLAG, ERROR_FILE_NOT_FOUND); - checkFileStoreFailure(filename, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - CERT_STORE_CREATE_NEW_FLAG, ERROR_FILE_NOT_FOUND); /* In all of the following tests, the encoding type seems to be ignored */ if (initFileFromData(filename, bigCert, sizeof(bigCert)))

1 0

Andrew Talbot : ws2_32: Exclude unused headers.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 9d59c0300caa92317961b60cfae0f89e66750fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d59c0300caa92317961b60cf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 25 17:51:53 2007 +0100 ws2_32: Exclude unused headers. --- dlls/ws2_32/async.c | 1 - dlls/ws2_32/protocol.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 8598953..ef7be5f 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -104,7 +104,6 @@ #include "wingdi.h" #include "winuser.h" #include "winsock2.h" -#include "mswsock.h" #include "ws2spi.h" #include "wownt32.h" #include "wine/winsock16.h" diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 4dcad3a..2f71d32 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -40,7 +40,6 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "wtypes.h" #include "nspapi.h" #include "winsock2.h"

1 0

Andrew Talbot : winmm: Exclude unused headers.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 5f8d15027e7472a943471cfad1bb307e1c6ed9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8d15027e7472a943471cfad… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 25 17:51:45 2007 +0100 winmm: Exclude unused headers. --- dlls/winmm/lolvldrv.c | 2 -- dlls/winmm/message16.c | 2 -- dlls/winmm/mmsystem.c | 1 - dlls/winmm/winmm.c | 1 - 4 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index a21e32b..55ed500 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -30,11 +30,9 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" -#include "winver.h" #include "winemm.h" #include "wine/debug.h" #include "wine/exception.h" -#include "excpt.h" WINE_DEFAULT_DEBUG_CHANNEL(winmm); diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index 54e9939..c9d5f95 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -25,8 +25,6 @@ #include "wine/winbase16.h" #include "windef.h" #include "winbase.h" -#include "winreg.h" -#include "winver.h" #include "wownt32.h" #include "winemm16.h" #include "digitalv.h" diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index b86c0c5..ac6e537 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -34,7 +34,6 @@ #include "windef.h" #include "winbase.h" #include "mmsystem.h" -#include "winreg.h" #include "winternl.h" #include "wownt32.h" #include "winnls.h" diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 3139e79..e98b405 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -50,7 +50,6 @@ #include "mmsystem.h" #include "winuser.h" #include "winnls.h" -#include "winreg.h" #include "winternl.h" #include "winemm.h"

1 0

appdb/include appData.php
by WineHQ 28 May '07

28 May '07

ChangeSet ID: 31145 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/28 16:44:14 Modified files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Speedup appData::objectGetEntries() Patch: http://cvs.winehq.org/patch.py?id=31145 Old revision New revision Changes Path 1.19 1.20 +26 -7 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.19 appdb/include/appData.php:1.20 --- appdb/include/appData.php:1.19 28 May 2007 21:44:14 -0000 +++ appdb/include/appData.php 28 May 2007 21:44:14 -0000 @@ -332,13 +332,30 @@ class appData } } else { - $sQuery = "SELECT DISTINCT appData.* FROM appData, appFamily, appVersion - WHERE - appVersion.appId = appFamily.appId + if($iStart || $iRows) + $sLimit = " LIMIT ?,?"; + + $sQuery = "(SELECT DISTINCT appData.* FROM appData, + appFamily, appVersion WHERE + appFamily.appId = appVersion.appId AND ( appData.appId = appFamily.appId - OR + ) + AND + appVersion.queued = 'false' + AND + appFamily.queued = 'false' + AND + appData.queued = '?' + AND + appData.type = '?'$sLimit) UNION + ( + SELECT DISTINCT appData.* FROM appData, + appFamily, appVersion WHERE + appFamily.appId = appVersion.appId + AND + ( appData.versionId = appVersion.versionId ) AND @@ -348,17 +365,19 @@ class appData AND appData.queued = '?' AND - appData.type = '?'"; + appData.type = '?'$sLimit)"; if(!$iRows && !$iStart) { - $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType); + $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType, + $bQueued ? "true" : "false", $sType); } else { if(!$iRows) $iRows = appData::objectGetEntriesCount($bQueued ? "true" : "false", $bRejected, $sType); - $sQuery .= " LIMIT ?,?"; $hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType, + $iStart, $iRows, + $bQueued ? "true" : "false", $sType, $iStart, $iRows); } }

1 0

appdb/include appData.php
by WineHQ 28 May '07

28 May '07

ChangeSet ID: 31144 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/28 15:10:49 Modified files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Speedup appData::objectGetEntriesCount() when selecting un-queued entries or we are an admin. Patch: http://cvs.winehq.org/patch.py?id=31144 Old revision New revision Changes Path 1.18 1.19 +26 -16 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.18 appdb/include/appData.php:1.19 --- appdb/include/appData.php:1.18 28 May 2007 20:10:49 -0000 +++ appdb/include/appData.php 28 May 2007 20:10:49 -0000 @@ -203,45 +203,55 @@ class appData $sQuery .= " AND type = '?'"; $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sType); - } else { + } else + { $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId); } } else { - $sQuery = "SELECT COUNT(DISTINCT appData.id) as count FROM appData, + if($sQueued == "true" || $sQueued == "false") + $sAppDataQueued = " AND appData.queued = '$sQueued'"; + + if($sType) + $sSelectType = " AND type = '?'"; + + $sQuery = "(SELECT COUNT(DISTINCT appData.id) as count FROM appData, appFamily, appVersion WHERE appFamily.appId = appVersion.appId AND ( appData.appId = appFamily.appId - OR + ) + AND + appVersion.queued = 'false' + AND + appFamily.queued = 'false'$sAppDataQueued$sSelectType) UNION + ( + SELECT COUNT(DISTINCT appData.id) as count FROM appData, + appFamily, appVersion WHERE + appFamily.appId = appVersion.appId + AND + ( appData.versionId = appVersion.versionId ) AND appVersion.queued = 'false' AND - appFamily.queued = 'false'"; - - if($sQueued == "true" || $sQueued == "false") - $sQuery .= " AND appData.queued = '$sQueued'"; - + appFamily.queued = 'false'$sAppDataQueued$sSelectType)"; if($sType) - { - $sQuery .= " AND type = '?'"; - $hResult = query_parameters($sQuery, $sType); - } else + $hResult = query_parameters($sQuery, $sType, $sType); + else $hResult = query_parameters($sQuery); } if(!$hResult) return FALSE; - if(!$oRow = mysql_fetch_object($hResult)) - return FALSE; - - return $oRow->count; + for($iCount = 0; $oRow = mysql_fetch_object($hResult);) + $iCount += $oRow->count; + return $iCount; } function objectGetHeader($sType)

1 0

lostwages/ news/2007052601.xml wwn/wn20070526_ ...
by WineHQ 27 May '07

27 May '07

ChangeSet ID: 31143 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/05/27 00:08:46 Added files: news : 2007052601.xml wwn : wn20070526_332.xml Log message: WWN #332 Patch: http://cvs.winehq.org/patch.py?id=31143 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007052601.xml Added 1.1 +0 -0 lostwages/wwn/wn20070526_332.xml

1 0