Re: [PATCH 01/41] robocopy: add stub

[Zebediah Figura]

Hello Florian!

On 9/6/21 9:54 AM, Florian Eder wrote:
> Basic files and required changes to configure(.ac) to create a stub version
> of the robocopy utility
>
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43653
> Signed-off-by: Florian Eder

In the future (and in future revisions of this patch set) please don't 
send so many patches at once. It's pretty much impossible to review this 
many at once, and it means you'd have to resend the whole series if 
changes are requested. I'd recommend limiting a single series to about 
five patches.

I'll review the first five patches of this submission.
> configure                     |  2 +-
>   configure.ac                  |  1 +
>   programs/robocopy/Makefile.in |  9 +++++++++
>   programs/robocopy/main.c      | 29 +++++++++++++++++++++++++++++
>   programs/robocopy/robocopy.h  | 19 +++++++++++++++++++
>   programs/robocopy/robocopy.rc | 35 +++++++++++++++++++++++++++++++++++
>   6 files changed, 94 insertions(+), 1 deletion(-)
>   create mode 100644 programs/robocopy/Makefile.in
>   create mode 100644 programs/robocopy/main.c
>   create mode 100644 programs/robocopy/robocopy.h
>   create mode 100644 programs/robocopy/robocopy.rc
>
> diff --git a/configure b/configure
> index 99283e0ef18..9e2fa9ef009 100755
> --- a/configure
> +++ b/configure
> @@ -21264,6 +21264,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests
>   wine_fn_config_makefile programs/regini enable_regini
>   wine_fn_config_makefile programs/regsvcs enable_regsvcs
>   wine_fn_config_makefile programs/regsvr32 enable_regsvr32
> +wine_fn_config_makefile programs/robocopy enable_robocopy
>   wine_fn_config_makefile programs/rpcss enable_rpcss
>   wine_fn_config_makefile programs/rundll.exe16 enable_win16
>   wine_fn_config_makefile programs/rundll32 enable_rundll32
> @@ -22797,4 +22798,3 @@ IFS="$ac_save_IFS"
>   $as_echo "
>   $as_me: Finished.  Do '${ac_make}' to compile Wine.
>   " >&6
> -
>
> diff --git a/configure.ac b/configure.ac
> index 26f74985924..88b9426260f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -3963,6 +3963,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests)
>   WINE_CONFIG_MAKEFILE(programs/regini)
>   WINE_CONFIG_MAKEFILE(programs/regsvcs)
>   WINE_CONFIG_MAKEFILE(programs/regsvr32)
> +WINE_CONFIG_MAKEFILE(programs/robocopy)
>   WINE_CONFIG_MAKEFILE(programs/rpcss)
>   WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16)
>   WINE_CONFIG_MAKEFILE(programs/rundll32)
> diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in
> new file mode 100644
> index 00000000000..5463edcb8b3
> --- /dev/null
> +++ b/programs/robocopy/Makefile.in
> @@ -0,0 +1,9 @@
> +MODULE    = robocopy.exe
> +IMPORTS   =

Nitpick, but the empty imports line is kind of useless.
> -
>
> +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
> -
>
> +C_SRCS = \
> - main.c
> -
>
> +RC_SRCS = robocopy.rc
> \ No newline at end of file
> diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c
> new file mode 100644
> index 00000000000..a184235e488
> --- /dev/null
> +++ b/programs/robocopy/main.c
> @@ -0,0 +1,29 @@
> +/*
> -
> - Copyright 2021 Florian Eder
> -
> -
> -
> - 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(robocopy);
> -
>
> +#define WIN32_LEAN_AND_MEAN
> +#include <windows.h>
> -
>
> +int __cdecl wmain(int argc, WCHAR *argv[])
> +{
> - WINE_FIXME("robocopy stub");
> - return 0;
>
> +}
> \ No newline at end of file

Whitespace error here; git should have warned you about this when sending.
> diff --git a/programs/robocopy/robocopy.h b/programs/robocopy/robocopy.h
> new file mode 100644
> index 00000000000..33e84b82ea0
> --- /dev/null
> +++ b/programs/robocopy/robocopy.h
> @@ -0,0 +1,19 @@
> +/*
> -
> - Copyright 2021 Florian Eder
> -
> -
> -
> - 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
> - */
> -
>
> +#define WIN32_LEAN_AND_MEAN
> \ No newline at end of file

This file does nothing; it should be left out until it's used.
> diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc
> new file mode 100644
> index 00000000000..c7acd5ad161
> --- /dev/null
> +++ b/programs/robocopy/robocopy.rc
> @@ -0,0 +1,35 @@
> +/*
> -
> - Copyright 2021 Florian Eder
> -
> -
> -
> - 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 <windef.h>
> +#include "robocopy.h"
> -
>
> +#pragma makedep po
> -
>
> +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
> -
>
> +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy"
> +#define WINE_FILENAME_STR "robocopy.exe"
> +#define WINE_FILETYPE VFT_APP
> +#define WINE_FILEVERSION 5,1,10,1027
> +#define WINE_FILEVERSION_STR "5.1.10.1027"
> -
>
> +#define WINE_PRODUCTVERSION 5,1,10,1027
> +#define WINE_PRODUCTVERSION_STR "XP027"
> -
>
> +#include "wine/wine_common_ver.rc"