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

[CMAKE]

Browse source 
- Sync kernel32 with trunk.

svn path=/branches/cmake-bringup/; revision=48530
This commit is contained in:
Amine Khaldi 2010-08-13 14:47:01 +00:00
parent a62f514cfb
commit af612f3786
37 changed files with 575 additions and 591 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dll/win32/kernel32/file/backup.c
View file

@ -11,9 +11,8 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
/* FUNCTIONS ****************************************************************/

5
dll/win32/kernel32/file/bintype.c
View file

@ -13,9 +13,10 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
#define NDEBUG
#include <debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS ****************************************************************/

5
dll/win32/kernel32/file/cnotify.c
View file

@ -10,9 +10,8 @@
*/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
/*
* @implemented

6
dll/win32/kernel32/file/copy.c
View file

@ -13,9 +13,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS ****************************************************************/

6
dll/win32/kernel32/file/create.c
View file

@ -15,9 +15,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
#define SYMLINK_FLAG_RELATIVE 1

6
dll/win32/kernel32/file/curdir.c
View file

@ -17,9 +17,9 @@
/* INCLUDES ******************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* GLOBAL VARIABLES **********************************************************/

6
dll/win32/kernel32/file/delete.c
View file

@ -12,9 +12,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <reactos/debug.h>
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS ****************************************************************/

3
dll/win32/kernel32/file/deviceio.c
View file

@ -9,7 +9,8 @@
/* INCLUDES *******************************************************************/
#include <k32.h>
#include <wine/debug.h>
#define NDEBUG
#include <debug.h>
/* FUNCTIONS ******************************************************************/

8
dll/win32/kernel32/file/dir.c
View file

@ -16,9 +16,9 @@
/* INCLUDES ******************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
UNICODE_STRING DllDirectory = {0, 0, NULL};
@ -972,7 +972,7 @@ ContainsPath(LPCWSTR name)
{
if (RtlDetermineDosPathNameType_U(name) != RtlPathTypeRelative) return TRUE;
if (name[0] != '.') return FALSE;
if (name[1] == '/' || name[1] == '\\') return TRUE;
if (name[1] == '/' || name[1] == '\\' || name[1] == '\0') return TRUE;
return (name[1] == '.' && (name[2] == '/' || name[2] == '\\'));
}

6
dll/win32/kernel32/file/dosdev.c
View file

@ -12,9 +12,9 @@
/* INCLUDES ******************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS *****************************************************************/

6
dll/win32/kernel32/file/file.c
View file

@ -13,9 +13,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* GLOBALS ******************************************************************/

6
dll/win32/kernel32/file/find.c
View file

@ -12,9 +12,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* TYPES ********************************************************************/

6
dll/win32/kernel32/file/hardlink.c
View file

@ -12,9 +12,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS ****************************************************************/

5
dll/win32/kernel32/file/iocompl.c
View file

@ -10,14 +10,13 @@
*/
#include <k32.h>
#include <wine/debug.h>
#define NDEBUG
#include <debug.h>
#define NANOS_TO_100NS(nanos) (((LONGLONG)(nanos)) / 100)
#define MICROS_TO_100NS(micros) (((LONGLONG)(micros)) * NANOS_TO_100NS(1000))
#define MILLIS_TO_100NS(milli) (((LONGLONG)(milli)) * MICROS_TO_100NS(1000))
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/*
* @implemented
*/

5
dll/win32/kernel32/file/lfile.c
View file

@ -10,9 +10,8 @@
*/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
/*
* @implemented

6
dll/win32/kernel32/file/lock.c
View file

@ -14,9 +14,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS ****************************************************************/

6
dll/win32/kernel32/file/mailslot.c
View file

@ -11,9 +11,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS ****************************************************************/

6
dll/win32/kernel32/file/move.c
View file

@ -17,9 +17,9 @@
#include <k32.h>
#include <malloc.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* GLOBALS *****************************************************************/

6
dll/win32/kernel32/file/npipe.c
View file

@ -10,9 +10,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
//#define USING_PROPER_NPFS_WAIT_SEMANTICS

6
dll/win32/kernel32/file/pipe.c
View file

