March 2011 - Wine-commits - list.winehq.org

André Hentschel : kernel32/tests: Fix a test for real hardware.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 27ae573806cc541a63288884f29483905da80c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae573806cc541a63288884f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 13:41:47 2011 +0100 kernel32/tests: Fix a test for real hardware. --- dlls/kernel32/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index fab01dc..25b55ac 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -865,7 +865,7 @@ static VOID test_thread_processor(void) } error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS); - ok(error==0, "SetThreadIdealProcessor returned an incorrect value\n"); + ok(error!=-1, "SetThreadIdealProcessor failed\n"); } }

1 0

André Hentschel : ws2_32: Downgrade FIXME for WS_SIO_SET_COMPATIBILITY_MODE to a TRACE.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 42d3bd713d9575a393a1a7d909d72a56d1e5f10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d3bd713d9575a393a1a7d90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 22:27:32 2011 +0100 ws2_32: Downgrade FIXME for WS_SIO_SET_COMPATIBILITY_MODE to a TRACE. --- dlls/ws2_32/socket.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1993419..9469d30 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3483,6 +3483,10 @@ INT WINAPI WSAIoctl(SOCKET s, HeapFree(GetProcessHeap(), 0, ipAddrTable); return 0; } + case WS_SIO_SET_COMPATIBILITY_MODE: + TRACE("WS_SIO_SET_COMPATIBILITY_MODE ignored\n"); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break;

1 0

