January 2009 - Wine-commits

Nikolay Sivov : msi: Fix potential NULL pointer dereference in ILockBytes_Release (Coverity).
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 2fbe8d23eb2070472d75037ac8024bd9e2509bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fbe8d23eb2070472d75037ac… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jan 24 18:47:33 2009 +0300 msi: Fix potential NULL pointer dereference in ILockBytes_Release (Coverity). --- dlls/msi/storages.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 2e21cb8..302906b 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -134,7 +134,7 @@ static UINT STORAGES_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec static HRESULT stream_to_storage(IStream *stm, IStorage **stg) { - ILockBytes *lockbytes; + ILockBytes *lockbytes = NULL; STATSTG stat; LPVOID data; HRESULT hr; @@ -177,7 +177,7 @@ static HRESULT stream_to_storage(IStream *stm, IStorage **stg) done: msi_free(data); - ILockBytes_Release(lockbytes); + if (lockbytes) ILockBytes_Release(lockbytes); return hr; }

1 0

Nikolay Sivov : msi: Fix NULL dereference in MsiQueryComponentStateW ( Coverity).
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 9598a509162eda3efc00c8c3258f821a32d84dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9598a509162eda3efc00c8c32… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jan 24 16:56:49 2009 +0300 msi: Fix NULL dereference in MsiQueryComponentStateW (Coverity). --- dlls/msi/msi.c | 2 +- dlls/msi/tests/msi.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 86713fd..9503cf9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1553,7 +1553,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, TRACE("(%s, %s, %d, %s, %p)\n", debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, debugstr_w(szComponent), pdwState); - if (!pdwState) + if (!pdwState || !szComponent) return ERROR_INVALID_PARAMETER; if (!szProductCode || !*szProductCode || lstrlenW(szProductCode) != GUID_SIZE - 1) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3ce1a0d..fec9d89 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1278,6 +1278,12 @@ static void test_MsiQueryComponentState(void) ok(state == INSTALLSTATE_NOTUSED || state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_NOTUSED or INSTALLSTATE_LOCAL, got %d\n", state); + /* NULL component, product exists */ + state = MAGIC_ERROR; + r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, NULL, &state); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(state == MAGIC_ERROR, "Expected state not changed, got %d\n", state); + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Andrew Talbot : setupapi: Declare a function static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: f34e733c2cc28766f015f9e2cb1f8a9ddaf78ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34e733c2cc28766f015f9e2c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 24 13:27:07 2009 +0000 setupapi: Declare a function static. --- dlls/setupapi/parser.c | 4 ++-- dlls/setupapi/setupapi_private.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index c94e513..85d87bb 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -365,8 +365,8 @@ static const WCHAR *get_string_subst( const struct inf_file *file, const WCHAR * /* do string substitutions on the specified text */ /* the buffer is assumed to be large enough */ /* returns necessary length not including terminating null */ -unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, WCHAR *buffer, - unsigned int size ) +static unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, + WCHAR *buffer, unsigned int size ) { const WCHAR *start, *subst, *p; unsigned int len, total = 0; diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index caf1d3b..d01edba 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -70,8 +70,6 @@ struct inf_file; extern const WCHAR *DIRID_get_string( int dirid ); extern unsigned int PARSER_string_substA( const struct inf_file *file, const WCHAR *text, char *buffer, unsigned int size ); -extern unsigned int PARSER_string_substW( const struct inf_file *file, const WCHAR *text, - WCHAR *buffer, unsigned int size ); extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); extern WCHAR *PARSER_get_src_root( HINF hinf ); extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context );

1 0

Andrew Talbot : secur32: Declare a function static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 247b7c5a83cd3b9afd589456ca88f458f7892c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=247b7c5a83cd3b9afd589456c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 24 13:27:03 2009 +0000 secur32: Declare a function static. --- dlls/secur32/secur32.c | 2 +- dlls/secur32/secur32_priv.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index f194ab7..2e25b15 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -163,7 +163,7 @@ PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(void) return &securityFunctionTableW; } -PWSTR SECUR32_strdupW(PCWSTR str) +static PWSTR SECUR32_strdupW(PCWSTR str) { PWSTR ret; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9eed1a5..7b4f3ff 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -115,7 +115,6 @@ SecurePackage *SECUR32_findPackageA(PCSTR packageName); /* A few string helpers; will return NULL if str is NULL. Free return with * HeapFree */ -PWSTR SECUR32_strdupW(PCWSTR str); PWSTR SECUR32_AllocWideFromMultiByte(PCSTR str); PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str);

1 0

