mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 22:52:54 +00:00
eliminated warnings for GCC 3.3
svn path=/trunk/; revision=7455
This commit is contained in:
parent
c82235044d
commit
63080fde1a
3 changed files with 4 additions and 6 deletions
|
@ -388,7 +388,7 @@ int WINAPI RestartDialogEx(HWND hwndOwner, LPCWSTR lpwstrReason, UINT uFlags, UI
|
||||||
if (SHELL_OsIsUnicode())
|
if (SHELL_OsIsUnicode())
|
||||||
{
|
{
|
||||||
HANDLE hToken;
|
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 */
|
/* enable shutdown privilege for current process */
|
||||||
OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken);
|
OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken);
|
||||||
|
@ -444,7 +444,7 @@ void WINAPI ExitWindowsDialog (HWND hWndOwner)
|
||||||
if (SHELL_OsIsUnicode())
|
if (SHELL_OsIsUnicode())
|
||||||
{
|
{
|
||||||
HANDLE hToken;
|
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 */
|
/* enable shutdown privilege for current process */
|
||||||
OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken);
|
OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken);
|
||||||
|
|
|
@ -911,8 +911,6 @@ HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi)
|
||||||
*/
|
*/
|
||||||
void (WINAPI *pDLLInitComctl)(LPVOID);
|
void (WINAPI *pDLLInitComctl)(LPVOID);
|
||||||
|
|
||||||
static HINSTANCE hComctl32;
|
|
||||||
|
|
||||||
HINSTANCE shell32_hInstance = 0;
|
HINSTANCE shell32_hInstance = 0;
|
||||||
HIMAGELIST ShellSmallIconList = 0;
|
HIMAGELIST ShellSmallIconList = 0;
|
||||||
HIMAGELIST ShellBigIconList = 0;
|
HIMAGELIST ShellBigIconList = 0;
|
||||||
|
|
|
@ -71,8 +71,8 @@ static BOOL argify(char* out, int len, const char* fmt, const char* lpFile, LPIT
|
||||||
char xlpFile[1024];
|
char xlpFile[1024];
|
||||||
BOOL done = FALSE;
|
BOOL done = FALSE;
|
||||||
LPVOID pv;
|
LPVOID pv;
|
||||||
char *cmd;
|
|
||||||
char *res = out;
|
char *res = out;
|
||||||
|
const char *cmd;
|
||||||
|
|
||||||
while (*fmt)
|
while (*fmt)
|
||||||
{
|
{
|
||||||
|
@ -971,7 +971,7 @@ BOOL WINAPI ShellExecuteExA32 (LPSHELLEXECUTEINFOA sei, SHELL_ExecuteA1632 execf
|
||||||
char buffer[MAX_PATH], xlpFile[MAX_PATH];
|
char buffer[MAX_PATH], xlpFile[MAX_PATH];
|
||||||
|
|
||||||
LPSTR beg = szApplicationName;
|
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;
|
int idx = space-szApplicationName;
|
||||||
strncpy(buffer, szApplicationName, idx);
|
strncpy(buffer, szApplicationName, idx);
|
||||||
buffer[idx] = '\0';
|
buffer[idx] = '\0';
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue