September 2014 - Wine-Commits

Marcus Meissner : dwrite: Check correct variable for NULL (Coverity).
by Alexandre Julliard Sept. 23, 2014

Sept. 23, 2014

Module: wine Branch: master Commit: 50c8766cce35a497370a615e0fcf0b92d4874f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c8766cce35a497370a615e0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Sep 23 08:45:12 2014 +0200 dwrite: Check correct variable for NULL (Coverity). --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6e7de46..25b47ef 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1049,7 +1049,7 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon This = heap_alloc(sizeof(struct dwrite_fontfamily)); if (!This) return E_OUTOFMEMORY; This->data = heap_alloc(sizeof(struct dwrite_fontfamily_data)); - if (!This) + if (!This->data) { heap_free(This); return E_OUTOFMEMORY; @@ -1346,7 +1346,7 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This = heap_alloc(sizeof(struct dwrite_fontface)); if (!This) return E_OUTOFMEMORY; This->data = heap_alloc(sizeof(struct dwrite_fontface_data)); - if (!This) + if (!This->data) { heap_free(This); return E_OUTOFMEMORY;

1 0

André Hentschel : ntdll: Use a dynamic buffer for change notification data.
by Alexandre Julliard Sept. 23, 2014

Sept. 23, 2014

Module: wine Branch: master Commit: 6d50cfcac28f84e07777fc10874887356832102e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d50cfcac28f84e07777fc108… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 22 23:43:26 2014 +0200 ntdll: Use a dynamic buffer for change notification data. --- dlls/ntdll/directory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 01998b2..9b5852a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -3307,8 +3307,10 @@ struct read_changes_info HANDLE FileHandle; PVOID Buffer; ULONG BufferSize; + ULONG data_size; PIO_APC_ROUTINE apc; void *apc_arg; + char data[1]; }; /* callback for ioctl user APC */ @@ -3322,14 +3324,13 @@ static void WINAPI read_changes_user_apc( void *arg, IO_STATUS_BLOCK *io, ULONG static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) { struct read_changes_info *info = user; - char data[PATH_MAX]; NTSTATUS ret; int size; SERVER_START_REQ( read_change ) { req->handle = wine_server_obj_handle( info->FileHandle ); - wine_server_set_reply( req, data, PATH_MAX ); + wine_server_set_reply( req, info->data, info->data_size ); ret = wine_server_call( req ); size = wine_server_reply_size( reply ); } @@ -3340,7 +3341,7 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st PFILE_NOTIFY_INFORMATION pfni = info->Buffer; int i, left = info->BufferSize; DWORD *last_entry_offset = NULL; - struct filesystem_event *event = (struct filesystem_event*)data; + struct filesystem_event *event = (struct filesystem_event*)info->data; while (size && left >= sizeof(*pfni)) { @@ -3413,6 +3414,7 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, { struct read_changes_info *info; NTSTATUS status; + ULONG size = max( 4096, BufferSize ); ULONG_PTR cvalue = ApcRoutine ? 0 : (ULONG_PTR)ApcContext; TRACE("%p %p %p %p %p %p %u %u %d\n", @@ -3425,7 +3427,7 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, if (CompletionFilter == 0 || (CompletionFilter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof *info ); + info = RtlAllocateHeap( GetProcessHeap(), 0, offsetof( struct read_changes_info, data[size] )); if (!info) return STATUS_NO_MEMORY; @@ -3434,6 +3436,7 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, info->BufferSize = BufferSize; info->apc = ApcRoutine; info->apc_arg = ApcContext; + info->data_size = size; SERVER_START_REQ( read_directory_changes ) {

1 0

André Hentschel : dwrite: Check correct variable ( Coverity).
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: b12381a04a4183f046cc70113db094f79d54db3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12381a04a4183f046cc70113… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 22 20:46:51 2014 +0200 dwrite: Check correct variable (Coverity). --- dlls/dwrite/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c626201..ec7f92d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -364,7 +364,7 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt *strings = NULL; New = heap_alloc(sizeof(struct localizedstrings)); - if (!This) return E_OUTOFMEMORY; + if (!New) return E_OUTOFMEMORY; New->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; New->ref = 1;

1 0

Qian Hong : mshtml: Using UTF-8 as default charset in bind_mon_to_wstr.
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: 2eeffe8acd829ebeb4bbabc6c7e1ebd0725e40ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eeffe8acd829ebeb4bbabc6c… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Sep 20 00:48:00 2014 +0800 mshtml: Using UTF-8 as default charset in bind_mon_to_wstr. --- dlls/mshtml/navigate.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c29e211..195f82e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -938,7 +938,6 @@ static const BSCallbackVtbl BufferBSCVtbl = { HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) { BufferBSC *bsc; - int cp = CP_ACP; WCHAR *text; HRESULT hres; @@ -981,19 +980,17 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) break; case BOM_UTF8: - cp = CP_UTF8; - /* fallthrough */ default: { DWORD len; - len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + len = MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, NULL, 0); text = heap_alloc((len+1)*sizeof(WCHAR)); if(!text) { hres = E_OUTOFMEMORY; break; } - MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, text, len); text[len] = 0; } }

1 0

Nikolay Sivov : usp10: Use proper type for return value.
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: e65307f29f18fff724d2630e6263169a5a4d9f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65307f29f18fff724d2630e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 22 19:21:47 2014 +0400 usp10: Use proper type for return value. --- dlls/usp10/usp10_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 77bb20d..504bd55 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -208,7 +208,7 @@ static inline BOOL is_consonant( int type ) return (type == lex_Ra || type == lex_Consonant); } -static inline WCHAR get_table_entry( const unsigned short *table, WCHAR ch ) +static inline unsigned short get_table_entry( const unsigned short *table, WCHAR ch ) { return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; }

1 0

Jacek Caban : vbscript: Don't try to convert int to short in return_int.
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: 85b989927f0118dda8900e1db897de7f3f505ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b989927f0118dda8900e1db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 22 15:52:13 2014 +0200 vbscript: Don't try to convert int to short in return_int. --- dlls/vbscript/global.c | 28 ++++------------------------ dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/tests/error.vbs | 1 + 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 311c892..2901623 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -112,9 +112,6 @@ static HRESULT return_short(VARIANT *res, short val) static HRESULT return_int(VARIANT *res, int val) { - if((short)val == val) - return return_short(res, val); - if(res) { V_VT(res) = VT_I4; V_I4(res) = val; @@ -417,9 +414,7 @@ static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI if(!res) return DISP_E_BADVARTYPE; - V_VT(res) = VT_I4; - V_I4(res) = i; - return S_OK; + return return_int(res, i); } static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1778,12 +1773,7 @@ static HRESULT Global_ScriptEngineMajorVersion(vbdisp_t *This, VARIANT *arg, uns assert(args_cnt == 0); - if(res) { - V_VT(res) = VT_I4; - V_I4(res) = VBSCRIPT_MAJOR_VERSION; - } - - return S_OK; + return return_int(res, VBSCRIPT_MAJOR_VERSION); } static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1792,12 +1782,7 @@ static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, uns assert(args_cnt == 0); - if(res) { - V_VT(res) = VT_I4; - V_I4(res) = VBSCRIPT_MINOR_VERSION; - } - - return S_OK; + return return_int(res, VBSCRIPT_MINOR_VERSION); } static HRESULT Global_ScriptEngineBuildVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1806,12 +1791,7 @@ static HRESULT Global_ScriptEngineBuildVersion(vbdisp_t *This, VARIANT *arg, uns assert(args_cnt == 0); - if(res) { - V_VT(res) = VT_I4; - V_I4(res) = VBSCRIPT_BUILD_VERSION; - } - - return S_OK; + return return_int(res, VBSCRIPT_BUILD_VERSION); } static HRESULT Global_FormatNumber(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d688e17..9e64412 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -242,6 +242,7 @@ Call ok(x = 2, "InStr returned " & x) x = InStr("abcd", "bc") Call ok(x = 2, "InStr returned " & x) +Call ok(getVT(x) = "VT_I4*", "getVT(InStr) returned " & getVT(x)) x = InStr("abc", "bc") Call ok(x = 2, "InStr returned " & x) @@ -335,6 +336,7 @@ Call ok(Len("") = 0, "Len() = " & Len("")) Call ok(Len(1) = 1, "Len(1) = " & Len(1)) Call ok(isNull(Len(null)), "Len(null) = " & Len(null)) Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) +Call ok(getVT(Len("abc")) = "VT_I4", "getVT(Len(abc)) = " & getVT(Len("abc"))) Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 830344c..3bf03df 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -75,6 +75,7 @@ const RPC_S_SERVER_UNAVAILABLE = &h800706BA& const CO_E_SERVER_EXEC_FAILURE = &h80080005& call ok(Err.Number = 0, "Err.Number = " & Err.Number) +call ok(getVT(Err.Number) = "VT_I4", "getVT(Err.Number) = " & getVT(Err.Number)) dim calledFunc

1 0

Marcus Meissner : wbemprox: Fixed a memory leak in get_sd (Coverity).
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: e0905d780e1d94a24659f76b59562d659066a15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0905d780e1d94a24659f76b5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 21 14:23:08 2014 +0200 wbemprox: Fixed a memory leak in get_sd (Coverity). --- dlls/wbemprox/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index 0ff6c0b..d3057e0 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -120,8 +120,11 @@ static HRESULT get_sd( SECURITY_DESCRIPTOR **sd, DWORD *size ) if (SUCCEEDED(hr)) { - if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) + if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) { + HeapFree( GetProcessHeap(), 0, *sd ); + *sd = NULL; hr = E_FAIL; + } } return hr;

1 0

Nikolay Sivov : dwrite: Use proper type for return value.
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: 2c6cc0be468d8668043ed414218aa020226f8905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6cc0be468d8668043ed4142… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 22 19:22:27 2014 +0400 dwrite: Use proper type for return value. --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 740b61e..bec0235 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -381,7 +381,7 @@ static inline void set_break_condition(UINT32 pos, enum BreakConditionLocation l } } -static inline WCHAR get_table_entry(const unsigned short *table, WCHAR ch) +static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) { return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; }

