May 2014 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp/tests: Force dll cleanup code to get executed ( for valgrind).
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 73a996de013264379c1b68e9512aa127b0b21bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a996de013264379c1b68e95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 16:45:25 2014 +0200 msvcp/tests: Force dll cleanup code to get executed (for valgrind). --- dlls/msvcp100/tests/misc.c | 5 ++++- dlls/msvcp100/tests/string.c | 5 ++++- dlls/msvcp60/tests/ios.c | 5 ++++- dlls/msvcp60/tests/string.c | 5 ++++- dlls/msvcp90/tests/ios.c | 8 ++++++-- dlls/msvcp90/tests/misc.c | 8 ++++++-- dlls/msvcp90/tests/string.c | 8 ++++++-- 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 554db2e..7775888 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -93,11 +93,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + msvcp = LoadLibraryA("msvcp100.dll"); if(!msvcp) { win_skip("msvcp100.dll not installed\n"); return FALSE; @@ -200,4 +201,6 @@ START_TEST(misc) return; test__Container_base12(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index 5fb2003..eb02bc5 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -83,11 +83,12 @@ static void (__thiscall *_Yarn_char_dtor)(_Yarn_char *this); static const char* (__thiscall *_Yarn_char_c_str)(const _Yarn_char *this); static char (__thiscall *_Yarn_char_empty)(const _Yarn_char *this); +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + msvcp = LoadLibraryA("msvcp100.dll"); if(!msvcp) { win_skip("msvcp100.dll not installed\n"); return FALSE; @@ -173,4 +174,6 @@ START_TEST(string) return; test__Yarn_char(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 2a8b966..cf0fa19 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -565,11 +565,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp60.dll"); + msvcp = LoadLibraryA("msvcp60.dll"); if(!msvcp) { win_skip("msvcp60.dll not installed\n"); return FALSE; @@ -1651,4 +1652,6 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 6d3ab1a..3ed1480 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -149,11 +149,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp60.dll"); + msvcp = LoadLibraryA("msvcp60.dll"); if(!msvcp) { win_skip("msvcp60.dll not installed\n"); return FALSE; @@ -701,4 +702,6 @@ START_TEST(string) test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index dc70c3f..76107b0 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -590,12 +590,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -1969,4 +1970,7 @@ START_TEST(ios) test_ostream_print_ushort(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index f294b2a..e94ddcb 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -183,12 +183,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -863,4 +864,7 @@ START_TEST(misc) test_complex(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 6cc06ce..f1aa92a 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -170,12 +170,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -784,4 +785,7 @@ START_TEST(string) test_basic_string_char_find_last_not_of(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); }

1 0

Frédéric Delanoy : usp10: Silence a noisy fixme in ScriptPlaceOpenType.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 0ec7907c611fa00cea7cf6de7708d3d0d441443f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec7907c611fa00cea7cf6de7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 8 17:04:42 2014 +0200 usp10: Silence a noisy fixme in ScriptPlaceOpenType. --- dlls/usp10/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ac9c0fd..0493487 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3078,6 +3078,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS { HRESULT hr; int i; + static int once = 0; TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %p, %p, %d, %p, %p, %d, %p %p %p)\n", hdc, psc, psa, @@ -3091,7 +3092,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (!pGoffset) return E_FAIL; if (cRanges) - FIXME("Ranges not supported yet\n"); + if (!once++) FIXME("Ranges not supported yet\n"); ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys;

1 0

Jacek Caban : mshtml: Use debugmsg_mshtml_guid in a few more places.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: cac04a675c22c593bd0ad82bdddd5c0a270ee4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac04a675c22c593bd0ad82bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 11:48:32 2014 +0200 mshtml: Use debugmsg_mshtml_guid in a few more places. --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlelem.c | 54 +++++++++++++++-------------------------------- dlls/mshtml/htmlelem2.c | 6 +++--- dlls/mshtml/htmlevent.c | 17 ++++++--------- dlls/mshtml/htmlimg.c | 18 +++++++--------- dlls/mshtml/htmlnode.c | 54 +++++++++++++++++------------------------------ dlls/mshtml/main.c | 16 ++++++++++++++ 7 files changed, 72 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cac04a675c22c593bd0ad…

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client Initialize.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 0d8f86c66de4fc75793f777967c7df2d9202776b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8f86c66de4fc75793f77796… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 3 15:45:06 2014 +1000 dpnet: Implement IDirectPlay8Client Initialize. --- dlls/dpnet/client.c | 15 ++++++++++++--- dlls/dpnet/dpnet_private.h | 10 +++++++--- dlls/dpnet/tests/client.c | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 9668a68..43ffb59 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -86,9 +86,18 @@ static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(IDirectPlay8Client *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pfn, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p):(%p,%p,%x)\n", This, pvUserContext, pfn, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPARAM; + + This->usercontext = pvUserContext; + This->msghandler = pfn; + This->flags = dwFlags; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 00ea94b..34d2aee 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -46,9 +46,13 @@ typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; */ struct IDirectPlay8ClientImpl { - IDirectPlay8Client IDirectPlay8Client_iface; - LONG ref; - /* IDirectPlay8Client fields */ + IDirectPlay8Client IDirectPlay8Client_iface; + LONG ref; + + /* IDirectPlay8Client fields */ + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; }; /* ------------------- */ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 890f218..0df99dd 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -44,7 +44,7 @@ static BOOL test_init_dp(void) ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr);

1 0

Zhenbo Li : mshtml: Added IHTMLSelectElement:: remove method implementation.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 15ccfef0804fe1730ded9ab22c30291573bbf61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ccfef0804fe1730ded9ab22… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun May 4 18:51:32 2014 +0800 mshtml: Added IHTMLSelectElement::remove method implementation. --- dlls/mshtml/htmlselect.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index aef0bf0..08a374a 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -407,8 +407,14 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG index) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%d)\n", This, index); - return E_NOTIMPL; + nsresult nsres; + TRACE("(%p)->(%d)\n", This, index); + nsres = nsIDOMHTMLSelectElement_select_Remove(This->nsselect, index); + if(NS_FAILED(nsres)) { + ERR("Remove failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02e0d00..4378ad3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2559,6 +2559,24 @@ static void _test_select_get_disabled(unsigned line, IHTMLSelectElement *select, _test_elem3_get_disabled(line, (IUnknown*)select, exb); } +static void test_select_remove(IHTMLSelectElement *select) +{ + HRESULT hres; + + hres = IHTMLSelectElement_remove(select, 3); + ok(hres == S_OK, "remove failed: %08x, expected S_OK\n", hres); + test_select_length(select, 2); + + hres = IHTMLSelectElement_remove(select, -1); + todo_wine + ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres); + test_select_length(select, 2); + + hres = IHTMLSelectElement_remove(select, 0); + ok(hres == S_OK, "remove failed:%08x\n", hres); + test_select_length(select, 1); +} + #define test_text_length(u,l) _test_text_length(__LINE__,u,l) static void _test_text_length(unsigned line, IUnknown *unk, LONG l) { @@ -4324,6 +4342,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_multiple(select, VARIANT_FALSE); test_select_set_multiple(select, VARIANT_TRUE); + test_select_remove(select); } static void test_form_item(IHTMLElement *elem)

1 0

Shuai Meng : vbscript: Fixed CBool handling.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: b8aecb92b959eaf140a4e752b8caf911db391079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aecb92b959eaf140a4e752b… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat May 3 10:14:26 2014 +0800 vbscript: Fixed CBool handling. --- dlls/vbscript/global.c | 41 ++++++++++---------------------- dlls/vbscript/tests/api.vbs | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index b89b888..9aeba34 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -114,16 +114,6 @@ static HRESULT return_int(VARIANT *res, int val) return S_OK; } -static HRESULT return_bool(VARIANT *res, int val) -{ - if(res) { - V_VT(res) = VT_BOOL; - V_BOOL(res) = val != 0 ? VARIANT_TRUE : VARIANT_FALSE; - } - - return S_OK; -} - static inline HRESULT return_double(VARIANT *res, double val) { if(res) { @@ -413,30 +403,23 @@ static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int val; + VARIANT v; + HRESULT hres; + TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - switch(V_VT(arg)) { - case VT_I2: - val = V_I2(arg); - break; - case VT_I4: - val = V_I4(arg); - break; - case VT_R4: - val = V_R4(arg) > 0.0 || V_R4(arg) < 0.0; - break; - case VT_R8: - val = V_R8(arg) > 0.0 || V_R8(arg) < 0.0; - break; - default: - ERR("Not a numeric value: %s\n", debugstr_variant(arg)); - return E_FAIL; - } + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_BOOL); + if(FAILED(hres)) + return hres; - return return_bool(res, val); + if(res) + *res = v; + else + VariantClear(&v); + return S_OK; } static HRESULT Global_CByte(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 ee9ebd3..12124b7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -478,4 +478,59 @@ Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) Call ok(CBool(-5) = true, "CBool(-5) = " & CBool(-5)) Call ok(getVT(CBool(-5)) = "VT_BOOL", "getVT(CBool(-5)) = " & getVT(CBool(-5))) +Sub testCBoolError(strings, error_num) + on error resume next + + Call Err.clear() + Call CBool(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Class ValClass + Public myval + + Public default Property Get defprop + defprop = myval + End Property +End Class + +Dim MyObject +Set MyObject = New ValClass + +Call ok(CBool(Empty) = False, "CBool(Empty) = " & CBool(Empty)) +Call ok(getVT(CBool(Empty)) = "VT_BOOL", "getVT(CBool(Empty)) = " & getVT(CBool(Empty))) +Call ok(CBool(1) = True, "CBool(1) = " & CBool(1)) +Call ok(getVT(CBool(1)) = "VT_BOOL", "getVT(CBool(1)) = " & getVT(CBool(1))) +Call ok(CBool(0) = False, "CBool(0) = " & CBool(0)) +Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) +Call ok(CBool(-0.56) = True, "CBool(-0.56) = " & CBool(-0.56)) +Call ok(getVT(CBool(-0.56)) = "VT_BOOL", "getVT(CBool(-0.56)) = " & getVT(CBool(-0.56))) +Call testCBoolError("", 13) +Call ok(CBool("0") = False, "CBool(""0"") = " & CBool("0")) +Call ok(getVT(CBool("0")) = "VT_BOOL", "getVT(CBool(""0"")) = " & getVT(CBool("0"))) +If isEnglishLang Then + Call ok(CBool("0.1") = True, "CBool(""0.1"") = " & CBool("0.1")) + Call ok(getVT(CBool("0.1")) = "VT_BOOL", "getVT(CBool(""0.1"")) = " & getVT(CBool("0.1"))) +End If + Call ok(CBool("true") = True, "CBool(""true"") = " & CBool("true")) +Call ok(getVT(CBool("true")) = "VT_BOOL", "getVT(CBool(""true"")) = " & getVT(CBool("true"))) +Call ok(CBool("false") = False, "CBool(""false"") = " & CBool("false")) +Call ok(getVT(CBool("false")) = "VT_BOOL", "getVT(CBool(""false"")) = " & getVT(CBool("false"))) +Call ok(CBool("TRUE") = True, "CBool(""TRUE"") = " & CBool("TRUE")) +Call ok(getVT(CBool("TRUE")) = "VT_BOOL", "getVT(CBool(""TRUE"")) = " & getVT(CBool("TRUE"))) +Call ok(CBool("FALSE") = False, "CBool(""FALSE"") = " & CBool("FALSE")) +Call ok(getVT(CBool("FALSE")) = "VT_BOOL", "getVT(CBool(""FALSE"")) = " & getVT(CBool("FALSE"))) +Call ok(CBool("#TRUE#") = True, "CBool(""#TRUE#"") = " & CBool("#TRUE#")) +Call ok(getVT(CBool("#TRUE#")) = "VT_BOOL", "getVT(CBool(""#TRUE#"")) = " & getVT(CBool("#TRUE#"))) +Call ok(CBool("#FALSE#") = False, "CBool(""#FALSE#"") = " & CBool("#FALSE#")) +Call ok(getVT(CBool("#FALSE#")) = "VT_BOOL", "getVT(CBool(""#FALSE#"")) = " & getVT(CBool("#FALSE#"))) +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 1 +Call ok(CBool(MyObject) = True, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 0 +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) + Call reportSuccess()

1 0

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Client tests.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 594c4ea392743b4b81306279997dfa0b2b2e2076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594c4ea392743b4b813062799… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 3 15:31:13 2014 +1000 dpnet/tests: Add IDirectPlay8Client tests. --- dlls/dpnet/tests/Makefile.in | 1 + dlls/dpnet/tests/client.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 69339dc..f6e45ea 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -3,5 +3,6 @@ IMPORTS = dxguid uuid dpnet ole32 C_SRCS = \ address.c \ + client.c \ peer.c \ server.c diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c new file mode 100644 index 0000000..890f218 --- /dev/null +++ b/dlls/dpnet/tests/client.c @@ -0,0 +1,206 @@ +/* + * Copyright 2011 Louis Lenders + * Copyright 2014 Alistair Leslie-Hughes + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> + +#include <dplay8.h> +#include "wine/test.h" + + +static IDirectPlay8Client* client = NULL; +static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; + +static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + +static BOOL test_init_dp(void) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "CoInitialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); + todo_wine ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + + return client != NULL; +} + +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info; + DWORD items, size; + DWORD i; + HRESULT hr; + + size = 0; + items = 0; + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, NULL, 0); + todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, NULL, &items, 0); + todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); +} + +static void test_enum_hosts(void) +{ + HRESULT hr; + IDirectPlay8Address *host = NULL; + IDirectPlay8Address *local = NULL; + DPN_APPLICATION_DESC appdesc; + DPNHANDLE async = 0; + static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.guidApplication = appguid; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&local); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(local, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&host); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), + DPNA_DATATYPE_STRING); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + /* Since we are running asynchronously, EnumHosts returns DPNSUCCESS_PENDING. */ + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); + todo_wine ok(async, "No Handle returned\n"); + + hr = IDirectPlay8Client_CancelAsyncOperation(client, async, 0); + ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); + + IDirectPlay8Address_Release(local); + IDirectPlay8Address_Release(host); +} + +static void test_get_sp_caps(void) +{ + DPN_SP_CAPS caps; + HRESULT hr; + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + todo_wine ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + todo_wine ok((caps.dwFlags & + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), + "unexpected flags %x\n", caps.dwFlags); + todo_wine ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + todo_wine ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + todo_wine ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + todo_wine ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + todo_wine ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + todo_wine ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + todo_wine ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); +} + +static void test_cleanup_dp(void) +{ + HRESULT hr; + + hr = IDirectPlay8Client_Close(client, 0); + ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); + + hr = IDirectPlay8Client_Release(client); + ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + + CoUninitialize(); +} + +START_TEST(client) +{ + if(!test_init_dp()) + return; + + test_enum_service_providers(); + test_enum_hosts(); + test_get_sp_caps(); + test_cleanup_dp(); +}

