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

Alexandre Julliard : makefiles: Generate all the program rules inside the corresponding shell function.
by Alexandre Julliard 22 Mar '10

22 Mar '10

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 : makefiles: Add a configure macro for tools directories .
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: d81a8f8d47731db79d3d2936cb8b15c97f6fe964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81a8f8d47731db79d3d2936c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 15:02:56 2010 +0100 makefiles: Add a configure macro for tools directories. --- aclocal.m4 | 24 +++++++++++++++++++++ configure | 55 ++++++++++++++++++++++++------------------------- configure.ac | 14 ++++++------ tools/make_makefiles | 3 +- 4 files changed, 60 insertions(+), 36 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f9c0b38..ac03af2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -268,6 +268,23 @@ $ac_dir/__clean__ $ac_dir/__crosstest__ $ac_dir: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP) @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" AS_VAR_IF([enable_tests],[no],,[wine_fn_append_file ALL_TEST_DIRS $ac_dir]) +} + +wine_fn_config_tool () +{ + ac_dir=$[1] + ac_deps="Make.rules" + if test "$ac_dir" != tools + then + dnl makedep is in tools so tools makefile cannot depend on it + ac_deps="$ac_deps \$(MAKEDEP)" + fi + wine_fn_append_file ALL_DIRS $ac_dir + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps + @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + AS_VAR_IF([enable_tools],[no],,[wine_fn_append_file ALL_TOOL_DIRS $ac_dir]) }]) dnl **** Define helper function to append a file to a makefile file list **** @@ -360,6 +377,13 @@ dnl AC_DEFUN([WINE_CONFIG_LIB],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl wine_fn_config_lib $1]) +dnl **** Create a tool makefile from config.status **** +dnl +dnl Usage: WINE_CONFIG_TOOL(name) +dnl +AC_DEFUN([WINE_CONFIG_TOOL],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +wine_fn_config_tool $1]) + dnl **** Add a message to the list displayed at the end **** dnl dnl Usage: WINE_NOTICE(notice) diff --git a/configure b/configure index 8cfccff..1ee7db2 100755 --- a/configure +++ b/configure @@ -13957,6 +13957,26 @@ else wine_fn_append_file ALL_TEST_DIRS $ac_dir fi } + +wine_fn_config_tool () +{ + ac_dir=$1 + ac_deps="Make.rules" + if test "$ac_dir" != tools + then + ac_deps="$ac_deps \$(MAKEDEP)" + fi + wine_fn_append_file ALL_DIRS $ac_dir + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps + @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + if test "x$enable_tools" = x""no; then : + +else + wine_fn_append_file ALL_TOOL_DIRS $ac_dir +fi +} ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_append_file ALL_SYMLINKS "dlls/wineps.drv/generic.ppd" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" @@ -14569,27 +14589,13 @@ wine_fn_config_program xcopy enable_xcopy install wine_fn_config_makefile server "Make.rules \$(MAKEDEP)" test "x$enable_server" != xno && wine_fn_append_file ALL_TOP_DIRS "server" -wine_fn_config_makefile tools Make.rules -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools" - -wine_fn_config_makefile tools/widl "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/widl" - -wine_fn_config_makefile tools/winebuild "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/winebuild" - -wine_fn_config_makefile tools/winedump "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/winedump" - -wine_fn_config_makefile tools/winegcc "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/winegcc" - -wine_fn_config_makefile tools/wmc "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/wmc" - -wine_fn_config_makefile tools/wrc "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/wrc" - +wine_fn_config_tool tools +wine_fn_config_tool tools/widl +wine_fn_config_tool tools/winebuild +wine_fn_config_tool tools/winedump +wine_fn_config_tool tools/winegcc +wine_fn_config_tool tools/wmc +wine_fn_config_tool tools/wrc test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -15314,13 +15320,6 @@ do "loader/Makefile") CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;; "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; - "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "tools/widl/Makefile") CONFIG_FILES="$CONFIG_FILES tools/widl/Makefile" ;; - "tools/winebuild/Makefile") CONFIG_FILES="$CONFIG_FILES tools/winebuild/Makefile" ;; - "tools/winedump/Makefile") CONFIG_FILES="$CONFIG_FILES tools/winedump/Makefile" ;; - "tools/winegcc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/winegcc/Makefile" ;; - "tools/wmc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;; - "tools/wrc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 4ec7363..55edefc 100644 --- a/configure.ac +++ b/configure.ac @@ -2700,13 +2700,13 @@ WINE_CONFIG_PROGRAM(wordpad,install) WINE_CONFIG_PROGRAM(write,install) WINE_CONFIG_PROGRAM(xcopy,install) WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_TOOL(tools) +WINE_CONFIG_TOOL(tools/widl) +WINE_CONFIG_TOOL(tools/winebuild) +WINE_CONFIG_TOOL(tools/winedump) +WINE_CONFIG_TOOL(tools/winegcc) +WINE_CONFIG_TOOL(tools/wmc) +WINE_CONFIG_TOOL(tools/wrc) dnl End of auto-generated output commands dnl Don't install in bin dir for Windows build diff --git a/tools/make_makefiles b/tools/make_makefiles index ed2278e..33fcbc0 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -392,7 +392,8 @@ sub update_makefiles(@) } elsif ($file =~ /^tools.*\/Makefile$/) { - push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[ALL_TOOL_DIRS],enable_tools)\n"; + (my $name = $file) =~ s/^(.*)\/Makefile/$1/; + push @lines, "WINE_CONFIG_TOOL($name)\n"; } elsif ($file =~ /^[^\/]*\/Makefile$/) {

1 0

Alexandre Julliard : Wine release 1.1.41
by Alexandre Julliard 19 Mar '10

19 Mar '10

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

Alexandre Julliard : Release 1.1.41.
by Alexandre Julliard 19 Mar '10

19 Mar '10

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

Tag wine-1.1.41 : Alexandre Julliard : Release 1.1.41
by Alexandre Julliard 19 Mar '10

19 Mar '10

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

Andrew Eikum : shlwapi: Only skip 'localhost' in file URLs in UrlCanonicalize.
by Alexandre Julliard 19 Mar '10

19 Mar '10

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

Huw Davies : dispex: Implement proxy and stub for IDispatchEx_InvokeEx.
by Alexandre Julliard 19 Mar '10

19 Mar '10

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

Trey Hunner : ping: Add skeleton ping command.
by Alexandre Julliard 19 Mar '10

19 Mar '10

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

Christian Costa : attrib.exe: Add stubbed command.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 3ae8d5888af2ddb592b66fdba3764e220484b66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae8d5888af2ddb592b66fdba… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:56:20 2010 +0100 attrib.exe: Add stubbed command. --- configure | 5 +++++ configure.ac | 1 + programs/attrib/Makefile.in | 12 ++++++++++++ programs/attrib/attrib.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c177802..e62a54e 100755 --- a/configure +++ b/configure @@ -16026,6 +16026,10 @@ test "x$enable_loader" != xno && wine_fn_append_file ALL_TOP_DIRS "loader" wine_fn_config_makefile programs "Make.rules \$(MAKEDEP)" test "x$enable_programs" != xno && wine_fn_append_file ALL_TOP_DIRS "programs" +wine_fn_config_program attrib +wine_fn_config_makefile programs/attrib "programs/Makeprog.rules \$(MAKEDEP)" +test "x$enable_attrib" != xno && wine_fn_append_file ALL_PROGRAM_DIRS "programs/attrib" && wine_fn_append_file ALL_INSTALL_DIRS "programs/attrib" + wine_fn_config_program cacls wine_fn_config_makefile programs/cacls "programs/Makeprog.rules \$(MAKEDEP)" test "x$enable_cacls" != xno && wine_fn_append_file ALL_PROGRAM_DIRS "programs/cacls" && wine_fn_append_file ALL_INSTALL_DIRS "programs/cacls" @@ -17470,6 +17474,7 @@ do "libs/wpp/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;; "loader/Makefile") CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;; "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; + "programs/attrib/Makefile") CONFIG_FILES="$CONFIG_FILES programs/attrib/Makefile" ;; "programs/cacls/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cacls/Makefile" ;; "programs/clock/Makefile") CONFIG_FILES="$CONFIG_FILES programs/clock/Makefile" ;; "programs/cmd/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmd/Makefile" ;; diff --git a/configure.ac b/configure.ac index ce14e53..1431a33 100644 --- a/configure.ac +++ b/configure.ac @@ -2642,6 +2642,7 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[ALL_TOP_DIRS]) +WINE_CONFIG_PROGRAM(attrib,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(cacls,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(clock,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(cmd,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in new file mode 100644 index 0000000..3696b93 --- /dev/null +++ b/programs/attrib/Makefile.in @@ -0,0 +1,12 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = attrib.exe +APPMODE = -mconsole -municode +IMPORTS = kernel32 + +C_SRCS = attrib.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c new file mode 100644 index 0000000..9cb9d9f --- /dev/null +++ b/programs/attrib/attrib.c @@ -0,0 +1,34 @@ +/* + * Copyright 2010 Christian Costa + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(attrib); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("attrib.exe is currently only a stub command\n"); + WINE_FIXME("cmdline:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Rob Shearman : rpcrt4: Add tests for a complex array of pointers.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: f6c4c49f86866cb7c15edb43af7203fca32850de URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c4c49f86866cb7c15edb43a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 19 14:50:15 2010 +0000 rpcrt4: Add tests for a complex array of pointers. --- dlls/rpcrt4/tests/server.c | 19 +++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 3 +++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 693fe69..e792170 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -283,6 +283,15 @@ s_sum_var_array(int x[20], int n) } int +s_sum_complex_array(int n, refpint_t pi[]) +{ + int total = 0; + for (; n > 0; n--) + total += *pi[n - 1]; + return total; +} + +int s_dot_two_vectors(vector_t vs[2]) { return vs[0].x * vs[1].x + vs[0].y * vs[1].y + vs[0].z * vs[1].z; @@ -1213,6 +1222,7 @@ array_tests(void) int *pi; pints_t api[5]; numbers_struct_t *ns; + refpint_t rpi[5]; if (!old_windows_version) { @@ -1317,6 +1327,15 @@ array_tests(void) HeapFree(GetProcessHeap(), 0, ns); } HeapFree(GetProcessHeap(), 0, pi); + + pi = HeapAlloc(GetProcessHeap(), 0, 5 * sizeof(*pi)); + pi[0] = 3; rpi[0] = &pi[0]; + pi[1] = 5; rpi[1] = &pi[1]; + pi[2] = -2; rpi[2] = &pi[2]; + pi[3] = -1; rpi[3] = &pi[3]; + pi[4] = -4; rpi[4] = &pi[4]; + ok(sum_complex_array(5, rpi) == 1, "RPC sum_complex_array\n"); + HeapFree(GetProcessHeap(), 0, pi); } void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 29b90b5..6899675 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -120,6 +120,8 @@ cpp_quote("#endif") } u; } test_list_t; + typedef [ref] int *refpint_t; + int test_list_length(test_list_t *ls); int sum_fixed_int_3d(int m[2][3][4]); int sum_conf_array([size_is(n)] int x[], int n); @@ -154,6 +156,7 @@ cpp_quote("#endif") int sum_cs(cs_t *cs); int sum_cps(cps_t *cps); int sum_cpsc(cpsc_t *cpsc); + int sum_complex_array(int n, refpint_t pi[n]); typedef [wire_marshal(int)] void *puint_t; int square_puint(puint_t p);

1 0