Author: pschweitzer
Date: Thu Aug 13 12:30:12 2009
New Revision: 42651
URL: http://svn.reactos.org/svn/reactos?rev=42651&view=rev
Log:
Fixed rtl lib, and got back some deleted stuff by sync.
Modified:
branches/pierre-fsd/lib/rtl/dos8dot3.c
branches/pierre-fsd/lib/rtl/nls.c
Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?rev=42651&r1=42650&r2=42651&view=diff
==============================================================================
--- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original)
+++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Thu Aug 13 12:30:12 2009
@@ -11,11 +11,6 @@
#define NDEBUG
#include <debug.h>
-
-/* GLOBALS *******************************************************************/
-
-extern BOOLEAN NlsMbOemCodePageTag;
-extern PUSHORT NlsOemLeadByteInfo;
/* CONSTANTS *****************************************************************/
@@ -274,29 +269,20 @@
for (i = 0; i < AnsiName->Length; i++)
{
- /* First make sure the character it's not the Lead DBCS */
- if (NlsMbOemCodePageTag &&
NlsOemLeadByteInfo[(UCHAR)AnsiName->Buffer[i]])
+ switch (AnsiName->Buffer[i])
{
- if (i == AnsiName->Length - 1) return FALSE;
- i++;
- }
- else
- {
- switch (AnsiName->Buffer[i])
- {
- case ' ':
- /* leading/trailing spaces not allowed */
- if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1]
== '.') return FALSE;
- GotSpace = TRUE;
- break;
- case '.':
- if (Dot != -1) return FALSE;
- Dot = i;
- break;
- default:
- if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE;
- break;
- }
+ case ' ':
+ /* leading/trailing spaces not allowed */
+ if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.')
return FALSE;
+ GotSpace = TRUE;
+ break;
+ case '.':
+ if (Dot != -1) return FALSE;
+ Dot = i;
+ break;
+ default:
+ if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE;
+ break;
}
}
/* check file part is shorter than 8, extension shorter than 3
Modified: branches/pierre-fsd/lib/rtl/nls.c
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/nls.c?rev=42651&r1=42650&r2=42651&view=diff
==============================================================================
--- branches/pierre-fsd/lib/rtl/nls.c [iso-8859-1] (original)
+++ branches/pierre-fsd/lib/rtl/nls.c [iso-8859-1] Thu Aug 13 12:30:12 2009
@@ -31,8 +31,9 @@
PWCHAR NlsOemToUnicodeTable = NULL;
PCHAR NlsUnicodeToOemTable =NULL;
PWCHAR NlsDbcsUnicodeToOemTable = NULL;
-PUSHORT NlsOemLeadByteInfo = NULL; /* exported */
-
+PUSHORT _NlsOemLeadByteInfo = NULL; /* exported */
+
+#define NlsOemLeadByteInfo _NlsOemLeadByteInfo
#define INIT_FUNCTION
/* FUNCTIONS *****************************************************************/
