Detlef Riekenberg : control: Convert application to Unicode.
Alexandre Julliard
julliard at winehq.org
Wed Apr 28 16:35:48 CDT 2010
Module: wine
Branch: master
Commit: a2a47baac0bde63d1fdefdd9a76c7e69375bcc34
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a47baac0bde63d1fdefdd9a76c7e69375bcc34
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Tue Apr 27 21:13:53 2010 +0200
control: Convert application to Unicode.
---
programs/control/Makefile.in | 2 +-
programs/control/control.c | 81 +++++++++++++++++++++++++----------------
programs/control/params.h | 42 ----------------------
3 files changed, 50 insertions(+), 75 deletions(-)
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index f3b859b..291836b 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = control.exe
-APPMODE = -mwindows
+APPMODE = -mwindows -municode
IMPORTS = shell32 user32 kernel32
C_SRCS = control.c
diff --git a/programs/control/control.c b/programs/control/control.c
index 095d221..49f006c 100644
--- a/programs/control/control.c
+++ b/programs/control/control.c
@@ -1,6 +1,8 @@
/*
- * Control
+ * Start a control panel applet or open the control panel window
+ *
* Copyright (C) 1998 by Marcel Baur <mbaur at g26.ethz.ch>
+ * Copyright 2010 Detlef Riekenberg
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -23,48 +25,63 @@
#include <string.h>
#include <windows.h>
#include <shellapi.h>
-#include "params.h"
-extern void WINAPI Control_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow);
-static void launch(const char *what)
+/* alphabetical list of recognized optional command line parameters */
+static const WCHAR szP_COLOR[] = {'C','O','L','O','R',0};
+static const WCHAR szP_DATETIME[] = {'D','A','T','E','/','T','I','M','E',0};
+static const WCHAR szP_DESKTOP[] = {'D','E','S','K','T','O','P',0};
+static const WCHAR szP_INTERNATIONAL[] = {'I','N','T','E','R','N','A','T','I','O','N','A','L',0};
+static const WCHAR szP_KEYBOARD[] = {'K','E','Y','B','O','A','R','D',0};
+static const WCHAR szP_MOUSE[] = {'M','O','U','S','E',0};
+static const WCHAR szP_PORTS[] = {'P','O','R','T','S',0};
+static const WCHAR szP_PRINTERS [] = {'P','R','I','N','T','E','R','S',0};
+
+/* alphabetical list of appropriate commands to execute */
+static const WCHAR szC_COLOR[] = {'d','e','s','k','.','c','p','l',',',',','2',0};
+static const WCHAR szC_DATETIME[] = {'t','i','m','e','d','a','t','e','.','c','p','l',0};
+static const WCHAR szC_DESKTOP[] = {'d','e','s','k','.','c','p','l',0};
+static const WCHAR szC_FONTS[] = {'m','a','i','n','.','c','p','l',' ','@','3',0};
+static const WCHAR szC_INTERNATIONAL[] = {'i','n','t','l','.','c','p','l',0};
+static const WCHAR szC_KEYBOARD[] = {'m','a','i','n','.','c','p','l',' ','@','1',0};
+static const WCHAR szC_MOUSE[] = {'m','a','i','n','.','c','p','l',0};
+static const WCHAR szC_PORTS[] = {'s','y','s','d','m','.','c','p','l',',',',','1',0};
+static const WCHAR szC_PRINTERS[] = {'m','a','i','n','.','c','p','l',' ','@','2',0};
+
+
+extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow);
+
+static void launch(LPCWSTR what)
{
- Control_RunDLL(GetDesktopWindow(), 0, what, SW_SHOW);
+ Control_RunDLLW(GetDesktopWindow(), 0, what, SW_SHOW);
ExitProcess(0);
}
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszCmdLine, INT nCmdShow)
+int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nCmdShow)
{
- char szParams[255];
- strcpy(szParams, lpszCmdLine);
- CharUpperA(szParams);
-
/* no parameters - pop up whole "Control Panel" by default */
- if (!*szParams) {
- launch("");
- return 0;
+ if (!*lpszCmdLine) {
+ launch(lpszCmdLine);
}
/* check for optional parameter */
- if (!strcmp(szParams,szP_DESKTOP))
- launch(szC_DESKTOP);
- if (!strcmp(szParams,szP_COLOR))
- launch(szC_COLOR);
- if (!strcmp(szParams,szP_DATETIME))
- launch(szC_DATETIME);
- if (!strcmp(szParams,szP_DESKTOP))
- launch(szC_DESKTOP);
- if (!strcmp(szParams,szP_INTERNATIONAL))
- launch(szC_INTERNATIONAL);
- if (!strcmp(szParams,szP_KEYBOARD))
- launch(szC_KEYBOARD);
- if (!strcmp(szParams,szP_MOUSE))
- launch(szC_MOUSE);
- if (!strcmp(szParams,szP_PORTS))
- launch(szC_PORTS);
- if (!strcmp(szParams,szP_PRINTERS))
- launch(szC_PRINTERS);
+ if (!lstrcmpiW(lpszCmdLine,szP_COLOR))
+ launch(szC_COLOR);
+ if (!lstrcmpiW(lpszCmdLine,szP_DATETIME))
+ launch(szC_DATETIME);
+ if (!lstrcmpiW(lpszCmdLine,szP_DESKTOP))
+ launch(szC_DESKTOP);
+ if (!lstrcmpiW(lpszCmdLine,szP_INTERNATIONAL))
+ launch(szC_INTERNATIONAL);
+ if (!lstrcmpiW(lpszCmdLine,szP_KEYBOARD))
+ launch(szC_KEYBOARD);
+ if (!lstrcmpiW(lpszCmdLine,szP_MOUSE))
+ launch(szC_MOUSE);
+ if (!lstrcmpiW(lpszCmdLine,szP_PORTS))
+ launch(szC_PORTS);
+ if (!lstrcmpiW(lpszCmdLine,szP_PRINTERS))
+ launch(szC_PRINTERS);
/* try to launch if a .cpl file is given directly */
- launch(szParams);
+ launch(lpszCmdLine);
return 0;
}
diff --git a/programs/control/params.h b/programs/control/params.h
deleted file mode 100644
index d7b73d3..0000000
--- a/programs/control/params.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Control
- * Copyright (C) 1998 by Marcel Baur <mbaur at g26.ethz.ch>
- *
- * 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
- */
-
-/* alphabetical list of recognized optional command line parameters */
-
-#define szP_COLOR "COLOR"
-#define szP_DATETIME "DATE/TIME"
-#define szP_DESKTOP "DESKTOP"
-#define szP_INTERNATIONAL "INTERNATIONAL"
-#define szP_KEYBOARD "KEYBOARD"
-#define szP_MOUSE "MOUSE"
-#define szP_PORTS "PORTS"
-#define szP_PRINTERS "PRINTERS"
-
-
-/* alphabetical list of appropriate commands to execute */
-
-#define szC_COLOR "desk.cpl,,2"
-#define szC_DATETIME "timedate.cpl"
-#define szC_DESKTOP "desk.cpl"
-#define szC_FONTS "main.cpl @3"
-#define szC_INTERNATIONAL "intl.cpl"
-#define szC_KEYBOARD "main.cpl @1"
-#define szC_MOUSE "main.cpl"
-#define szC_PORTS "sysdm.cpl,,1"
-#define szC_PRINTERS "main.cpl @2"
More information about the wine-cvs
mailing list