Author: cwittich
Date: Sun May 24 16:14:42 2009
New Revision: 41100
URL:
http://svn.reactos.org/svn/reactos?rev=41100&view=rev
Log:
a little bit of wine syncing - no real code changes - just to make syncing a bit easier
next time
Modified:
trunk/reactos/dll/win32/kernel32/misc/profile.c
Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Sun May 24 16:14:42 2009
@@ -70,6 +70,7 @@
#define IS_ENTRY_COMMENT(str) ((str)[0] == ';')
static const WCHAR emptystringW[] = {0};
+static const WCHAR wininiW[] = {
'w','i','n','.','i','n','i',0 };
static RTL_CRITICAL_SECTION PROFILE_CritSect;
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
@@ -158,7 +159,6 @@
break;
}
}
-
static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING encoding)
{
@@ -198,7 +198,6 @@
}
}
-
/***********************************************************************
* PROFILE_Save
*
@@ -279,14 +278,12 @@
}
}
-
/* returns 1 if a character white space else 0 */
static __inline int PROFILE_isspaceW(WCHAR c)
{
/* ^Z (DOS EOF) is a space too (found on CD-ROMs) */
return isspace(c) || c == 0x1a;
}
-
static __inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len)
{
@@ -729,7 +726,6 @@
ZeroMemory(&CurProfile->LastWriteTime, sizeof(CurProfile->LastWriteTime));
}
-
/***********************************************************************
*
* Compares a file time with the current time. If the file time is
@@ -749,7 +745,6 @@
DPRINT("%08x;%08x\n",(unsigned)ftll+21000000,(unsigned)nowll);
return ftll + 21000000 < nowll;
}
-
/***********************************************************************
* PROFILE_Open
@@ -784,7 +779,7 @@
GetWindowsDirectoryW( windirW, MAX_PATH );
if (!filename)
- filename = L"win.ini";
+ filename = wininiW;
if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) &&
!wcschr(filename, '\\') && !wcschr(filename, '/'))
@@ -1139,14 +1134,13 @@
static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry,
LPCWSTR def_val, LPWSTR buffer,
UINT len, LPCWSTR filename,
- BOOL win32 )
+ BOOL win32 )
{
int ret;
LPWSTR defval_tmp = NULL;
DPRINT("%S, %S, %S, %p, %u, %S\n",
- section, entry,
- def_val, buffer, len, filename);
+ section, entry, def_val, buffer, len, filename);
/* strip any trailing ' ' of def_val. */
if (def_val)
@@ -1235,7 +1229,6 @@
HeapFree(GetProcessHeap(), 0, bufferW);
return ret;
}
-
/***********************************************************************
* GetPrivateProfileStringW (KERNEL32.@)
@@ -1348,7 +1341,6 @@
return res;
}
-
/***********************************************************************
* GetPrivateProfileSectionW (KERNEL32.@)
*/
@@ -1363,8 +1355,7 @@
return 0;
}
- DPRINT("(%S, %p, %ld, %S)\n",
- section, buffer, len, filename);
+ DPRINT("(%S, %p, %ld, %S)\n", section, buffer, len, filename);
RtlEnterCriticalSection( &PROFILE_CritSect );
@@ -1375,7 +1366,6 @@
return ret;
}
-
/***********************************************************************
* GetPrivateProfileSectionA (KERNEL32.@)
@@ -1597,7 +1587,7 @@
*/
BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values)
{
- return WritePrivateProfileSectionW(section, keys_n_values, L"win.ini");
+ return WritePrivateProfileSectionW(section, keys_n_values, wininiW);
}