wine-commits February 2007

wine-commits@winehq.org

4 participants
839 discussions

Mikołaj Zalewski : shell32: shlfileop tests: Avoid buffer overflows for paths.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: dbef32e4ed168b83496a0c60f434e220914673df URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbef32e4ed168b83496a0c60f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 4 23:52:39 2007 +0100 shell32: shlfileop tests: Avoid buffer overflows for paths. --- dlls/shell32/tests/shlfileop.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index b363c5e..23aaeba 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -329,8 +329,8 @@ static void test_delete(void) static void test_rename(void) { SHFILEOPSTRUCTA shfo, shfo2; - CHAR from[MAX_PATH]; - CHAR to[MAX_PATH]; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; DWORD retval; shfo.hwnd = NULL; @@ -438,8 +438,8 @@ static void test_rename(void) static void test_copy(void) { SHFILEOPSTRUCTA shfo, shfo2; - CHAR from[MAX_PATH]; - CHAR to[MAX_PATH]; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; FILEOP_FLAGS tmp_flags; DWORD retval; @@ -767,8 +767,8 @@ static void test_copy(void) static void test_move(void) { SHFILEOPSTRUCTA shfo, shfo2; - CHAR from[MAX_PATH]; - CHAR to[MAX_PATH]; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; DWORD retval; shfo.hwnd = NULL;

1 0

Vitaliy Margolen : winex11drv: Do extra error checking when opening XInput device.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 8e52754226035ab739b60ab5567619c9fe83a426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e52754226035ab739b60ab55… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Feb 4 09:43:39 2007 -0700 winex11drv: Do extra error checking when opening XInput device. --- dlls/winex11.drv/wintab.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index f56bf08..c6b65a1 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -367,8 +367,9 @@ void X11DRV_LoadTabletInfo(HWND hwnddefa target = &devices[loop]; cursor = &gSysCursor[cursor_target]; + X11DRV_expect_error(data->display, Tablet_ErrorHandler, NULL); opendevice = pXOpenDevice(data->display,target->id); - if (opendevice) + if (!X11DRV_check_error() && opendevice) { unsigned char map[32]; int i;

1 0

Paul Vriens : wininet/ftp.c: Remove unneeded check.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 0cc5a68e2cf4eac4fa45c25f1e2ff7b85af495f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc5a68e2cf4eac4fa45c25f1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 09:07:45 2007 +0100 wininet/ftp.c: Remove unneeded check. --- dlls/wininet/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 841ae3c..b26350f 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -262,8 +262,6 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTP return FALSE; } - assert( WH_HFTPSESSION == lpwfs->hdr.htype); - /* Clear any error information */ INTERNET_SetLastError(0); hIC = lpwfs->lpAppInfo;

1 0

Paul Vriens : urlmon: Cast-qual warning fixes.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: f5035577fb630da8b8714024c10dbde8a247e8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5035577fb630da8b8714024c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 08:06:49 2007 +0100 urlmon: Cast-qual warning fixes. --- dlls/urlmon/umon.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index d593c81..03289ff 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); /* native urlmon.dll uses this key, too */ -static const WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; +static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; /*static BOOL registered_wndclass = FALSE;*/ @@ -541,7 +541,7 @@ static HRESULT URLMonikerImpl_BindToStor *ppvObject = (void *) bind->pstrCache; IStream_AddRef((IStream *) bind->pstrCache); - hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&bind->pbscb); + hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown**)&bind->pbscb); if(SUCCEEDED(hres)) { TRACE("Got IBindStatusCallback...\n"); @@ -1296,16 +1296,16 @@ HRESULT WINAPI RegisterBindStatusCallbac if (pbc == NULL || pbsc == NULL) return E_INVALIDARG; - if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown **)&prev))) + if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown **)&prev))) { - IBindCtx_RevokeObjectParam(pbc, (LPOLESTR)BSCBHolder); + IBindCtx_RevokeObjectParam(pbc, BSCBHolder); if (ppbscPrevious) *ppbscPrevious = prev; else IBindStatusCallback_Release(prev); } - return IBindCtx_RegisterObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown *)pbsc); + return IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown *)pbsc); } /*********************************************************************** @@ -1333,11 +1333,11 @@ HRESULT WINAPI RevokeBindStatusCallback( if (pbc == NULL || pbsc == NULL) return E_INVALIDARG; - if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown **)&callback))) + if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown **)&callback))) { if (callback == pbsc) { - IBindCtx_RevokeObjectParam(pbc, (LPOLESTR)BSCBHolder); + IBindCtx_RevokeObjectParam(pbc, BSCBHolder); hr = S_OK; } IBindStatusCallback_Release(pbsc);

1 0

Paul Vriens : urlmon: Cast-qual warning fix.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: bb6e47af6cc6f7e9641621f8af228a7b74b2f672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6e47af6cc6f7e9641621f8a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 08:06:41 2007 +0100 urlmon: Cast-qual warning fix. --- dlls/urlmon/umon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 49260ab..d593c81 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1605,7 +1605,7 @@ HRESULT WINAPI URLDownloadToCacheFileW(L HRESULT hr; LPWSTR ext; - static const WCHAR header[] = { + static WCHAR header[] = { 'H','T','T','P','/','1','.','0',' ','2','0','0',' ', 'O','K','\\','r','\\','n','\\','r','\\','n',0 }; @@ -1631,7 +1631,7 @@ HRESULT WINAPI URLDownloadToCacheFileW(L modified.dwLowDateTime = 0; if (!CommitUrlCacheEntryW(szURL, cache_path, expire, modified, NORMAL_CACHE_ENTRY, - (LPWSTR)header, sizeof(header), NULL, NULL)) + header, sizeof(header), NULL, NULL)) return E_FAIL; if (lstrlenW(cache_path) > dwBufLength)

1 0

Misha Koshelev : msi: Make sure to ignore UI level flags in dialog and files as well.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: d8b00a071d37bfcd13b4152f3f5106021e9d5f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b00a071d37bfcd13b4152f3… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Tue Feb 6 23:53:24 2007 -0600 msi: Make sure to ignore UI level flags in dialog and files as well. --- dlls/msi/action.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/files.c | 2 +- dlls/msi/msipriv.h | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6c2fdf4..1a8fa5a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -642,7 +642,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac msi_apply_transforms( package ); msi_apply_patches( package ); - if ( (msi_get_property_int(package, szUILevel, 0) & 0xf) >= INSTALLUILEVEL_REDUCED ) + if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED ) { package->script->InWhatSequence |= SEQUENCE_UI; rc = ACTION_ProcessUISequence(package); diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 86f9e00..421105c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3542,7 +3542,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 }; - if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE ) + if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE ) return ERROR_SUCCESS; if ( !error_dialog ) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9af403f..e370b1e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -77,7 +77,7 @@ static UINT msi_change_media( MSIPACKAGE static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; - if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE && !gUIHandlerA ) + if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE && !gUIHandlerA ) return ERROR_SUCCESS; error = generate_error_string( package, 1302, 1, mi->disk_prompt ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 815b70c..a89da66 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -46,6 +46,9 @@ #define MSIWORDCOUNT_ADMINISTRATIVE 0x0004 #define MSIWORDCOUNT_PRIVILEGES 0x0008 +/* Install UI level mask for AND operation to exclude flags */ +#define INSTALLUILEVEL_MASK 0x0007 + #define MSITYPE_IS_BINARY(type) (((type) & ~MSITYPE_NULLABLE) == (MSITYPE_STRING|MSITYPE_VALID)) struct tagMSITABLE;

