August 2008 - Wine-Commits - list.winehq.org

Rob Shearman : rpcrt4: Remove unreachable code in EmbeddedComplexSize.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 27ae234b04d2d9617bcbc0e3d900b394ccbba349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae234b04d2d9617bcbc0e3d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:33:42 2008 +0100 rpcrt4: Remove unreachable code in EmbeddedComplexSize. RPC_FC_ERROR_STATUS_T has a value of 0x10 and therefore isn't a possible value of "flags_type & 0xf" in the switch statement. --- dlls/rpcrt4/ndr_marshall.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4f5506c..bda04be 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2584,8 +2584,6 @@ static unsigned long EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, return sizeof(double); case RPC_FC_HYPER: return sizeof(ULONGLONG); - case RPC_FC_ERROR_STATUS_T: - return sizeof(error_status_t); case RPC_FC_ENUM16: return sizeof(UINT); default:

1 0

Rob Shearman : ole32: Remove dead code in StorageImpl_LoadFileHeader.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 23bb94c005bbc25d5ae1532e95c6534b30f6e842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bb94c005bbc25d5ae1532e9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:34:04 2008 +0100 ole32: Remove dead code in StorageImpl_LoadFileHeader. --- dlls/ole32/storage32.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 565146b..663ff4f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3139,16 +3139,8 @@ static HRESULT StorageImpl_LoadFileHeader( /* * Make the bitwise arithmetic to get the size of the blocks in bytes. */ - if ((1 << 2) == 4) - { - This->bigBlockSize = 0x000000001 << (DWORD)This->bigBlockSizeBits; - This->smallBlockSize = 0x000000001 << (DWORD)This->smallBlockSizeBits; - } - else - { - This->bigBlockSize = 0x000000001 >> (DWORD)This->bigBlockSizeBits; - This->smallBlockSize = 0x000000001 >> (DWORD)This->smallBlockSizeBits; - } + This->bigBlockSize = 0x000000001 << (DWORD)This->bigBlockSizeBits; + This->smallBlockSize = 0x000000001 << (DWORD)This->smallBlockSizeBits; /* * Right now, the code is making some assumptions about the size of the

1 0

Rob Shearman : quartz: Use memcmp instead of strncmp in MPEGSplitter_pre_connect.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: a35431a194c4924ea447cb9e6278954947aa2fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35431a194c4924ea447cb9e6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:33:17 2008 +0100 quartz: Use memcmp instead of strncmp in MPEGSplitter_pre_connect. header isn't a string and therefore using strncmp doesn't make sense. --- dlls/quartz/mpegsplit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index ee93e2e..8625277 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -471,7 +471,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO pos += 4; /* Skip ID3 v2 tag, if any */ - if (SUCCEEDED(hr) && !strncmp("ID3", (char*)header, 3)) + if (SUCCEEDED(hr) && !memcmp("ID3", header, 3)) do { UINT length; hr = IAsyncReader_SyncRead(pPin->pReader, pos, 6, header + 4);

1 0

Rob Shearman : hhctrl.ocx: Nul-terminate url_indicator constant in NavigateToUrl.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 89b479c8ec123f8b0518758942ae9e9df3e98948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b479c8ec123f8b051875894… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:33:01 2008 +0100 hhctrl.ocx: Nul-terminate url_indicator constant in NavigateToUrl. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 0e81a99..6a694a9 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -89,7 +89,7 @@ BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) BOOL ret; HRESULT hres; - static const WCHAR url_indicator[] = {':', '/', '/'}; + static const WCHAR url_indicator[] = {':', '/', '/', 0}; TRACE("%s\n", debugstr_w(surl));

1 0

Rob Shearman : oleaut32: Fix buffer length passed to VARIANT_DI_tostringW in VarBstrFromCy.
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: b234173b1fdf446c8425ca4de16e53f290ce7a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b234173b1fdf446c8425ca4de… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:32:50 2008 +0100 oleaut32: Fix buffer length passed to VARIANT_DI_tostringW in VarBstrFromCy. It's the number of elements, not the number of bytes. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 318a58a..5f697c8 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6516,7 +6516,7 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) VARIANT_int_add(decVal.bitsnum, 3, &one, 1); } decVal.bitsnum[2] = 0; - VARIANT_DI_tostringW(&decVal, buff, sizeof(buff)); + VARIANT_DI_tostringW(&decVal, buff, sizeof(buff)/sizeof(buff[0])); if (dwFlags & LOCALE_USE_NLS) {

1 0

Rob Shearman : shell32: Don' t assign a result from a function that returns a BOOL to an HRESULT in shellex_get_dataobj .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 3261814e08e791c64d53c2c285dd7ef4231d1039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3261814e08e791c64d53c2c28… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:32:26 2008 +0100 shell32: Don't assign a result from a function that returns a BOOL to an HRESULT in shellex_get_dataobj. Otherwise there could be confusion as to what type GetFullPathNameW is returning. --- dlls/shell32/shlexec.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index d83a132..bf820ca 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1091,10 +1091,11 @@ static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) else { WCHAR fullpath[MAX_PATH]; + BOOL ret; fullpath[0] = 0; - r = GetFullPathNameW( sei->lpFile, MAX_PATH, fullpath, NULL ); - if (!r) + ret = GetFullPathNameW( sei->lpFile, MAX_PATH, fullpath, NULL ); + if (!ret) goto end; pidl = ILCreateFromPathW( fullpath );

1 0

Rob Shearman : urlmon: Fix testing of HRESULT types with not operator instead of comparing against S_OK .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 5dd6d798a46d6748907137038184acf17a27ef26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd6d798a46d6748907137038… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:32:16 2008 +0100 urlmon: Fix testing of HRESULT types with not operator instead of comparing against S_OK. This makes it more obvious what the code is doing. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index f6ea427..d6a4242 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -189,7 +189,7 @@ static HRESULT Binding_MoreCacheData(Binding *This, const char *buf, DWORD dwByt BINDSTATUS_BEGINDOWNLOADDATA : BINDSTATUS_DOWNLOADINGDATA, This->URLName); - if (!hr) + if (hr == S_OK) { STGMEDIUM stg; FORMATETC fmt;

1 0

Rob Shearman : shlwapi: Fix testing of HRESULT types with not operator instead of comparing against S_OK .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 9dd75ea09313014f7cbacaab307c27e6b4ac44c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd75ea09313014f7cbacaab3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:31:57 2008 +0100 shlwapi: Fix testing of HRESULT types with not operator instead of comparing against S_OK. This makes it more obvious what the code is doing. --- dlls/shlwapi/ordinal.c | 6 +++--- dlls/shlwapi/string.c | 8 +++++--- dlls/shlwapi/url.c | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index d0bff7f..b7be1f1 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -422,11 +422,11 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) pIEnumFormatEtc = NULL; hRet = IUnknown_QueryInterface(pIUnknown, &IID_IEnumFORMATETC, (PVOID)&pIEnumFormatEtc); - if (!hRet && pIEnumFormatEtc) + if (hRet == S_OK && pIEnumFormatEtc) { /* Clone and register the enumerator */ hRet = IEnumFORMATETC_Clone(pIEnumFormatEtc, &pClone); - if (!hRet && pClone) + if (hRet == S_OK && pClone) { RegisterFormatEnumerator(lpBC, pClone, 0); @@ -1462,7 +1462,7 @@ HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID ri hRet = IUnknown_QueryInterface(lpUnknown, &IID_IServiceProvider, (LPVOID*)&pService); - if (!hRet && pService) + if (hRet == S_OK && pService) { TRACE("QueryInterface returned (IServiceProvider*)%p\n", pService); diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index abbfdba..89cf5ef 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2511,8 +2511,9 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, DWORD dwMode = 0; INT nWideCharCount = len - 1; - if (!ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &nWideCharCount, lpDstStr, - lpiLen)) + if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, + &nWideCharCount, lpDstStr, + lpiLen) == S_OK) return 0; if (nWideCharCount < len - 1) @@ -2523,7 +2524,8 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, *lpiLen = 0; - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, mem, lpiLen)) + if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, + mem, lpiLen) != S_OK) { SHTruncateString(mem, *lpiLen); lstrcpynA(lpDstStr, mem, *lpiLen + 1); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 03941a9..18ebc41 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2077,7 +2077,7 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, debugstr_w(pszIn), pszOut, pcchOut, *pcchOut, dwPart, dwFlags); ret = URL_ParseUrl(pszIn, &pl); - if (!ret) { + if (ret == S_OK) { schaddr = pl.pScheme; schsize = pl.szScheme;

1 0

Rob Shearman : quartz: Fix testing of HRESULT types with not operator instead of comparing against S_OK .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: 03a25b487f51cbe85e5ef9db56b7b47b9e29b432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a25b487f51cbe85e5ef9db5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:31:32 2008 +0100 quartz: Fix testing of HRESULT types with not operator instead of comparing against S_OK. This makes it more obvious what the code is doing. --- dlls/quartz/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index e719831..a2db24b 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -254,7 +254,7 @@ static HRESULT ForwardCmdSeek( PCRITICAL_SECTION crit_sect, IBaseFilter* from, S IMediaSeeking *seek = NULL; hr_local = IPin_QueryInterface( connected, &IID_IMediaSeeking, (void**)&seek ); - if (!hr_local) + if (hr_local == S_OK) { foundend = TRUE; if (crit_sect)

1 0

Rob Shearman : oleaut32: Fix testing of HRESULT types with not operator instead of comparing against S_OK .
by Alexandre Julliard Aug. 18, 2008

Aug. 18, 2008

Module: wine Branch: master Commit: e57697a04b702adec26b196868fb767f7d6b8ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57697a04b702adec26b19686… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 17 18:31:17 2008 +0100 oleaut32: Fix testing of HRESULT types with not operator instead of comparing against S_OK. This makes it more obvious what the code is doing. --- dlls/oleaut32/variant.c | 4 ++-- dlls/oleaut32/vartype.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e6191d1..5c094e1 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1191,7 +1191,7 @@ INT WINAPI DosDateTimeToVariantTime(USHORT wDosDate, USHORT wDosTime, ud.st.wSecond = DOS_SECOND(wDosTime); ud.st.wDayOfWeek = ud.st.wMilliseconds = 0; - return !VarDateFromUdate(&ud, 0, pDateOut); + return VarDateFromUdate(&ud, 0, pDateOut) == S_OK; } /********************************************************************** @@ -1255,7 +1255,7 @@ INT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME lpSt, double *pDateOut) return FALSE; ud.st = *lpSt; - return !VarDateFromUdate(&ud, 0, pDateOut); + return VarDateFromUdate(&ud, 0, pDateOut) == S_OK; } /*********************************************************************** diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index daeac85..318a58a 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5179,7 +5179,7 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di to multiply quotient by 10 (without overflowing), while adjusting the scale, until scale is 0. If this cannot be done, it is a real overflow. */ - while (!r_overflow && quotientscale < 0) { + while (r_overflow == S_OK && quotientscale < 0) { memset(remainderplusquotient, 0, sizeof(remainderplusquotient)); memcpy(remainderplusquotient, quotient->bitsnum, sizeof(quotient->bitsnum)); VARIANT_int_mulbychar(remainderplusquotient, sizeof(remainderplusquotient)/sizeof(DWORD), 10); @@ -5189,7 +5189,7 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di memcpy(quotient->bitsnum, remainderplusquotient, sizeof(quotient->bitsnum)); } else r_overflow = DISP_E_OVERFLOW; } - if (!r_overflow) { + if (r_overflow == S_OK) { if (quotientscale <= 255) quotient->scale = quotientscale; else VARIANT_DI_clear(quotient); }

1 0