André Hentschel : advapi32/tests: Add some skips.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: e2a3b4b4e59d519d07be925c057aa3e82ff1a8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a3b4b4e59d519d07be925c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 13 15:32:59 2011 +0100 advapi32/tests: Add some skips. --- dlls/advapi32/tests/registry.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2809559..91164bd 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2064,8 +2064,13 @@ static void test_classesroot(void) delete_key( hkey ); RegCloseKey( hkey ); } - if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, - KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip("not enough privileges to add a user class\n"); + return; + } /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, @@ -2075,7 +2080,7 @@ static void test_classesroot(void) "test key not found in hkcr: %d\n", res); if (res) { - trace( "HKCR key merging not supported\n" ); + skip("HKCR key merging not supported\n"); delete_key( hkey ); RegCloseKey( hkey ); return;

1 0

Alexandre Julliard : wininet/tests: Update test data location to test. winehq.org/tests.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: ac6a5a6355cc5ad1c9efa393835300d224a85cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6a5a6355cc5ad1c9efa3938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 16:43:19 2011 +0100 wininet/tests: Update test data location to test.winehq.org/tests. --- dlls/wininet/tests/http.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 95a5779..980a809 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -31,7 +31,7 @@ #include "wine/test.h" -#define TEST_URL "http://test.winehq.org/hello.html" +#define TEST_URL "http://test.winehq.org/tests/hello.html" static BOOL first_connection_to_test_url = TRUE; @@ -121,10 +121,10 @@ typedef struct { static const test_data_t test_data[] = { { - "http://test.winehq.org/testredirect", - "http://test.winehq.org/hello.html", + "http://test.winehq.org/tests/redirect", + "http://test.winehq.org/tests/hello.html", "test.winehq.org", - "/testredirect", + "/tests/redirect", "", TESTF_REDIRECT }, @@ -629,7 +629,7 @@ static void InternetReadFile_chunked_test(void) if (hic == 0x0) goto abort; trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testchunked", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -748,7 +748,7 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testredirect", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -1150,7 +1150,7 @@ static void test_http_cache(void) INTERNET_SERVICE_HTTP, 0, 0); ok(connect != NULL, "Unable to connect to http://test.winehq.org with error %d\n", GetLastError()); - request = HttpOpenRequestA(connect, NULL, "/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); + request = HttpOpenRequestA(connect, NULL, "/tests/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { skip( "Network unreachable, skipping test\n" ); @@ -1165,7 +1165,7 @@ static void test_http_cache(void) size = sizeof(url); ret = InternetQueryOptionA(request, INTERNET_OPTION_URL, url, &size); ok(ret, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(url, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", url); + ok(!strcmp(url, "http://test.winehq.org/tests/hello.html"), "Wrong URL %s\n", url); size = sizeof(file_name); ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); @@ -2913,7 +2913,7 @@ static void test_user_agent_header(void) con = InternetConnect(ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequest(con, "GET", "/hello.html", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequest(con, "GET", "/tests/hello.html", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); size = sizeof(buffer);

1 0

Alexandre Julliard : urlmon/tests: Update test data location to test.winehq .org/tests.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 3dc7ffb7a55d5518f8900904cc6985baea4fc2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc7ffb7a55d5518f8900904c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 16:43:22 2011 +0100 urlmon/tests: Update test data location to test.winehq.org/tests. --- dlls/urlmon/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 2549e02..be8494c 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -797,7 +797,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_REDIRECTING: CHECK_EXPECT(ReportProgress_REDIRECTING); if(test_redirect) - ok(!strcmp_wa(szStatusText, "http://test.winehq.org/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!strcmp_wa(szStatusText, "http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else ok(szStatusText == NULL, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; @@ -2901,7 +2901,7 @@ static void test_http_protocol(void) 'p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR redirect_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', - 't','e','s','t','r','e','d','i','r','e','c','t',0}; + 't','e','s','t','s','/','r','e','d','i','r','e','c','t',0}; static const WCHAR winetest_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','d','a','t','a','/',0};

1 0

Ken Thomases : secur32: Make no-implementation error message non-GnuTLS-specific.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c890bf4dc8dae67ff4119de78bfd49d84c6b5ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c890bf4dc8dae67ff4119de78… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:36 2011 -0500 secur32: Make no-implementation error message non-GnuTLS-specific. --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0e49112..4cebf4b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1757,7 +1757,7 @@ void SECUR32_deinitSchannelSP(void) void SECUR32_initSchannelSP(void) { - ERR("libgnutls not found, SSL connections will fail\n"); + ERR("TLS library not found, SSL connections will fail\n"); } void SECUR32_deinitSchannelSP(void) {}

1 0

Ken Thomases : secur32: Separate GnuTLS schannel implementation into separate file.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0b396208db68c950725adae49cedd1486ee56afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b396208db68c950725adae49… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:40 2011 -0500 secur32: Separate GnuTLS schannel implementation into separate file. --- dlls/secur32/Makefile.in | 1 + dlls/secur32/schannel.c | 443 +-------------------------------------- dlls/secur32/schannel_gnutls.c | 462 ++++++++++++++++++++++++++++++++++++++++ dlls/secur32/secur32_priv.h | 37 ++++ 4 files changed, 503 insertions(+), 440 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b396208db68c950725ad…

1 0

Ken Thomases : configure: Add test for Security/Security.h header.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 25ed687fe66045a2b06578a8912486dbecc5e1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ed687fe66045a2b06578a89… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:44 2011 -0500 configure: Add test for Security/Security.h header. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0d715db..3651711 100755 --- a/configure +++ b/configure @@ -5782,6 +5782,7 @@ for ac_header in \ OpenAL/al.h \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ + Security/Security.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/configure.ac b/configure.ac index edbf111..8314579 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,7 @@ AC_CHECK_HEADERS(\ OpenAL/al.h \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ + Security/Security.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/include/config.h.in b/include/config.h.in index 7195429..44b6bb6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -716,6 +716,9 @@ /* Define to 1 if you have the <scsi/sg.h> header file. */ #undef HAVE_SCSI_SG_H +/* Define to 1 if you have the <Security/Security.h> header file. */ +#undef HAVE_SECURITY_SECURITY_H + /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT

1 0

Ken Thomases : secur32: Add alternative schannel implementation for Mac OS X.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 5015f388d1cd1db86609e2414b9ea660383f8dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5015f388d1cd1db86609e2414… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:48 2011 -0500 secur32: Add alternative schannel implementation for Mac OS X. It uses the native Secure Transport API rather than GnuTLS. --- dlls/secur32/Makefile.in | 2 + dlls/secur32/schannel.c | 6 +- dlls/secur32/schannel_gnutls.c | 4 +- dlls/secur32/schannel_macosx.c | 791 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 798 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5015f388d1cd1db86609e…

1 0

Alexandre Julliard : configure: Improve check for security framework and don' t warn about gnutls in that case.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 45db3481f4d9ef7290eab9c2d29e5e3904cd16ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=45db3481f4d9ef7290eab9c2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 14:25:45 2011 +0100 configure: Improve check for security framework and don't warn about gnutls in that case. --- configure | 12 ++++++++---- configure.ac | 6 +++++- dlls/crypt32/rootstore.c | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 3651711..8790041 100755 --- a/configure +++ b/configure @@ -657,12 +657,12 @@ QUICKTIMELIB LIBOPENCL FRAMEWORK_OPENAL COREAUDIO +SECURITYLIB DISKARBITRATIONLIB LDEXECFLAGS APPLICATIONSERVICESLIB IOKITLIB COREFOUNDATIONLIB -SECURITYLIB DLLWRAP DLLTOOL LDD @@ -6519,9 +6519,7 @@ fi LDSHARED="\$(CC) -dynamiclib" STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" - SECURITYLIB="-framework Security -framework CoreFoundation" - - COREFOUNDATIONLIB="-framework CoreFoundation" + COREFOUNDATIONLIB="-framework CoreFoundation" IOKITLIB="-framework IOKit -framework CoreFoundation" @@ -6534,6 +6532,12 @@ fi DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation" fi + if test "$ac_cv_header_Security_Security_h" = "yes" + then + SECURITYLIB="-framework Security -framework CoreFoundation" + + with_gnutls=${with_gnutls:-no} + fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" diff --git a/configure.ac b/configure.ac index 8314579..b16b9e9 100644 --- a/configure.ac +++ b/configure.ac @@ -703,7 +703,6 @@ case $host_os in STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" dnl declare needed frameworks - AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") @@ -713,6 +712,11 @@ case $host_os in dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation") fi + if test "$ac_cv_header_Security_Security_h" = "yes" + then + AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") + with_gnutls=${with_gnutls:-no} + fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 506497a..c6f106e 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -40,7 +40,7 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" -#ifdef __APPLE__ +#ifdef HAVE_SECURITY_SECURITY_H #include <Security/Security.h> #endif @@ -746,7 +746,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) DWORD i; BOOL ret = FALSE; -#ifdef __APPLE__ +#ifdef HAVE_SECURITY_SECURITY_H OSStatus status; CFArrayRef rootCerts;

1 0