[Cegcc-svn] SF.net SVN: cegcc:[1337] trunk/cegcc/src/w32api

[<dan...@us...>]

Revision: 1337
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1337&view=rev
Author:   dannybackx
Date:     2009-06-11 19:42:38 +0000 (Thu, 11 Jun 2009)

Log Message:
-----------
Define struct _SHELLEXECUTEINFO instead of struct _SHELLEXECUTEINFOA and
struct _SHELLEXECUTEINFOW.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/include/shellapi.h

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2009-06-11 18:05:52 UTC (rev 1336)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2009-06-11 19:42:38 UTC (rev 1337)
@@ -1,3 +1,8 @@
+2009-06-11  Danny Backx  <dan...@us...>
+
+	* include/shellapi.h (struct _SHELLEXECUTEINFO) : Define instead of
+	its struct _SHELLEXECUTEINFO(A|W) brothers.
+
 2009-06-11  Vincent Richomme  <fo...@sm...>
 
 	* include/mapidefs.h, include/pimstore.h : New files.

Modified: trunk/cegcc/src/w32api/include/shellapi.h
===================================================================
--- trunk/cegcc/src/w32api/include/shellapi.h	2009-06-11 18:05:52 UTC (rev 1336)
+++ trunk/cegcc/src/w32api/include/shellapi.h	2009-06-11 19:42:38 UTC (rev 1337)
@@ -213,40 +213,43 @@
 #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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.