1 0

Vincent Povirk : gdiplus: Process a row instead of a column in inner conversion loop.
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: 3fc386fc865c20d14798786943c8de0d9921d55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc386fc865c20d1479878694… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 18 13:22:14 2014 -0500 gdiplus: Process a row instead of a column in inner conversion loop. --- dlls/gdiplus/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7964cd8..0564f33 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -582,8 +582,8 @@ GpStatus convert_pixels(INT width, INT height, } #define convert_indexed_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE index; \ ARGB argb; \ BYTE *color = (BYTE *)&argb; \ @@ -595,8 +595,8 @@ GpStatus convert_pixels(INT width, INT height, } while (0); #define convert_rgb_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x); \ @@ -605,8 +605,8 @@ GpStatus convert_pixels(INT width, INT height, } while (0); #define convert_rgb_to_indexed(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \

1 0

Marcus Meissner : dwrite: Avoid NULL ptr dereference (Coverity).
by Alexandre Julliard Sept. 22, 2014

Sept. 22, 2014

Module: wine Branch: master Commit: d684d776c24bfb2b680dff8675d597919df9c19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d684d776c24bfb2b680dff867… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 21 14:26:13 2014 +0200 dwrite: Avoid NULL ptr dereference (Coverity). --- dlls/dwrite/layout.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0b33b92..f6b1e8c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -271,6 +271,8 @@ static struct layout_range *alloc_layout_range_from(struct layout_range *from, c static void free_layout_range(struct layout_range *range) { + if (!range) + return; if (range->object) IDWriteInlineObject_Release(range->object); if (range->effect)

1 0