wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Alexandre Julliard : makefiles: Install dlls from the top-level makefile.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: bf8f435797cb1fdf756fa58c08a82f6715f6dda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8f435797cb1fdf756fa58c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 11:39:42 2011 +0200 makefiles: Install dlls from the top-level makefile. --- Makefile.in | 5 ++++- aclocal.m4 | 43 +++++++++++++++++++++++++++++-------------- configure | 43 +++++++++++++++++++++++++++++-------------- 3 files changed, 62 insertions(+), 29 deletions(-) diff --git a/Makefile.in b/Makefile.in index ae438b2..056754b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +26,10 @@ EXTRASUBDIRS = \ programs # Destination directories for make install -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) +INSTALLDIRS = \ + $(DESTDIR)$(bindir) \ + $(DESTDIR)$(dlldir) \ + $(DESTDIR)$(fakedlldir) all: wine @echo "Wine build complete." diff --git a/aclocal.m4 b/aclocal.m4 index 01bfa77..c04d269 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -276,35 +276,50 @@ wine_fn_config_dll () ac_flags=$[3] ac_implib=${4:-$ac_name} ac_file=$ac_dir/lib$ac_implib + ac_dll=$ac_name ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_implibflags="" case $ac_name in *16) ac_implibflags=" -m16" ;; + *.*) ;; + *) ac_dll=$ac_dll.dll ;; esac - wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules + wine_fn_config_makefile $ac_dir $ac_enable "$ac_flags" dlls/Makedll.rules AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too [test "$ac_enable" != enable_win16 || return 0], [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -.PHONY: $ac_dir $ac_dir/__install__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ -$ac_dir: $ac_dir/Makefile __builddeps__ dummy - @cd $ac_dir && \$(MAKE) -$ac_dir/__install__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install -$ac_dir/__install-lib__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-lib -$ac_dir/__uninstall__:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall -install:: $ac_dir/__install__ -install-lib:: $ac_dir/__install-lib__ -__uninstall__: $ac_dir/__uninstall__ +"$ac_dir: __builddeps__ manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) \$[@]" + if wine_fn_has_flag install-lib $ac_flags + then : + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +".PHONY: $ac_dir/__install-lib__ $ac_dir/__uninstall__ +install install-lib:: $ac_dir/__install-lib__ +__uninstall__: $ac_dir/__uninstall__" + if test -n "$DLLEXT" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" + fi + fi + if test "x$enable_maintainer_mode" = xyes then if wine_fn_has_flag mc $ac_flags diff --git a/configure b/configure index bf6540f..20080ec 100755 --- a/configure +++ b/configure @@ -14344,35 +14344,50 @@ wine_fn_config_dll () ac_flags=$3 ac_implib=${4:-$ac_name} ac_file=$ac_dir/lib$ac_implib + ac_dll=$ac_name ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_implibflags="" case $ac_name in *16) ac_implibflags=" -m16" ;; + *.*) ;; + *) ac_dll=$ac_dll.dll ;; esac - wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules + wine_fn_config_makefile $ac_dir $ac_enable "$ac_flags" dlls/Makedll.rules if eval test \"x\$"$ac_enable"\" = x"no"; then : test "$ac_enable" != enable_win16 || return 0 else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all: $ac_dir -.PHONY: $ac_dir $ac_dir/__install__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ -$ac_dir: $ac_dir/Makefile __builddeps__ dummy - @cd $ac_dir && \$(MAKE) -$ac_dir/__install__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install -$ac_dir/__install-lib__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-lib -$ac_dir/__uninstall__:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall -install:: $ac_dir/__install__ -install-lib:: $ac_dir/__install-lib__ -__uninstall__: $ac_dir/__uninstall__ +"$ac_dir: __builddeps__ manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) \$@" + if wine_fn_has_flag install-lib $ac_flags + then : + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +".PHONY: $ac_dir/__install-lib__ $ac_dir/__uninstall__ +install install-lib:: $ac_dir/__install-lib__ +__uninstall__: $ac_dir/__uninstall__" + if test -n "$DLLEXT" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) \$(DESTDIR)\$(fakedlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT + \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" + fi + fi + if test "x$enable_maintainer_mode" = xyes then if wine_fn_has_flag mc $ac_flags

1 0

Jacek Caban : ieframe: Moved InternetShortcut implementation to ieframe.dll .
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 02ceb94351d20a615b75dba016a4053ffb408bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ceb94351d20a615b75dba01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 18:40:54 2011 +0200 ieframe: Moved InternetShortcut implementation to ieframe.dll. --- configure | 2 +- configure.ac | 2 +- dlls/ieframe/Makefile.in | 5 ++- dlls/ieframe/ieframe.h | 90 ++++++++++++++++++++++++++++++++++ dlls/ieframe/ieframe.spec | 1 + dlls/ieframe/ieframe_main.c | 69 ++++++++++++++++++++++--- dlls/{shdocvw => ieframe}/intshcut.c | 81 ++++++++++++++---------------- dlls/shdocvw/Makefile.in | 3 +- dlls/shdocvw/factory.c | 22 ++++++++- dlls/shdocvw/shdocvw.h | 5 +- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 14 +++++ 12 files changed, 233 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02ceb94351d20a615b75d…

