July 2011 - Wine-Commits - list.winehq.org

Francois Gouget : po: Use non-breaking spaces where required by the French typography rules.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: bd50ce88a84cf6fda62d39d910e23714c6b794d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd50ce88a84cf6fda62d39d91… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 23 23:50:34 2011 +0200 po: Use non-breaking spaces where required by the French typography rules. Except where they may be sent to a command line terminal. --- po/fr.po | 160 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd50ce88a84cf6fda62d3…

1 0

Jacek Caban : ieframe: Moved InternetShortcut implementation to ieframe.dll .
by Alexandre Julliard July 25, 2011

July 25, 2011

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

Alexandre Julliard : user32/tests: Make hook messages optional in the SetParent test.
by Alexandre Julliard July 25, 2011

July 25, 2011

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

Jacek Caban : ieframe: Added new DLL.
by Alexandre Julliard July 25, 2011

July 25, 2011

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 + +(a)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

Alexandre Julliard : widl: Check for mismatched types in ?: expressions.
by Alexandre Julliard July 25, 2011

July 25, 2011

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

Austin English : configure: Fix audio detection on OSX.
by Alexandre Julliard July 25, 2011

July 25, 2011

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 : wrc: Run through the translation process even if libgettext-po is missing.
by Alexandre Julliard July 25, 2011

July 25, 2011

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 July 25, 2011

July 25, 2011

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: Implement IWinHttpRequest::get_ResponseBody.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: a25c865cb8b9c6c640e80c7a2585c9bae07084f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25c865cb8b9c6c640e80c7a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jul 23 18:15:09 2011 +0200 winhttp: Implement IWinHttpRequest::get_ResponseBody. --- dlls/winhttp/request.c | 27 +++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 11 ++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b639f6c..65e0aa7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2724,8 +2724,31 @@ static HRESULT WINAPI winhttp_request_get_ResponseBody( IWinHttpRequest *iface, VARIANT *body ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + SAFEARRAY *sa; + HRESULT hr; + DWORD err; + char *ptr; + + TRACE("%p, %p\n", request, body); + + if ((err = request_read_body( request, INFINITE ))) return HRESULT_FROM_WIN32( err ); + + if (!(sa = SafeArrayCreateVector( VT_UI1, 0, request->offset ))) return E_OUTOFMEMORY; + if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) + { + SafeArrayDestroy( sa ); + return hr; + } + memcpy( ptr, request->buffer, request->offset ); + if ((hr = SafeArrayUnaccessData( sa )) != S_OK) + { + SafeArrayDestroy( sa ); + return hr; + } + V_VT( body ) = VT_ARRAY|VT_UI1; + V_ARRAY( body ) = sa; + return S_OK; } static HRESULT WINAPI winhttp_request_get_ResponseStream( diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8f2af5a..1227902 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2107,7 +2107,7 @@ static void test_IWinHttpRequest(void) HRESULT hr; IWinHttpRequest *req; BSTR method, url, response = NULL, status_text = NULL; - VARIANT async, empty, timeout; + VARIANT async, empty, timeout, body; VARIANT_BOOL succeeded; LONG status; @@ -2241,6 +2241,15 @@ static void test_IWinHttpRequest(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( response ); + VariantInit( &body ); + V_VT( &body ) = VT_ERROR; + hr = IWinHttpRequest_get_ResponseBody( req, &body ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &body ) == (VT_ARRAY|VT_UI1), "got %08x\n", V_VT( &body ) ); + + hr = VariantClear( &body ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr );

1 0

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

July 25, 2011

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