April 2006 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Add WINED3DLOCKED_BOX to wined3d_types.h.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: e71468c7867df877718c53e5f0c68b3b89ef4976 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e71468c7867df877718c53e… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 7 00:25:14 2006 +0200 wined3d: Add WINED3DLOCKED_BOX to wined3d_types.h. --- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 7 +++++++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index b90be9b..5ca962c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -152,7 +152,7 @@ HRESULT WINAPI IDirect3DVolume8Impl_GetD HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; TRACE("(%p) relay %p %p %p %ld\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); - return IWineD3DVolume_LockBox(This->wineD3DVolume, pLockedVolume, pBox, Flags); + return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, pBox, Flags); } HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 322558f..8714368 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -169,7 +169,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Im HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) Relay %p %p %p %ld\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); - return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, pLockedVolume, pBox, Flags); + return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, pBox, Flags); } HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3093b9a..25a50c9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -159,7 +159,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_GetDes return D3D_OK; } -HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { +HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; FIXME("(%p) : pBox=%p stub\n", This, pBox); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index bd08bcf..850b7e0 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -229,7 +229,7 @@ HRESULT WINAPI IWineD3DVolumeTextureImpl return D3D_OK; } -HRESULT WINAPI IWineD3DVolumeTextureImpl_LockBox(IWineD3DVolumeTexture *iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { +HRESULT WINAPI IWineD3DVolumeTextureImpl_LockBox(IWineD3DVolumeTexture *iface, UINT Level, WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { HRESULT hr; IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index b0c3a9c..6c0dc15 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -992,7 +992,7 @@ DECLARE_INTERFACE_(IWineD3DVolumeTexture /*** IWineD3DVolumeTexture methods ***/ STDMETHOD(GetLevelDesc)(THIS_ UINT Level, WINED3DVOLUME_DESC *pDesc) PURE; STDMETHOD(GetVolumeLevel)(THIS_ UINT Level, struct IWineD3DVolume** ppVolumeLevel) PURE; - STDMETHOD(LockBox)(THIS_ UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; + STDMETHOD(LockBox)(THIS_ UINT Level, WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE; STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE; }; @@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DVOLUME_DESC * pDesc) PURE; - STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; + STDMETHOD(LockBox)(THIS_ WINED3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; STDMETHOD(UnlockBox)(THIS) PURE; STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE; STDMETHOD(CleanDirtyBox)(THIS) PURE; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index fb9f531..d2704f2 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -695,6 +695,13 @@ typedef struct _WINED3DLOCKED_RECT { void* pBits; } WINED3DLOCKED_RECT; +typedef struct _WINED3DLOCKED_BOX { + INT RowPitch; + INT SlicePitch; + void* pBits; +} WINED3DLOCKED_BOX; + + /*Vertex cache optimization hints.*/ typedef struct WINED3DDEVINFO_VCACHE { /*Must be a 4 char code FOURCC (e.g. CACH)*/

1 0

James Hawkins : ntdll: Return error if the signal index equals the size of the array.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 14faf12845a7359dabc4aced7e3eca7849be0183 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14faf12845a7359dabc4ace… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 7 01:16:48 2006 -0500 ntdll: Return error if the signal index equals the size of the array. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d957cd3..39b20d0 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1436,7 +1436,7 @@ static int set_handler( int sig, int hav */ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0;

1 0

Mike McCormack : oleaut32: Remove unnecessary check for NULL.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: e0276035a4b6bef1a9020e9f27225edadb318cdb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0276035a4b6bef1a9020e9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 16:28:05 2006 +0900 oleaut32: Remove unnecessary check for NULL. --- dlls/oleaut32/typelib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 61403a6..43dfb73 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -347,8 +347,7 @@ HRESULT WINAPI LoadTypeLibEx( { case REGKIND_DEFAULT: /* don't register typelibs supplied with full path. Experimentation confirms the following */ - if ((!szFile) || - ((szFile[0] == '\\') && (szFile[1] == '\\')) || + if (((szFile[0] == '\\') && (szFile[1] == '\\')) || (szFile[0] && (szFile[1] == ':'))) break; /* else fall-through */

1 0

Mike McCormack : server: Avoid comparison of -1 with an unsigned variable.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 14278b42994e58bbe0266ffff28bed92ced2f7ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14278b42994e58bbe0266ff… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 15:06:15 2006 +0900 server: Avoid comparison of -1 with an unsigned variable. --- server/registry.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index 63b3c12..f2a5ce5 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1233,9 +1233,10 @@ static struct key_value *parse_value_nam } else { - if ((*len = parse_strW( info->tmp, &maxlen, buffer + 1, '\"' )) == -1) goto error; + int r = parse_strW( info->tmp, &maxlen, buffer + 1, '\"' ); + if (r == -1) goto error; + *len = r + 1; /* for initial quote */ name.len = maxlen - sizeof(WCHAR); - (*len)++; /* for initial quote */ } while (isspace(buffer[*len])) (*len)++; if (buffer[*len] != '=') goto error;

1 0

Mike McCormack : libwine: Fix a memory leak.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: f7679b4594afc38c380a7ed3bd8721f06b87214e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7679b4594afc38c380a7ed… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 14:20:49 2006 +0900 libwine: Fix a memory leak. --- libs/wine/config.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 5aadf73..a130021 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -117,7 +117,7 @@ static char *build_path( const char *dir } /* return the directory that contains the library at run-time */ -static const char *get_runtime_libdir(void) +static char *get_runtime_libdir(void) { #ifdef HAVE_DLADDR Dl_info info; @@ -279,8 +279,8 @@ static char *running_from_build_dir( con void wine_init_argv0_path( const char *argv0 ) { size_t size, len; - const char *p, *libdir, *basename; - char *cwd; + const char *p, *basename; + char *cwd, *libdir; if (!(p = strrchr( argv0, '/' ))) basename = argv0; @@ -292,10 +292,14 @@ void wine_init_argv0_path( const char *a if ((libdir = get_runtime_libdir())) { bindir = build_path( libdir, LIB_TO_BINDIR ); - if ((build_dir = running_from_build_dir( libdir, bindir ))) goto in_build_dir; - + if ((build_dir = running_from_build_dir( libdir, bindir ))) + { + free( libdir ); + goto in_build_dir; + } dlldir = build_path( libdir, LIB_TO_DLLDIR ); datadir = build_path( libdir, LIB_TO_DATADIR ); + free( libdir ); return; }

1 0

Mike McCormack : msi: Fix a logic error.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: ccdd0869a1afc9b951eed6da4ead9af6a739896b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccdd0869a1afc9b951eed6d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 13:33:43 2006 +0900 msi: Fix a logic error. --- dlls/msi/classes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index b7799f3..75a0ffa 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -863,8 +863,8 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE * yes. MSDN says that these are based on _Feature_ not on * Component. So verify the feature is to be installed */ - if ((!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL )) && - !(install_on_demand && + if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL ) || + !(install_on_demand && ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED ))) { TRACE("Skipping class %s reg due to disabled feature %s\n",

1 0

Mike McCormack : msi: Avoid accessing a null pointer.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: ed580a1d85c7f915794d64801f1aab49b8700526 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed580a1d85c7f915794d648… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 13:33:16 2006 +0900 msi: Avoid accessing a null pointer. --- dlls/msi/record.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index c1f6d1f..0cfd7a9 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -100,8 +100,10 @@ MSIHANDLE WINAPI MsiCreateRecord( unsign rec = MSI_CreateRecord( cParams ); if( rec ) + { ret = alloc_msihandle( &rec->hdr ); - msiobj_release( &rec->hdr ); + msiobj_release( &rec->hdr ); + } return ret; }

1 0

Mike McCormack : msi: Check the correct pointer after allocating memory.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: ed9745b94f61d85bc129db33a5ca96eb400fcc2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed9745b94f61d85bc129db3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 13:30:40 2006 +0900 msi: Check the correct pointer after allocating memory. --- dlls/msi/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 7e514c3..cb595e8 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -82,7 +82,7 @@ string_table *msi_init_stringtable( int if( entries < 1 ) entries = 1; st->strings = msi_alloc_zero( sizeof (msistring) * entries ); - if( !st ) + if( !st->strings ) { msi_free( st ); return NULL;

1 0

Mike McCormack : msi: Fix possible free of uninitialized pointer.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: 85e8d3adf8820fa43e7998700a34e0e08907eca2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85e8d3adf8820fa43e79987… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 13:29:56 2006 +0900 msi: Fix possible free of uninitialized pointer. --- dlls/msi/table.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 8ce24fa..167dd81 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -683,8 +683,8 @@ HRESULT init_string_table( IStorage *stg string_table *load_string_table( IStorage *stg ) { string_table *st = NULL; - CHAR *data; - USHORT *pool; + CHAR *data = NULL; + USHORT *pool = NULL; UINT r, datasize = 0, poolsize = 0, codepage; DWORD i, count, offset, len, n; static const WCHAR szStringData[] = {

1 0

Alexandre Julliard : kernel: Fixed set_process_name for the winevdm case.
by Alexandre Julliard April 7, 2006

April 7, 2006

Module: wine Branch: refs/heads/master Commit: fcb771d9c0eafd812432b333cba6f2da0b4e5d8b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fcb771d9c0eafd812432b33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 11:45:22 2006 +0200 kernel: Fixed set_process_name for the winevdm case. --- dlls/kernel/process.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 2cdc0ef..3056263 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -873,26 +873,30 @@ static void set_process_name( int *argc, { strcpy( argv[0], name ); offset = argv[1] - (argv[0] + strlen(name) + 1); + memmove( argv[1] - offset, argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < *argc; i++) argv[i] -= offset; } else { offset = argv[1] - argv[0]; + memmove( argv[1] - offset, argv[1], end - argv[1] ); + memset( end - offset, 0, offset ); + for (i = 1; i < *argc; i++) argv[i-1] = argv[i] - offset; + argv[i-1] = NULL; + (*argc)--; } - memmove( argv[1] - offset, argv[1], end - argv[1] ); - memset( end - offset, 0, offset ); - for (i = 1; i < *argc; i++) argv[i-1] = argv[i] - offset; - argv[i-1] = NULL; - (*argc)--; - return; } -#endif /* HAVE_PRCTL */ - - if (name) argv[0] = name; else +#endif /* HAVE_PRCTL */ { - /* remove argv[0] */ - memmove( argv, argv + 1, *argc * sizeof(argv[0]) ); - (*argc)--; + if (name) argv[0] = name; + else + { + /* remove argv[0] */ + memmove( argv, argv + 1, *argc * sizeof(argv[0]) ); + (*argc)--; + } } }

1 0