March 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : makefiles: Generate all the dll rules inside the corresponding shell function.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 5cdd84158c7d6a9dd392dfc6c438e57ebdc42f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdd84158c7d6a9dd392dfc6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 14:52:44 2010 +0100 makefiles: Generate all the dll rules inside the corresponding shell function. --- aclocal.m4 | 29 +- configure | 2321 ++++++++++-------------------------------------------------- 2 files changed, 396 insertions(+), 1954 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cdd84158c7d6a9dd392d…

1 0

Alexandre Julliard : makefiles: Generate all the program rules inside the corresponding shell function.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: d394e0420f5437cc502e47387c768402e0d5df14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d394e0420f5437cc502e47387… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 14:53:39 2010 +0100 makefiles: Generate all the program rules inside the corresponding shell function. --- aclocal.m4 | 21 +++- configure | 355 +++++++++++--------------------------------------- configure.ac | 112 ++++++++-------- tools/make_makefiles | 8 +- 4 files changed, 151 insertions(+), 345 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d394e0420f5437cc502e4…

1 0

Alexandre Julliard : Wine release 1.1.41
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: website Branch: master Commit: 0fff3bf4e0f2d94e751232d3d8b997232b56c814 URL: http://source.winehq.org/git/website.git/?a=commit;h=0fff3bf4e0f2d94e751232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 20:09:01 2010 +0100 Wine release 1.1.41 --- news/en/2010031901.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/en/2010031901.xml b/news/en/2010031901.xml new file mode 100644 index 0000000..1c3312e --- /dev/null +++ b/news/en/2010031901.xml @@ -0,0 +1,19 @@ +<news> +<date>March 19, 2010</date> +<title>Wine 1.1.41 Released</title> +<body> + The Wine development release 1.1.41 is now available. + <a href="{$root}/announce/1.1.41">What's new</a> in this release: +<ul> + <li>A wide range of Direct3D improvements.</li> + <li>Support for SHA-256, SHA-384, and SHA-512 algorithms.</li> + <li>A number of MSHTML fixes.</li> + <li>Support for mp3 decoding on Mac OS X.</li> + <li>Various widl improvements.</li> + <li>More typelib fixes.</li> + <li>OLE storage improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.41.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.41 : Alexandre Julliard : Release 1.1.41
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: refs/tags/wine-1.1.41 Tag: 657f2fb7aea554de3133af365d31ab8df00df1c2 URL: http://source.winehq.org/git/wine.git/?a=tag;h=657f2fb7aea554de3133af365d31… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 20:02:16 2010 +0100 Release 1.1.41

1 0

Alexandre Julliard : Release 1.1.41.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: c53592e468d0e565dc0b7ec291dd93aa8fa1ba61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53592e468d0e565dc0b7ec29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 20:02:16 2010 +0100 Release 1.1.41. --- ANNOUNCE | 976 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 462 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c53592e468d0e565dc0b7…

1 0

Andrew Eikum : shlwapi: Only skip 'localhost' in file URLs in UrlCanonicalize.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 594a19645e9ff54bcf3787c74028af725f329067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594a19645e9ff54bcf3787c74… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 19 10:57:13 2010 -0500 shlwapi: Only skip 'localhost' in file URLs in UrlCanonicalize. --- dlls/shlwapi/tests/url.c | 1 + dlls/shlwapi/url.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index f1bd648..f7c9455 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -160,6 +160,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"A", 0, S_OK, "A", FALSE}, {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", FALSE} /*LimeWire online installer calls this*/, {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"}, + {"http://localhost/test.html", URL_FILE_USE_PATHURL, S_OK, "http://localhost/test.html"} }; /* ################ */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 1568714..958a842 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -359,6 +359,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++; if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) + && !strncmpW(wszFile, pszUrl, sizeof(wszFile)/sizeof(WCHAR)) && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))){ wk1 += sizeof(wszLocalhost)/sizeof(WCHAR); while(*wk1 == '\\' && (dwFlags & URL_FILE_USE_PATHURL))

1 0

Alexandre Julliard : shlwapi/tests: Avoid size_t in a trace.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 82e7a6e52a154e31a88518dc7cf61118525561e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e7a6e52a154e31a88518dc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 17:04:02 2010 +0100 shlwapi/tests: Avoid size_t in a trace. --- dlls/shlwapi/tests/url.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 944d679..f1bd648 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -547,8 +547,7 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); ok(dwSize == strlen(szExpected)+1 || (*szExpected == '?' && dwSize == strlen(szExpected)), - "UrlGetPart for \"%s\" gave size: %d, expected: %d\n", - szUrl, dwSize, (*szExpected == '?' ? strlen(szExpected) : strlen(szExpected) + 1)); + "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; res = pUrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags);

1 0

Huw Davies : dispex: Implement proxy and stub for IDispatchEx_InvokeEx.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: df07561ce2b129c4ae73653829bd7b521158783b URL: http://source.winehq.org/git/wine.git/?a=commit;h=df07561ce2b129c4ae7365382… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 13:34:53 2010 +0000 dispex: Implement proxy and stub for IDispatchEx_InvokeEx. --- configure | 5 + configure.ac | 1 + dlls/dispex/tests/Makefile.in | 11 + dlls/dispex/tests/marshal.c | 416 +++++++++++++++++++++++++++++++++++++++++ dlls/dispex/usrmarshal.c | 90 ++++++++- 5 files changed, 515 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df07561ce2b129c4ae736…

