January 2009 - Wine-Commits

Austin English : traffic: Add stub dll.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 2de77982a94f8946b6bc26402c3d33551e9f458b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de77982a94f8946b6bc26402… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 28 10:51:51 2009 -0600 traffic: Add stub dll. --- configure | 9 ++++++++ configure.ac | 1 + dlls/traffic/Makefile.in | 13 ++++++++++++ dlls/traffic/traffic.spec | 21 ++++++++++++++++++++ dlls/traffic/traffic_main.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 162775d..9add58a 100755 --- a/configure +++ b/configure @@ -26550,6 +26550,14 @@ dlls/tapi32/Makefile: dlls/tapi32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/tapi32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/traffic/Makefile" +test "x$enable_traffic" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + traffic" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/traffic/Makefile: dlls/traffic/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/traffic/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/twain_32/Makefile" test "x$enable_twain_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ twain_32" @@ -28603,6 +28611,7 @@ do "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;; "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; + "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;; "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;; diff --git a/configure.ac b/configure.ac index 06e3678..682d1da 100644 --- a/configure.ac +++ b/configure.ac @@ -2111,6 +2111,7 @@ WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[AL WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in new file mode 100644 index 0000000..9af37e2 --- /dev/null +++ b/dlls/traffic/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = traffic.dll +IMPORTS = kernel32 + +C_SRCS = \ + traffic_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/traffic/traffic.spec b/dlls/traffic/traffic.spec new file mode 100644 index 0000000..eed26e8 --- /dev/null +++ b/dlls/traffic/traffic.spec @@ -0,0 +1,21 @@ +@ stub TcAddClassMap +@ stub TcAddFilter +@ stub TcAddFlow +@ stub TcCloseInterface +@ stub TcDeleteFilter +@ stub TcDeleteFlow +@ stub TcDeregisterClient +@ stub TcEnumerateFlows +@ stub TcEnumerateInterfaces +@ stub TcGetFlowNameA +@ stub TcGetFlowNameW +@ stub TcModifyFlow +@ stub TcOpenInterfaceA +@ stub TcOpenInterfaceW +@ stub TcQueryFlowA +@ stub TcQueryFlowW +@ stub TcQueryInterface +@ stub TcRegisterClient +@ stub TcSetFlowA +@ stub TcSetFlowW +@ stub TcSetInterface diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c new file mode 100644 index 0000000..421be6c --- /dev/null +++ b/dlls/traffic/traffic_main.c @@ -0,0 +1,44 @@ +/* + * QoS traffic control implementation + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(traffic); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +}

1 0