1 0

Jacek Caban : ieframe: Added new DLL.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: c33c583093f914a90d82599b6a55e463b9b7ae7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33c583093f914a90d82599b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 18:36:37 2011 +0200 ieframe: Added new DLL. --- configure | 1 + configure.ac | 1 + dlls/ieframe/Makefile.in | 6 +++ dlls/ieframe/ieframe.spec | 4 ++ dlls/ieframe/ieframe_main.c | 85 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a309da5..702388f 100755 --- a/configure +++ b/configure @@ -14854,6 +14854,7 @@ wine_fn_config_dll hnetcfg enable_hnetcfg wine_fn_config_dll httpapi enable_httpapi wine_fn_config_dll iccvid enable_iccvid po wine_fn_config_dll icmp enable_icmp +wine_fn_config_dll ieframe enable_ieframe wine_fn_config_dll ifsmgr.vxd enable_win16 wine_fn_config_dll imaadp32.acm enable_imaadp32_acm wine_fn_config_dll imagehlp enable_imagehlp implib diff --git a/configure.ac b/configure.ac index 306a673..0eb3ac8 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,6 +2527,7 @@ WINE_CONFIG_DLL(hnetcfg) WINE_CONFIG_DLL(httpapi) WINE_CONFIG_DLL(iccvid,,[po]) WINE_CONFIG_DLL(icmp) +WINE_CONFIG_DLL(ieframe) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(imaadp32.acm) WINE_CONFIG_DLL(imagehlp,,[implib]) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in new file mode 100644 index 0000000..77b5e29 --- /dev/null +++ b/dlls/ieframe/Makefile.in @@ -0,0 +1,6 @@ +MODULE = ieframe.dll + +C_SRCS = \ + ieframe_main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/ieframe/ieframe.spec b/dlls/ieframe/ieframe.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/ieframe/ieframe.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c new file mode 100644 index 0000000..53c40cf --- /dev/null +++ b/dlls/ieframe/ieframe_main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ieframe); + +/****************************************************************** + * DllMain (ieframe.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (ieframe.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (ieframe.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (ieframe.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (ieframe.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("()\n"); + return S_OK; +}

1 0

Austin English : configure: Fix audio detection on OSX.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: eb17b8c2c164245631709e0822c27447050d241c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb17b8c2c164245631709e082… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 23 23:05:04 2011 -0500 configure: Fix audio detection on OSX. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e8bc505..a309da5 100755 --- a/configure +++ b/configure @@ -11745,7 +11745,7 @@ test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} -if test "x$ALSALIBS$COREAUDIOLIBS" = "x" -a \ +if test "x$ALSALIBS$COREAUDIO" = "x" -a \ "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ "x$with_alsa$with_coreaudio$with_oss" != xnonono then diff --git a/configure.ac b/configure.ac index b213923..306a673 100644 --- a/configure.ac +++ b/configure.ac @@ -1640,7 +1640,7 @@ test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=$ test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} dnl **** Check for any sound system **** -if test "x$ALSALIBS$COREAUDIOLIBS" = "x" -a \ +if test "x$ALSALIBS$COREAUDIO" = "x" -a \ "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ "x$with_alsa$with_coreaudio$with_oss" != xnonono then

1 0

Alexandre Julliard : user32/tests: Make hook messages optional in the SetParent test.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: adc59e14376135cc6b74ba68a9254c9fabb6ad4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc59e14376135cc6b74ba68a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 24 13:18:01 2011 +0200 user32/tests: Make hook messages optional in the SetParent test. --- dlls/user32/tests/msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index afca225..7e33a22 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12847,12 +12847,12 @@ static const struct message WmSetParentSeq_2[] = { { WM_KILLFOCUS, sent|wparam, 0 }, { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, - { HCBT_ACTIVATE, hook }, + { HCBT_ACTIVATE, hook|optional }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, - { HCBT_SETFOCUS, hook }, + { HCBT_SETFOCUS, hook|optional }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE },

1 0

Alexandre Julliard : widl: Check for mismatched types in ?: expressions.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 82f33d3f6be2e5088a48f5616ab3c4c312f3916d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f33d3f6be2e5088a48f5616… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 10:43:09 2011 +0200 widl: Check for mismatched types in ?: expressions. --- tools/widl/expr.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 60e3a50..7012382 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -649,6 +649,10 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc check_scalar_type(expr_loc, cont_type, result_first.type); result_second = resolve_expression(expr_loc, cont_type, e->u.ext); result_third = resolve_expression(expr_loc, cont_type, e->ext2); + check_scalar_type(expr_loc, cont_type, result_second.type); + check_scalar_type(expr_loc, cont_type, result_third.type); + if (!is_ptr(result_second.type) ^ !is_ptr(result_third.type)) + error_loc_info(&expr_loc->v->loc_info, "type mismatch in ?: expression\n" ); /* FIXME: determine the correct return type */ result = result_second; result.is_variable = FALSE;

