From 347272b37e81aee143e274089f114411d4c95ad9 Mon Sep 17 00:00:00 2001 From: Andrey Turkin Date: Wed, 28 Jan 2009 19:56:25 +0300 Subject: [PATCH] programs: Add lodctr and unlodctr tools. --- .gitignore | 2 ++ configure | 20 ++++++++++++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 5 +++++ dlls/loadperf/Makefile.in | 1 + programs/lodctr/Makefile.in | 13 +++++++++++++ programs/lodctr/lodctr_main.c | 25 +++++++++++++++++++++++++ programs/unlodctr/Makefile.in | 13 +++++++++++++ programs/unlodctr/unlodctr_main.c | 25 +++++++++++++++++++++++++ 9 files changed, 106 insertions(+) create mode 100644 programs/lodctr/Makefile.in create mode 100644 programs/lodctr/lodctr_main.c create mode 100644 programs/unlodctr/Makefile.in create mode 100644 programs/unlodctr/unlodctr_main.c diff --git a/.gitignore b/.gitignore index d9c831ed21b..4a5a3b02a54 100644 --- a/.gitignore +++ b/.gitignore @@ -236,6 +236,7 @@ programs/explorer/explorer programs/hh/hh programs/icinfo/icinfo programs/iexplore/iexplore +programs/lodctr/lodctr programs/msiexec/msiexec programs/net/net programs/notepad/notepad @@ -259,6 +260,7 @@ programs/start/start programs/svchost/svchost programs/taskmgr/taskmgr programs/uninstaller/uninstaller +programs/unlodctr/unlodctr programs/view/view programs/wineapploader programs/wineboot/wineboot diff --git a/configure b/configure index efb673c9446..f2bf40e3917 100755 --- a/configure +++ b/configure @@ -27292,6 +27292,15 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/iexplore/Makefile: programs/iexplore/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/iexplore/Makefile" +ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/lodctr/Makefile" +test "x$enable_lodctr" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + lodctr" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + lodctr" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/lodctr/Makefile: programs/lodctr/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/lodctr/Makefile" + ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/msiexec/Makefile" test "x$enable_msiexec" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ @@ -27451,6 +27460,15 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/uninstaller/Makefile: programs/uninstaller/Makefile.in programs/Makeprog.rules" ac_config_files="$ac_config_files programs/uninstaller/Makefile" +ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/unlodctr/Makefile" +test "x$enable_unlodctr" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + unlodctr" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + unlodctr" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/unlodctr/Makefile: programs/unlodctr/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/unlodctr/Makefile" + ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/view/Makefile" test "x$enable_view" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ @@ -28711,6 +28729,7 @@ do "programs/hh/Makefile") CONFIG_FILES="$CONFIG_FILES programs/hh/Makefile" ;; "programs/icinfo/Makefile") CONFIG_FILES="$CONFIG_FILES programs/icinfo/Makefile" ;; "programs/iexplore/Makefile") CONFIG_FILES="$CONFIG_FILES programs/iexplore/Makefile" ;; + "programs/lodctr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/lodctr/Makefile" ;; "programs/msiexec/Makefile") CONFIG_FILES="$CONFIG_FILES programs/msiexec/Makefile" ;; "programs/net/Makefile") CONFIG_FILES="$CONFIG_FILES programs/net/Makefile" ;; "programs/notepad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/notepad/Makefile" ;; @@ -28728,6 +28747,7 @@ do "programs/svchost/Makefile") CONFIG_FILES="$CONFIG_FILES programs/svchost/Makefile" ;; "programs/taskmgr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/taskmgr/Makefile" ;; "programs/uninstaller/Makefile") CONFIG_FILES="$CONFIG_FILES programs/uninstaller/Makefile" ;; + "programs/unlodctr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/unlodctr/Makefile" ;; "programs/view/Makefile") CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;; "programs/wineboot/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wineboot/Makefile" ;; "programs/winebrowser/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winebrowser/Makefile" ;; diff --git a/configure.ac b/configure.ac index 89e9c5a34c0..fe713435492 100644 --- a/configure.ac +++ b/configure.ac @@ -2203,6 +2203,7 @@ WINE_CONFIG_MAKEFILE([programs/explorer/Makefile],[programs/Makeprog.rules],[pro WINE_CONFIG_MAKEFILE([programs/hh/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/icinfo/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/iexplore/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/lodctr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/msiexec/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/net/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/notepad/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) @@ -2220,6 +2221,7 @@ WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules],[progra WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/unlodctr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) WINE_CONFIG_MAKEFILE([programs/wineboot/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/winebrowser/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 90075c66c4f..9b68b4f32f1 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -232,6 +232,7 @@ IMPORT_LIBS = \ inetcomm/libinetcomm.$(IMPLIBEXT) \ iphlpapi/libiphlpapi.$(IMPLIBEXT) \ kernel32/libkernel32.$(IMPLIBEXT) \ + loadperf/libloadperf.$(IMPLIBEXT) \ lz32/liblz32.$(IMPLIBEXT) \ mapi32/libmapi32.$(IMPLIBEXT) \ mlang/libmlang.$(IMPLIBEXT) \ @@ -375,6 +376,7 @@ CROSS_IMPLIBS = \ inetcomm/libinetcomm.a \ iphlpapi/libiphlpapi.a \ kernel32/libkernel32.a \ + loadperf/libloadperf.a \ lz32/liblz32.a \ mapi32/libmapi32.a \ mlang/libmlang.a \ @@ -634,6 +636,9 @@ iphlpapi/libiphlpapi.def iphlpapi/libiphlpapi.a: iphlpapi/iphlpapi.spec $(WINEBU kernel32/libkernel32.def kernel32/libkernel32.a: kernel32/kernel32.spec $(WINEBUILD) @cd kernel32 && $(MAKE) `basename $@` +loadperf/libloadperf.def loadperf/libloadperf.a: loadperf/loadperf.spec $(WINEBUILD) + @cd loadperf && $(MAKE) `basename $@` + lz32/liblz32.def lz32/liblz32.a: lz32/lz32.spec $(WINEBUILD) @cd lz32 && $(MAKE) `basename $@` diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in index 3d5019b89ee..1a5715911e5 100644 --- a/dlls/loadperf/Makefile.in +++ b/dlls/loadperf/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = loadperf.dll +IMPORTLIB = loadperf IMPORTS = kernel32 C_SRCS = \ diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in new file mode 100644 index 00000000000..5446a88ac47 --- /dev/null +++ b/programs/lodctr/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = lodctr.exe +APPMODE = -mconsole -municode +IMPORTS = loadperf kernel32 + +C_SRCS = lodctr_main.c + +@MAKE_PROG_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/lodctr/lodctr_main.c b/programs/lodctr/lodctr_main.c new file mode 100644 index 00000000000..de5d242b4d9 --- /dev/null +++ b/programs/lodctr/lodctr_main.c @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2009 Andrey Turkin + * + * 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 +#include + +int wmain(int argc, WCHAR *argv[]) +{ + return LoadPerfCounterTextStringsW(GetCommandLineW(), FALSE); +} diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in new file mode 100644 index 00000000000..4e284a505c3 --- /dev/null +++ b/programs/unlodctr/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = unlodctr.exe +APPMODE = -mconsole -municode +IMPORTS = loadperf kernel32 + +C_SRCS = unlodctr_main.c + +@MAKE_PROG_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/unlodctr/unlodctr_main.c b/programs/unlodctr/unlodctr_main.c new file mode 100644 index 00000000000..1e33b1cfa4c --- /dev/null +++ b/programs/unlodctr/unlodctr_main.c @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2009 Andrey Turkin + * + * 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 +#include + +int wmain(int argc, WCHAR *argv[]) +{ + return UnloadPerfCounterTextStringsW(GetCommandLineW(), FALSE); +}