1 0

Alexandre Julliard : oleaut32: Move variable declaration outside of the switch statement.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 3cc7574e9c03e4b27b2a06124068ced20bfdcd5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc7574e9c03e4b27b2a06124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 16:54:44 2010 +0100 oleaut32: Move variable declaration outside of the switch statement. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8816e9d..6b1aea0 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1179,6 +1179,7 @@ static HRESULT ctl2_add_default_value( { VARIANT v; HRESULT hres; + int mask = 0; TRACE("%p %d %d\n", This, V_VT(value), arg_type); @@ -1196,7 +1197,6 @@ static HRESULT ctl2_add_default_value( /* Check if default value can be stored in encoded_value */ switch(arg_type) { - int mask = 0; case VT_I4: case VT_UI4: mask = 0x3ffffff;

1 0

Trey Hunner : ping: Add skeleton ping command.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 5e3e2ca7ffcd9d8c7e47da30eae7780349ba6add URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3e2ca7ffcd9d8c7e47da30e… Author: Trey Hunner <treyhunner(a)gmail.com> Date: Tue Mar 2 09:26:57 2010 -0800 ping: Add skeleton ping command. --- configure | 5 +++ configure.ac | 1 + programs/ping/Makefile.in | 13 +++++++++ programs/ping/ping_main.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 96dabf2..c177802 100755 --- a/configure +++ b/configure @@ -16106,6 +16106,10 @@ wine_fn_config_program oleview wine_fn_config_makefile programs/oleview "programs/Makeprog.rules \$(MAKEDEP)" test "x$enable_oleview" != xno && wine_fn_append_file ALL_PROGRAM_DIRS "programs/oleview" && wine_fn_append_file ALL_INSTALL_DIRS "programs/oleview" +wine_fn_config_program ping +wine_fn_config_makefile programs/ping "programs/Makeprog.rules \$(MAKEDEP)" +test "x$enable_ping" != xno && wine_fn_append_file ALL_PROGRAM_DIRS "programs/ping" && wine_fn_append_file ALL_INSTALL_DIRS "programs/ping" + wine_fn_config_program progman wine_fn_config_makefile programs/progman "programs/Makeprog.rules \$(MAKEDEP)" test "x$enable_progman" != xno && wine_fn_append_file ALL_PROGRAM_DIRS "programs/progman" && wine_fn_append_file ALL_INSTALL_DIRS "programs/progman" @@ -17486,6 +17490,7 @@ do "programs/net/Makefile") CONFIG_FILES="$CONFIG_FILES programs/net/Makefile" ;; "programs/notepad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/notepad/Makefile" ;; "programs/oleview/Makefile") CONFIG_FILES="$CONFIG_FILES programs/oleview/Makefile" ;; + "programs/ping/Makefile") CONFIG_FILES="$CONFIG_FILES programs/ping/Makefile" ;; "programs/progman/Makefile") CONFIG_FILES="$CONFIG_FILES programs/progman/Makefile" ;; "programs/reg/Makefile") CONFIG_FILES="$CONFIG_FILES programs/reg/Makefile" ;; "programs/regedit/Makefile") CONFIG_FILES="$CONFIG_FILES programs/regedit/Makefile" ;; diff --git a/configure.ac b/configure.ac index a168c4e..ce14e53 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,6 +2662,7 @@ WINE_CONFIG_PROGRAM(msiexec,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_I WINE_CONFIG_PROGRAM(net,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(notepad,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(oleview,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) +WINE_CONFIG_PROGRAM(ping,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(progman,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(reg,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(regedit,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in new file mode 100644 index 0000000..b67e318 --- /dev/null +++ b/programs/ping/Makefile.in @@ -0,0 +1,13 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ping.exe +APPMODE = -mconsole +IMPORTS = kernel32 + +C_SRCS = \ + ping_main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c new file mode 100644 index 0000000..70db17f --- /dev/null +++ b/programs/ping/ping_main.c @@ -0,0 +1,61 @@ +/* + * ping stub + * Copyright (C) 2010 Trey Hunner + * + * 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 <unistd.h> +#include <windows.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ping); + +static void usage(void) +{ + WINE_MESSAGE( "Usage: ping [-n count] [-w timeout] target_name\n\n" ); + WINE_MESSAGE( "Options:\n" ); + WINE_MESSAGE( " -n Number of echo requests to send.\n" ); + WINE_MESSAGE( " -w Timeout in milliseconds to wait for each reply.\n" ); +} + +int main(int argc, char** argv) +{ + int n = 0; + int optc; + + WINE_FIXME( "this command currently just sleeps based on -n parameter\n" ); + + while ((optc = getopt( argc, argv, "n:w:tal:fi:v:r:s:j:k:" )) != -1) + { + switch(optc) + { + case 'n': + n = atoi( optarg ); + break; + case '?': + usage(); + exit(1); + default: + usage(); + WINE_FIXME( "this command currently only supports the -n parameter\n" ); + exit(1); + } + } + + Sleep(n * 1000); + return 0; +}

1 0