Signed-off-by: Zhiyi Zhang zzhang@codeweavers.com --- programs/view/Makefile.in | 2 +- programs/view/resource.h | 1 + programs/view/view.c | 3 +++ programs/view/view.manifest | 16 ++++++++++++++++ programs/view/view.rc | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 programs/view/view.manifest
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 7e9ff33e2d1..ce55999c1a9 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -1,5 +1,5 @@ MODULE = view.exe -IMPORTS = comdlg32 user32 gdi32 +IMPORTS = comdlg32 user32 gdi32 comctl32
EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
diff --git a/programs/view/resource.h b/programs/view/resource.h index 1cfaf5fca11..76f940d1fad 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -17,6 +17,7 @@ */
#include <windef.h> +#include <winuser.h>
#define IDS_DESCRIPTION 2 #define IDS_OPEN_META_STRING 3 diff --git a/programs/view/view.c b/programs/view/view.c index ad29734828b..1e5c7daa8cf 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -17,6 +17,7 @@ */
#include <windows.h> +#include <commctrl.h> #include <commdlg.h> #include <stdio.h>
@@ -403,6 +404,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd { MSG msg;
+ InitCommonControls(); + /* Other instances of app running? */ if (!hPrevInstance) { diff --git a/programs/view/view.manifest b/programs/view/view.manifest new file mode 100644 index 00000000000..198ffbfc055 --- /dev/null +++ b/programs/view/view.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.View" 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/view/view.rc b/programs/view/view.rc index 39971dd555f..19a778c8036 100644 --- a/programs/view/view.rc +++ b/programs/view/view.rc @@ -48,3 +48,6 @@ BEGIN IDS_DESCRIPTION "Regular Metafile Viewer" IDS_OPEN_META_STRING "Metafiles (*.wmf, *.emf)" END + +/* @makedep: view.manifest */ +1 RT_MANIFEST view.manifest