Signed-off-by: Zhiyi Zhang zzhang@codeweavers.com --- programs/control/Makefile.in | 4 +++- programs/control/control.c | 3 +++ programs/control/control.manifest | 16 ++++++++++++++++ programs/control/control.rc | 25 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 programs/control/control.manifest create mode 100644 programs/control/control.rc
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index c90fca4de95..866896031b7 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -1,6 +1,8 @@ MODULE = control.exe -IMPORTS = shell32 user32 +IMPORTS = shell32 user32 comctl32
EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
C_SRCS = control.c + +RC_SRCS = control.rc diff --git a/programs/control/control.c b/programs/control/control.c index b72416893c9..507abcc1cce 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <string.h> #include <windows.h> +#include <commctrl.h> #include <shellapi.h>
@@ -37,6 +38,8 @@ static void launch(LPCWSTR what)
int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nCmdShow) { + InitCommonControls(); + /* no parameters - pop up whole "Control Panel" by default */ if (!*lpszCmdLine) { launch(lpszCmdLine); diff --git a/programs/control/control.manifest b/programs/control/control.manifest new file mode 100644 index 00000000000..2834937e564 --- /dev/null +++ b/programs/control/control.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Control" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/control/control.rc b/programs/control/control.rc new file mode 100644 index 00000000000..ef5e2f6e69e --- /dev/null +++ b/programs/control/control.rc @@ -0,0 +1,25 @@ +/* + * Control resources + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * 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 <winuser.h> + +/* @makedep: control.manifest */ +1 RT_MANIFEST control.manifest