Marcus Meissner : xcopy: Handle return from vsnprintfW (Coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 1db4c5dc67e6754bad0bee3a442d639ecd80c97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db4c5dc67e6754bad0bee3a4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 28 23:40:56 2009 +0100 xcopy: Handle return from vsnprintfW (Coverity). --- programs/xcopy/xcopy.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index e89c404..eaff10c 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -984,7 +984,8 @@ int XCOPY_wprintf(const WCHAR *format, ...) { #define MAX_WRITECONSOLE_SIZE 65535 va_list parms; - DWORD len, nOut; + DWORD nOut; + int len; DWORD res = 0; /* @@ -1003,6 +1004,10 @@ int XCOPY_wprintf(const WCHAR *format, ...) { va_start(parms, format); len = vsnprintfW(output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(WCHAR), format, parms); va_end(parms); + if (len < 0) { + WINE_FIXME("String too long.\n"); + return 0; + } /* Try to write as unicode all the time we think its a console */ if (toConsole) {

1 0

Marcus Meissner : msxml3: Handle get_element returning NULL (Coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 525a5510d15952cb388cd124ca8d226aeaa081d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=525a5510d15952cb388cd124c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 28 23:25:16 2009 +0100 msxml3: Handle get_element returning NULL (Coverity). --- dlls/msxml3/element.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index f479395..4f0bce9 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -644,6 +644,7 @@ static HRESULT WINAPI domelem_getElementsByTagName( { domelem *This = impl_from_IXMLDOMElement( iface ); LPWSTR szPattern; + xmlNodePtr element; HRESULT hr; TRACE("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), resultList); @@ -654,7 +655,11 @@ static HRESULT WINAPI domelem_getElementsByTagName( lstrcpyW(szPattern+3, bstrName); TRACE("%s\n", debugstr_w(szPattern)); - hr = queryresult_create(get_element(This), szPattern, resultList); + element = get_element(This); + if (!element) + hr = E_FAIL; + else + hr = queryresult_create(element, szPattern, resultList); HeapFree(GetProcessHeap(), 0, szPattern); return hr;

1 0

Marcus Meissner : server: Handle NULL thread in send_hardware_message ( Coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 3b86f463b5cb6217fa835c67c9325f8a592fd1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b86f463b5cb6217fa835c67c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 28 23:58:38 2009 +0100 server: Handle NULL thread in send_hardware_message (Coverity). --- server/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index ab524a7..bc0aea7 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1720,7 +1720,7 @@ DECL_HANDLER(send_hardware_message) if (!(data = mem_alloc( sizeof(*data) ))) { - release_object( thread ); + if (thread) release_object( thread ); return; } memset( data, 0, sizeof(*data) );

1 0

Marcus Meissner : riched20: Handle more missing allocs gracefully (Coverity ).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: a09621b00fe4d57db48cec93a059bf5e2baa4030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a09621b00fe4d57db48cec93a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 29 09:51:05 2009 +0100 riched20: Handle more missing allocs gracefully (Coverity). --- dlls/riched20/reader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index c5a3a35..17f530d 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -219,8 +219,10 @@ void RTFInit(RTF_Info *info) { info->rtfTextBuf = heap_alloc (rtfBufSiz); info->pushedTextBuf = heap_alloc (rtfBufSiz); - if (info->rtfTextBuf == NULL || info->pushedTextBuf == NULL) + if (info->rtfTextBuf == NULL || info->pushedTextBuf == NULL) { ERR ("Cannot allocate text buffers.\n"); + return; + } info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; }

1 0

Marcus Meissner : riched20: Handle cp NULL more gracefully (Coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 9eb4c73ae3e915994bbe3de156a7acf0d3d177a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb4c73ae3e915994bbe3de15… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 29 09:49:05 2009 +0100 riched20: Handle cp NULL more gracefully (Coverity). --- dlls/riched20/reader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 295d6d8..f99ac58 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1044,8 +1044,10 @@ static void ReadColorTbl(RTF_Info *info) } cp = New (RTFColor); - if (cp == NULL) + if (cp == NULL) { ERR ( "%s: cannot allocate color entry\n", fn); + break; + } cp->rtfCNum = cnum++; cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; cp->rtfNextColor = info->colorList;

1 0

Marcus Meissner : riched20: Handle NULL fp more gracefully (Coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 605a40e477386264efc57a097f1df6e9cfb06ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605a40e477386264efc57a097… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 29 09:46:21 2009 +0100 riched20: Handle NULL fp more gracefully (Coverity). --- dlls/riched20/reader.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index f99ac58..c5a3a35 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -871,8 +871,10 @@ static void ReadFontTbl(RTF_Info *info) break; } fp = New (RTFFont); - if (fp == NULL) + if (fp == NULL) { ERR ( "%s: cannot allocate font entry\n", fn); + break; + } fp->rtfNextFont = info->fontList; info->fontList = fp; @@ -992,7 +994,7 @@ static void ReadFontTbl(RTF_Info *info) TRACE("default font codepage %d\n", info->codePage); } } - if (fp->rtfFNum == -1) + if (!fp || (fp->rtfFNum == -1)) ERR( "%s: missing font number\n", fn); /* * Could check other pieces of structure here, too, I suppose.

1 0

Marcus Meissner : riched20: Exit the loop instead of crashing (Coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 3d8fd826e13e310dc118f20cd0591e9edc92a45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8fd826e13e310dc118f20cd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 29 09:42:33 2009 +0100 riched20: Exit the loop instead of crashing (Coverity). --- dlls/riched20/reader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 7fc952b..295d6d8 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1090,8 +1090,10 @@ static void ReadStyleSheet(RTF_Info *info) if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; sp = New (RTFStyle); - if (sp == NULL) + if (sp == NULL) { ERR ( "%s: cannot allocate stylesheet entry\n", fn); + break; + } sp->rtfSName = NULL; sp->rtfSNum = -1; sp->rtfSType = rtfParStyle;

1 0

Marcus Meissner : riched20: Removed unneeded NULL check (Coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 4662271afdbcf67e87fafb847f7c0431dc8e0e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4662271afdbcf67e87fafb847… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 29 09:26:40 2009 +0100 riched20: Removed unneeded NULL check (Coverity). --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4495fb4..574118a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4059,7 +4059,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, origNPos = editor->vert_si.nPos; lineHeight = 24; - if (editor && editor->pBuffer && editor->pBuffer->pDefaultStyle) + if (editor->pBuffer && editor->pBuffer->pDefaultStyle) lineHeight = editor->pBuffer->pDefaultStyle->tm.tmHeight; if (lineHeight <= 0) lineHeight = 24;

1 0

Marcus Meissner : regedit: Check HeapAlloc results (coverity).
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 1082779ddc55cec4f1a6e076140e109baf707502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1082779ddc55cec4f1a6e0761… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jan 29 08:47:42 2009 +0100 regedit: Check HeapAlloc results (coverity). --- programs/regedit/listview.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index fb7688f..333b2a4 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -533,7 +533,12 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli max_val_size++; valName = HeapAlloc(GetProcessHeap(), 0, max_val_name_len * sizeof(WCHAR)); + if (!valName) + goto done; valBuf = HeapAlloc(GetProcessHeap(), 0, max_val_size); + if (!valBuf) + goto done; + if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); } @@ -545,7 +550,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - if (valName && highlightValue && !lstrcmpW(valName, highlightValue)) + if (highlightValue && !lstrcmpW(valName, highlightValue)) bSelected = TRUE; AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); }

1 0