December 2008 - Wine-Commits

Francois Gouget : msvcrt/tests: Add a stat() test.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 266ee43e23430d1a29dd92f933547bf58bd47ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=266ee43e23430d1a29dd92f93… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 9 15:18:32 2008 +0100 msvcrt/tests: Add a stat() test. --- dlls/msvcrt/tests/file.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 54bfe4b..c925948 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -910,6 +910,12 @@ static void test_stat(void) ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); ok(buf.st_size == 0, "st_size is %d, expected 0\n", buf.st_size); + ok(stat("stat.tst", &buf) == 0, "stat failed: errno=%d", errno); + ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); + ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", buf.st_dev, buf.st_rdev); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); + ok(buf.st_size == 0, "st_size is %d, expected 0\n", buf.st_size); + close(fd); remove("stat.tst"); }

1 0

Francois Gouget : msvcrt/tests: Stricter fstat() tests.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 5f8c3b4a3883c0042ac987d7375e99f5116e009d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8c3b4a3883c0042ac987d73… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 9 15:18:16 2008 +0100 msvcrt/tests: Stricter fstat() tests. Don't allow fstat() to fail for no reason. Better check the st_mode field. --- dlls/msvcrt/tests/file.c | 62 ++++++++++++++------------------------------- 1 files changed, 19 insertions(+), 43 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 36fcc80..54bfe4b 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -903,23 +903,13 @@ static void test_stat(void) fd = open("stat.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); if (fd >= 0) { - if (fstat(fd, &buf) == 0) - { - if ((buf.st_mode & _S_IFMT) == _S_IFREG) - { - ok(buf.st_dev == 0, "st_dev is %d, expected 0\n", buf.st_dev); - ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", - buf.st_dev, buf.st_rdev); - ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", - buf.st_nlink); - ok(buf.st_size == 0, "st_size is %d, expected 0\n", - buf.st_size); - } - else - skip("file is not a file?\n"); - } - else - skip("fstat failed, errno %d\n", errno); + ok(fstat(fd, &buf) == 0, "fstat failed: errno=%d", errno); + ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); + ok(buf.st_dev == 0, "st_dev is %d, expected 0\n", buf.st_dev); + ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", buf.st_dev, buf.st_rdev); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); + ok(buf.st_size == 0, "st_size is %d, expected 0\n", buf.st_size); + close(fd); remove("stat.tst"); } @@ -929,19 +919,16 @@ static void test_stat(void) /* Tests for a char device */ if (_dup2(0, 10) == 0) { - if (fstat(10, &buf) == 0) + ok(fstat(10, &buf) == 0, "fstat(stdin) failed: errno=%d\n", errno); + if ((buf.st_mode & _S_IFMT) == _S_IFCHR) { - if (buf.st_mode == _S_IFCHR) - { - ok(buf.st_dev == 10, "st_dev is %d, expected 10\n", buf.st_dev); - ok(buf.st_rdev == 10, "st_rdev is %d, expected 10\n", buf.st_rdev); - ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); - } - else - skip("stdin is not a char device?\n"); + ok(buf.st_mode == _S_IFCHR, "bad st_mode=%06o\n", buf.st_mode); + ok(buf.st_dev == 10, "st_dev is %d, expected 10\n", buf.st_dev); + ok(buf.st_rdev == 10, "st_rdev is %d, expected 10\n", buf.st_rdev); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); } else - skip("fstat failed with errno %d\n", errno); + skip("stdin is not a char device? st_mode=%06o\n", buf.st_mode); close(10); } else @@ -950,22 +937,11 @@ static void test_stat(void) /* Tests for pipes */ if (_pipe(pipes, 1024, O_BINARY) == 0) { - if (fstat(pipes[0], &buf) == 0) - { - if (buf.st_mode == _S_IFIFO) - { - ok(buf.st_dev == pipes[0], "st_dev is %d, expected %d\n", - buf.st_dev, pipes[0]); - ok(buf.st_rdev == pipes[0], "st_rdev is %d, expected %d\n", - buf.st_rdev, pipes[0]); - ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", - buf.st_nlink); - } - else - skip("pipe() didn't make a pipe?\n"); - } - else - skip("fstat failed with errno %d\n", errno); + ok(fstat(pipes[0], &buf) == 0, "fstat(pipe) failed: errno=%d\n", errno); + ok(buf.st_mode == _S_IFIFO, "bad st_mode=%06o\n", buf.st_mode); + ok(buf.st_dev == pipes[0], "st_dev is %d, expected %d\n", buf.st_dev, pipes[0]); + ok(buf.st_rdev == pipes[0], "st_rdev is %d, expected %d\n", buf.st_rdev, pipes[0]); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); close(pipes[0]); close(pipes[1]); }

