From ade6106bf623e984bd5bb85cc22cab56a19f4efe Mon Sep 17 00:00:00 2001
From: dannybackx <dannybackx@d7810a3d-100a-0410-8641-c3624a9c11f1>
Date: Thu, 11 Jun 2009 19:42:38 +0000
Subject: [PATCH] Define struct _SHELLEXECUTEINFO instead of struct
 _SHELLEXECUTEINFOA and struct _SHELLEXECUTEINFOW.

git-svn-id: svn://svn.code.sf.net/p/cegcc/code/trunk@1337 d7810a3d-100a-0410-8641-c3624a9c11f1
---
 cegcc/src/w32api/ChangeLog.ce       |  5 +++++
 cegcc/src/w32api/include/shellapi.h | 31 +++++++++++++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/cegcc/src/w32api/ChangeLog.ce b/cegcc/src/w32api/ChangeLog.ce
index d58a5be49..fca132751 100644
--- a/cegcc/src/w32api/ChangeLog.ce
+++ b/cegcc/src/w32api/ChangeLog.ce
@@ -1,3 +1,8 @@
+2009-06-11  Danny Backx  <dannybackx@users.sourceforge.net>
+
+	* include/shellapi.h (struct _SHELLEXECUTEINFO) : Define instead of
+	its struct _SHELLEXECUTEINFO(A|W) brothers.
+
 2009-06-11  Vincent Richomme  <forumer@smartmobili.com>
 
 	* include/mapidefs.h, include/pimstore.h : New files.
diff --git a/cegcc/src/w32api/include/shellapi.h b/cegcc/src/w32api/include/shellapi.h
index eb1d664ec..46790572a 100644
--- a/cegcc/src/w32api/include/shellapi.h
+++ b/cegcc/src/w32api/include/shellapi.h
@@ -213,40 +213,43 @@ typedef struct _NOTIFYICONDATAW {
 #endif
 } NOTIFYICONDATAW,*PNOTIFYICONDATAW;
 
-typedef struct _SHELLEXECUTEINFOA {
+#ifdef UNICODE
+typedef struct _SHELLEXECUTEINFO {
 	DWORD cbSize;
 	ULONG fMask;
 	HWND hwnd;
-	LPCSTR lpVerb;
-	LPCSTR lpFile;
-	LPCSTR lpParameters;
-	LPCSTR lpDirectory;
+	LPCWSTR lpVerb;
+	LPCWSTR lpFile;
+	LPCWSTR lpParameters;
+	LPCWSTR lpDirectory;
 	int nShow;
 	HINSTANCE hInstApp;
 	PVOID lpIDList;
-	LPCSTR lpClass;
+	LPCWSTR lpClass;
 	HKEY hkeyClass;
 	DWORD dwHotKey;
 	HANDLE hIcon;
 	HANDLE hProcess;
-} SHELLEXECUTEINFOA,*LPSHELLEXECUTEINFOA;
-typedef struct _SHELLEXECUTEINFOW {
+} SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
+#else
+typedef struct _SHELLEXECUTEINFO {
 	DWORD cbSize;
 	ULONG fMask;
 	HWND hwnd;
-	LPCWSTR lpVerb;
-	LPCWSTR lpFile;
-	LPCWSTR lpParameters;
-	LPCWSTR lpDirectory;
+	LPCSTR lpVerb;
+	LPCSTR lpFile;
+	LPCSTR lpParameters;
+	LPCSTR lpDirectory;
 	int nShow;
 	HINSTANCE hInstApp;
 	PVOID lpIDList;
-	LPCWSTR lpClass;
+	LPCSTR lpClass;
 	HKEY hkeyClass;
 	DWORD dwHotKey;
 	HANDLE hIcon;
 	HANDLE hProcess;
-} SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
+} SHELLEXECUTEINFOA,*LPSHELLEXECUTEINFOA;
+#endif
 typedef struct _SHFILEOPSTRUCTA {
 	HWND hwnd;
 	UINT wFunc;
-- 
2.11.4.GIT