[ros-diffs] [mf] 18184: sync with Wine:

sync with Wine: 
- Fix warnings in 64bit. (Kevin Koltzau [e-mail])
- simplify 'sei' structure initialization in ShellExecuteA/W
Modified: trunk/reactos/lib/shell32/shell32_main.h
Modified: trunk/reactos/lib/shell32/shlexec.c
  _____

Modified: trunk/reactos/lib/shell32/shell32_main.h
--- trunk/reactos/lib/shell32/shell32_main.h	2005-10-01 07:37:13 UTC
(rev 18183)
+++ trunk/reactos/lib/shell32/shell32_main.h	2005-10-01 08:20:12 UTC
(rev 18184)
@@ -210,7 +210,7 @@

#define HINSTANCE_32(h16)	((HINSTANCE)(ULONG_PTR)(h16))
 #define HINSTANCE_16(h32)	(LOWORD(h32))

-typedef UINT (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL
shWait,
+typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env,
BOOL shWait,
    		    LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW
sei_out);

BOOL WINAPI ShellExecuteExW32(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32
execfunc);
  _____

Modified: trunk/reactos/lib/shell32/shlexec.c
--- trunk/reactos/lib/shell32/shlexec.c	2005-10-01 07:37:13 UTC (rev
18183)
+++ trunk/reactos/lib/shell32/shlexec.c	2005-10-01 08:20:12 UTC (rev
18184)
@@ -334,12 +334,12 @@

*	SHELL_ExecuteW [Internal]
  *
  */
-static UINT SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
+static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL
shWait,
    		    LPSHELLEXECUTEINFOW psei,
LPSHELLEXECUTEINFOW psei_out)
 {
     STARTUPINFOW  startup;
     PROCESS_INFORMATION info;
-    UINT retval = 31;
+    UINT_PTR retval = 31;
     UINT gcdret = 0;
     WCHAR curdir[MAX_PATH];

@@ -864,13 +864,13 @@

/***********************************************************************
**
  *	execute_from_key [Internal]
  */
-static UINT execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env,
LPCWSTR szCommandline,
+static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR
*env, LPCWSTR szCommandline,
    		     SHELL_ExecuteW32 execfunc,
    		     LPSHELLEXECUTEINFOW psei,
LPSHELLEXECUTEINFOW psei_out)
 {
     WCHAR cmd[1024];
     LONG cmdlen = sizeof(cmd);
-    UINT retval = 31;
+    UINT_PTR retval = 31;

cmd[0] = '\0';

@@ -936,7 +936,7 @@
  */
 HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory,
LPWSTR lpResult)
 {
-    UINT retval = 31;    /* default - 'No association was found' */
+    UINT_PTR retval = 31;    /* default - 'No association was found' */
     WCHAR old_dir[1024];

TRACE("File %s, Dir %s\n",
@@ -989,7 +989,7 @@
     WCHAR *env;
     WCHAR lpstrProtocol[256];
     LPCWSTR lpFile;
-    UINT retval = 31;
+    UINT_PTR retval = 31;
     WCHAR wcmd[1024];
     WCHAR buffer[MAX_PATH];
     const WCHAR* ext;
@@ -1360,7 +1360,6 @@
                                LPCSTR lpParameters,LPCSTR lpDirectory,
INT iShowCmd)
 {
     SHELLEXECUTEINFOA sei;
-    HANDLE hProcess = 0;

TRACE("%p,%s,%s,%s,%s,%d\n",
           hWnd, debugstr_a(lpOperation), debugstr_a(lpFile),
@@ -1378,7 +1377,7 @@
     sei.lpClass = 0;
     sei.hkeyClass = 0;
     sei.dwHotKey = 0;
-    sei.hProcess = hProcess;
+    sei.hProcess = 0;

ShellExecuteExA (&sei);
     return sei.hInstApp;
@@ -1450,7 +1449,6 @@
                                LPCWSTR lpParameters, LPCWSTR
lpDirectory, INT nShowCmd)
 {
     SHELLEXECUTEINFOW sei;
-    HANDLE hProcess = 0;

TRACE("\n");
     sei.cbSize = sizeof(sei);
@@ -1465,7 +1463,7 @@
     sei.lpClass = 0;
     sei.hkeyClass = 0;
     sei.dwHotKey = 0;
-    sei.hProcess = hProcess;
+    sei.hProcess = 0;

ShellExecuteExW32 (&sei, SHELL_ExecuteW);
     return sei.hInstApp;