@ -11,9 +11,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* GLOBALS ******************************************************************/

6
dll/win32/kernel32/file/rw.c
View file

@ -12,9 +12,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
/* FUNCTIONS ****************************************************************/

5
dll/win32/kernel32/file/tape.c
View file

@ -12,9 +12,8 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
/* FUNCTIONS ****************************************************************/

6
dll/win32/kernel32/file/volume.c
View file

@ -20,9 +20,9 @@
*/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32file;
#define MAX_DOS_DRIVES 26

26
dll/win32/kernel32/include/kernel32.h
View file

@ -1,5 +1,25 @@
#pragma once
//
// Kernel32 Filter IDs
//
#define kernel32file 200
#define kernel32ver 201
#define actctx 202
#define resource 203
#define kernel32session 204
#define TRACE(fmt, ...) TRACE__(gDebugChannel, fmt, ##__VA_ARGS__)
#define WARN(fmt, ...) WARN__(gDebugChannel, fmt, ##__VA_ARGS__)
#define FIXME(fmt, ...) WARN__(gDebugChannel, fmt,## __VA_ARGS__)
#define ERR(fmt, ...) ERR__(gDebugChannel, fmt, ##__VA_ARGS__)
#define debugstr_a
#define debugstr_w
#define wine_dbgstr_w
#define debugstr_guid
#include "wine/unicode.h"
#include "baseheap.h"
#define BINARY_UNKNOWN (0)
@ -40,8 +60,9 @@
/* Undocumented CreateProcess flag */
#define STARTF_SHELLPRIVATE 0x400
#define SetLastErrorByStatus(__S__) \
((void)SetLastError(RtlNtStatusToDosError(__S__)))
#define SetLastErrorByStatus(x) RtlSetLastWin32ErrorAndNtStatusFromNtStatus((x))
#define GetLastError() NtCurrentTeb()->LastErrorValue
#define SetLastError(x) NtCurrentTeb()->LastErrorValue = (x)
typedef struct _CODEPAGE_ENTRY
{
@ -100,6 +121,7 @@ DWORD FilenameU2A_FitOrFail(LPSTR DestA, INT destLen, PUNICODE_STRING SourceU);
#define HeapAlloc RtlAllocateHeap
#define HeapReAlloc RtlReAllocateHeap
#define HeapFree RtlFreeHeap
#define _lread (_readfun)_hread
POBJECT_ATTRIBUTES
WINAPI

8
dll/win32/kernel32/locale_rc.rc
View file

@ -48,11 +48,11 @@
#include "nls/cat.nls" /* 0x0403 LANG_CATALAN, SUBLANG_DEFAULT */
#include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */
//#include "nls/cht.nls" /* 0x0404 LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL */
#include "nls/chs.nls" /* 0x0804 LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED */
#include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */
//#include "nls/zhh.nls" /* 0x0c04 LANG_CHINESE, SUBLANG_CHINESE_HONGKONG */
#include "nls/zhi.nls" /* 0x1004 LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE */
#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */
//#include "nls/zhm.nls" /* 0x1404 LANG_CHINESE, SUBLANG_CHINESE_MACAU */
#include "nls/csy.nls" /* 0x0405 LANG_CZECH, SUBLANG_DEFAULT */
@ -119,7 +119,7 @@
#include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */
#include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */
#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */
//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_DEFAULT */
#include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */

7
dll/win32/kernel32/misc/actctx.c
View file

@ -13,10 +13,9 @@
/* synched with wine 1.1.26 */
#include <k32.h>
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(actctx);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = actctx;
#define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa)

14
dll/win32/kernel32/misc/console.c
View file

@ -1371,20 +1371,6 @@ SetConsolePalette(DWORD Unknown0,
return FALSE;
}
/*
* @unimplemented (Undocumented)
*/
BOOL
WINAPI
SetLastConsoleEventActive(VOID)
{
DPRINT1("SetLastConsoleEventActive() UNIMPLEMENTED!\n");
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
/*
* @unimplemented (Undocumented)
*/

9
dll/win32/kernel32/misc/format_msg.c
View file

@ -20,12 +20,9 @@
*/
#include <k32.h>
#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(resource);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = resource;
struct format_args
{

136
dll/win32/kernel32/misc/lang.c
View file

@ -158,142 +158,6 @@ ConvertDefaultLocale(LCID lcid)
}
/**************************************************************************
* EnumDateFormatsExA (KERNEL32.@)
*
* FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle
* LOCALE_NOUSEROVERRIDE here as well?
*/
BOOL
WINAPI
EnumDateFormatsExA(
DATEFMT_ENUMPROCEXA lpDateFmtEnumProcEx,
LCID Locale,
DWORD dwFlags)
{
CALID cal_id;
char szBuf[256];
if (!lpDateFmtEnumProcEx)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
if (!GetLocaleInfoW(Locale,
LOCALE_ICALENDARTYPE|LOCALE_RETURN_NUMBER,
(LPWSTR)&cal_id,
sizeof(cal_id)/sizeof(WCHAR)))
{
return FALSE;
}
switch (dwFlags & ~LOCALE_USE_CP_ACP)
{
case 0:
case DATE_SHORTDATE:
if (GetLocaleInfoA(Locale,
LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP),
szBuf, 256))
{
lpDateFmtEnumProcEx(szBuf, cal_id);
}
break;
case DATE_LONGDATE:
if (GetLocaleInfoA(Locale,
LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP),
szBuf, 256))
{
lpDateFmtEnumProcEx(szBuf, cal_id);
}
break;
case DATE_YEARMONTH:
if (GetLocaleInfoA(Locale,
LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP),
szBuf, 256))
{
lpDateFmtEnumProcEx(szBuf, cal_id);
}
break;
default:
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
return TRUE;
}
/**************************************************************************
* EnumDateFormatsExW (KERNEL32.@)
*/
BOOL
WINAPI
EnumDateFormatsExW(
DATEFMT_ENUMPROCEXW lpDateFmtEnumProcEx,
LCID Locale,
DWORD dwFlags)
{
CALID cal_id;
WCHAR wbuf[256]; // FIXME
if (!lpDateFmtEnumProcEx)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
if (!GetLocaleInfoW(Locale,
LOCALE_ICALENDARTYPE | LOCALE_RETURN_NUMBER,
(LPWSTR)&cal_id,
sizeof(cal_id)/sizeof(WCHAR)))
{
return FALSE;
}
switch (dwFlags & ~LOCALE_USE_CP_ACP)
{
case 0:
case DATE_SHORTDATE:
if (GetLocaleInfoW(Locale,
LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP),
wbuf,
256))
{
lpDateFmtEnumProcEx(wbuf, cal_id);
}
break;
case DATE_LONGDATE:
if (GetLocaleInfoW(Locale,
LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP),
wbuf,
256))
{
lpDateFmtEnumProcEx(wbuf, cal_id);
}
break;
case DATE_YEARMONTH:
if (GetLocaleInfoW(Locale,
LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP),
wbuf,
256))
{
lpDateFmtEnumProcEx(wbuf, cal_id);
}
break;
default:
SetLastError(ERROR_INVALID_FLAGS);
return FALSE;
}
return TRUE;
}
static BOOL NLS_RegEnumValue(HANDLE hKey, UINT ulIndex,
LPWSTR szValueName, ULONG valueNameSize,
LPWSTR szValueData, ULONG valueDataSize)