1 0

Bruno Jesus : ws2_32: Avoid using WS_ prefix on unix sockaddr struct.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 43241934c616a5b757212241f2b0ca48a0f755f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43241934c616a5b757212241f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 7 23:31:57 2014 -0300 ws2_32: Avoid using WS_ prefix on unix sockaddr struct. The address was already converted to unix in these situations, so it's wrong to check against windows #defines. --- dlls/ws2_32/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 630e463..a8fb9a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2559,7 +2559,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) DWORD adap_size; int enable = 1; - if (bind_addr == htonl(WS_INADDR_ANY) || bind_addr == htonl(WS_INADDR_LOOPBACK)) + if (bind_addr == htonl(INADDR_ANY) || bind_addr == htonl(INADDR_LOOPBACK)) return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &optlen) == -1 || sock_type != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ @@ -2664,10 +2664,10 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) * INADDR_ANY instead*/ WARN("Trying to bind to magic IP address, using " "INADDR_ANY instead.\n"); - in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); + in4->sin_addr.s_addr = htonl(INADDR_ANY); } else if (interface_bind(s, fd, &uaddr.addr)) - in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); + in4->sin_addr.s_addr = htonl(INADDR_ANY); } if (bind(fd, &uaddr.addr, uaddrlen) < 0) { @@ -2725,7 +2725,7 @@ static int do_connect(int fd, const struct WS_sockaddr* name, int namelen) * assuming we really want to connect to localhost */ TRACE("Trying to connect to magic IP address, using " "INADDR_LOOPBACK instead.\n"); - in4->sin_addr.s_addr = htonl(WS_INADDR_LOOPBACK); + in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); } }

