January 2007 - Wine-commits

Francois Gouget : ddrawex: Self-register the DirectDrawFactory CoClass.
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: 4c93eb2e66b224d0f08eac907e7134692d36181d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c93eb2e66b224d0f08eac907… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 5 18:48:33 2007 +0100 ddrawex: Self-register the DirectDrawFactory CoClass. --- dlls/ddrawex/Makefile.in | 5 +- dlls/ddrawex/main.c | 19 --- dlls/ddrawex/regsvr.c | 360 ++++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf | 1 + 4 files changed, 364 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c93eb2e66b224d0f08ea…

1 0

Francois Gouget : wine.inf: Self-register objsel.dll.
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: fa053b74c15f5c044a4b1a7a98330b2d3d1a397d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa053b74c15f5c044a4b1a7a9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 5 18:47:55 2007 +0100 wine.inf: Self-register objsel.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 8257e44..f21a0de 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2132,6 +2132,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,msi.dll,1 11,,msiexec.exe,1 11,,msxml3.dll,1 +11,,objsel.dll,1 11,,ole32.dll,1 11,,oleaut32.dll,1 11,,qcap.dll,1

1 0

Francois Gouget : advapi32: Remove a useless macro.
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: f46cfe601cb1992e34700fac5838d0ee81cfcfd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46cfe601cb1992e34700fac5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 12:45:46 2007 +0100 advapi32: Remove a useless macro. --- dlls/advapi32/crypt.c | 375 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 294 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f46cfe601cb1992e34700…

1 0

Francois Gouget : taskmgr: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: bf52744657be681e5ae435ef7f7b10d6176b080d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf52744657be681e5ae435ef7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 12:55:05 2007 +0100 taskmgr: Print GetLastError() in decimal with '%u'. --- programs/taskmgr/taskmgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index af4d54b..d59bd19 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -731,8 +731,8 @@ LPTSTR GetLastErrorText(LPTSTR lpszBuf, if (!dwRet || ( (long)dwSize < (long)dwRet+14)) { lpszBuf[0] = TEXT('\0'); } else { - lpszTemp[lstrlen(lpszTemp)-2] = TEXT('\0'); /*remove cr and newline character */ - _stprintf(lpszBuf, TEXT("%s (0x%x)"), lpszTemp, (int)GetLastError()); + lpszTemp[lstrlen(lpszTemp)-2] = TEXT('\0'); /* remove cr and newline character */ + _stprintf(lpszBuf, TEXT("%s (%u)"), lpszTemp, GetLastError()); } if (lpszTemp) { LocalFree((HLOCAL)lpszTemp);

1 0

Francois Gouget : dinput8: Self-register the DirectInput8 CoClass.
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: 168b30011307d1548d7489e4039880d014c48196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=168b30011307d1548d7489e40… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 5 18:48:18 2007 +0100 dinput8: Self-register the DirectInput8 CoClass. --- dlls/dinput8/Makefile.in | 3 +- dlls/dinput8/dinput8_main.c | 20 --- dlls/dinput8/regsvr.c | 359 +++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf | 4 +- 4 files changed, 362 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=168b30011307d1548d748…

1 0

Kai Blin : shlwapi: Remove redundant check in assignment, unicode version ( Coverity).
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: 9595ea7cd6d4b4b8f386b75e93aef4348c28d246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9595ea7cd6d4b4b8f386b75e9… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jan 5 12:11:21 2007 +0100 shlwapi: Remove redundant check in assignment, unicode version (Coverity). --- dlls/shlwapi/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 3ad4ebc..fe77ddb 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1459,7 +1459,7 @@ DWORD WINAPI SHQueryValueExW(HKEY hKey, if ((!pvData) || (dwRet == ERROR_MORE_DATA) ) { WCHAR cNull = '\0'; - nBytesToAlloc = (!pvData || (dwRet == ERROR_MORE_DATA)) ? dwUnExpDataLen : *pcbData; + nBytesToAlloc = dwUnExpDataLen; szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExW (hKey, lpszValue, lpReserved, NULL, (LPBYTE)szData, &nBytesToAlloc);

1 0

Kai Blin : user32: If pTest was allocated, length has to be > 0 (Coverity).
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: 7bfe2b06c359965e8b314282f963f9dd696b4229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfe2b06c359965e8b314282f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jan 5 12:40:56 2007 +0100 user32: If pTest was allocated, length has to be > 0 (Coverity). --- dlls/user32/combo.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 9674840..badb2ef 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -995,8 +995,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lph if( pText ) { - if( length ) GetWindowTextW( lphc->hWndEdit, pText, length + 1); - else pText[0] = '\0'; + GetWindowTextW( lphc->hWndEdit, pText, length + 1); idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, (WPARAM)(-1), (LPARAM)pText ); HeapFree( GetProcessHeap(), 0, pText );

1 0

Kai Blin : ole32: Remove redundant NULL check (Coverity).
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: fb2a3914e11a3ae9dbe656f0fc27e4a9ef47d480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2a3914e11a3ae9dbe656f0f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jan 5 11:00:43 2007 +0100 ole32: Remove redundant NULL check (Coverity). --- dlls/ole32/ole2.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 151957c..5da68fc 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2562,15 +2562,7 @@ BSTR WINAPI PropSysAllocString(LPCOLESTR */ newBuffer++; - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (str != 0) - memcpy(newBuffer, str, bufferSize); - else - memset(newBuffer, 0, bufferSize); + memcpy(newBuffer, str, bufferSize); /* * Make sure that there is a nul character at the end of the

1 0

Jeff Latimer : wininet: Ensure null check before dereference.
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: d7697bd55ef06c0315926251914bc19e644802c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7697bd55ef06c03159262519… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Jan 5 11:54:26 2007 +1100 wininet: Ensure null check before dereference. --- dlls/wininet/utility.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index baf04a6..273177d 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -50,7 +50,7 @@ time_t ConvertTimeString(LPCWSTR asctime struct tm t; int timelen = strlenW(asctime); - if(!asctime || !timelen) + if(!timelen) return 0; /* FIXME: the atoiWs below rely on that tmpChar is \0 padded */

1 0

Jeff Latimer : winemp3.acm: Ensure null check before dereference.
by Alexandre Julliard 05 Jan '07

05 Jan '07

Module: wine Branch: master Commit: cfdd3349f869fc971275a47357dffe7fbcaeb21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfdd3349f869fc971275a4735… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Jan 5 11:55:23 2007 +1100 winemp3.acm: Ensure null check before dereference. --- dlls/winemp3.acm/interface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 3af2bbc..6f039a7 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -122,10 +122,6 @@ static int read_buf_byte(struct mpstr *m while(pos >= mp->tail->size) { remove_buf(mp); pos = mp->tail->pos; - if(!mp->tail) { - fprintf(stderr,"Fatal error!\n"); - exit(1); - } } b = mp->tail->pnt[pos];

1 0