23 Dec
2008
23 Dec
'08
1:23 a.m.
Author: tkreuzer
Date: Mon Dec 22 19:23:25 2008
New Revision: 38291
URL: http://svn.reactos.org/svn/reactos?rev=38291&view=rev
Log:
Replace all deprecate functions like wcsicmp with the new ones, like _wcsicmp in our own
code. Define __WINESRC__ or _CRT_NONSTDC_NO_DEPRECATE where neccessary in 3rd party code
to silence warnings about deprecated functions, that the upcoming crt header update will
create. Remove allowwarnings="true" from telnet.
Modified:
trunk/reactos/base/applications/network/net/main.c
trunk/reactos/base/applications/network/net/net.h
trunk/reactos/base/applications/network/net/process.c
trunk/reactos/base/applications/network/telnet/telnet.rbuild
trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
trunk/reactos/base/system/services/rpcserver.c
trunk/reactos/base/system/userinit/userinit.c
trunk/reactos/dll/cpl/mmsys/sounds.c
trunk/reactos/dll/cpl/sysdm/startrec.c
trunk/reactos/dll/win32/msgina/msgina.rbuild
trunk/reactos/dll/win32/netcfgx/netcfg_iface.c
trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c
trunk/reactos/dll/win32/netshell/connectmanager.c
trunk/reactos/dll/win32/netshell/lanconnectui.c
trunk/reactos/dll/win32/netshell/lanstatusui.c
trunk/reactos/dll/win32/newdev/newdev.c
trunk/reactos/dll/win32/newdev/wizard.c
trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild
trunk/reactos/dll/win32/shell32/pidl.c
trunk/reactos/dll/win32/shell32/shelllink.c
trunk/reactos/dll/win32/shell32/shlexec.c
trunk/reactos/dll/win32/shell32/shv_item_new.c
Modified: trunk/reactos/base/applications/network/net/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Mon Dec 22 19:23:25
2008
@@ -20,91 +20,91 @@
return 1;
}
- if (stricmp(argv[1],"ACCOUNTS")==0)
+ if (_stricmp(argv[1],"ACCOUNTS")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"COMPUTER")==0)
+ if (_stricmp(argv[1],"COMPUTER")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"CONFIG")==0)
+ if (_stricmp(argv[1],"CONFIG")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"CONTINUE")==0)
+ if (_stricmp(argv[1],"CONTINUE")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"FILE")==0)
+ if (_stricmp(argv[1],"FILE")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"GROUP")==0)
+ if (_stricmp(argv[1],"GROUP")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"HELP")==0)
+ if (_stricmp(argv[1],"HELP")==0)
{
return cmdHelp(argc,&argv[1]);
}
- if (stricmp(argv[1],"HELPMSG")==0)
+ if (_stricmp(argv[1],"HELPMSG")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"LOCALGROUP")==0)
+ if (_stricmp(argv[1],"LOCALGROUP")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"NAME")==0)
+ if (_stricmp(argv[1],"NAME")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"PRINT")==0)
+ if (_stricmp(argv[1],"PRINT")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"SEND")==0)
+ if (_stricmp(argv[1],"SEND")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"SESSION")==0)
+ if (_stricmp(argv[1],"SESSION")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"SHARE")==0)
+ if (_stricmp(argv[1],"SHARE")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"START")==0)
+ if (_stricmp(argv[1],"START")==0)
{
return cmdStart(argc, &argv[1]);
}
- if (stricmp(argv[1],"STATISTICS")==0)
+ if (_stricmp(argv[1],"STATISTICS")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"STOP")==0)
+ if (_stricmp(argv[1],"STOP")==0)
{
return cmdStop(argc, &argv[1]);
}
- if (stricmp(argv[1],"TIME")==0)
+ if (_stricmp(argv[1],"TIME")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"USE")==0)
+ if (_stricmp(argv[1],"USE")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"USER")==0)
+ if (_stricmp(argv[1],"USER")==0)
{
- return unimplement();
+ return unimplemented();
}
- if (stricmp(argv[1],"VIEW")==0)
+ if (_stricmp(argv[1],"VIEW")==0)
{
- return unimplement();
+ return unimplemented();
}
help();
@@ -112,9 +112,9 @@
}
-int unimplement()
+int unimplemented()
{
- puts("This command is not implement yet");
+ puts("This command is not implemented yet");
return 1;
}
Modified: trunk/reactos/base/applications/network/net/net.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Mon Dec 22 19:23:25
2008
@@ -14,7 +14,7 @@
#include <windows.h>
void help();
-int unimplement();
+int unimplemented();
INT cmdHelp(INT argc, CHAR **argv);
Modified: trunk/reactos/base/applications/network/net/process.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/process.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/process.c [iso-8859-1] Mon Dec 22 19:23:25
2008
@@ -208,7 +208,7 @@
}
/* Compare now */
- if (strnicmp(name,&buffer[t],strlen(&buffer[t]))==0)
+ if (_strnicmp(name,&buffer[t],strlen(&buffer[t]))==0)
{
if (save != NULL)
{
Modified: trunk/reactos/base/applications/network/telnet/telnet.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/telnet/telnet.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/telnet/telnet.rbuild [iso-8859-1] Mon Dec 22
19:23:25 2008
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="telnet" type="win32cui"
installbase="system32" installname="telnet.exe" allowwarnings
="true">
+<module name="telnet" type="win32cui"
installbase="system32" installname="telnet.exe" >
<include base="telnet">.</include>
<library>kernel32</library>
<library>ws2_32</library>
<library>user32</library>
+ <define name="_CRT_NONSTDC_NO_DEPRECATE" />
<directory name="src">
<file>ansiprsr.cpp</file>
<file>keytrans.cpp</file>
Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump…
==============================================================================
--- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -2062,7 +2062,7 @@
NextOption = wcschr(CurrentOption, L' ');
if (NextOption)
*NextOption = L'\0';
- if (wcsicmp(CurrentOption, L"CONSOLE") == 0)
+ if (_wcsicmp(CurrentOption, L"CONSOLE") == 0)
{
DPRINT("Found %S. Switching to console boot\n", CurrentOption);
ConsoleBoot = TRUE;
Modified: trunk/reactos/base/system/services/rpcserver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse…
==============================================================================
--- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -151,12 +151,12 @@
if (lpDatabaseName == NULL)
lpDatabaseName = SERVICES_ACTIVE_DATABASEW;
- if (wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0)
+ if (_wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0)
{
DPRINT1("Database %S, does not exist\n",lpDatabaseName);
return ERROR_DATABASE_DOES_NOT_EXIST;
}
- else if (wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0)
+ else if (_wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0)
{
DPRINT1("Invalid Database name %S.\n",lpDatabaseName);
return ERROR_INVALID_NAME;
@@ -332,7 +332,7 @@
/* Can be more than one Dependencies in the DependOnService string */
while (wcslen(lpszValueBuf + dwDependServiceStrPtr) > 0)
{
- if (wcsicmp(lpszValueBuf + dwDependServiceStrPtr,
lpService->lpServiceName) == 0)
+ if (_wcsicmp(lpszValueBuf + dwDependServiceStrPtr,
lpService->lpServiceName) == 0)
{
/* Get the current enumed service pointer */
lpCurrentService = ScmGetServiceEntryByName(lpszNameBuf);
@@ -1344,7 +1344,7 @@
/* First check, if it's already good */
if (ServiceNameLen > 12 &&
- !wcsnicmp(L"\\SystemRoot\\", CanonName, 12))
+ !_wcsnicmp(L"\\SystemRoot\\", CanonName, 12))
{
*RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) +
sizeof(WCHAR));
if (*RelativeName == NULL)
@@ -1362,7 +1362,7 @@
/* If it has %SystemRoot% prefix, substitute it to \System*/
if (ServiceNameLen > 13 &&
- !wcsnicmp(L"%SystemRoot%\\", CanonName, 13))
+ !_wcsnicmp(L"%SystemRoot%\\", CanonName, 13))
{
/* There is no +sizeof(wchar_t) because the name is less by 1 wchar */
*RelativeName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR));
@@ -1432,7 +1432,7 @@
Expanded[ExpandedLen] = 0;
if (ServiceNameLen > ExpandedLen &&
- !wcsnicmp(Expanded, CanonName, ExpandedLen))
+ !_wcsnicmp(Expanded, CanonName, ExpandedLen))
{
/* Only \SystemRoot\ is missing */
*RelativeName = LocalAlloc(LMEM_ZEROINIT,
@@ -1504,7 +1504,7 @@
ExpandedLen = LinkTarget.Length / sizeof(WCHAR);
if ((ServiceNameLen > ExpandedLen) &&
- !wcsnicmp(LinkTarget.Buffer, CanonName, ExpandedLen))
+ !_wcsnicmp(LinkTarget.Buffer, CanonName, ExpandedLen))
{
*RelativeName = LocalAlloc(LMEM_ZEROINIT,
(ServiceNameLen - ExpandedLen) * sizeof(WCHAR) +
13*sizeof(WCHAR));
@@ -1584,7 +1584,7 @@
/* 12 is wcslen(L"\\SystemRoot\\") */
if (ServiceNameLen > 12 &&
- !wcsnicmp(L"\\SystemRoot\\", lpServiceName, 12))
+ !_wcsnicmp(L"\\SystemRoot\\", lpServiceName, 12))
{
/* SystemRoot prefix is already included */
@@ -1609,7 +1609,7 @@
/* Check if it has %SystemRoot% (len=13) */
if (ServiceNameLen > 13 &&
- !wcsnicmp(L"%%SystemRoot%%\\", lpServiceName, 13))
+ !_wcsnicmp(L"%%SystemRoot%%\\", lpServiceName, 13))
{
/* Substitute %SystemRoot% with \\SystemRoot\\ */
*lpCanonName = LocalAlloc(LMEM_ZEROINIT, ServiceNameLen * sizeof(WCHAR) +
sizeof(WCHAR));
@@ -1828,7 +1828,7 @@
/* Fill the display name */
if (lpDisplayName != NULL &&
*lpDisplayName != 0 &&
- wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0)
+ _wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0)
{
lpService->lpDisplayName = (WCHAR*) HeapAlloc(GetProcessHeap(), 0,
(wcslen(lpDisplayName) + 1) *
sizeof(WCHAR));
Modified: trunk/reactos/base/system/userinit/userinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -120,7 +120,7 @@
NextOption = wcschr(CurrentOption, L' ');
if (NextOption)
*NextOption = L'\0';
- if (wcsicmp(CurrentOption, L"CONSOLE") == 0)
+ if (_wcsicmp(CurrentOption, L"CONSOLE") == 0)
{
TRACE("Found 'CONSOLE' boot option\n");
ret = TRUE;
Modified: trunk/reactos/dll/cpl/mmsys/sounds.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -697,7 +697,7 @@
if (lResult != CB_ERR)
{
wcscpy(&szPath[length-1], FileData.cFileName);
- SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult,
(LPARAM)wcsdup(szPath));
+ SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult,
(LPARAM)_wcsdup(szPath));
}
}while(FindNextFileW(hFile, &FileData) != 0);
Modified: trunk/reactos/dll/cpl/sysdm/startrec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -140,9 +140,9 @@
break;
}
- if (!wcsnicmp(szName, L"BootType", 8))
- {
- if (!wcsnicmp(szValue, L"ReactOS", 7))
+ if (!_wcsnicmp(szName, L"BootType", 8))
+ {
+ if (!_wcsnicmp(szValue, L"ReactOS", 7))
{
//FIXME store as enum
pRecord->BootType = 1;
@@ -152,11 +152,11 @@
pRecord->BootType = 0;
}
}
- else if (!wcsnicmp(szName, L"SystemPath", 10))
+ else if (!_wcsnicmp(szName, L"SystemPath", 10))
{
wcscpy(pRecord->szBootPath, szValue);
}
- else if (!wcsnicmp(szName, L"Options", 7))
+ else if (!_wcsnicmp(szName, L"Options", 7))
{
//FIXME store flags as values
wcscpy(pRecord->szOptions, szValue);
@@ -329,12 +329,12 @@
return FALSE;
}
- if (!wcsnicmp(szName, L"timeout", 7))
+ if (!_wcsnicmp(szName, L"timeout", 7))
{
TimeOut = _wtoi(szValue);
}
- if (!wcsnicmp(szName, L"default", 7))
+ if (!_wcsnicmp(szName, L"default", 7))
{
wcscpy(szDefaultOS, szValue);
}
Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb…
==============================================================================
--- trunk/reactos/dll/win32/msgina/msgina.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgina/msgina.rbuild [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -2,6 +2,7 @@
<importlibrary definition="msgina.spec" />
<include base="msgina">.</include>
<include base="msgina">include</include>
+ <include base="ReactOS">include/reactos/wine</include>
<library>ntdll</library>
<library>wine</library>
<library>kernel32</library>
Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -430,7 +430,7 @@
{
while(pHead)
{
- if (!wcsicmp(pHead->szId, pszwComponentId))
+ if (!_wcsicmp(pHead->szId, pszwComponentId))
{
return INetCfgComponent_Constructor(NULL, &IID_INetCfgComponent,
(LPVOID*)pComponent, pHead, iface);
}
Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Mon Dec 22 19:23:25
2008
@@ -2812,7 +2812,7 @@
{
szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
}
- if (!wcsicmp(szBuffer, pStr))
+ if (!_wcsicmp(szBuffer, pStr))
{
bFound = TRUE;
break;
Modified: trunk/reactos/dll/win32/netshell/connectmanager.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect…
==============================================================================
--- trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Mon Dec 22 19:23:25
2008
@@ -527,7 +527,7 @@
{
szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
}
- if (!wcsicmp(szBuffer, szNetCfg))
+ if (!_wcsicmp(szBuffer, szNetCfg))
{
*pIndex = pCurrentAdapter->Index;
return TRUE;
Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn…
==============================================================================
--- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -97,7 +97,7 @@
hr = INetCfgComponent_GetDisplayName(pNCg, &pName);
if (SUCCEEDED(hr))
{
- if (!wcsicmp(pName, This->pProperties->pszwDeviceName))
+ if (!_wcsicmp(pName, This->pProperties->pszwDeviceName))
{
*pOut = pNCg;
IEnumNetCfgComponent_Release(pEnumCfg);
Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat…
==============================================================================
--- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -591,7 +591,7 @@
break;
}
RegCloseKey(hSubKey);
- if (!wcsicmp(pGuid, szNetCfg))
+ if (!_wcsicmp(pGuid, szNetCfg))
{
return TRUE;
}
Modified: trunk/reactos/dll/win32/newdev/newdev.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -383,7 +383,7 @@
{
LPCWSTR pszExtension = GetFileExt(FileName);
- if ((wcsicmp(pszExtension, L".inf") == 0) && (wcscmp(LastDirPath,
DirPath) != 0))
+ if ((_wcsicmp(pszExtension, L".inf") == 0) && (wcscmp(LastDirPath,
DirPath) != 0))
{
wcscpy(LastDirPath, DirPath);
Modified: trunk/reactos/dll/win32/newdev/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -365,7 +365,7 @@
TRACE("ComboBox_GetLBText() failed\n");
goto cleanup;
}
- else if (UseCustomPath && wcsicmp(CustomPath, pBuffer) == 0)
+ else if (UseCustomPath && _wcsicmp(CustomPath, pBuffer) == 0)
UseCustomPath = FALSE;
pBuffer += 1 + Length;
}
Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.…
==============================================================================
--- trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -1,6 +1,7 @@
<module name="ntmarta" type="win32dll"
baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32"
installname="ntmarta.dll" unicode="yes">
<importlibrary definition="ntmarta.spec" />
<include base="ntmarta">.</include>
+ <define name="__WINESRC__" />
<define name="_WIN32_WINNT">0x600</define>
<library>ntdll</library>
<library>kernel32</library>
Modified: trunk/reactos/dll/win32/shell32/pidl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r…
==============================================================================
--- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -2261,7 +2261,7 @@
}
/* display Ext-file as description */
strcpy(pOut, sType);
- strupr(pOut);
+ _strupr(pOut);
/* load localized file string */
sTemp[0] = '\0';
if(LoadStringA(shell32_hInstance, IDS_SHV_COLUMN1, sTemp, 64))
Modified: trunk/reactos/dll/win32/shell32/shelllink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -2637,7 +2637,7 @@
return TRUE;
}
ptr = wcsrchr(szBuffer, L'.');
- if (ptr && !wcsnicmp(ptr, L".lnk", 4))
+ if (ptr && !_wcsnicmp(ptr, L".lnk", 4))
{
// FIXME load localized error msg
MessageBoxW( hwndDlg, L"You cannot create a link to a
shortcut", L"Error", MB_ICONERROR );
Modified: trunk/reactos/dll/win32/shell32/shlexec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -360,7 +360,7 @@
while (*p)
{
int len = wcslen(p) + 1;
- if (!wcsnicmp( p, wPath, 5 )) got_path = TRUE;
+ if (!_wcsnicmp( p, wPath, 5 )) got_path = TRUE;
total += len;
p += len;
}
@@ -378,7 +378,7 @@
{
int len = wcslen(p) + 1;
memcpy( p2, p, len * sizeof(WCHAR) );
- if (!wcsnicmp( p, wPath, 5 ))
+ if (!_wcsnicmp( p, wPath, 5 ))
{
p2[len - 1] = ';';
wcscpy( p2 + len, path );
@@ -1627,7 +1627,7 @@
/* Remove File Protocol from lpFile */
/* In the case file://path/file */
- if (!wcsnicmp(lpFile, wFile, iSize))
+ if (!_wcsnicmp(lpFile, wFile, iSize))
{
lpFile += iSize;
while (*lpFile == ':') lpFile++;
@@ -1635,7 +1635,7 @@
retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters,
wcmd, execfunc, &sei_tmp, sei);
}
/* Check if file specified is in the form www.??????.*** */
- else if (!wcsnicmp(lpFile, wWww, 3))
+ else if (!_wcsnicmp(lpFile, wWww, 3))
{
/* if so, append lpFile http:// and call ShellExecute */
WCHAR lpstrTmpFile[256];
Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] Mon Dec 22 19:23:25 2008
@@ -161,13 +161,13 @@
pNewItem = HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM));
pNewItem->Type = type;
if (szTarget)
- pNewItem->szTarget = wcsdup(szTarget);
+ pNewItem->szTarget = _wcsdup(szTarget);
else
pNewItem->szTarget = NULL;
- pNewItem->szDesc = wcsdup(szDesc);
- pNewItem->szIcon = wcsdup(szIcon);
- pNewItem->szExt = wcsdup(szKeyName);
+ pNewItem->szDesc = _wcsdup(szDesc);
+ pNewItem->szIcon = _wcsdup(szIcon);
+ pNewItem->szExt = _wcsdup(szKeyName);
pNewItem->Next = NULL;
break;
}
@@ -388,7 +388,7 @@
ZeroMemory(&sInfo, sizeof(sInfo));
sInfo.cb = sizeof(sizeof(sInfo));
- szCmd = wcsdup(ptr);
+ szCmd = _wcsdup(ptr);
if (!szCmd)
break;
if (CreateProcessW(NULL, szCmd, NULL, NULL,FALSE,0,NULL,NULL,&sInfo,
&pi))