October 2015 - Wine-Commits

Alexandre Julliard : makefiles: Generate rules for installing scripts.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 5cd3395975f687ba8390fddda38bd110d98b30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd3395975f687ba8390fddda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:43:54 2015 +0900 makefiles: Generate rules for installing scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++++ tools/winedump/Makefile.in | 9 ++------- tools/winemaker/Makefile.in | 10 +++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9a21397..ffd286f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -150,6 +150,7 @@ struct makefile struct strarray include_args; struct strarray define_args; struct strarray programs; + struct strarray scripts; struct strarray appmode; struct strarray imports; struct strarray delayimports; @@ -2488,6 +2489,10 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strmake( "p$(bindir)/%s", program )); } + for (i = 0; i < make->scripts.count; i++) + add_install_rule( make, make->scripts.str[i], make->scripts.str[i], + strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (all_targets.count) { output( "all:" ); @@ -2775,6 +2780,7 @@ static void update_makefile( const char *path ) make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); + make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); make->appmode = get_expanded_make_var_array( make, "APPMODE" ); make->imports = get_expanded_make_var_array( make, "IMPORTS" ); make->delayimports = get_expanded_make_var_array( make, "DELAYIMPORTS" ); diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index a93f078..b55ac72 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,5 +1,6 @@ PROGRAMS = winedump MANPAGES = winedump.man.in +SCRIPTS = function_grep.pl C_SRCS = \ debug.c \ @@ -23,10 +24,4 @@ C_SRCS = \ symbol.c \ tlb.c -INSTALL_DEV = $(PROGRAMS) - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/function_grep.pl +INSTALL_DEV = $(PROGRAMS) $(SCRIPTS) diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in index 6afa016..37e345d 100644 --- a/tools/winemaker/Makefile.in +++ b/tools/winemaker/Makefile.in @@ -1,12 +1,8 @@ +SCRIPTS = winemaker + MANPAGES = \ winemaker.de.UTF-8.man.in \ winemaker.fr.UTF-8.man.in \ winemaker.man.in -INSTALL_DEV = winemaker - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker +INSTALL_DEV = $(SCRIPTS)

1 0

Daniel Lehman : msvcp120: Implement _Thrd_equal/lt.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 95cde2c8b8e1af1b58223a40e2dac9beb320183c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95cde2c8b8e1af1b58223a40e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 27 23:21:07 2015 -0700 msvcp120: Implement _Thrd_equal/lt. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/misc.c | 20 +++++++++++++ 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b8d21eb..9fb938a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3859,10 +3859,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0458b01..c25e2e4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3806,10 +3806,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d754191..fc69fd0 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -130,6 +130,16 @@ static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); +/* thrd */ +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); +static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); + 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) @@ -253,6 +263,10 @@ static BOOL init(void) SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z"); } + SET(p__Thrd_equal, + "_Thrd_equal"); + SET(p__Thrd_lt, + "_Thrd_lt"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -1120,6 +1134,47 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static void test_thrd(void) +{ + int ret, i; + struct test { + _Thrd_t a; + _Thrd_t b; + int r; + }; + const HANDLE hnd1 = (HANDLE)0xcccccccc; + const HANDLE hnd2 = (HANDLE)0xdeadbeef; + + struct test testeq[] = { + { {0, 0}, {0, 0}, 1 }, + { {0, 1}, {0, 0}, 0 }, + { {hnd1, 0}, {hnd1, 1}, 0 }, + { {hnd1, 0}, {hnd2, 0}, 1 } + }; + + struct test testlt[] = { + { {0, 0}, {0, 0}, 0 }, + { {0, 0}, {0, 1}, 1 }, + { {0, 1}, {0, 0}, 0 }, + { {hnd1, 0}, {hnd2, 0}, 0 }, + { {hnd1, 0}, {hnd2, 1}, 1 } + }; + + /* test for equal */ + for(i=0; i<sizeof(testeq)/sizeof(testeq[0]); i++) { + ret = p__Thrd_equal(testeq[i].a, testeq[i].b); + ok(ret == testeq[i].r, "(%p %u) = (%p %u) expected %d, got %d\n", + testeq[i].a.hnd, testeq[i].a.id, testeq[i].b.hnd, testeq[i].b.id, testeq[i].r, ret); + } + + /* test for less than */ + for(i=0; i<sizeof(testlt)/sizeof(testlt[0]); i++) { + ret = p__Thrd_lt(testlt[i].a, testlt[i].b); + ok(ret == testlt[i].r, "(%p %u) < (%p %u) expected %d, got %d\n", + testlt[i].a.hnd, testlt[i].a.id, testlt[i].b.hnd, testlt[i].b.id, testlt[i].r, ret); + } +} + START_TEST(msvcp120) { if(!init()) return; @@ -1143,5 +1198,8 @@ START_TEST(msvcp120) test_tr2_sys__Statvfs(); test_tr2_sys__Stat(); test_tr2_sys__Last_write_time(); + + test_thrd(); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 2598904..6fd94ae 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3806,10 +3806,10 @@ @ stub _Thrd_create @ stub _Thrd_current @ stub _Thrd_detach -@ stub _Thrd_equal +@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit @ stub _Thrd_join -@ stub _Thrd_lt +@ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt @ stub _Thrd_sleep @ stub _Thrd_start @ stub _Thrd_yield diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 6501ff9..2ec34fe 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -683,3 +683,23 @@ void init_misc(void *base) iostream_category_ctor(&iostream_category); #endif } + +#if _MSVCP_VER >= 110 +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +int __cdecl _Thrd_equal(_Thrd_t a, _Thrd_t b) +{ + TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + return a.id == b.id; +} + +int __cdecl _Thrd_lt(_Thrd_t a, _Thrd_t b) +{ + TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); + return a.id < b.id; +} +#endif

1 0

Alistair Leslie-Hughes : vbscript/tests: Show IActiveScriptSite OnScriptError is called on error.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: ae119b4205121d3bdcfcfb270700093ac9a22deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae119b4205121d3bdcfcfb270… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 29 19:11:47 2015 +1100 vbscript/tests: Show IActiveScriptSite OnScriptError is called on error. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index a86711a..d8c5467 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(Next); DEFINE_EXPECT(GetWindow); DEFINE_EXPECT(GetUIBehavior); DEFINE_EXPECT(EnableModeless); +DEFINE_EXPECT(OnScriptError); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -138,6 +139,7 @@ static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; static IDispatchEx testObj; +static HRESULT onerror_hres = E_NOTIMPL; static BSTR a2bstr(const char *str) { @@ -1623,7 +1625,12 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) { - return E_NOTIMPL; + HRESULT hr = onerror_hres; + CHECK_EXPECT(OnScriptError); + + onerror_hres = E_NOTIMPL; + + return hr; } static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) @@ -1927,18 +1934,22 @@ static void test_msgbox(void) SET_EXPECT(GetUIBehavior); SET_EXPECT(GetWindow); SET_EXPECT(EnableModeless); + SET_EXPECT(OnScriptError); hres = parse_script_ar("MsgBox \"testing...\""); ok(FAILED(hres), "script not failed\n"); CHECK_CALLED(GetUIBehavior); CHECK_CALLED(GetWindow); CHECK_CALLED(EnableModeless); + todo_wine CHECK_CALLED(OnScriptError); uic_handling = SCRIPTUICHANDLING_NOUIERROR; SET_EXPECT(GetUIBehavior); + SET_EXPECT(OnScriptError); hres = parse_script_ar("MsgBox \"testing...\""); ok(FAILED(hres), "script not failed\n"); CHECK_CALLED(GetUIBehavior); + todo_wine CHECK_CALLED(OnScriptError); } static HRESULT test_global_vars_ref(BOOL use_close) @@ -2184,8 +2195,10 @@ static void run_tests(void) parse_htmlscript_a("\n"); parse_htmlscript_a("\n\n"); + SET_EXPECT(OnScriptError); hres = parse_script_ar("<!--"); ok(FAILED(hres), "script didn't fail\n"); + todo_wine CHECK_CALLED(OnScriptError); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); @@ -2208,19 +2221,39 @@ static void run_tests(void) test_global_vars_ref(TRUE); test_global_vars_ref(FALSE); + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80080008&)"); ok(hres == 0x80080008, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); /* DISP_E_BADINDEX */ + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h8002000b&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h800a0009&)"); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + + onerror_hres = S_OK; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwInt(&h800a0009&)"); + todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); /* E_NOTIMPL */ + SET_EXPECT(OnScriptError); hres = parse_script_ar("throwInt(&h80004001&)"); ok(hres == MAKE_VBSERROR(445), "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); + + onerror_hres = S_OK; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwInt(&h80004001&)"); + todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres); + todo_wine CHECK_CALLED(OnScriptError); SET_EXPECT(global_testoptionalarg_i); parse_script_a("call testOptionalArg(1,,2)"); @@ -2255,8 +2288,10 @@ static void run_tests(void) parse_script_a("x = y\n" "Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n" "Call ok(getVT(y) = \"VT_EMPTY*\", \"getVT(y) = \" & getVT(y))"); + SET_EXPECT(OnScriptError); hres = parse_script_ar("x = y(\"a\")"); ok(FAILED(hres), "script didn't fail\n"); + todo_wine CHECK_CALLED(OnScriptError); run_from_res("lang.vbs"); run_from_res("api.vbs");

1 0

Stefan Dösinger : wined3d: Prepare GL resources before calling context_apply_fbo_state.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 1ca9dfc8ee25f4ae188fdacd4d3d56046cef8003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca9dfc8ee25f4ae188fdacd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 28 15:29:17 2015 +0100 wined3d: Prepare GL resources before calling context_apply_fbo_state. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 ------- dlls/wined3d/device.c | 13 ++++++++---- dlls/wined3d/drawprim.c | 20 ++++++++++++------ dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 54 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ca9dfc8ee25f4ae188fd…

1 0

