adjustments for building in Wine; eliminated compiler warnings

svn path=/trunk/; revision=7566

diff --git a/reactos/lib/shell32/shell.c b/reactos/lib/shell32/shell.c
index a409a66..5581134 100644 (file)
--- a/reactos/lib/shell32/shell.c
+++ b/reactos/lib/shell32/shell.c
@@ -614,8 +614,8 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 static UINT SHELL_Execute16(const char *lpCmd, void *env, BOOL shWait,
                            LPSHELLEXECUTEINFOA psei, LPSHELLEXECUTEINFOA psei_out)
 {
-    UINT ret = WinExec16(lpCmd, sei->nShow);
-    sei->hInstApp = HINSTANCE_32(ret);
+    UINT ret = WinExec16(lpCmd, psei->nShow);
+    psei->hInstApp = HINSTANCE_32(ret);
     return ret;
 }
 

diff --git a/reactos/lib/shell32/shlcpanel.c b/reactos/lib/shell32/shlcpanel.c
index 4fb193e..4fcefa5 100644 (file)
--- a/reactos/lib/shell32/shlcpanel.c
+++ b/reactos/lib/shell32/shlcpanel.c
@@ -754,7 +754,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP
     BOOL ret;
     int l;
 
-    TRACE("(%p)->execute(%x)\n", This, psei);
+    TRACE("(%p)->execute(%p)\n", This, psei);
 
     if (!psei)
        return E_INVALIDARG;
@@ -768,8 +768,8 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP
     l = 1 + MultiByteToWideChar(CP_ACP, 0, pcpanel->szName, -1, path+1, MAX_PATH);
 
     /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file */
-    lstrcpyW(path+1, L"\" ");
-    l += 2;
+    path[++l] = '"';
+    path[++l] = ' ';
 
     MultiByteToWideChar(CP_ACP, 0, pcpanel->szName+pcpanel->offsDispName, -1, path+l, MAX_PATH);
 
@@ -836,7 +836,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LP
     char path[MAX_PATH];
     BOOL ret;
 
-    TRACE("(%p)->execute(%x)\n", This, psei);
+    TRACE("(%p)->execute(%p)\n", This, psei);
 
     if (!psei)
        return E_INVALIDARG;

diff --git a/reactos/lib/shell32/shlfolder.c b/reactos/lib/shell32/shlfolder.c
index 1fff0fa..1e6fb97 100644 (file)
--- a/reactos/lib/shell32/shlfolder.c
+++ b/reactos/lib/shell32/shlfolder.c
@@ -397,7 +397,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO
        if (SFGAO_LINK & *pdwAttributes) {
            char ext[MAX_PATH];
 
-           if (!_ILGetExtension(pidl, ext, MAX_PATH) || stricmp(ext, "lnk"))
+           if (!_ILGetExtension(pidl, ext, MAX_PATH) || strcasecmp(ext, "lnk"))
                *pdwAttributes &= ~SFGAO_READONLY;
        }
     } else {