February 2011 - Wine-Commits

Austin English : crypt32/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: b9179032918e0d651a252e1f906b008b65639c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9179032918e0d651a252e1f9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:35:07 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/msg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index ddb94bd..d5d5309 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1838,6 +1838,7 @@ static void test_signed_msg_encoding(void) CMSG_CONTENT_PARAM, signedWithCertWithValidPubKeyEmptyContent, sizeof(signedWithCertWithValidPubKeyEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); check_param("signedWithCertWithValidPubKeyContent", msg, CMSG_CONTENT_PARAM, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent)); @@ -2868,6 +2869,7 @@ static void test_decode_msg_get_param(void) ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); ret = CryptMsgUpdate(msg, dataContent, sizeof(dataContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); check_param("data content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); CryptMsgClose(msg); @@ -2885,6 +2887,7 @@ static void test_decode_msg_get_param(void) CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); check_param("hash content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); check_param("hash hash data", msg, CMSG_HASH_DATA_PARAM, hashParam, @@ -2904,6 +2907,7 @@ static void test_decode_msg_get_param(void) if (buf) { ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, buf, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(size == sizeof(hashParam), "Unexpected size %d\n", size); ok(!memcmp(buf, hashParam, size), "Unexpected value\n"); CryptMemFree(buf); @@ -3249,6 +3253,7 @@ static void test_msg_control(void) "Expected E_INVALIDARG, got %08x\n", GetLastError()); } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); /* or after an update. */ for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) {

1 0

Frédéric Delanoy : po: Add missing \n in various po language files.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 7d07e03c397958207bf68849a78c2ecb1f61b414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d07e03c397958207bf68849a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 16 21:13:17 2011 +0100 po: Add missing \n in various po language files. --- po/fr.po | 6 +++--- po/lt.po | 2 +- po/ro.po | 2 +- po/sl.po | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index ac36e17..c1f59a3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4176,7 +4176,7 @@ msgstr "Échec de l'authentification mutuelle\n" #: winerror.mc:2391 msgid "Time skew between client and server\n" -msgstr "Décalage horaire entre le client et le serveur" +msgstr "Décalage horaire entre le client et le serveur\n" #: winerror.mc:2396 msgid "Invalid window handle\n" @@ -4616,7 +4616,7 @@ msgstr "Installation distante non autorisée\n" #: winerror.mc:2926 msgid "Reboot initiated after successful install\n" -msgstr "Redémarrage initié après une installation réussie" +msgstr "Redémarrage initié après une installation réussie\n" #: winerror.mc:2931 msgid "Invalid string binding\n" @@ -5218,7 +5218,7 @@ msgstr "Tube RPC fermé\n" #: winerror.mc:3671 msgid "Discipline error on RPC pipe\n" -msgstr "Erreur de discipline sur le tube RPC" +msgstr "Erreur de discipline sur le tube RPC\n" #: winerror.mc:3676 msgid "No data on RPC pipe\n" diff --git a/po/lt.po b/po/lt.po index 51b6454..155dc5d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3761,7 +3761,7 @@ msgstr "Vykdyti operaciją, net jei niekas nepasikeitė\n" #: winerror.mc:1896 msgid "The user profile is invalid\n" -msgstr "Naudotojo profilis yra netinkamas." +msgstr "Naudotojo profilis yra netinkamas\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server\n" diff --git a/po/ro.po b/po/ro.po index 8443663..498669a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8383,7 +8383,7 @@ msgid "" "HELP without an argument shows all CMD built-in commands.\n" msgstr "" "HELP <comandă> arată un scurt ajutor pentru <comandă>\n" -"HELP fără nici un parametru enumerează toate comenzile integrate în cmd." +"HELP fără nici un parametru enumerează toate comenzile integrate în cmd.\n" #: cmd.rc:95 msgid "" diff --git a/po/sl.po b/po/sl.po index 3a1c891..08c643e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7185,7 +7185,7 @@ msgstr "Navedena koda za dostop do naprave je neveljavna." #: winmm.rc:34 msgid "There is no driver installed on your system !\n" -msgstr "Nameščen ni noben gonilnik!" +msgstr "Nameščen ni noben gonilnik!\n" #: winmm.rc:35 msgid ""

1 0

Austin English : kernel32/tests: Make sure to use return values (LLVM/Clang ).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 194e43f6e3d68691c502fece1c8503b6354f3b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=194e43f6e3d68691c502fece1… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:18:11 2011 -0800 kernel32/tests: Make sure to use return values (LLVM/Clang). --- dlls/kernel32/tests/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 375b5f0..4e8136a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -178,11 +178,11 @@ static void test__hwrite( void ) ok( 0 != memory_object, "LocalAlloc fails. (Could be out of memory.)\n" ); contents = LocalLock( memory_object ); + ok( NULL != contents, "LocalLock whines\n" ); filehandle = _lopen( filename, OF_READ ); contents = LocalLock( memory_object ); - ok( NULL != contents, "LocalLock whines\n" ); ok( bytes_written == _hread( filehandle, contents, bytes_written), "read length differ from write length\n" ); @@ -541,11 +541,11 @@ static void test__lwrite( void ) ok( 0 != memory_object, "LocalAlloc fails, could be out of memory\n" ); contents = LocalLock( memory_object ); + ok( NULL != contents, "LocalLock whines\n" ); filehandle = _lopen( filename, OF_READ ); contents = LocalLock( memory_object ); - ok( NULL != contents, "LocalLock whines\n" ); ok( bytes_written == _hread( filehandle, contents, bytes_written), "read length differ from write length\n" ); @@ -2094,7 +2094,7 @@ static void test_FindFirstFileA(void) strcat(buffer2, "nul"); handle = FindFirstFileA(buffer2, &data); err = GetLastError(); - ok( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s failed\n", buffer2 ); + ok( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s failed: %d\n", buffer2, err ); ok( 0 == lstrcmpiA(data.cFileName, "nul"), "wrong name %s\n", data.cFileName ); ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes || FILE_ATTRIBUTE_DEVICE == data.dwFileAttributes /* Win9x */, @@ -2114,7 +2114,7 @@ static void test_FindFirstFileA(void) strcpy(buffer2, "lpt1"); handle = FindFirstFileA(buffer2, &data); err = GetLastError(); - ok( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s failed\n", buffer2 ); + ok( handle != INVALID_HANDLE_VALUE, "FindFirstFile on %s failed: %d\n", buffer2, err ); ok( 0 == lstrcmpiA(data.cFileName, "lpt1"), "wrong name %s\n", data.cFileName ); ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes || FILE_ATTRIBUTE_DEVICE == data.dwFileAttributes /* Win9x */,

1 0

Alexander Scott-Johns : user32: Fix read of uninitialized data and a couple of typos in TrackMouseEvent ( Valgrind).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 182b6a0483c94afcd02ae47b54fe74f842fe80bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=182b6a0483c94afcd02ae47b5… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Feb 16 01:09:35 2011 +0000 user32: Fix read of uninitialized data and a couple of typos in TrackMouseEvent (Valgrind). --- dlls/user32/input.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 4fd00ba..162c155 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1106,11 +1106,11 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) return FALSE; } - hover_time = ptme->dwHoverTime; + hover_time = (ptme->dwFlags & TME_HOVER) ? ptme->dwHoverTime : HOVER_DEFAULT; - /* if HOVER_DEFAULT was specified replace this with the systems current value. + /* if HOVER_DEFAULT was specified replace this with the system's current value. * TME_LEAVE doesn't need to specify hover time so use default */ - if (hover_time == HOVER_DEFAULT || hover_time == 0 || !(ptme->dwHoverTime&TME_HOVER)) + if (hover_time == HOVER_DEFAULT || hover_time == 0) SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); GetCursorPos(&pos);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLAnchorElement_put_href.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: df25f0d9a6d08ab5bd58e430619809d7ff58b936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df25f0d9a6d08ab5bd58e4306… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 17 14:29:48 2011 +1100 mshtml: Implement IHTMLAnchorElement_put_href. --- dlls/mshtml/htmlanchor.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 90ece1d..ae3dd18 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -102,8 +102,18 @@ static HRESULT WINAPI HTMLAnchorElement_Invoke(IHTMLAnchorElement *iface, DISPID static HRESULT WINAPI HTMLAnchorElement_put_href(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLAnchorElement_SetHref(This->nsanchor, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_get_href(IHTMLAnchorElement *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c6e49ef..06743d2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1168,6 +1168,21 @@ static void _test_anchor_href(unsigned line, IUnknown *unk, const char *exhref) _test_disp_value(line, unk, exhref); } +#define test_anchor_put_href(a,h) _test_anchor_put_href(__LINE__,a,h) +static void _test_anchor_put_href(unsigned line, IUnknown *unk, const char *exhref) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + str = a2bstr(exhref); + hres = IHTMLAnchorElement_put_href(anchor, str); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + SysFreeString(str); + + _test_disp_value(line, unk, exhref); +} + #define test_option_text(o,t) _test_option_text(__LINE__,o,t) static void _test_option_text(unsigned line, IHTMLOptionElement *option, const char *text) { @@ -6481,6 +6496,14 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "a", TRUE); if(elem) { test_anchor_href((IUnknown*)elem, "http://test/"); + + /* Change the href */ + test_anchor_put_href((IUnknown*)elem, "http://test1/"); + test_anchor_href((IUnknown*)elem, "http://test1/"); + + /* Restore the href */ + test_anchor_put_href((IUnknown*)elem, "http://test/"); + test_anchor_href((IUnknown*)elem, "http://test/"); IHTMLElement_Release(elem); }

1 0

Dmitry Timoshkov : mlang: GetGlobalFontLinkObject() takes a non-zero number of arguments.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 15c322c235e369b9ac69b2a47417e2efee2f60e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c322c235e369b9ac69b2a47… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 17 17:05:05 2011 +0800 mlang: GetGlobalFontLinkObject() takes a non-zero number of arguments. --- dlls/mlang/mlang.c | 7 +++++-- dlls/mlang/mlang.spec | 2 +- dlls/mlang/tests/mlang.c | 18 ++++++++++++++++++ include/mlang.idl | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e324aea..92fab82 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3608,8 +3608,11 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( instance, NULL ); } -HRESULT WINAPI GetGlobalFontLinkObject(void) +HRESULT WINAPI GetGlobalFontLinkObject(void **unknown) { - FIXME("\n"); + if (!unknown) return E_INVALIDARG; + + FIXME("%p: stub\n", unknown); + return S_FALSE; } diff --git a/dlls/mlang/mlang.spec b/dlls/mlang/mlang.spec index dc9630a..fd683a9 100644 --- a/dlls/mlang/mlang.spec +++ b/dlls/mlang/mlang.spec @@ -12,4 +12,4 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stdcall GetGlobalFontLinkObject() +@ stdcall GetGlobalFontLinkObject(ptr) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index c8d098f..96a19a6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1931,6 +1931,23 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) } } +static void test_GetGlobalFontLinkObject(void) +{ + HRESULT ret; + void *unknown; + + ret = GetGlobalFontLinkObject(NULL); + ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#x\n", ret); + + unknown = (void *)0xdeadbeef; + ret = GetGlobalFontLinkObject(&unknown); +todo_wine { + ok(ret == S_OK, "expected S_OK got %#x\n", ret); + ok(unknown != NULL && unknown != (void *)0xdeadbeef, + "GetGlobalFontLinkObject() returned %p\n", unknown); + } +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -1949,6 +1966,7 @@ START_TEST(mlang) test_ConvertINetUnicodeToMultiByte(); test_JapaneseConversion(); + test_GetGlobalFontLinkObject(); trace("IMultiLanguage\n"); ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, diff --git a/include/mlang.idl b/include/mlang.idl index 7664a22..7cdc970 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -739,7 +739,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);") cpp_quote("STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);") cpp_quote("#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)") -cpp_quote("STDAPI GetGlobalFontLinkObject(void);") +cpp_quote("STDAPI GetGlobalFontLinkObject(void **unknown);") cpp_quote("STDAPI IsConvertINetStringAvailable(DWORD, DWORD);") cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);") cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);")

1 0

Austin English : ole32/tests: Make sure to use a return value (LLVM/Clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 671b9a43e73c359193e52992676f7237a51a8e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=671b9a43e73c359193e529926… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:57:22 2011 -0800 ole32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/ole32/tests/hglobalstream.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 0810d9f..b2a6ee9 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -421,6 +421,8 @@ static void test_copyto(void) static const LARGE_INTEGER llZero; char buffer[15]; + ok_ole_success(hr, "CreateStreamOnHGlobal"); + expected_method_list = methods_copyto; hr = IStream_Write(pStream, szHello, sizeof(szHello), &written);

1 0

Alexander Scott-Johns : comctl32: Fix read of uninitialized data in LISTVIEW_HeaderNotification and rename it to LISTVIEW_Notify (Valgrind).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: e2d477523370eb3b16a656a0bb6d791c8dbb8237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d477523370eb3b16a656a0b… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Thu Feb 17 01:24:14 2011 +0000 comctl32: Fix read of uninitialized data in LISTVIEW_HeaderNotification and rename it to LISTVIEW_Notify (Valgrind). --- dlls/comctl32/listview.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a59406f..dc96200 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10129,26 +10129,32 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) /*** * DESCRIPTION: - * Handles notifications from header. + * Handles notifications. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure - * [I] nCtrlId : control identifier - * [I] lpnmh : notification information + * [I] lpnmhdr : notification information * * RETURN: * Zero */ -static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) +static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) { HWND hwndSelf = infoPtr->hwndSelf; + const NMHEADERW *lpnmh; - TRACE("(lpnmh=%p)\n", lpnmh); + TRACE("(lpnmhdr=%p)\n", lpnmhdr); - if (!lpnmh || lpnmh->iItem < 0 || lpnmh->iItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0; - - switch (lpnmh->hdr.code) - { + if (!lpnmhdr || lpnmhdr->hwndFrom != infoPtr->hwndHeader) return 0; + + /* remember: HDN_LAST < HDN_FIRST */ + if (lpnmhdr->code > HDN_FIRST || lpnmhdr->code < HDN_LAST) return 0; + lpnmh = (const NMHEADERW *)lpnmhdr; + + if (lpnmh->iItem < 0 || lpnmh->iItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0; + + switch (lpnmhdr->code) + { case HDN_TRACKW: case HDN_TRACKA: { @@ -11456,9 +11462,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_NCPaint(infoPtr, (HRGN)wParam); case WM_NOTIFY: - if (lParam && ((LPNMHDR)lParam)->hwndFrom == infoPtr->hwndHeader) - return LISTVIEW_HeaderNotification(infoPtr, (LPNMHEADERW)lParam); - else return 0; + return LISTVIEW_Notify(infoPtr, (LPNMHDR)lParam); case WM_NOTIFYFORMAT: return LISTVIEW_NotifyFormat(infoPtr, (HWND)wParam, (INT)lParam);

1 0

Austin English : usp10/tests: Remove dead assignment (LLVM/Clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 408d06891503be601bd3fbe3ae85759a2671ca67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408d06891503be601bd3fbe3a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:24:26 2011 -0800 usp10/tests: Remove dead assignment (LLVM/Clang). --- dlls/usp10/tests/usp10.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 109b1db..a64f4db 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -838,7 +838,6 @@ static void test_ScriptTextOut(HDC hdc) /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue * ie. ScriptItemize has succeeded and that pItem has been set */ cInChars = 5; - cMaxItems = 255; if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars;

1 0

Austin English : msi/tests: Remove dead assignments.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: b6bea541db741f515dcdb26b160fe78246fb1b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bea541db741f515dcdb26b1… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 17:37:48 2011 -0800 msi/tests: Remove dead assignments. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index a6f1ddb..a85b29d 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -489,7 +489,7 @@ static DISPID get_dispid( IDispatch *disp, const char *name ) str = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR) ); if (str) { - len = MultiByteToWideChar(CP_ACP, 0, name, -1, str, len ); + MultiByteToWideChar(CP_ACP, 0, name, -1, str, len ); r = IDispatch_GetIDsOfNames( disp, &IID_NULL, &str, 1, 0, &id ); HeapFree(GetProcessHeap(), 0, str); if (r != S_OK) @@ -871,7 +871,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA len = MultiByteToWideChar(CP_ACP, 0, szName, -1, NULL, 0 ); name = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR) ); if (!name) return E_FAIL; - len = MultiByteToWideChar(CP_ACP, 0, szName, -1, name, len ); + MultiByteToWideChar(CP_ACP, 0, szName, -1, name, len ); hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); HeapFree(GetProcessHeap(), 0, name); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr);

1 0