Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed "kernel32_test codepage" conformance test:

Browse source 
C:\reactos\bin>kernel32_test codepage
codepage: 2 tests executed, 0 marked as todo, 0 failures.
Plus a bit of cvsignoring and #ifdef's in stubs for trying to build with the ole2nls module.

svn path=/trunk/; revision=3871
This commit is contained in:
Robert Dickenson 2002-12-12 04:53:23 +00:00
parent 785d4e6698
commit 30b8d5cc45
7 changed files with 78 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/lib/advapi32/.cvsignore
View file

@ -2,6 +2,7 @@ advapi32.a
advapi32.dll
advapi32.nostrip.dll
advapi32.lib
advapi32.sym
advapi32.coff
base.tmp
junk.tmp

1
reactos/lib/fmifs/.cvsignore
View file

@ -1,6 +1,7 @@
fmifs.coff
fmifs.dll
fmifs.nostrip.dll
fmifs.sym
*.o
*.obj
*.d

1
reactos/lib/gdi32/.cvsignore
View file

@ -1,4 +1,5 @@
gdi32.coff
gdi32.sym
gdi32.dll
gdi32.nostrip.dll
*.o

23
reactos/lib/kernel32/misc/mbchars.c
View file

@ -1,4 +1,4 @@
/* $Id: mbchars.c,v 1.1 2002/12/06 13:14:14 robd Exp $
/* $Id: mbchars.c,v 1.2 2002/12/12 04:53:23 robd Exp $
*
*/
#include <windows.h>
@ -99,7 +99,8 @@ MultiByteToWideChar(
/*
* Compute the input buffer length.
*/
if (-1 == cchMultiByte)
//if (-1 == cchMultiByte)
if (cchMultiByte < 0)
{
InStringLength = lstrlen(lpMultiByteStr) + 1;
}
@ -113,7 +114,7 @@ MultiByteToWideChar(
*/
if (0 == cchWideChar)
{
SetLastError(ERROR_SUCCESS);
//SetLastError(ERROR_SUCCESS); /* according to wine tests this shouldn't be touched on success.
return InStringLength;
}
/*
@ -144,7 +145,7 @@ MultiByteToWideChar(
* Return how many characters we
* wrote in the output buffer.
*/
SetLastError(ERROR_SUCCESS);
//SetLastError(ERROR_SUCCESS); /* according to wine tests this shouldn't be touched on success.
return cchConverted;
}
@ -255,16 +256,20 @@ WideCharToMultiByte(
}
// for now, make no difference but only convert cut the characters to 7Bit
if (cchWideChar == -1) // assume its a 0-terminated str
//if (cchWideChar == -1) // assume its a 0-terminated str
if (cchWideChar < 0) // assume its a 0-terminated str
{ // and determine its length
for (cchWideChar=0; lpWideCharStr[cchWideChar]!=0; cchWideChar++)
cchWideChar++;
// for (cchWideChar=0; lpWideCharStr[cchWideChar]!=0; cchWideChar++)
// cchWideChar++;
for (cchWideChar = 0; lpWideCharStr[cchWideChar] != 0; cchWideChar++) {
}
cchWideChar++; // length includes the null terminator
}
// user wants to determine needed space
if (cchMultiByte == 0)
{
SetLastError(ERROR_SUCCESS);
//SetLastError(ERROR_SUCCESS); /* according to wine tests this shouldn't be touched on success.
return cchWideChar; // FIXME: determine correct.
}
// the lpWideCharStr is cchWideChar characters long.
@ -288,7 +293,7 @@ WideCharToMultiByte(
return 0;
}
// else return # of bytes wirtten to MBCSbuffer (di)
SetLastError(ERROR_SUCCESS);
//SetLastError(ERROR_SUCCESS); /* according to wine tests this shouldn't be touched on success.
// FIXME: move that elsewhere
if (lpUsedDefaultChar != NULL) *lpUsedDefaultChar = FALSE;
return di;

92
reactos/lib/kernel32/misc/stubs.c
View file

@ -1,10 +1,11 @@
/* $Id: stubs.c,v 1.37 2002/12/06 13:14:14 robd Exp $
/* $Id: stubs.c,v 1.38 2002/12/12 04:53:23 robd Exp $
*
* KERNEL32.DLL stubs (unimplemented functions)
* Remove from this file, if you implement them.
*/
#include <windows.h>
#define _OLE2NLS_IN_BUILD_
BOOL
STDCALL
@ -168,6 +169,7 @@ EnumSystemCodePagesA (
return FALSE;
}
#ifndef _OLE2NLS_IN_BUILD_
WINBOOL
STDCALL
@ -192,6 +194,7 @@ EnumSystemLocalesA (
return FALSE;
}
#endif
WINBOOL
STDCALL
@ -283,6 +286,7 @@ FreeVirtualBuffer (
return FALSE;
}
#ifndef _OLE2NLS_IN_BUILD_
UINT
STDCALL
@ -292,6 +296,7 @@ GetACP (VOID)
return 0;
}
#endif
WINBOOL
STDCALL
@ -316,6 +321,7 @@ GetBinaryTypeA (
return FALSE;
}
#ifndef _OLE2NLS_IN_BUILD_
WINBOOL
STDCALL
@ -328,6 +334,7 @@ GetCPInfo (
return 0;
}
#endif
int
STDCALL
@ -360,6 +367,7 @@ GetCurrencyFormatA (
return 0;
}
#ifndef _OLE2NLS_IN_BUILD_
int
STDCALL
@ -557,6 +565,7 @@ GetSystemDefaultLangID (VOID)
);
}
#endif
DWORD
STDCALL
@ -568,6 +577,7 @@ GetSystemPowerStatus (
return 0;
}
#ifndef _OLE2NLS_IN_BUILD_
LCID
STDCALL
@ -581,6 +591,7 @@ GetThreadLocale (VOID)
);
}
#endif
WINBOOL
STDCALL
@ -639,6 +650,7 @@ GetTimeFormatA (
return 0;
}
#ifndef _OLE2NLS_IN_BUILD_
LCID
STDCALL
@ -665,6 +677,7 @@ GetUserDefaultLangID (VOID)
);
}
#endif
DWORD
STDCALL
@ -677,6 +690,7 @@ GetVDMCurrentDirectories (
return 0;
}
#ifndef _OLE2NLS_IN_BUILD_
WINBOOL
STDCALL
@ -755,6 +769,7 @@ LCMapStringW (
return 0;
}
#endif
DWORD
STDCALL
@ -855,32 +870,6 @@ SetComputerNameW (
}
WINBOOL
STDCALL
SetLocaleInfoA (
LCID Locale,
LCTYPE LCType,
LPCSTR lpLCData
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
WINBOOL
STDCALL
SetLocaleInfoW (
LCID Locale,
LCTYPE LCType,
LPCWSTR lpLCData
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
WINBOOL
STDCALL
SetSystemPowerState (
@ -901,16 +890,6 @@ SetThreadIdealProcessor(VOID)
return 0;
}
WINBOOL
STDCALL
SetThreadLocale (
LCID Locale
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
WINBOOL
STDCALL
@ -966,6 +945,44 @@ VDMOperationStarted (
return 0;
}
#ifndef _OLE2NLS_IN_BUILD_
WINBOOL
STDCALL
SetLocaleInfoA (
LCID Locale,
LCTYPE LCType,
LPCSTR lpLCData
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
WINBOOL
STDCALL
SetLocaleInfoW (
LCID Locale,
LCTYPE LCType,
LPCWSTR lpLCData
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
WINBOOL
STDCALL
SetThreadLocale (
LCID Locale
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
DWORD
STDCALL
@ -992,6 +1009,7 @@ VerLanguageNameW (
return 0;
}
#endif
DWORD
STDCALL

5
reactos/lib/msvcrt/.cvsignore
View file

@ -4,3 +4,8 @@ msvcrt.nostrip.dll
*.d
*.o
*.sym
*.dsp
*.dsw
*.ncb
*.opt
*.txt

1
reactos/lib/ntdll/.cvsignore
View file

@ -3,6 +3,7 @@ junk.tmp
napi.asm
napi.c
ntdll.lib
ntdll.sym
ntdll.coff
ntdll.dll
ntdll.nostrip.dll