1 0

Alexandre Julliard : wrc: Run through the translation process even if libgettext-po is missing.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: a92d60efb594e2dc521cead91536e80ac98e9e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a92d60efb594e2dc521cead91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 24 13:17:47 2011 +0200 wrc: Run through the translation process even if libgettext-po is missing. --- tools/wrc/po.c | 328 ++++++++++++++++++++++++++++++-------------------------- 1 files changed, 176 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a92d60efb594e2dc521ce…

1 0

Hans Leidekker : winhttp: Propagate errors from asynchronous requests.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 41845905791ed03cb98d8a7992890c34fbb1b5f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41845905791ed03cb98d8a799… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jul 23 18:16:02 2011 +0200 winhttp: Propagate errors from asynchronous requests. --- dlls/winhttp/request.c | 120 +++++++++++++++++++++++++++-------------------- 1 files changed, 69 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41845905791ed03cb98d8…

1 0

Hans Leidekker : winhttp: Set last error if the server didn' t return a valid response.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 694d43a91068caa5f67717ca7bf699cbae1806be URL: http://source.winehq.org/git/wine.git/?a=commit;h=694d43a91068caa5f67717ca7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jul 23 18:15:37 2011 +0200 winhttp: Set last error if the server didn't return a valid response. --- dlls/winhttp/request.c | 7 +++++-- dlls/winhttp/tests/winhttp.c | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d170573..8f41df8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1828,8 +1828,11 @@ static BOOL receive_response( request_t *request, BOOL async ) for (;;) { - if (!(ret = read_reply( request ))) break; - + if (!(ret = read_reply( request ))) + { + set_last_error( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ); + break; + } size = sizeof(DWORD); query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; if (!(ret = query_headers( request, query, NULL, &status, &size, NULL ))) break; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index acffece..28ab72d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1955,6 +1955,7 @@ static void test_no_headers(int port) { static const WCHAR no_headersW[] = {'/','n','o','_','h','e','a','d','e','r','s',0}; HINTERNET ses, con, req; + DWORD error; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1969,8 +1970,11 @@ static void test_no_headers(int port) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = WinHttpReceiveResponse(req, NULL); + error = GetLastError(); ok(!ret, "expected failure\n"); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); WinHttpCloseHandle(req); WinHttpCloseHandle(con);

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetCredentials.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: b218ed1a690a3553c9fc64b4ab2a7076371744a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b218ed1a690a3553c9fc64b4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jul 23 18:15:23 2011 +0200 winhttp: Implement IWinHttpRequest::SetCredentials. --- dlls/winhttp/request.c | 24 ++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 65e0aa7..d170573 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2361,8 +2361,28 @@ static HRESULT WINAPI winhttp_request_SetCredentials( BSTR password, HTTPREQUEST_SETCREDENTIALS_FLAGS flags ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */ + + TRACE("%p, %s, %p\n", request, debugstr_w(username), password); + + if (request->state < REQUEST_STATE_OPEN) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ); + } + switch (flags) + { + case HTTPREQUEST_SETCREDENTIALS_FOR_SERVER: + target = WINHTTP_AUTH_TARGET_SERVER; + break; + case HTTPREQUEST_SETCREDENTIALS_FOR_PROXY: + target = WINHTTP_AUTH_TARGET_PROXY; + break; + default: + return E_INVALIDARG; + } + if (WinHttpSetCredentials( request->hrequest, target, scheme, username, password, NULL )) return S_OK; + return HRESULT_FROM_WIN32( GetLastError() ); } static HRESULT WINAPI winhttp_request_Open( diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1227902..acffece 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2100,13 +2100,15 @@ static void test_credentials(void) static void test_IWinHttpRequest(void) { + static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; + static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; static const WCHAR url1W[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR url2W[] = {'w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR method1W[] = {'G','E','T',0}; static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; HRESULT hr; IWinHttpRequest *req; - BSTR method, url, response = NULL, status_text = NULL; + BSTR method, url, username, password, response = NULL, status_text = NULL; VARIANT async, empty, timeout, body; VARIANT_BOOL succeeded; LONG status; @@ -2189,6 +2191,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + SysFreeString( method ); method = SysAllocString( method1W ); SysFreeString( url ); @@ -2205,6 +2210,20 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + username = SysAllocString( usernameW ); + hr = IWinHttpRequest_SetCredentials( req, username, NULL, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + password = SysAllocString( passwordW ); + hr = IWinHttpRequest_SetCredentials( req, username, password, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2221,6 +2240,9 @@ static void test_IWinHttpRequest(void) trace("%s\n", wine_dbgstr_w(status_text)); SysFreeString( status_text ); + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; @@ -2234,6 +2256,9 @@ static void test_IWinHttpRequest(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( status_text ); + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2264,6 +2289,8 @@ static void test_IWinHttpRequest(void) SysFreeString( method ); SysFreeString( url ); + SysFreeString( username ); + SysFreeString( password ); CoUninitialize(); }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011