1 0

Andrew Talbot : shell32: Declare some functions static.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 0b1fb44aaf4173636fc3f31c658653e5ce45c3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1fb44aaf4173636fc3f31c6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Feb 6 22:06:26 2007 +0000 shell32: Declare some functions static. --- dlls/shell32/trash.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index ccd347f..8a6de4c 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -254,7 +254,7 @@ static char *create_trashinfo(const char return NULL; } -void remove_trashinfo_file(const char *info_dir, const char *base_name) +static void remove_trashinfo_file(const char *info_dir, const char *base_name) { char *filename_buffer; @@ -386,7 +386,7 @@ void TRASH_DisposeElement(TRASH_ELEMENT SHFree(element->filename); } -HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data) +static HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data) { LPSTR path = NULL; XDG_PARSED_FILE *parsed = NULL; @@ -480,7 +480,7 @@ failed: return ret; } -INT CALLBACK free_item_callback(void *item, void *lParam) +static INT CALLBACK free_item_callback(void *item, void *lParam) { SHFree(item); return TRUE;

1 0

Andrew Talbot : shell32: Declare some functions static.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 388fe7e371977eaeddfaf8b49cd723551a3ca9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=388fe7e371977eaeddfaf8b49… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Feb 6 22:05:44 2007 +0000 shell32: Declare some functions static. --- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shlexec.c | 2 +- dlls/shell32/shlfileop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 208c1d3..5fda4af 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1158,7 +1158,7 @@ ISFHelper_fnAddFolder (ISFHelper * iface * Builds a list of paths like the one used in SHFileOperation from a table of * PIDLs relative to the given base folder */ -WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) +static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) { WCHAR *wszPathsList; WCHAR *wszListPos; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 900cea6..2d4a25e 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -295,7 +295,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, in return found_p1; } -HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize) +static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize) { STRRET strret; IShellFolder* desktop; diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 1aa41de..ac38957 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -662,7 +662,7 @@ static DWORD SHFindAttrW(LPCWSTR pName, * otherwise the ASCII strings are copied into it and the buffer is increased * to point to the location after the final 0 termination char. */ -DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) +static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more) { DWORD size = 0, aSize = 0; LPCSTR aString = (LPCSTR)*pWToFrom;

1 0

Andrew Talbot : shell32: Declare some functions static.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: dfe3d5b88cbb9c6cbaf020d93045817cfc2567f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe3d5b88cbb9c6cbaf020d93… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Feb 6 22:05:10 2007 +0000 shell32: Declare some functions static. --- dlls/shell32/shellole.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index e39a57a..e5d8368 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -55,7 +55,7 @@ static const WCHAR sShell32[12] = {'S',' * Default ClassFactory types */ typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); -IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst); +static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst); /* this table contains all CLSID's of shell32 objects */ static const struct { @@ -397,7 +397,7 @@ static const IClassFactoryVtbl dclfvt; * IDefClF_fnConstructor */ -IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst) +static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pcRefDll, REFIID riidInst) { IDefClFImpl* lpclf;

1 0

Andrew Talbot : shell32: Declare some functions static.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 434c24d83bcd311a953264157f923f2acad4b672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434c24d83bcd311a953264157… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Feb 6 22:04:31 2007 +0000 shell32: Declare some functions static. --- dlls/shell32/dialogs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index e5f06c6..eb5c1a1 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -52,8 +52,8 @@ typedef struct typedef BOOL (*LPFNOFN) (OPENFILENAMEA *) ; WINE_DEFAULT_DEBUG_CHANNEL(shell); -INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ; -void FillList (HWND, char *) ; +static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ; +static void FillList (HWND, char *) ; /************************************************************************* @@ -116,7 +116,7 @@ void WINAPI RunFileDlg( } /* Dialog procedure for RunFileDlg */ -INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { int ic ; char *psz, szMsg[256] ; @@ -235,7 +235,7 @@ INT_PTR CALLBACK RunDlgProc (HWND hwnd, } /* This grabs the MRU list from the registry and fills the combo for the "Run" dialog above */ -void FillList (HWND hCb, char *pszLatest) +static void FillList (HWND hCb, char *pszLatest) { HKEY hkey ; /* char szDbgMsg[256] = "" ; */

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2007