1 0

Alexandre Julliard : wininet/tests: Use new test URLs on test.winehq.org.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 48db9ceff45627f630f342955affd46b639a4c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48db9ceff45627f630f342955… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 10 10:47:13 2008 +0100 wininet/tests: Use new test URLs on test.winehq.org. --- dlls/wininet/tests/http.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bc9ad33..5de889f 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://www.winehq.org/site/about" +#define TEST_URL "http://test.winehq.org/hello.html" static BOOL first_connection_to_test_url = TRUE; @@ -263,7 +263,7 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("InternetConnectA <--\n"); - hic=InternetConnectA(hi, "www.winehq.org", INTERNET_INVALID_PORT_NUMBER, + hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); trace("InternetConnectA -->\n"); @@ -274,7 +274,7 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/about/", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/testredirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -294,7 +294,7 @@ static void InternetReadFile_test(int flags) length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "http://www.winehq.org/about/"), "Wrong URL %s\n", buffer); + ok(!strcmp(buffer, "http://test.winehq.org/testredirect"), "Wrong URL %s\n", buffer); length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); @@ -388,7 +388,7 @@ static void InternetReadFile_test(int flags) length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "http://www.winehq.org/site/about"), "Wrong URL %s\n", buffer); + ok(!strcmp(buffer, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", buffer); length = 16; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); @@ -452,11 +452,13 @@ static void InternetReadFile_test(int flags) CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); abort: + trace("aborting\n"); SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); if (hor != 0x0) { SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); SetLastError(0xdeadbeef); + trace("closing\n"); res = InternetCloseHandle(hor); ok (res, "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); SetLastError(0xdeadbeef); @@ -472,13 +474,14 @@ abort: * INTERNET_STATUS_HANDLE_CLOSING notifications matches the number expected. */ if (hi != 0x0) { SET_WINE_ALLOW(INTERNET_STATUS_HANDLE_CLOSING); + trace("closing 2\n"); res = InternetCloseHandle(hi); ok (res, "InternetCloseHandle of handle opened by InternetOpenA failed\n"); if (flags & INTERNET_FLAG_ASYNC) Sleep(100); } CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor != 0x0 && (flags & INTERNET_FLAG_ASYNC)) todo_wine + if (hor != 0x0) todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); @@ -516,7 +519,7 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("InternetConnectA <--\n"); - hic=InternetConnectA(hi, "www.winehq.org", INTERNET_INVALID_PORT_NUMBER, + hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); trace("InternetConnectA -->\n"); @@ -527,7 +530,7 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/about/", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/testredirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -720,7 +723,7 @@ static void InternetReadFileExA_test(int flags) length += inetbuffers.dwBufferLength; } - todo_wine ok(length > 0, "failed to read any of the document\n"); + ok(length > 0, "failed to read any of the document\n"); trace("Finished. Read %d bytes\n", length); /* WinXP does not send, but Win98 does */ @@ -871,9 +874,9 @@ static void InternetOpenRequest_test(void) ok(connect == NULL, "InternetConnectA should have failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "InternetConnectA with blank server named should have failed with ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); - connect = InternetConnectA(session, "winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + connect = InternetConnectA(session, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(connect != NULL, "Unable to connect to http://winehq.org with error %d\n", GetLastError()); + ok(connect != NULL, "Unable to connect to http://test.winehq.org with error %d\n", GetLastError()); request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) @@ -913,11 +916,11 @@ static void test_http_cache(void) session = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(session != NULL ,"Unable to open Internet session\n"); - connect = InternetConnectA(session, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + connect = InternetConnectA(session, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(connect != NULL, "Unable to connect to http://winehq.org with error %d\n", GetLastError()); + ok(connect != NULL, "Unable to connect to http://test.winehq.org with error %d\n", GetLastError()); - request = HttpOpenRequestA(connect, NULL, "/site/about", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); + request = HttpOpenRequestA(connect, NULL, "/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { skip( "Network unreachable, skipping test\n" ); @@ -932,7 +935,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://www.winehq.org/site/about"), "Wrong URL %s\n", url); + ok(!strcmp(url, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", url); size = sizeof(file_name); ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); @@ -1598,7 +1601,7 @@ static void test_proxy_direct(int port) ok(hi != NULL, "open failed\n"); /* try connect without authorization */ - hc = InternetConnect(hi, "www.winehq.org/", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + hc = InternetConnect(hi, "test.winehq.org/", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(hc != NULL, "connect failed\n"); hr = HttpOpenRequest(hc, NULL, "/test2", NULL, NULL, NULL, 0, 0); @@ -2033,10 +2036,10 @@ static void test_user_agent_header(void) ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnect(ses, "www.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + con = InternetConnect(ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequest(con, "GET", "/", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequest(con, "GET", "/hello.html", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); size = sizeof(buffer); @@ -2163,7 +2166,7 @@ static void test_open_url_async(void) pInternetSetStatusCallbackA(ses, cb); ResetEvent(ctx.event); - req = InternetOpenUrl(ses, "http://www.winehq.org", NULL, 0, 0, (DWORD_PTR)&ctx); + req = InternetOpenUrl(ses, "http://test.winehq.org", NULL, 0, 0, (DWORD_PTR)&ctx); ok(!req && GetLastError() == ERROR_IO_PENDING, "InternetOpenUrl failed\n"); WaitForSingleObject(ctx.event, INFINITE);