Michael Stefaniuc : oleaut32: Remove an always true if-subcondition ( PVS-Studio).
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 45839dccee543f8dbb28ac8f93e2cc921efa12ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=45839dccee543f8dbb28ac8f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 29 10:37:50 2015 +0100 oleaut32: Remove an always true if-subcondition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8ca9cf9..b31e8bc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3606,7 +3606,7 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result) } /* Determine return type */ - if (!(rightvt == VT_EMPTY)) + if (rightvt != VT_EMPTY) { if (leftvt == VT_NULL || rightvt == VT_NULL) { @@ -3639,7 +3639,7 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result) else if (leftvt == VT_R4 || rightvt == VT_R4) resvt = VT_R4; } - else if (leftvt == VT_NULL && rightvt == VT_EMPTY) + else if (leftvt == VT_NULL) { V_VT(result) = VT_NULL; hres = S_OK;

1 0

Michael Stefaniuc : ddraw/tests: Use the proper type for a return value ( PVS-Studio).
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: ad4057803dd23be219f7e1406780e7a6adb937d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4057803dd23be219f7e1406… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 29 01:01:28 2015 +0100 ddraw/tests: Use the proper type for a return value (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddrawmodes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 13e2732..f5b0666 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -932,8 +932,8 @@ static void testcooperativelevels_exclusive(void) /* rect_before_create is assumed to hold the screen rect */ GetClientRect(hwnd, &window_rect); - rc = EqualRect(&rect_before_create, &window_rect); - ok(rc, "Fullscreen window has wrong size.\n"); + success = EqualRect(&rect_before_create, &window_rect); + ok(success, "Fullscreen window has wrong size.\n"); /* Set the focus window. Should fail */ rc = IDirectDraw_SetCooperativeLevel(lpDD,

1 0

Jacek Caban : ws2_32: Added GetAddrInfoExW stub.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 9d452e2ccdebd8dfd579eeeb2603879315e60ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d452e2ccdebd8dfd579eeeb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 16:51:51 2015 +0100 ws2_32: Added GetAddrInfoExW stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1cad112..9e8510d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6542,6 +6542,18 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) } /*********************************************************************** + * GetAddrInfoExW (WS2_32.@) + */ +int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id, + const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) +{ + FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, + debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); + return WSAHOST_NOT_FOUND; +} + +/*********************************************************************** * GetAddrInfoW (WS2_32.@) */ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 1b096b5..6de888f 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -51,6 +51,7 @@ 500 stub WEP @ stdcall FreeAddrInfoW(ptr) +@ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) @ stdcall InetPtonW(long wstr ptr)

1 0

Jacek Caban : ws2def.h: Fixed ADDRINFOEX declaration.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: 22fca3a11041e136f4cc7867426179635db5d295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fca3a11041e136f4cc78674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 17:55:51 2015 +0100 ws2def.h: Fixed ADDRINFOEX declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2def.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/ws2def.h b/include/ws2def.h index 5ea8ff3..cbd6f74 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -115,11 +115,11 @@ typedef struct addrinfoexA { int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; char *ai_canonname; - struct sockaddr *ai_addr; + struct WS(sockaddr) *ai_addr; void *ai_blob; - size_t ai_bloblen; + SIZE_T ai_bloblen; GUID *ai_provider; struct addrinfoexA *ai_next; } ADDRINFOEXA, *PADDRINFOEXA, *LPADDRINFOEXA; @@ -129,11 +129,11 @@ typedef struct addrinfoexW { int ai_family; int ai_socktype; int ai_protocol; - size_t ai_addrlen; + SIZE_T ai_addrlen; WCHAR *ai_canonname; - struct sockaddr *ai_addr; + struct WS(sockaddr) *ai_addr; void *ai_blob; - size_t ai_bloblen; + SIZE_T ai_bloblen; GUID *ai_provider; struct addrinfoexW *ai_next; } ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW;

1 0

Nikolay Sivov : dwrite: Fix analysis leak on error path.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: edea5fc342a58928137c20f0c4ff56c2f0193a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=edea5fc342a58928137c20f0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 21:00:49 2015 +0300 dwrite: Fix analysis leak on error path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 53c9c51..7c8d319 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -408,6 +408,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &bounds); if (FAILED(hr)) { WARN("GetAlphaTextureBounds() failed, 0x%08x\n", hr); + IDWriteGlyphRunAnalysis_Release(analysis); return hr; } texturetype = DWRITE_TEXTURE_CLEARTYPE_3x1;

1 0

Matteo Bruni : msctf: Add ITfThreadMgrEx stub.
by Alexandre Julliard Oct. 29, 2015

Oct. 29, 2015

Module: wine Branch: master Commit: ccff353a0b366b5e44c06cb00b4a983a70df3143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccff353a0b366b5e44c06cb00… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 28 22:27:25 2015 +0100 msctf: Add ITfThreadMgrEx stub. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 145 ++++++++++++++++++++++++++++--------------------- include/msctf.idl | 14 +++++ 2 files changed, 96 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccff353a0b366b5e44c06…

1 0