661
dll/win32/kernel32/misc/lcformat.c
View file

File diff suppressed because it is too large Load diff

19
dll/win32/kernel32/misc/profile.c
View file

@ -84,25 +84,6 @@ static RTL_CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0
static const char hex[16] = "0123456789ABCDEF";
static __inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n )
{
const WCHAR *end;
for (end = ptr + n; ptr < end; ptr++)
if (*ptr == ch)
return (WCHAR *)(ULONG_PTR)ptr;
return NULL;
}
static __inline WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n )
{
const WCHAR *end;
WCHAR *ret = NULL;
for (end = ptr + n; ptr < end; ptr++)
if (*ptr == ch)
ret = (WCHAR *)(ULONG_PTR)ptr;
return ret;
}
/***********************************************************************
* PROFILE_CopyEntry
*

142
dll/win32/kernel32/misc/stubs.c
View file

@ -958,17 +958,6 @@ SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes)
return FALSE;
}
HANDLE
WINAPI
ReOpenFile(IN HANDLE hOriginalFile,
IN DWORD dwDesiredAccess,
IN DWORD dwShareMode,
IN DWORD dwFlags)
{
STUB;
return INVALID_HANDLE_VALUE;
}
BOOL
WINAPI
SetProcessWorkingSetSizeEx(IN HANDLE hProcess,
@ -1259,3 +1248,134 @@ UnregisterConsoleIME(VOID)
STUB;
return FALSE;
}
/*
* @unimplemented
*/
BOOL
WINAPI
BaseCheckRunApp(IN DWORD Unknown1,
IN DWORD Unknown2,
IN DWORD Unknown3,
IN DWORD Unknown4,
IN DWORD Unknown5,
IN DWORD Unknown6,
IN DWORD Unknown7,
IN DWORD Unknown8,
IN DWORD Unknown9,
IN DWORD Unknown10)
{
STUB;
return FALSE;
}
/*
* @unimplemented
*/
BOOL
WINAPI
BasepCheckWinSaferRestrictions(IN DWORD Unknown1,
IN DWORD Unknown2,
IN DWORD Unknown3,
IN DWORD Unknown4,
IN DWORD Unknown5,
IN DWORD Unknown6)
{
STUB;
return FALSE;
}
/*
* @unimplemented
*/
BOOL
WINAPI
NumaVirtualQueryNode(IN DWORD Unknown1,
IN DWORD Unknown2,
IN DWORD Unknown3,
IN DWORD Unknown4)
{
STUB;
return FALSE;
}
/*
* @unimplemented
*/
HANDLE
WINAPI
ReOpenFile(IN HANDLE hOriginalFile,
IN DWORD dwDesiredAccess,
IN DWORD dwShareMode,
IN DWORD dwFlags)
{
STUB;
return INVALID_HANDLE_VALUE;
}
/*
* @unimplemented
*/
BOOL
WINAPI
SetLastConsoleEventActive(VOID)
{
STUB;
return FALSE;
}
/*
* @unimplemented
*/
BOOL
WINAPI
SetConsoleCommandHistoryMode(IN DWORD dwMode)
{
STUB;
return FALSE;
}
/*
* @unimplemented
*/
BOOL
WINAPI
SetLocalPrimaryComputerNameA(IN DWORD Unknown1,
IN DWORD Unknown2)
{
STUB;
return FALSE;
}
/*
* @unimplemented
*/
BOOL
WINAPI
SetLocalPrimaryComputerNameW(IN DWORD Unknown1,
IN DWORD Unknown2)
{
STUB;
return FALSE;
}
/*
* @unimplemented
*/
VOID
WINAPI
SetTermsrvAppInstallMode(IN BOOL bInstallMode)
{
STUB;
}
/*
* @unimplemented
*/
BOOL
WINAPI
TermsrvAppInstallMode(VOID)
{
STUB;
return FALSE;
}

7
dll/win32/kernel32/misc/version.c
View file

@ -9,10 +9,9 @@
#include <k32.h>
#include <reactos/buildno.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32Ver);
#define NDEBUG
#include <debug.h>
static ULONG gDebugChannel = kernel32ver;
#define UNICODIZE1(x) L##x
#define UNICODIZE(x) UNICODIZE1(x)

BIN
dll/win32/kernel32/nls/cym.nls
View file

Binary file not shown.

BIN
dll/win32/kernel32/nls/lth.nls
View file

Binary file not shown.

BIN
dll/win32/kernel32/nls/ukr.nls
View file

Binary file not shown.

6
dll/win32/kernel32/process/session.c
View file

@ -9,9 +9,9 @@
* 2001-12-07 created
*/
#include <k32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(kernel32session);
#define NDEBUG
#include <debug.h>
//static ULONG gDebugChannel = kernel32session; not actually used
DWORD ActiveConsoleSessionId = 0;