1 0

Alexandre Julliard : winetest: Report information about the CPU and host OS .
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 490bb349ce8a9e9ea14e1f21100e69a74b8fb139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=490bb349ce8a9e9ea14e1f211… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 10 09:46:02 2008 +0100 winetest: Report information about the CPU and host OS. --- programs/winetest/main.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 9623039..a6d4425 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -147,10 +147,23 @@ static int running_on_visible_desktop (void) static void print_version (void) { +#ifdef __i386__ + static const char platform[] = "i386"; +#elif defined(__x86_64__) + static const char platform[] = "x86_64"; +#elif defined(__sparc__) + static const char platform[] = "sparc"; +#elif defined(__ALPHA__) + static const char platform[] = "alpha"; +#elif defined(__powerpc__) + static const char platform[] = "powerpc"; +#endif OSVERSIONINFOEX ver; - BOOL ext; + BOOL ext, wow64; int is_win2k3_r2; - const char *(*wine_get_build_id)(void); + const char *(CDECL *wine_get_build_id)(void); + void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); + BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); if (!(ext = GetVersionEx ((OSVERSIONINFO *) &ver))) @@ -159,7 +172,10 @@ static void print_version (void) if (!GetVersionEx ((OSVERSIONINFO *) &ver)) report (R_FATAL, "Can't get OS version."); } + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsWow64Process"); + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &wow64 )) wow64 = FALSE; + xprintf (" Platform=%s%s\n", platform, wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); xprintf (" dwMajorVersion=%u\n dwMinorVersion=%u\n" @@ -168,8 +184,14 @@ static void print_version (void) ver.dwPlatformId, ver.szCSDVersion); wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); + wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); if (wine_get_build_id) xprintf( " WineBuild=%s\n", wine_get_build_id() ); - + if (wine_get_host_version) + { + const char *sysname, *release; + wine_get_host_version( &sysname, &release ); + xprintf( " Host system=%s\n Host version=%s\n", sysname, release ); + } is_win2k3_r2 = GetSystemMetrics(SM_SERVERR2); if(is_win2k3_r2) xprintf(" R2 build number=%d\n", is_win2k3_r2);

1 0

Alexandre Julliard : ntdll: Add a function to export the host OS type and version.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 66eb4bd375a379a8cde867f59b6a40015330e124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66eb4bd375a379a8cde867f59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 19:33:06 2008 +0100 ntdll: Add a function to export the host OS type and version. --- configure | 2 ++ configure.ac | 1 + dlls/ntdll/misc.c | 25 +++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/config.h.in | 3 +++ 5 files changed, 32 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 1ff8e1f..eaa4da7 100755 --- a/configure +++ b/configure @@ -7437,6 +7437,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7543,6 +7544,7 @@ for ac_header in \ sys/times.h \ sys/uio.h \ sys/un.h \ + sys/utsname.h \ sys/vm86.h \ sys/wait.h \ syscall.h \ diff --git a/configure.ac b/configure.ac index 1dce0d1..071013c 100644 --- a/configure.ac +++ b/configure.ac @@ -344,6 +344,7 @@ AC_CHECK_HEADERS(\ sys/times.h \ sys/uio.h \ sys/un.h \ + sys/utsname.h \ sys/vm86.h \ sys/wait.h \ syscall.h \ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 218c289..5272c87 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -22,6 +22,9 @@ #include <time.h> #include <math.h> +#ifdef HAVE_SYS_UTSNAME_H +#include <sys/utsname.h> +#endif #include "wine/library.h" #include "wine/debug.h" @@ -156,6 +159,28 @@ const char * CDECL NTDLL_wine_get_build_id(void) } /********************************************************************* + * wine_get_host_version (NTDLL.@) + */ +void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **release ) +{ +#ifdef HAVE_SYS_UTSNAME_H + static struct utsname buf; + static int init_done; + + if (!init_done) + { + uname( &buf ); + init_done = 1; + } + if (sysname) *sysname = buf.sysname; + if (release) *release = buf.release; +#else + if (sysname) *sysname = ""; + if (release) *release = ""; +#endif +} + +/********************************************************************* * abs (NTDLL.@) */ int CDECL NTDLL_abs( int i ) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d4c8d4e..442516e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1384,6 +1384,7 @@ # Version @ cdecl wine_get_version() NTDLL_wine_get_version @ cdecl wine_get_build_id() NTDLL_wine_get_build_id +@ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version # Codepages @ cdecl __wine_init_codepages(ptr ptr ptr) diff --git a/include/config.h.in b/include/config.h.in index 84c41de..c45765e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -897,6 +897,9 @@ /* Define to 1 if you have the <sys/user.h> header file. */ #undef HAVE_SYS_USER_H +/* Define to 1 if you have the <sys/utsname.h> header file. */ +#undef HAVE_SYS_UTSNAME_H + /* Define to 1 if you have the <sys/vfs.h> header file. */ #undef HAVE_SYS_VFS_H

1 0

Alexandre Julliard : include: Fix a few compiler warnings for the Mingw64 build.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: baaaa58b506a728dceaf11d1afa8ace55c7e1b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baaaa58b506a728dceaf11d1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 17:56:16 2008 +0100 include: Fix a few compiler warnings for the Mingw64 build. --- include/wine/debug.h | 2 +- include/wine/library.h | 10 +++++----- include/winnt.h | 2 ++ include/winsock.h | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index adab558..ba6fabe 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -186,7 +186,7 @@ static inline const char *wine_dbgstr_w( const WCHAR *s ) static inline const char *wine_dbgstr_guid( const GUID *id ) { if (!id) return "(null)"; - if (!((ULONG_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04lx>", (ULONG_PTR)id & 0xffff ); + if (!((ULONG_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04hx>", (WORD)(ULONG_PTR)id ); return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], diff --git a/include/wine/library.h b/include/wine/library.h index 84d0a60..52186c6 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -132,9 +132,9 @@ WINE_LDT_EXTERN struct __wine_ldt_copy /* helper functions to manipulate the LDT_ENTRY structure */ static inline void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) { - ent->BaseLow = (WORD)(unsigned long)base; - ent->HighWord.Bits.BaseMid = (BYTE)((unsigned long)base >> 16); - ent->HighWord.Bits.BaseHi = (BYTE)((unsigned long)base >> 24); + ent->BaseLow = (WORD)(ULONG_PTR)base; + ent->HighWord.Bits.BaseMid = (BYTE)((ULONG_PTR)base >> 16); + ent->HighWord.Bits.BaseHi = (BYTE)((ULONG_PTR)base >> 24); } static inline void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) { @@ -145,8 +145,8 @@ static inline void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) static inline void *wine_ldt_get_base( const LDT_ENTRY *ent ) { return (void *)(ent->BaseLow | - (unsigned long)ent->HighWord.Bits.BaseMid << 16 | - (unsigned long)ent->HighWord.Bits.BaseHi << 24); + (ULONG_PTR)ent->HighWord.Bits.BaseMid << 16 | + (ULONG_PTR)ent->HighWord.Bits.BaseHi << 24); } static inline unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) { diff --git a/include/winnt.h b/include/winnt.h index 1a71f88..083bd96 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -246,6 +246,7 @@ extern "C" { /* C99 unaligned support */ +#ifndef UNALIGNED #if defined(_MSC_VER) && (defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64) || defined(_M_AMD64)) # define UNALIGNED __unaligned # ifdef _WIN64 @@ -257,6 +258,7 @@ extern "C" { # define UNALIGNED # define UNALIGNED64 #endif +#endif /* Alignment macros */ diff --git a/include/winsock.h b/include/winsock.h index 4dafb9c..b531bb3 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -90,6 +90,7 @@ # undef FD_SET # undef FD_ZERO # undef FD_ISSET +# undef _TIMEVAL_DEFINED # define WS_DEFINE_SELECT # endif /* FD_CLR */ @@ -120,7 +121,7 @@ typedef unsigned long WS_u_long; #else typedef unsigned int WS_u_long; #endif -#elif (defined(_MSC_VER) || defined(__MINGW_H) || defined(__WATCOMC__)) && !defined(_BSDTYPES_DEFINED) +#elif (defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__)) && !defined(_BSDTYPES_DEFINED) /* MinGW doesn't define the u_xxx types */ typedef unsigned char u_char; typedef unsigned short u_short;

1 0

Alexandre Julliard : configure: Add detection of Mingw64 for crosstests.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: fc4f3efbd81939c726e21d36418c081e795c7b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4f3efbd81939c726e21d364… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 17:42:42 2008 +0100 configure: Add detection of Mingw64 for crosstests. --- aclocal.m4 | 2 +- configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index b5beeb7..e73b934 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -141,7 +141,7 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [AC_CHECK_PROGS([$1], m4_foreach([ac_wine_prefix], - [i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, i686-pc-mingw32, mingw], + [$host_cpu-pc-mingw32, i586-mingw32msvc, i386-mingw32msvc, i686-mingw32, i586-mingw32, i486-mingw32, i386-mingw32, mingw32, i686-pc-mingw32, mingw], [ac_wine_prefix-$2 ]), [$3],[$4])]) diff --git a/configure b/configure index 1a1da47..1ff8e1f 100755 --- a/configure +++ b/configure @@ -9721,7 +9721,7 @@ fi if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" then - for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc i686-pc-mingw32-gcc mingw-gcc + for ac_prog in $host_cpu-pc-mingw32-gcc i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc i686-pc-mingw32-gcc mingw-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9764,7 +9764,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool i686-pc-mingw32-dlltool mingw-dlltool + for ac_prog in $host_cpu-pc-mingw32-dlltool i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool i686-pc-mingw32-dlltool mingw-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9807,7 +9807,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres i686-pc-mingw32-windres mingw-windres + for ac_prog in $host_cpu-pc-mingw32-windres i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres i686-pc-mingw32-windres mingw-windres do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9850,7 +9850,7 @@ fi done test -n "$CROSSWINDRES" || CROSSWINDRES="false" - for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar + for ac_prog in $host_cpu-pc-mingw32-ar i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar i686-pc-mingw32-ar mingw-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2

1 0

Alexandre Julliard : configure: Add a wrapper macro for mkdir on Windows.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 53e165716d20076610295e568b1c4b9f9108be19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e165716d20076610295e568… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 16:15:18 2008 +0100 configure: Add a wrapper macro for mkdir on Windows. --- configure | 2 ++ configure.ac | 1 + dlls/shell32/xdg.c | 1 + include/config.h.in | 3 +++ include/wine/port.h | 4 ++++ 5 files changed, 11 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c8bb66b..939e20d 100755 --- a/configure +++ b/configure @@ -17912,7 +17912,9 @@ esac + for ac_func in \ + _mkdir \ _pclose \ _popen \ _snprintf \ diff --git a/configure.ac b/configure.ac index 0d5c530..2540c0d 100644 --- a/configure.ac +++ b/configure.ac @@ -1370,6 +1370,7 @@ esac dnl **** Check for functions **** AC_CHECK_FUNCS(\ + _mkdir \ _pclose \ _popen \ _snprintf \ diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index d7f84ab..0cb4272 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -46,6 +46,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdarg.h> diff --git a/include/config.h.in b/include/config.h.in index 8f2c78e..dd8c5ce 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -999,6 +999,9 @@ /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM +/* Define to 1 if you have the `_mkdir' function. */ +#undef HAVE__MKDIR + /* Define to 1 if you have the `_pclose' function. */ #undef HAVE__PCLOSE diff --git a/include/wine/port.h b/include/wine/port.h index 68ded3d..df34174 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -114,6 +114,10 @@ struct statvfs #define RTLD_GLOBAL 0x100 #endif +#ifdef HAVE__MKDIR +#define mkdir(path,mode) _mkdir(path) +#endif + #if !defined(HAVE_FTRUNCATE) && defined(HAVE_CHSIZE) #define ftruncate chsize #endif

1 0

Alexandre Julliard : shell32: Disable the Unix folder for the Windows build .
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: f65e491668573cfbcd8932385619ca702527ea65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65e491668573cfbcd8932385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 17:10:10 2008 +0100 shell32: Disable the Unix folder for the Windows build. --- dlls/shell32/shell32_main.h | 1 - dlls/shell32/shfldr_unixfs.c | 83 ++++++++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 1ad4d6e..920625f 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -99,7 +99,6 @@ HRESULT WINAPI UnixDosFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO HRESULT WINAPI FolderShortcut_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID *ppv); -HRESULT WINAPI ShellFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*); HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 582a980..a560397 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -166,6 +166,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +#if !defined(__MINGW32__) && !defined(_MSC_VER) + #define ADJUST_THIS(c,m,p) ((c*)(((long)p)-(long)&(((c*)0)->lp##m##Vtbl))) #define STATIC_CAST(i,p) ((i*)&p->lp##i##Vtbl) @@ -202,32 +204,6 @@ typedef struct _UnixFolder { static UINT cfShellIDList = 0; /****************************************************************************** - * UNIXFS_is_rooted_at_desktop [Internal] - * - * Checks if the unixfs namespace extension is rooted at desktop level. - * - * RETURNS - * TRUE, if unixfs is rooted at desktop level - * FALSE, if not. - */ -BOOL UNIXFS_is_rooted_at_desktop(void) { - HKEY hKey; - WCHAR wszRootedAtDesktop[69 + CHARS_IN_GUID] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', - 'N','a','m','e','S','p','a','c','e','\\',0 }; - - if (StringFromGUID2(&CLSID_UnixDosFolder, wszRootedAtDesktop + 69, CHARS_IN_GUID) && - RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRootedAtDesktop, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - return TRUE; - } - return FALSE; -} - -/****************************************************************************** * UNIXFS_filename_from_shitemid [Internal] * * Get CP_UNIXCP encoded filename corresponding to the first item of a pidl @@ -2224,11 +2200,6 @@ HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_MyDocuments); } -HRESULT WINAPI ShellFSFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); - return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_ShellFSFolder); -} - /****************************************************************************** * UnixSubFolderIterator * @@ -2402,3 +2373,53 @@ static IUnknown *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCO return (IUnknown*)iterator; } + +#else /* __MINGW32__ || _MSC_VER */ + +HRESULT WINAPI UnixFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI FolderShortcut_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) +{ + return E_NOTIMPL; +} + +#endif /* __MINGW32__ || _MSC_VER */ + +/****************************************************************************** + * UNIXFS_is_rooted_at_desktop [Internal] + * + * Checks if the unixfs namespace extension is rooted at desktop level. + * + * RETURNS + * TRUE, if unixfs is rooted at desktop level + * FALSE, if not. + */ +BOOL UNIXFS_is_rooted_at_desktop(void) { + HKEY hKey; + WCHAR wszRootedAtDesktop[69 + CHARS_IN_GUID] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', + 'N','a','m','e','S','p','a','c','e','\\',0 }; + + if (StringFromGUID2(&CLSID_UnixDosFolder, wszRootedAtDesktop + 69, CHARS_IN_GUID) && + RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRootedAtDesktop, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + return FALSE; +}

1 0

Alexandre Julliard : include: Disable the asm optimizations for the Windows build.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 4bddbedc4189ff58bcc986b9f89f56cbc9c2066b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bddbedc4189ff58bcc986b9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 17:10:20 2008 +0100 include: Disable the asm optimizations for the Windows build. --- include/winbase.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 6fa4dce..e3c8ec9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2460,7 +2460,7 @@ static inline LONG WINAPI InterlockedDecrement( LONG volatile *dest ) /* A few optimizations for gcc */ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64)) +#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || defined(__x86_64__)) extern inline DWORD WINAPI GetLastError(void); extern inline DWORD WINAPI GetLastError(void)

1 0