diff --git a/reactos/lib/shell32/dialogs.c b/reactos/lib/shell32/dialogs.c index b202ab18822..e689452dae4 100644 --- a/reactos/lib/shell32/dialogs.c +++ b/reactos/lib/shell32/dialogs.c @@ -388,7 +388,7 @@ int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UI if (SHELL_OsIsUnicode()) { HANDLE hToken; - TOKEN_PRIVILEGES npr = {1, {0, 0, SE_PRIVILEGE_ENABLED}}; + TOKEN_PRIVILEGES npr = {1, {{{0, 0}, SE_PRIVILEGE_ENABLED}}}; /* enable shutdown privilege for current process */ OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken); @@ -444,7 +444,7 @@ void WINAPI ExitWindowsDialog (HWND hWndOwner) if (SHELL_OsIsUnicode()) { HANDLE hToken; - TOKEN_PRIVILEGES npr = {1, {0, 0, SE_PRIVILEGE_ENABLED}}; + TOKEN_PRIVILEGES npr = {1, {{{0, 0}, SE_PRIVILEGE_ENABLED}}}; /* enable shutdown privilege for current process */ OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken); diff --git a/reactos/lib/shell32/shell32_main.c b/reactos/lib/shell32/shell32_main.c index b5637c7e57f..ab66f87e047 100644 --- a/reactos/lib/shell32/shell32_main.c +++ b/reactos/lib/shell32/shell32_main.c @@ -911,8 +911,6 @@ HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi) */ void (WINAPI *pDLLInitComctl)(LPVOID); -static HINSTANCE hComctl32; - HINSTANCE shell32_hInstance = 0; HIMAGELIST ShellSmallIconList = 0; HIMAGELIST ShellBigIconList = 0; diff --git a/reactos/lib/shell32/shlexec.c b/reactos/lib/shell32/shlexec.c index 02fe592cfe8..7c9f46f2206 100644 --- a/reactos/lib/shell32/shlexec.c +++ b/reactos/lib/shell32/shlexec.c @@ -71,8 +71,8 @@ static BOOL argify(char* out, int len, const char* fmt, const char* lpFile, LPIT char xlpFile[1024]; BOOL done = FALSE; LPVOID pv; - char *cmd; char *res = out; + const char *cmd; while (*fmt) { @@ -971,7 +971,7 @@ BOOL WINAPI ShellExecuteExA32 (LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execf char buffer[MAX_PATH], xlpFile[MAX_PATH]; LPSTR beg = szApplicationName; - for(s=beg; space=strchr(s, ' '); s=space+1) { + for(s=beg; (space=strchr(s, ' ')); s=space+1) { int idx = space-szApplicationName; strncpy(buffer, szApplicationName, idx); buffer[idx] = '\0';