Paul Vriens : inetcomm: Wrap a few traces in debugstr_a() (Coverity).
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: cdabde7a04c84281a30a40c945e9e9d55876d850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdabde7a04c84281a30a40c94… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 26 13:50:56 2009 +0100 inetcomm: Wrap a few traces in debugstr_a() (Coverity). --- dlls/inetcomm/smtptransport.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index d704525..91070b6 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -735,7 +735,7 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailFrom); HRESULT hr; - TRACE("(%s)\n", pszEmailFrom); + TRACE("(%s)\n", debugstr_a(pszEmailFrom)); if (!pszEmailFrom) return E_INVALIDARG; @@ -761,7 +761,7 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailTo); HRESULT hr; - TRACE("(%s)\n", pszEmailTo); + TRACE("(%s)\n", debugstr_a(pszEmailTo)); if (!pszEmailTo) return E_INVALIDARG; @@ -836,7 +836,7 @@ static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszAuthType); HRESULT hr; - TRACE("(%s)\n", pszAuthType); + TRACE("(%s)\n", debugstr_a(pszAuthType)); if (!pszAuthType) return E_INVALIDARG;

1 0

Huw Davies : comdlg32: Set the correct error code if there is no default printer.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 0806d811ed80edf71133422ac1fe61d5c9e0f06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0806d811ed80edf71133422ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 26 12:15:22 2009 +0000 comdlg32: Set the correct error code if there is no default printer. --- dlls/comdlg32/printdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index a89eab8..318c82b 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3646,6 +3646,7 @@ static BOOL pagesetup_common(pagesetup_data *data) LoadStringW(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255); MessageBoxW(data->u.dlgw->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR); } + COMDLG32_SetCommDlgExtendedError(PDERR_NODEFAULTPRN); return FALSE; } pagesetup_change_printer(def, data);

1 0

Francois Gouget : ddraw: Make some device_parent_*() functions static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 96e81f069822e1e747543b2df72062569e2101f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e81f069822e1e747543b2df… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:53:22 2009 +0100 ddraw: Make some device_parent_*() functions static. --- dlls/ddraw/ddraw.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b185725..7666512 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3389,19 +3389,19 @@ static inline struct IDirectDrawImpl *ddraw_from_device_parent(IWineD3DDevicePar return (struct IDirectDrawImpl *)((char*)iface - FIELD_OFFSET(struct IDirectDrawImpl, device_parent_vtbl)); } -HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); return IDirectDrawImpl_QueryInterface((IDirectDraw7 *)This, riid, object); } -ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); return IDirectDrawImpl_AddRef((IDirectDraw7 *)This); } -ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); return IDirectDrawImpl_Release((IDirectDraw7 *)This);

1 0

Francois Gouget : d3d8: Make some device_parent_*() functions static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 1f601015cda20b5ff863cbe9b000f61e2ac9b040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f601015cda20b5ff863cbe9b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:53:26 2009 +0100 d3d8: Make some device_parent_*() functions static. --- dlls/d3d8/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5ef6311..9e3fb69 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2265,19 +2265,19 @@ static inline struct IDirect3DDevice8Impl *device_from_device_parent(IWineD3DDev - FIELD_OFFSET(struct IDirect3DDevice8Impl, device_parent_vtbl)); } -HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); return IDirect3DDevice8Impl_QueryInterface((IDirect3DDevice8 *)This, riid, object); } -ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); return IDirect3DDevice8Impl_AddRef((IDirect3DDevice8 *)This); } -ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); return IDirect3DDevice8Impl_Release((IDirect3DDevice8 *)This);

1 0

Francois Gouget : d3d10core: Make some device_parent_*() functions static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 191eeef0e40e38395e2290e46c71375375b1712c URL: http://source.winehq.org/git/wine.git/?a=commit;h=191eeef0e40e38395e2290e46… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:53:17 2009 +0100 d3d10core: Make some device_parent_*() functions static. --- dlls/d3d10core/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 978fcd3..7ee3e5e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1123,19 +1123,19 @@ static inline struct d3d10_device *device_from_device_parent(IWineD3DDeviceParen return (struct d3d10_device *)((char*)iface - FIELD_OFFSET(struct d3d10_device, device_parent_vtbl)); } -HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) { struct d3d10_device *This = device_from_device_parent(iface); return d3d10_device_QueryInterface((ID3D10Device *)This, riid, object); } -ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) { struct d3d10_device *This = device_from_device_parent(iface); return d3d10_device_AddRef((ID3D10Device *)This); } -ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) +static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) { struct d3d10_device *This = device_from_device_parent(iface); return d3d10_device_Release((ID3D10Device *)This);

1 0

Francois Gouget : regedit: We don' t bother unregistering window classes on exit, so remove HexEdit_Unregister ().
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 492304128bddc9e8ade50485c5b8a8e349ee4d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=492304128bddc9e8ade50485c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:53:03 2009 +0100 regedit: We don't bother unregistering window classes on exit, so remove HexEdit_Unregister(). --- programs/regedit/hexedit.c | 6 ------ programs/regedit/main.h | 1 - 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index fcf2a58..5e770c9 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -688,9 +688,3 @@ void HexEdit_Register(void) RegisterClass(&wndClass); } - - -void HexEdit_Unregister(void) -{ - UnregisterClass(HEXEDIT_CLASS, NULL); -} diff --git a/programs/regedit/main.h b/programs/regedit/main.h index ab51256..6ecaf6c 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -147,6 +147,5 @@ extern void error(HWND hwnd, INT resId, ...); /* hexedit.c */ extern void HexEdit_Register(void); -extern void HexEdit_Unregister(void); #endif /* __MAIN_H__ */

1 0