1 0

Piotr Caban : msvcp60: Fix uninitialized variable access in basic_string:: _Tidy.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: ea7baf5304d7c9fa72840999b2da6adc764d5fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7baf5304d7c9fa72840999b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 13:43:42 2014 +0200 msvcp60: Fix uninitialized variable access in basic_string::_Tidy. --- dlls/msvcp60/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 01b535d..f1b2b8e 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -164,7 +164,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil { TRACE("(%p %d)\n", this, built); - if(!this->ptr || !built); + if(!built || !this->ptr); else if(!this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) MSVCP_allocator_char_deallocate(NULL, this->ptr-1, this->res+2); else @@ -1885,7 +1885,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu { TRACE("(%p %d)\n", this, built); - if(!this->ptr || !built); + if(!built || !this->ptr); else if(!this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) MSVCP_allocator_wchar_deallocate(NULL, this->ptr-1, this->res+2); else

1 0

Jacek Caban : mshtml: Forward IHTMLImageElementFactory IDispatch functions to IDispatchEx implementation.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: cf2278b2d0cae4684bbc8e5244879a9a88df0322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2278b2d0cae4684bbc8e524… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 11:48:43 2014 +0200 mshtml: Forward IHTMLImageElementFactory IDispatch functions to IDispatchEx implementation. --- dlls/mshtml/htmlimg.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index defb08e..212d01e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -750,16 +750,14 @@ static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElement UINT *pctinfo) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfo(IHTMLImageElementFactory *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFactory *iface, @@ -767,9 +765,7 @@ static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFac DISPID *rgDispId) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, - cNames, lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *iface, @@ -778,9 +774,8 @@ static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *i UINT *puArgErr) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static LONG var_to_size(const VARIANT *v)

1 0