Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[akhaldi] 48531: [CMAKE] - Add an MSVC compatible definition file. - Temporarily add the kernel32 import library (until RosBE ships with one). - Group kernel32 wine stubs into kernel32_stubs.c - Add kernel32 to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 13 14:56:34 2010 New Revision: 48531 URL: http://svn.reactos.org/svn/reactos?rev=48531&view=rev Log: [CMAKE] - Add an MSVC compatible definition file. - Temporarily add the kernel32 import library (until RosBE ships with one). - Group kernel32 wine stubs into kernel32_stubs.c - Add kernel32 to build. Added: branches/cmake-bringup/dll/win32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/kernel32/kernel32.def (with props) branches/cmake-bringup/dll/win32/kernel32/kernel32_stubs.c (with props) branches/cmake-bringup/dll/win32/kernel32/libkernel32.a (with props) Modified: branches/cmake-bringup/dll/CMakeLists.txt Modified: branches/cmake-bringup/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] Fri Aug 13 14:56:34 2010 @@ -1,2 +1,4 @@ +add_subdirectory(win32) add_subdirectory(ntdll) + Added: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Aug 13 14:56:34 2010 @@ -1,0 +1,6 @@ + +#add_subdirectory(advapi32) +#add_subdirectory(gdi32) +add_subdirectory(kernel32) +#add_subdirectory(msvcrt) +#add_subdirectory(user32) Propchange: branches/cmake-bringup/dll/win32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Fri Aug 13 14:56:34 2010 @@ -1,0 +1,27 @@ +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-D_KERNEL32_) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + +file(GLOB_RECURSE SOURCE "*.c") + +file(GLOB_RECURSE ARCH_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/thread/${ARCH}/*.s") + +add_library(kernel32 SHARED + ${SOURCE} + ${ARCH_SOURCE} + ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.rc + ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch) + +set_target_properties(kernel32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def + pseh + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) +add_dependencies(kernel32 errcodes version) Propchange: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/kernel32.def (added) +++ branches/cmake-bringup/dll/win32/kernel32/kernel32.def [iso-8859-1] Fri Aug 13 14:56:34 2010 @@ -1,0 +1,1024 @@ + +LIBRARY kernel32.dll + +EXPORTS + AcquireSRWLockExclusive=ntdll.RtlAcquireSRWLockExclusive + AcquireSRWLockShared=ntdll.RtlAcquireSRWLockShared + ActivateActCtx + AddAtomA + AddAtomW + AddConsoleAliasA + AddConsoleAliasW + AddLocalAlternateComputerNameA + AddLocalAlternateComputerNameW + AddRefActCtx + AddVectoredContinueHandler=ntdll.RtlAddVectoredContinueHandler + AddVectoredExceptionHandler=ntdll.RtlAddVectoredExceptionHandler + AllocConsole + AllocLSCallback=__wine_stub_kernel32_dll_14 + AllocateUserPhysicalPages + AreFileApisANSI + AssignProcessToJobObject + AttachConsole + BackupRead + BackupSeek + BackupWrite + BaseCheckAppcompatCache + BaseCheckRunApp=__wine_stub_kernel32_dll_23 + BaseCleanupAppcompatCache + BaseCleanupAppcompatCacheSupport + BaseDumpAppcompatCache + BaseFlushAppcompatCache + BaseInitAppcompatCache + BaseInitAppcompatCacheSupport + BaseProcessInitPostImport + BaseQueryModuleData + BaseUpdateAppcompatCache + BasepCheckWinSaferRestrictions=__wine_stub_kernel32_dll_33 + BasepDebugDump=__wine_stub_kernel32_dll_34 + Beep + BeginUpdateResourceA + BeginUpdateResourceW + BindIoCompletionCallback + BuildCommDCBA + BuildCommDCBAndTimeoutsA + BuildCommDCBAndTimeoutsW + BuildCommDCBW + CallNamedPipeA + CallNamedPipeW + CancelDeviceWakeupRequest + CancelIo + CancelIoEx + CancelSynchronousIo + CancelTimerQueueTimer + CancelWaitableTimer + ChangeTimerQueueTimer + CheckNameLegalDOS8Dot3A + CheckNameLegalDOS8Dot3W + CheckRemoteDebuggerPresent + ClearCommBreak + ClearCommError + CloseConsoleHandle + CloseHandle + CloseProfileUserMapping + CloseSystemHandle=__wine_stub_kernel32_dll_60 + CmdBatNotification + CommConfigDialogA + CommConfigDialogW + CompareFileTime + CompareStringA + CompareStringW + ConnectNamedPipe + ConsoleMenuControl + ConsoleSubst=__wine_stub_kernel32_dll_69 + ContinueDebugEvent + ConvertDefaultLocale + ConvertFiberToThread + ConvertThreadToFiber + ConvertThreadToFiberEx + CopyFileA + CopyFileExA + CopyFileExW + CopyFileW + CopyLZFile=LZCopy + CreateActCtxA + CreateActCtxW + CreateConsoleScreenBuffer + CreateDirectoryA + CreateDirectoryExA + CreateDirectoryExW + CreateDirectoryW + CreateEventA + CreateEventExA + CreateEventExW + CreateEventW + CreateFiber + CreateFiberEx + CreateFileA + CreateFileMappingA + CreateFileMappingW + CreateFileW + CreateHardLinkA + CreateHardLinkW + CreateIoCompletionPort + CreateJobObjectA + CreateJobObjectW + CreateJobSet + CreateKernelThread=__wine_stub_kernel32_dll_103 + CreateMailslotA + CreateMailslotW + CreateMemoryResourceNotification + CreateMutexA + CreateMutexExA + CreateMutexExW + CreateMutexW + CreateNamedPipeA + CreateNamedPipeW + CreateNlsSecurityDescriptor + CreatePipe + CreateProcessA + CreateProcessInternalA + CreateProcessInternalW + CreateProcessInternalWSecure + CreateProcessW + CreateRemoteThread + CreateSemaphoreA + CreateSemaphoreExA + CreateSemaphoreExW + CreateSemaphoreW + CreateSocketHandle + CreateSymbolicLinkA + CreateSymbolicLinkW + CreateTapePartition + CreateThread + CreateTimerQueue + CreateTimerQueueTimer + CreateToolhelp32Snapshot + CreateVirtualBuffer + CreateWaitableTimerA + CreateWaitableTimerExA + CreateWaitableTimerExW + CreateWaitableTimerW + DeactivateActCtx + DebugActiveProcess + DebugActiveProcessStop + DebugBreak=ntdll.DbgBreakPoint + DebugBreakProcess + DebugSetProcessKillOnExit + DecodePointer=ntdll.RtlDecodePointer + DecodeSystemPointer=ntdll.RtlDecodeSystemPointer + DefineDosDeviceA + DefineDosDeviceW + DelayLoadFailureHook + DeleteAtom + DeleteCriticalSection=ntdll.RtlDeleteCriticalSection + DeleteFiber + DeleteFileA + DeleteFileW + DeleteTimerQueue + DeleteTimerQueueEx + DeleteTimerQueueTimer + DeleteVolumeMountPointA + DeleteVolumeMountPointW + DeviceIoControl + DisableThreadLibraryCalls + DisconnectNamedPipe + DnsHostnameToComputerNameA + DnsHostnameToComputerNameW + DosDateTimeToFileTime + DosPathToSessionPathA + DosPathToSessionPathW + DuplicateConsoleHandle + DuplicateHandle + EncodePointer=ntdll.RtlEncodePointer + EncodeSystemPointer=ntdll.RtlEncodeSystemPointer + EndUpdateResourceA + EndUpdateResourceW + EnterCriticalSection=ntdll.RtlEnterCriticalSection + EnumCalendarInfoA + EnumCalendarInfoExA + EnumCalendarInfoExW + EnumCalendarInfoW + EnumDateFormatsA + EnumDateFormatsExA + EnumDateFormatsExW + EnumDateFormatsW + EnumLanguageGroupLocalesA + EnumLanguageGroupLocalesW + EnumResourceLanguagesA + EnumResourceLanguagesW + EnumResourceNamesA + EnumResourceNamesW + EnumResourceTypesA + EnumResourceTypesW + EnumSystemCodePagesA + EnumSystemCodePagesW + EnumSystemGeoID + EnumSystemLanguageGroupsA + EnumSystemLanguageGroupsW + EnumSystemLocalesA + EnumSystemLocalesW + EnumTimeFormatsA + EnumTimeFormatsW + EnumUILanguagesA + EnumUILanguagesW + EnumerateLocalComputerNamesA + EnumerateLocalComputerNamesW + EraseTape + EscapeCommFunction + ExitProcess + ExitThread + ExitVDM + ExpandEnvironmentStringsA + ExpandEnvironmentStringsW + ExpungeConsoleCommandHistoryA + ExpungeConsoleCommandHistoryW + ExtendVirtualBuffer + FatalAppExitA + FatalAppExitW + FatalExit + FileTimeToDosDateTime + FileTimeToLocalFileTime + FileTimeToSystemTime + FillConsoleOutputAttribute + FillConsoleOutputCharacterA + FillConsoleOutputCharacterW + FindActCtxSectionGuid + FindActCtxSectionStringA + FindActCtxSectionStringW + FindAtomA + FindAtomW + FindClose + FindCloseChangeNotification + FindFirstChangeNotificationA + FindFirstChangeNotificationW + FindFirstFileA + FindFirstFileExA + FindFirstFileExW + FindFirstFileW + FindFirstStreamW + FindFirstVolumeA + FindFirstVolumeMountPointA + FindFirstVolumeMountPointW + FindFirstVolumeW + FindNextChangeNotification + FindNextFileA + FindNextFileW + FindNextVolumeA + FindNextVolumeMountPointA + FindNextVolumeMountPointW + FindNextVolumeW + FindResourceA + FindResourceExA + FindResourceExW + FindResourceW + FindVolumeClose + FindVolumeMountPointClose + FlushConsoleInputBuffer + FlushFileBuffers + FlushInstructionCache + FlushViewOfFile + FoldStringA + FoldStringW + FormatMessageA + FormatMessageW + FreeConsole + FreeEnvironmentStringsA + FreeEnvironmentStringsW + FreeLibrary + FreeLibraryAndExitThread + FreeResource + FreeUserPhysicalPages + FreeVirtualBuffer + GenerateConsoleCtrlEvent + GetACP + GetAtomNameA + GetAtomNameW + GetBinaryType=GetBinaryTypeA + GetBinaryTypeA + GetBinaryTypeW + GetCPFileNameFromRegistry + GetCPInfo + GetCPInfoExA + GetCPInfoExW + GetCalendarInfoA + GetCalendarInfoW + GetComPlusPackageInstallStatus + GetCommConfig + GetCommMask + GetCommModemStatus + GetCommProperties + GetCommState + GetCommTimeouts + GetCommandLineA + GetCommandLineW + GetCompressedFileSizeA + GetCompressedFileSizeW + GetComputerNameA + GetComputerNameExA + GetComputerNameExW + GetComputerNameW + GetConsoleAliasA + GetConsoleAliasExesA + GetConsoleAliasExesLengthA + GetConsoleAliasExesLengthW + GetConsoleAliasExesW + GetConsoleAliasW + GetConsoleAliasesA + GetConsoleAliasesLengthA + GetConsoleAliasesLengthW + GetConsoleAliasesW + GetConsoleCP + GetConsoleCharType + GetConsoleCommandHistoryA + GetConsoleCommandHistoryLengthA + GetConsoleCommandHistoryLengthW + GetConsoleCommandHistoryW + GetConsoleCursorInfo + GetConsoleCursorMode + GetConsoleDisplayMode + GetConsoleFontInfo + GetConsoleFontSize + GetConsoleHardwareState + GetConsoleHistoryInfo + GetConsoleInputExeNameA + GetConsoleInputExeNameW + GetConsoleInputWaitHandle + GetConsoleKeyboardLayoutNameA + GetConsoleKeyboardLayoutNameW + GetConsoleMode + GetConsoleNlsMode + GetConsoleOutputCP + GetConsoleProcessList + GetConsoleScreenBufferInfo + GetConsoleSelectionInfo + GetConsoleTitleA + GetConsoleTitleW + GetConsoleWindow + GetCurrencyFormatA + GetCurrencyFormatW + GetCurrentActCtx + GetCurrentConsoleFont + GetCurrentDirectoryA + GetCurrentDirectoryW + GetCurrentProcess + GetCurrentProcessId + GetCurrentProcessorNumber=ntdll.RtlGetCurrentProcessorNumber + GetCurrentThread + GetCurrentThreadId + GetDateFormatA + GetDateFormatW + GetDaylightFlag=__wine_stub_kernel32_dll_347 + GetDefaultCommConfigA + GetDefaultCommConfigW + GetDefaultSortkeySize + GetDevicePowerState + GetDiskFreeSpaceA + GetDiskFreeSpaceExA + GetDiskFreeSpaceExW + GetDiskFreeSpaceW + GetDllDirectoryA + GetDllDirectoryW + GetDriveTypeA + GetDriveTypeW + GetEnvironmentStrings + GetEnvironmentStringsA=GetEnvironmentStrings + GetEnvironmentStringsW + GetEnvironmentVariableA + GetEnvironmentVariableW + GetErrorMode + GetExitCodeProcess + GetExitCodeThread + GetExpandedNameA + GetExpandedNameW + GetFileAttributesA + GetFileAttributesByHandle + GetFileAttributesExA + GetFileAttributesExW + GetFileAttributesW + GetFileBandwidthReservation + GetFileInformationByHandle + GetFileSize + GetFileSizeEx + GetFileTime + GetFileType + GetFinalPathNameByHandleA + GetFinalPathNameByHandleW + GetFirmwareEnvironmentVariableA + GetFirmwareEnvironmentVariableW + GetFullPathNameA + GetFullPathNameW + GetGeoInfoA + GetGeoInfoW + GetHandleContext + GetHandleInformation + GetSCallbackTarget=__wine_stub_kernel32_dll_391 + GetSCallbackTemplate=__wine_stub_kernel32_dll_392 + GetLargePageMinimum + GetLargestConsoleWindowSize + GetLastError=ntdll.RtlGetLastWin32Error + GetLinguistLangSize + GetLocalTime + GetLocaleInfoA + GetLocaleInfoEx + GetLocaleInfoW + GetLogicalDriveStringsA + GetLogicalDriveStringsW + GetLogicalDrives + GetLogicalProcessorInformation + GetLongPathNameA + GetLongPathNameW + GetMailslotInfo + GetModuleFileNameA + GetModuleFileNameW + GetModuleHandleA + GetModuleHandleExA + GetModuleHandleExW + GetModuleHandleW + GetNamedPipeHandleStateA + GetNamedPipeHandleStateW + GetNamedPipeInfo + GetNativeSystemInfo + GetNextVDMCommand + GetNlsSectionName + GetNumaAvailableMemory + GetNumaAvailableMemoryNode + GetNumaHighestNodeNumber + GetNumaNodeProcessorMask + GetNumaProcessorMap + GetNumaProcessorNode + GetNumberFormatA + GetNumberFormatW + GetNumberOfConsoleFonts + GetNumberOfConsoleInputEvents + GetNumberOfConsoleMouseButtons + GetOEMCP + GetOverlappedResult + GetPriorityClass + GetPrivateProfileIntA + GetPrivateProfileIntW + GetPrivateProfileSectionA + GetPrivateProfileSectionNamesA + GetPrivateProfileSectionNamesW + GetPrivateProfileSectionW + GetPrivateProfileStringA + GetPrivateProfileStringW + GetPrivateProfileStructA + GetPrivateProfileStructW + GetProcAddress + GetProcessAffinityMask + GetProcessHandleCount + GetProcessHeap + GetProcessHeaps + GetProcessId + GetProcessIoCounters + GetProcessPriorityBoost + GetProcessShutdownParameters + GetProcessTimes + GetProcessVersion + GetProcessWorkingSetSize + GetProductName=__wine_stub_kernel32_dll_456 + GetProfileIntA + GetProfileIntW + GetProfileSectionA + GetProfileSectionW + GetProfileStringA + GetProfileStringW + GetQueuedCompletionStatus + GetLSCallbackTarget=__wine_stub_kernel32_dll_464 + GetLSCallbackTemplate=__wine_stub_kernel32_dll_465 + GetShortPathNameA + GetShortPathNameW + GetStartupInfoA + GetStartupInfoW + GetStdHandle + GetStringTypeA + GetStringTypeExA + GetStringTypeExW + GetStringTypeW + GetSystemDefaultLCID + GetSystemDefaultLangID + GetSystemDefaultUILanguage + GetSystemDirectoryA + GetSystemDirectoryW + GetSystemInfo + GetSystemPowerStatus + GetSystemRegistryQuota + GetSystemTime + GetSystemTimeAdjustment + GetSystemTimeAsFileTime + GetSystemTimes + GetSystemWindowsDirectoryA + GetSystemWindowsDirectoryW + GetSystemWow64DirectoryA + GetSystemWow64DirectoryW + GetTapeParameters + GetTapePosition + GetTapeStatus + GetTempFileNameA + GetTempFileNameW + GetTempPathA + GetTempPathW + GetThreadContext + GetThreadIOPendingFlag + GetThreadId + GetThreadLocale + GetThreadPriority + GetThreadPriorityBoost + GetThreadSelectorEntry + GetThreadTimes + GetTickCount + GetTickCount64 + GetTimeFormatA + GetTimeFormatW + GetTimeZoneInformation + GetUserDefaultLCID + GetUserDefaultLangID + GetUserDefaultUILanguage + GetUserGeoID + GetVDMCurrentDirectories + GetVersion + GetVersionExA + GetVersionExW + GetVolumeInformationA + GetVolumeInformationW + GetVolumeNameForVolumeMountPointA + GetVolumeNameForVolumeMountPointW + GetVolumePathNameA + GetVolumePathNameW + GetVolumePathNamesForVolumeNameA + GetVolumePathNamesForVolumeNameW + GetWindowsDirectoryA + GetWindowsDirectoryW + GetWriteWatch + GlobalAddAtomA + GlobalAddAtomW + GlobalAlloc + GlobalCompact + GlobalDeleteAtom + GlobalFindAtomA + GlobalFindAtomW + GlobalFix + GlobalFlags + GlobalFree + GlobalGetAtomNameA + GlobalGetAtomNameW + GlobalHandle + GlobalLock + GlobalMemoryStatus + GlobalMemoryStatusEx + GlobalReAlloc + GlobalSize + GlobalUnWire + GlobalUnfix + GlobalUnlock + GlobalWire + Heap32First + Heap32ListFirst + Heap32ListNext + Heap32Next + HeapAlloc=ntdll.RtlAllocateHeap + HeapCompact + HeapCreate + HeapCreateTagsW + HeapDestroy + HeapExtend + HeapFree=ntdll.RtlFreeHeap + HeapLock + HeapQueryInformation + HeapQueryTagW + HeapReAlloc=ntdll.RtlReAllocateHeap + HeapSetFlags=__wine_stub_kernel32_dll_567 + HeapSetInformation + HeapSize=ntdll.RtlSizeHeap + HeapSummary + HeapUnlock + HeapUsage + HeapValidate + HeapWalk + InitAtomTable + InitializeCriticalSection + InitializeCriticalSectionAndSpinCount + InitializeCriticalSectionEx + InitializeSListHead=ntdll.RtlInitializeSListHead + InitializeSRWLock=ntdll.RtlInitializeSRWLock + InterlockedCompareExchange + InterlockedCompareExchange64=ntdll.RtlInterlockedCompareExchange64 + InterlockedDecrement + InterlockedExchange + InterlockedExchangeAdd + InterlockedFlushSList=ntdll.RtlInterlockedFlushSList + InterlockedIncrement + InterlockedPopEntrySList=ntdll.RtlInterlockedPopEntrySList + InterlockedPushEntrySList=ntdll.RtlInterlockedPushEntrySList + InvalidateConsoleDIBits + InvalidateNSCache=__wine_stub_kernel32_dll_591 + IsBadCodePtr + IsBadHugeReadPtr + IsBadHugeWritePtr + IsBadReadPtr + IsBadStringPtrA + IsBadStringPtrW + IsBadWritePtr + IsDBCSLeadByte + IsDBCSLeadByteEx + IsDebuggerPresent + IsProcessInJob + IsProcessorFeaturePresent + IsSystemResumeAutomatic + IsThreadAFiber + IsValidCodePage + IsValidLanguageGroup + IsValidLocale + IsValidUILanguage + IsWow64Process + LCIDToLocaleName + LCMapStringA + LCMapStringW + LZClose + LZCopy + LZDone + LZInit + LZOpenFileA + LZOpenFileW + LZRead + LZSeek + LZStart + LeaveCriticalSection=ntdll.RtlLeaveCriticalSection + LoadLibraryA + LoadLibraryExA + LoadLibraryExW + LoadLibraryW + LoadModule + LoadResource + LocalAlloc + LocalCompact + LocalFileTimeToFileTime + LocalFlags + LocalFree + LocalHandle + LocalLock + LocalReAlloc + LocalShrink + LocalSize + LocalUnlock + LockFile + LockFileEx + LockResource + MapUserPhysicalPages + MapUserPhysicalPagesScatter + MapViewOfFile + MapViewOfFileEx + Module32First + Module32FirstW + Module32Next + Module32NextW + MoveFileA + MoveFileExA + MoveFileExW + MoveFileW + MoveFileWithProgressA + MoveFileWithProgressW + MulDiv + MultiByteToWideChar + NeedCurrentDirectoryForExePathA + NeedCurrentDirectoryForExePathW + NlsConvertIntegerToString + NlsGetCacheUpdateCount + NlsResetProcessLocale=__wine_stub_kernel32_dll_664 + NotifyNLSUserCache=__wine_stub_kernel32_dll_665 + NumaVirtualQueryNode + OpenConsoleW + OpenDataFile + OpenEventA + OpenEventW + OpenFile + OpenFileMappingA + OpenFileMappingW + OpenJobObjectA + OpenJobObjectW + OpenMutexA + OpenMutexW + OpenProcess + OpenProfileUserMapping + OpenSemaphoreA + OpenSemaphoreW + OpenThread + OpenWaitableTimerA + OpenWaitableTimerW + OutputDebugStringA + OutputDebugStringW + PeekConsoleInputA + PeekConsoleInputW + PeekNamedPipe + PostQueuedCompletionStatus + PrepareTape + PrivCopyFileExW + PrivMoveFileIdentityW + Process32First + Process32FirstW + Process32Next + Process32NextW + ProcessIdToSessionId + PulseEvent + PurgeComm + QueryActCtxW + QueryDepthSList=ntdll.RtlQueryDepthSList + QueryDosDeviceA + QueryDosDeviceW + QueryFullProcessImageNameA + QueryFullProcessImageNameW + QueryInformationJobObject + QueryMemoryResourceNotification + QueryNumberOfEventLogRecords=__wine_stub_kernel32_dll_709 + QueryOldestEventLogRecord=__wine_stub_kernel32_dll_710 + QueryPerformanceCounter + QueryPerformanceFrequency + QueryWin31IniFilesMappedToRegistry + QueueUserAPC + QueueUserWorkItem + RaiseException + ReOpenFile=__wine_stub_kernel32_dll_717 + ReadConsoleA + ReadConsoleInputA + ReadConsoleInputExA + ReadConsoleInputExW + ReadConsoleInputW + ReadConsoleOutputA + ReadConsoleOutputAttribute + ReadConsoleOutputCharacterA + ReadConsoleOutputCharacterW + ReadConsoleOutputW + ReadConsoleW + ReadDirectoryChangesW + ReadFile + ReadFileEx + ReadFileScatter + ReadProcessMemory + RegisterApplicationRestart + RegisterConsoleIME + RegisterConsoleOS2 + RegisterConsoleVDM + RegisterSysMsgHandler=__wine_stub_kernel32_dll_738 + RegisterWaitForInputIdle + RegisterWaitForSingleObject + RegisterWaitForSingleObjectEx + RegisterWowBaseHandlers + RegisterWowExec + ReleaseActCtx + ReleaseMutex + ReleaseSRWLockExclusive=ntdll.RtlReleaseSRWLockExclusive + ReleaseSRWLockShared=ntdll.RtlReleaseSRWLockShared + ReleaseSemaphore + RemoveDirectoryA + RemoveDirectoryW + RemoveLocalAlternateComputerNameA + RemoveLocalAlternateComputerNameW + RemoveVectoredContinueHandler=ntdll.RtlRemoveVectoredContinueHandler + RemoveVectoredExceptionHandler=ntdll.RtlRemoveVectoredExceptionHandler + ReplaceFile=ReplaceFileW + ReplaceFileA + ReplaceFileW + RequestDeviceWakeup + RequestWakeupLatency + ResetEvent + ResetWriteWatch + RestoreLastError=ntdll.RtlRestoreLastWin32Error + ResumeThread + RtlCaptureContext=ntdll.RtlCaptureContext + RtlCaptureStackBackTrace=ntdll.RtlCaptureStackBackTrace + RtlFillMemory=ntdll.RtlFillMemory + RtlMoveMemory=ntdll.RtlMoveMemory + RtlUnwind=ntdll.RtlUnwind + RtlZeroMemory=ntdll.RtlZeroMemory + ScrollConsoleScreenBufferA + ScrollConsoleScreenBufferW + SearchPathA + SearchPathW + SetCPGlobal + SetCalendarInfoA + SetCalendarInfoW + SetClientTimeZoneInformation + SetComPlusPackageInstallStatus + SetCommBreak + SetCommConfig + SetCommMask + SetCommState + SetCommTimeouts + SetComputerNameA + SetComputerNameExA + SetComputerNameExW + SetComputerNameW + SetConsoleActiveScreenBuffer + SetConsoleCP + SetConsoleCommandHistoryMode + SetConsoleCtrlHandler + SetConsoleCursor + SetConsoleCursorInfo + SetConsoleCursorMode + SetConsoleCursorPosition + SetConsoleDisplayMode + SetConsoleFont + SetConsoleHardwareState + SetConsoleHistoryInfo + SetConsoleIcon + SetConsoleInputExeNameA + SetConsoleInputExeNameW + SetConsoleKeyShortcuts + SetConsoleLocalEUDC + SetConsoleMaximumWindowSize + SetConsoleMenuClose + SetConsoleMode + SetConsoleNlsMode + SetConsoleNumberOfCommandsA + SetConsoleNumberOfCommandsW + SetConsoleOS2OemFormat + SetConsoleOutputCP + SetConsolePalette + SetConsoleScreenBufferSize + SetConsoleTextAttribute + SetConsoleTitleA + SetConsoleTitleW + SetConsoleWindowInfo + SetCriticalSectionSpinCount=ntdll.RtlSetCriticalSectionSpinCount + SetCurrentDirectoryA + SetCurrentDirectoryW + SetDaylightFlag=__wine_stub_kernel32_dll_822 + SetDefaultCommConfigA + SetDefaultCommConfigW + SetDllDirectoryA + SetDllDirectoryW + SetEndOfFile + SetEnvironmentVariableA + SetEnvironmentVariableW + SetErrorMode + SetEvent + SetFileApisToANSI + SetFileApisToOEM + SetFileAttributesA + SetFileAttributesW + SetFilePointer + SetFilePointerEx + SetFileShortNameA + SetFileShortNameW + SetFileTime + SetFileValidData + SetFirmwareEnvironmentVariableA + SetFirmwareEnvironmentVariableW + SetHandleContext + SetHandleCount + SetHandleInformation + SetInformationJobObject + SetLastConsoleEventActive=__wine_stub_kernel32_dll_848 + SetLastError=ntdll.RtlSetLastWin32Error + SetLocalPrimaryComputerNameA=__wine_stub_kernel32_dll_850 + SetLocalPrimaryComputerNameW=__wine_stub_kernel32_dll_851 + SetLocalTime + SetLocaleInfoA + SetLocaleInfoW + SetMailslotInfo + SetMessageWaitingIndicator + SetNamedPipeHandleState + SetPriorityClass + SetProcessAffinityMask + SetProcessPriorityBoost + SetProcessShutdownParameters + SetProcessWorkingSetSize + SetStdHandle + SetSystemPowerState + SetSystemTime + SetSystemTimeAdjustment + SetTapeParameters + SetTapePosition + SetTermsrvAppInstallMode + SetThreadAffinityMask + SetThreadContext + SetThreadExecutionState + SetThreadIdealProcessor + SetThreadLocale + SetThreadPriority + SetThreadPriorityBoost + SetThreadUILanguage + SetTimeZoneInformation + SetTimerQueueTimer + SetUnhandledExceptionFilter + SetUserGeoID + SetVDMCurrentDirectories + SetVolumeLabelA + SetVolumeLabelW + SetVolumeMountPointA + SetVolumeMountPointW + SetWaitableTimer + SetupComm + ShowConsoleCursor + SignalObjectAndWait + SizeofResource + Sleep + SleepEx + SuspendThread + SwitchToFiber + SwitchToThread + SystemTimeToFileTime + SystemTimeToTzSpecificLocalTime + TerminateJobObject + TerminateProcess + TerminateThread + TermsrvAppInstallMode + Thread32First + Thread32Next + TlsAlloc + TlsAllocInternal=__wine_stub_kernel32_dll_906 + TlsFree + TlsFreeInternal=__wine_stub_kernel32_dll_908 + TlsGetValue + TlsSetValue + Toolhelp32ReadProcessMemory + TransactNamedPipe + TransmitCommChar + TrimVirtualBuffer + TryEnterCriticalSection=ntdll.RtlTryEnterCriticalSection + TzSpecificLocalTimeToSystemTime + UTRegister + UTUnRegister + UnhandledExceptionFilter + UnlockFile + UnlockFileEx + UnmapViewOfFile + UnregisterConsoleIME + UnregisterWait + UnregisterWaitEx + UpdateResourceA + UpdateResourceW + VDMConsoleOperation + VDMOperationStarted + ValidateCType=__wine_stub_kernel32_dll_930 + ValidateLocale=__wine_stub_kernel32_dll_931 + VerLanguageNameA + VerLanguageNameW + VerSetConditionMask=ntdll.VerSetConditionMask + VerifyConsoleIoHandle + VerifyVersionInfoA + VerifyVersionInfoW + VirtualAlloc + VirtualAllocEx + VirtualBufferExceptionHandler + VirtualFree + VirtualFreeEx + VirtualLock + VirtualProtect + VirtualProtectEx + VirtualQuery + VirtualQueryEx + VirtualUnlock + WaitCommEvent + WaitForDebugEvent + WaitForMultipleObjects + WaitForMultipleObjectsEx + WaitForSingleObject + WaitForSingleObjectEx + WaitNamedPipeA + WaitNamedPipeW + WakeAllConditionVariable=ntdll.RtlWakeAllConditionVariable + WakeConditionVariable=ntdll.RtlWakeConditionVariable + WideCharToMultiByte + WinExec + Wow64DisableWow64FsRedirection + Wow64EnableWow64FsRedirection + Wow64RevertWow64FsRedirection + WriteConsoleA + WriteConsoleInputA + WriteConsoleInputVDMA + WriteConsoleInputVDMW + WriteConsoleInputW + WriteConsoleOutputA + WriteConsoleOutputAttribute + WriteConsoleOutputCharacterA + WriteConsoleOutputCharacterW + WriteConsoleOutputW + WriteConsoleW + WriteFile + WriteFileEx + WriteFileGather + WritePrivateProfileSectionA + WritePrivateProfileSectionW + WritePrivateProfileStringA + WritePrivateProfileStringW + WritePrivateProfileStructA + WritePrivateProfileStructW + WriteProcessMemory + WriteProfileSectionA + WriteProfileSectionW + WriteProfileStringA + WriteProfileStringW + WriteTapemark + WTSGetActiveConsoleSessionId + ZombifyActCtx + _DebugOut=__wine_stub_kernel32_dll_992 + _DebugPrintf=__wine_stub_kernel32_dll_993 + _hread + _hwrite + _lclose + _lcreat + _llseek + _lopen + _lread=_hread + _lwrite=_hwrite + dprintf=__wine_stub_kernel32_dll_1002 + lstrcat=lstrcatA + lstrcatA + lstrcatW + lstrcmp=lstrcmpA + lstrcmpA + lstrcmpW + lstrcmpi=lstrcmpiA + lstrcmpiA + lstrcmpiW + lstrcpy=lstrcpyA + lstrcpyA + lstrcpyW + lstrcpyn=lstrcpynA + lstrcpynA + lstrcpynW + lstrlen=lstrlenA + lstrlenA + lstrlenW Propchange: branches/cmake-bringup/dll/win32/kernel32/kernel32.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/kernel32/kernel32_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/kernel32_stubs.c (added) +++ branches/cmake-bringup/dll/win32/kernel32/kernel32_stubs.c [iso-8859-1] Fri Aug 13 14:56:34 2010 @@ -1,0 +1,51 @@ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/config.h" +#include "wine/exception.h" + +void __wine_spec_unimplemented_stub( const char *module, const char *function ) +{ + ULONG_PTR args[2]; + + args[0] = (ULONG_PTR)module; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); +} + +static const char __wine_spec_file_name[] = "kernel32.dll"; + +void __wine_stub_kernel32_dll_14(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AllocLSCallback"); } +void __wine_stub_kernel32_dll_23(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "BaseCheckRunApp"); } +void __wine_stub_kernel32_dll_33(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "BasepCheckWinSaferRestrictions"); } +void __wine_stub_kernel32_dll_34(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "BasepDebugDump"); } +void __wine_stub_kernel32_dll_60(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CloseSystemHandle"); } +void __wine_stub_kernel32_dll_69(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConsoleSubst"); } +void __wine_stub_kernel32_dll_103(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CreateKernelThread"); } +void __wine_stub_kernel32_dll_347(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetDaylightFlag"); } +void __wine_stub_kernel32_dll_391(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetSCallbackTarget"); } +void __wine_stub_kernel32_dll_392(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetSCallbackTemplate"); } +void __wine_stub_kernel32_dll_456(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetProductName"); } +void __wine_stub_kernel32_dll_464(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetLSCallbackTarget"); } +void __wine_stub_kernel32_dll_465(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetLSCallbackTemplate"); } +void __wine_stub_kernel32_dll_567(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "HeapSetFlags"); } +void __wine_stub_kernel32_dll_591(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "InvalidateNSCache"); } +void __wine_stub_kernel32_dll_664(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "NlsResetProcessLocale"); } +void __wine_stub_kernel32_dll_665(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "NotifyNLSUserCache"); } +void __wine_stub_kernel32_dll_709(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryNumberOfEventLogRecords"); } +void __wine_stub_kernel32_dll_710(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryOldestEventLogRecord"); } +void __wine_stub_kernel32_dll_717(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ReOpenFile"); } +void __wine_stub_kernel32_dll_738(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RegisterSysMsgHandler"); } +void __wine_stub_kernel32_dll_822(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetDaylightFlag"); } +void __wine_stub_kernel32_dll_848(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetLastConsoleEventActive"); } +void __wine_stub_kernel32_dll_850(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetLocalPrimaryComputerNameA"); } +void __wine_stub_kernel32_dll_851(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetLocalPrimaryComputerNameW"); } +void __wine_stub_kernel32_dll_906(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "TlsAllocInternal"); } +void __wine_stub_kernel32_dll_908(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "TlsFreeInternal"); } +void __wine_stub_kernel32_dll_930(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ValidateCType"); } +void __wine_stub_kernel32_dll_931(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ValidateLocale"); } +void __wine_stub_kernel32_dll_992(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_DebugOut"); } +void __wine_stub_kernel32_dll_993(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "_DebugPrintf"); } +void __wine_stub_kernel32_dll_1002(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "dprintf"); } + Propchange: branches/cmake-bringup/dll/win32/kernel32/kernel32_stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/kernel32/libkernel32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/kernel32/libkernel32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 4 months

[akhaldi] 48530: [CMAKE] - Sync kernel32 with trunk.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 13 14:47:01 2010 New Revision: 48530 URL: http://svn.reactos.org/svn/reactos?rev=48530&view=rev Log: [CMAKE] - Sync kernel32 with trunk. Modified: branches/cmake-bringup/dll/win32/kernel32/file/backup.c branches/cmake-bringup/dll/win32/kernel32/file/bintype.c branches/cmake-bringup/dll/win32/kernel32/file/cnotify.c branches/cmake-bringup/dll/win32/kernel32/file/copy.c branches/cmake-bringup/dll/win32/kernel32/file/create.c branches/cmake-bringup/dll/win32/kernel32/file/curdir.c branches/cmake-bringup/dll/win32/kernel32/file/delete.c branches/cmake-bringup/dll/win32/kernel32/file/deviceio.c branches/cmake-bringup/dll/win32/kernel32/file/dir.c branches/cmake-bringup/dll/win32/kernel32/file/dosdev.c branches/cmake-bringup/dll/win32/kernel32/file/file.c branches/cmake-bringup/dll/win32/kernel32/file/find.c branches/cmake-bringup/dll/win32/kernel32/file/hardlink.c branches/cmake-bringup/dll/win32/kernel32/file/iocompl.c branches/cmake-bringup/dll/win32/kernel32/file/lfile.c branches/cmake-bringup/dll/win32/kernel32/file/lock.c branches/cmake-bringup/dll/win32/kernel32/file/mailslot.c branches/cmake-bringup/dll/win32/kernel32/file/move.c branches/cmake-bringup/dll/win32/kernel32/file/npipe.c branches/cmake-bringup/dll/win32/kernel32/file/pipe.c branches/cmake-bringup/dll/win32/kernel32/file/rw.c branches/cmake-bringup/dll/win32/kernel32/file/tape.c branches/cmake-bringup/dll/win32/kernel32/file/volume.c branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc branches/cmake-bringup/dll/win32/kernel32/misc/actctx.c branches/cmake-bringup/dll/win32/kernel32/misc/console.c branches/cmake-bringup/dll/win32/kernel32/misc/format_msg.c branches/cmake-bringup/dll/win32/kernel32/misc/lang.c branches/cmake-bringup/dll/win32/kernel32/misc/lcformat.c branches/cmake-bringup/dll/win32/kernel32/misc/profile.c branches/cmake-bringup/dll/win32/kernel32/misc/stubs.c branches/cmake-bringup/dll/win32/kernel32/misc/version.c branches/cmake-bringup/dll/win32/kernel32/nls/cym.nls branches/cmake-bringup/dll/win32/kernel32/nls/lth.nls branches/cmake-bringup/dll/win32/kernel32/nls/ukr.nls branches/cmake-bringup/dll/win32/kernel32/process/session.c Modified: branches/cmake-bringup/dll/win32/kernel32/file/backup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/backup.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/backup.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -11,9 +11,8 @@ /* INCLUDES *****************************************************************/ #include <k32.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); +#define NDEBUG +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/bintype.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/bintype.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -13,9 +13,10 @@ /* INCLUDES *****************************************************************/ #include <k32.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); +#define NDEBUG +#include <debug.h> + +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/cnotify.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/cnotify.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -10,9 +10,8 @@ */ #include <k32.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); +#define NDEBUG +#include <debug.h> /* * @implemented Modified: branches/cmake-bringup/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/copy.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/copy.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/create.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/create.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 Modified: branches/cmake-bringup/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/curdir.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 **********************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/delete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/delete.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/delete.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -9,7 +9,8 @@ /* INCLUDES *******************************************************************/ #include <k32.h> -#include <wine/debug.h> +#define NDEBUG +#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/dir.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 @@ { 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] == '\\')); } Modified: branches/cmake-bringup/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/dosdev.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/dosdev.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 *****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/file.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ******************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/find.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/find.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ********************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/hardlink.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/hardlink.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/iocompl.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/iocompl.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -10,13 +10,12 @@ */ #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 Modified: branches/cmake-bringup/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/lfile.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/lfile.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -10,9 +10,8 @@ */ #include <k32.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); +#define NDEBUG +#include <debug.h> /* * @implemented Modified: branches/cmake-bringup/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/lock.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/lock.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/mailslot.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/mailslot.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/move.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 *****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/npipe.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 Modified: branches/cmake-bringup/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/pipe.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/pipe.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ******************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/rw.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/rw.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/tape.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/tape.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/tape.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -12,9 +12,8 @@ /* INCLUDES *****************************************************************/ #include <k32.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); +#define NDEBUG +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/file/volume.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 Modified: branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 @@ #define HeapAlloc RtlAllocateHeap #define HeapReAlloc RtlReAllocateHeap #define HeapFree RtlFreeHeap +#define _lread (_readfun)_hread POBJECT_ATTRIBUTES WINAPI Modified: branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/locale_rc.rc [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 */ Modified: branches/cmake-bringup/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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) Modified: branches/cmake-bringup/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/console.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -1370,20 +1370,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - - -/* - * @unimplemented (Undocumented) - */ -BOOL -WINAPI -SetLastConsoleEventActive(VOID) -{ - DPRINT1("SetLastConsoleEventActive() UNIMPLEMENTED!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /* * @unimplemented (Undocumented) Modified: branches/cmake-bringup/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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 { Modified: branches/cmake-bringup/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/lang.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -155,142 +155,6 @@ } return 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; } Modified: branches/cmake-bringup/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -5,6 +5,7 @@ * Copyright 1998 David Lee Lambert * Copyright 2000 Julio César Gázquez * Copyright 2003 Jon Griffiths + * Copyright 2005 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* @@ -29,16 +30,9 @@ */ #include <k32.h> - -#include "wine/config.h" -#include "wine/unicode.h" #define NDEBUG #include <debug.h> - -#define TRACE DPRINT -#define WARN DPRINT1 -#define ERR DPRINT1 -#define FIXME DPRINT1 +static ULONG gDebugChannel = resource; #define DATE_DATEVARSONLY 0x0100 /* only date stuff: yMdg */ #define TIME_TIMEVARSONLY 0x0200 /* only time stuff: hHmst */ @@ -52,7 +46,7 @@ * * Our cache takes the form of a singly linked list, whose node is below: */ -#define NLS_NUM_CACHED_STRINGS 45 +#define NLS_NUM_CACHED_STRINGS 57 typedef struct _NLS_FORMAT_NODE { @@ -72,14 +66,15 @@ #define GetLongDate(fmt) fmt->lppszStrings[1] #define GetShortDate(fmt) fmt->lppszStrings[2] #define GetTime(fmt) fmt->lppszStrings[3] -#define GetAM(fmt) fmt->lppszStrings[42] -#define GetPM(fmt) fmt->lppszStrings[43] -#define GetYearMonth(fmt) fmt->lppszStrings[44] - -#define GetLongDay(fmt,day) fmt->lppszStrings[4 + day] -#define GetShortDay(fmt,day) fmt->lppszStrings[11 + day] -#define GetLongMonth(fmt,mth) fmt->lppszStrings[18 + mth] -#define GetShortMonth(fmt,mth) fmt->lppszStrings[30 + mth] +#define GetAM(fmt) fmt->lppszStrings[54] +#define GetPM(fmt) fmt->lppszStrings[55] +#define GetYearMonth(fmt) fmt->lppszStrings[56] + +#define GetLongDay(fmt,day) fmt->lppszStrings[4 + day] +#define GetShortDay(fmt,day) fmt->lppszStrings[11 + day] +#define GetLongMonth(fmt,mth) fmt->lppszStrings[18 + mth] +#define GetGenitiveMonth(fmt,mth) fmt->lppszStrings[30 + mth] +#define GetShortMonth(fmt,mth) fmt->lppszStrings[42 + mth] /* Write access to the cache is protected by this critical section */ static RTL_CRITICAL_SECTION NLS_FormatsCS; @@ -91,53 +86,6 @@ 0, 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; - -/************************************************************************** - * NLS_isSystemLocale <internal> - * - * Return TRUE, if locale is system-type - */ -BOOL NLS_isSystemLocale(LCID lcid) -{ - if(lcid == LOCALE_SYSTEM_DEFAULT || - lcid == LOCALE_NEUTRAL || - lcid == LOCALE_USER_DEFAULT) - { - return TRUE; - } - return FALSE; -} - -/************************************************************************** - * NLS_getDefaultLocale <internal> - * - * Return default system or user locale - */ -LCID NLS_getDefaultLocale(LCID lcid) -{ - LCID lcidTmp; - - DPRINT("Called NLS_getDefaultLocale(0x%04lx)\n", lcid); - - switch(lcid) - { - case LOCALE_SYSTEM_DEFAULT: - NtQueryDefaultLocale(FALSE, &lcidTmp); - return lcidTmp; - break; - - case LOCALE_USER_DEFAULT: - case LOCALE_NEUTRAL: - NtQueryDefaultLocale(TRUE, &lcidTmp); - return lcidTmp; - break; - - default: - DPRINT1("FIXME: unknown system lcid\n"); - } - - return lcid; -} /************************************************************************** * NLS_GetLocaleNumber <internal> @@ -184,10 +132,10 @@ } #define GET_LOCALE_NUMBER(num, type) num = NLS_GetLocaleNumber(lcid, type|dwFlags); \ - TRACE( #type ": %ld (%08lx)\n", (DWORD)num, (DWORD)num) + TRACE( #type ": %d (%08x)\n", (DWORD)num, (DWORD)num) #define GET_LOCALE_STRING(str, type) str = NLS_GetLocaleString(lcid, type|dwFlags); \ - TRACE( #type ": '%S'\n", (str)) + TRACE( #type ": %s\n", debugstr_w(str)) /************************************************************************** * NLS_GetFormats <internal> @@ -197,7 +145,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) { /* GetLocaleInfo() identifiers for cached formatting strings */ - static const USHORT NLS_LocaleIndices[] = { + static const LCTYPE NLS_LocaleIndices[] = { LOCALE_SNEGATIVESIGN, LOCALE_SLONGDATE, LOCALE_SSHORTDATE, LOCALE_STIMEFORMAT, @@ -210,6 +158,18 @@ LOCALE_SMONTHNAME4, LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12, + LOCALE_SMONTHNAME1 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME2 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME3 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME4 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME5 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME6 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME7 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME8 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME9 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME10 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME11 | LOCALE_RETURN_GENITIVE_NAMES, + LOCALE_SMONTHNAME12 | LOCALE_RETURN_GENITIVE_NAMES, LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, @@ -222,7 +182,7 @@ dwFlags &= LOCALE_NOUSEROVERRIDE; - TRACE("(0x%04lx,0x%08lx)\n", lcid, dwFlags); + TRACE("(0x%04x,0x%08x)\n", lcid, dwFlags); /* See if we have already cached the locales number format */ while (node && (node->lcid != lcid || node->dwFlags != dwFlags) && node->next) @@ -296,6 +256,16 @@ { GET_LOCALE_STRING(new_node->lppszStrings[i], NLS_LocaleIndices[i]); } + /* Save some memory if month genitive name is the same or not present */ + for (i = 0; i < 12; i++) + { + if (strcmpW(GetLongMonth(new_node, i), GetGenitiveMonth(new_node, i)) == 0) + { + HeapFree(GetProcessHeap(), 0, GetGenitiveMonth(new_node, i)); + GetGenitiveMonth(new_node, i) = NULL; + } + } + new_node->szShortAM[0] = GetAM(new_node)[0]; new_node->szShortAM[1] = '\0'; new_node->szShortPM[0] = GetPM(new_node)[0]; new_node->szShortPM[1] = '\0'; @@ -360,7 +330,7 @@ case LANG_MARATHI: case LANG_PUNJABI: case LANG_SANSKRIT: - TRACE("lcid 0x%08lx: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); + TRACE("lcid 0x%08x: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); return TRUE; default: return FALSE; @@ -399,14 +369,11 @@ INT cchWritten = 0; INT lastFormatPos = 0; BOOL bSkipping = FALSE; /* Skipping text around marker? */ + BOOL d_dd_formatted = FALSE; /* previous formatted part was for d or dd */ /* Verify our arguments */ if ((cchOut && !lpStr) || !(node = NLS_GetFormats(lcid, dwFlags))) - { -NLS_GetDateTimeFormatW_InvalidParameter: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + goto invalid_parameter; if (dwFlags & ~(DATE_DATEVARSONLY|TIME_TIMEVARSONLY)) { @@ -414,15 +381,13 @@ ((dwFlags & DATE_DATEVARSONLY && dwFlags & ~DATE_FORMAT_FLAGS) || (dwFlags & TIME_TIMEVARSONLY && dwFlags & ~TIME_FORMAT_FLAGS))) { -NLS_GetDateTimeFormatW_InvalidFlags: - SetLastError(ERROR_INVALID_FLAGS); - return 0; + goto invalid_flags; } if (dwFlags & DATE_DATEVARSONLY) { if ((dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) == (DATE_LTRREADING|DATE_RTLREADING)) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; else if (dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) FIXME("Unsupported flags: DATE_LTRREADING/DATE_RTLREADING\n"); @@ -434,10 +399,10 @@ case DATE_LONGDATE: case DATE_YEARMONTH: if (lpFormat) - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; break; default: - goto NLS_GetDateTimeFormatW_InvalidFlags; + goto invalid_flags; } } } @@ -476,7 +441,7 @@ st.wDay = lpTime->wDay; if (st.wDay > 31 || st.wMonth > 12 || !SystemTimeToFileTime(&st, &ftTmp)) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; FileTimeToSystemTime(&ftTmp, &st); lpTime = &st; @@ -486,7 +451,7 @@ { /* Verify the time */ if (lpTime->wHour > 24 || lpTime->wMinute > 59 || lpTime->wSecond > 59) - goto NLS_GetDateTimeFormatW_InvalidParameter; + goto invalid_parameter; } } @@ -511,7 +476,7 @@ if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping) { lpStr[cchWritten] = *lpFormat; @@ -523,7 +488,6 @@ else if ((dwFlags & DATE_DATEVARSONLY && IsDateFmtChar(*lpFormat)) || (dwFlags & TIME_TIMEVARSONLY && IsTimeFmtChar(*lpFormat))) { - char buffA[32]; WCHAR buff[32], fmtChar; LPCWSTR szAdd = NULL; DWORD dwVal = 0; @@ -539,6 +503,7 @@ } buff[0] = '\0'; + if (fmtChar != 'M') d_dd_formatted = FALSE; switch(fmtChar) { case 'd': @@ -550,12 +515,59 @@ { dwVal = lpTime->wDay; szAdd = buff; + d_dd_formatted = TRUE; } break; case 'M': if (count >= 4) + { + LPCWSTR genitive = GetGenitiveMonth(node, lpTime->wMonth - 1); + if (genitive) + { + if (d_dd_formatted) + { + szAdd = genitive; + break; + } + else + { + LPCWSTR format = lpFormat; + /* Look forward now, if next format pattern is for day genitive + name should be used */ + while (*format) + { + /* Skip parts within markers */ + if (IsLiteralMarker(*format)) + { + ++format; + while (*format) + { + if (IsLiteralMarker(*format)) + { + ++format; + if (!IsLiteralMarker(*format)) break; + } + } + } + if (*format != ' ') break; + ++format; + } + /* Only numeric day form matters */ + if (*format && *format == 'd') + { + INT dcount = 1; + while (*++format == 'd') dcount++; + if (dcount < 3) + { + szAdd = genitive; + break; + } + } + } + } szAdd = GetLongMonth(node, lpTime->wMonth - 1); + } else if (count == 3) szAdd = GetShortMonth(node, lpTime->wMonth - 1); else @@ -657,9 +669,9 @@ if (szAdd == buff && buff[0] == '\0') { + static const WCHAR fmtW[] = {'%','.','*','d',0}; /* We have a numeric value to add */ - sprintf(buffA, "%.*ld", count, dwVal); - MultiByteToWideChar(CP_ACP, 0, buffA, -1, buff, sizeof(buff)/sizeof(WCHAR)); + snprintfW(buff, sizeof(buff)/sizeof(WCHAR), fmtW, count, dwVal); } dwLen = szAdd ? strlenW(szAdd) : 0; @@ -671,7 +683,7 @@ else { memcpy(lpStr + cchWritten, szAdd, (cchOut - cchWritten) * sizeof(WCHAR)); - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; } } cchWritten += dwLen; @@ -683,7 +695,7 @@ if (!cchOut) cchWritten++; /* Count size only */ else if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else if (!bSkipping || *lpFormat == ' ') { lpStr[cchWritten] = *lpFormat; @@ -697,19 +709,27 @@ if (cchOut) { if (cchWritten >= cchOut) - goto NLS_GetDateTimeFormatW_Overrun; + goto overrun; else lpStr[cchWritten] = '\0'; } cchWritten++; /* Include terminating NUL */ - TRACE("returning length=%d, ouput='%S'\n", cchWritten, lpStr); + TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr)); return cchWritten; -NLS_GetDateTimeFormatW_Overrun: +overrun: TRACE("returning 0, (ERROR_INSUFFICIENT_BUFFER)\n"); SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; + +invalid_parameter: + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + +invalid_flags: + SetLastError(ERROR_INVALID_FLAGS); + return 0; } /****************************************************************************** @@ -725,12 +745,11 @@ WCHAR szFormat[128], szOut[128]; INT iRet; - TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime, - lpFormat, lpStr, cchOut); + TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime, + debugstr_a(lpFormat), lpStr, cchOut); if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetDateTimeFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -739,7 +758,11 @@ { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetDateTimeFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -810,8 +833,8 @@ INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, LPCSTR lpFormat, LPSTR lpDateStr, INT cchOut) { - TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, - lpFormat, lpDateStr, cchOut); + TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, + debugstr_a(lpFormat), lpDateStr, cchOut); return NLS_GetDateTimeFormatA(lcid, dwFlags | DATE_DATEVARSONLY, lpTime, lpFormat, lpDateStr, cchOut); @@ -826,8 +849,8 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, LPCWSTR lpFormat, LPWSTR lpDateStr, INT cchOut) { - TRACE("(0x%04lx,0x%08lx,%p,%S,%p,%d)\n", lcid, dwFlags, lpTime, - lpFormat, lpDateStr, cchOut); + TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime, + debugstr_w(lpFormat), lpDateStr, cchOut); return NLS_GetDateTimeFormatW(lcid, dwFlags|DATE_DATEVARSONLY, lpTime, lpFormat, lpDateStr, cchOut); @@ -877,8 +900,8 @@ INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, LPCSTR lpFormat, LPSTR lpTimeStr, INT cchOut) { - TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, - lpFormat, lpTimeStr, cchOut); + TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, + debugstr_a(lpFormat), lpTimeStr, cchOut); return NLS_GetDateTimeFormatA(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, lpFormat, lpTimeStr, cchOut); @@ -892,8 +915,8 @@ INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, LPCWSTR lpFormat, LPWSTR lpTimeStr, INT cchOut) { - TRACE("(0x%04lx,0x%08lx,%p,%S,%p,%d)\n",lcid, dwFlags, lpTime, - lpFormat, lpTimeStr, cchOut); + TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, + debugstr_w(lpFormat), lpTimeStr, cchOut); return NLS_GetDateTimeFormatW(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, lpFormat, lpTimeStr, cchOut); @@ -936,12 +959,11 @@ const NUMBERFMTW *pfmt = NULL; INT iRet; - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, lpszValue, + TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), lpFormat, lpNumberStr, cchOut); if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetNumberFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -950,7 +972,11 @@ { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetNumberFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -1013,28 +1039,16 @@ WCHAR szNegBuff[8]; const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0; - DWORD dwLeadingZeros = 0; INT iRet; - TRACE("(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", lcid, dwFlags, lpszValue, + TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), lpFormat, lpNumberStr, cchOut); - if(NLS_isSystemLocale(lcid)) - { - lcid = NLS_getDefaultLocale(lcid); - } - else if(!IsValidLocale(lcid, LCID_INSTALLED)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) || + !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep))) { -GetNumberFormatW_Error: - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; + goto error; } if (!lpFormat) @@ -1042,7 +1056,7 @@ const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetNumberFormatW_Error; + goto error; lpFormat = &node->fmt; lpszNegStart = lpszNeg = GetNegative(node); } @@ -1064,11 +1078,7 @@ /* Check the number for validity */ while (*szSrc) { - if (*szSrc == '0' && !(dwState & NF_DIGITS)) - { - dwLeadingZeros++; - } - else if ((*szSrc >= '1' && *szSrc <= '9') || (*szSrc == '0' && (dwState & NF_DIGITS))) + if (*szSrc >= '0' && *szSrc <= '9') { dwState |= NF_DIGITS; if (dwState & NF_ISREAL) @@ -1077,23 +1087,23 @@ else if (*szSrc == '-') { if (dwState) - goto GetNumberFormatW_Error; /* '-' not first character */ + goto error; /* '-' not first character */ dwState |= NF_ISNEGATIVE; } else if (*szSrc == '.') { if (dwState & NF_ISREAL) - goto GetNumberFormatW_Error; /* More than one '.' */ + goto error; /* More than one '.' */ dwState |= NF_ISREAL; } else - goto GetNumberFormatW_Error; /* Invalid char */ + goto error; /* Invalid char */ szSrc++; } szSrc--; /* Point to last character */ if (!(dwState & NF_DIGITS)) - goto GetNumberFormatW_Error; /* No digits */ + goto error; /* No digits */ /* Add any trailing negative sign */ if (dwState & NF_ISNEGATIVE) @@ -1181,7 +1191,7 @@ dwGroupCount = lpFormat->Grouping == 32 ? 3 : lpFormat->Grouping; /* Write the remaining whole number digits, including grouping chars */ - while (szSrc >= (lpszValue + dwLeadingZeros) && *szSrc >= '0' && *szSrc <= '9') + while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9') { if (dwState & NF_ROUND) { @@ -1199,7 +1209,7 @@ dwState |= NF_DIGITS_OUT; dwCurrentGroupCount++; - if (szSrc >= (lpszValue + dwLeadingZeros) && dwCurrentGroupCount == dwGroupCount && *szSrc != '-') + if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount && *szSrc != '-') { LPWSTR lpszGrp = lpFormat->lpThousandSep + strlenW(lpFormat->lpThousandSep) - 1; @@ -1251,6 +1261,10 @@ } } return iRet; + +error: + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; } /************************************************************************** @@ -1290,12 +1304,11 @@ const CURRENCYFMTW *pfmt = NULL; INT iRet; - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, lpszValue, + TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), lpFormat, lpCurrencyStr, cchOut); if (NLS_IsUnicodeOnlyLcid(lcid)) { -GetCurrencyFormatA_InvalidParameter: SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1304,7 +1317,11 @@ { const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetCurrencyFormatA_InvalidParameter; + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + cp = node->dwCodePage; } @@ -1395,32 +1412,16 @@ DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; INT iRet; - DPRINT1("GetCurrencyFormatW(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", - lcid, - dwFlags, - lpszValue, - lpFormat, - lpCurrencyStr, - cchOut); - - if(NLS_isSystemLocale(lcid)) - { - lcid = NLS_getDefaultLocale(lcid); - } - else if(!IsValidLocale(lcid, LCID_INSTALLED)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), + lpFormat, lpCurrencyStr, cchOut); if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || + !IsValidLocale(lcid, 0) || (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || lpFormat->PositiveOrder > 3))) { -GetCurrencyFormatW_Error: - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; + goto error; } if (!lpFormat) @@ -1428,7 +1429,8 @@ const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); if (!node) - goto GetCurrencyFormatW_Error; + goto error; + lpFormat = &node->cyfmt; lpszNegStart = lpszNeg = GetNegative(node); } @@ -1461,23 +1463,23 @@ else if (*szSrc == '-') { if (dwState) - goto GetCurrencyFormatW_Error; /* '-' not first character */ + goto error; /* '-' not first character */ dwState |= NF_ISNEGATIVE; } else if (*szSrc == '.') { if (dwState & NF_ISREAL) - goto GetCurrencyFormatW_Error; /* More than one '.' */ + goto error; /* More than one '.' */ dwState |= NF_ISREAL; } else - goto GetCurrencyFormatW_Error; /* Invalid char */ + goto error; /* Invalid char */ szSrc++; } szSrc--; /* Point to last character */ if (!(dwState & NF_DIGITS)) - goto GetCurrencyFormatW_Error; /* No digits */ + goto error; /* No digits */ if (dwState & NF_ISNEGATIVE) dwFmt = NLS_NegCyFormats[lpFormat->NegativeOrder]; @@ -1652,6 +1654,10 @@ } } return iRet; + +error: + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; } /* FIXME: Everything below here needs to move somewhere else along with the @@ -1660,40 +1666,132 @@ */ /************************************************************************** - * EnumDateFormatsA (KERNEL32.@) - */ -BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale, DWORD dwFlags) -{ + * EnumDateFormatsExA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? + */ +BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA proc, LCID lcid, DWORD flags) +{ + CALID cal_id; char buf[256]; - if (!lpDateFmtEnumProc) + if (!proc) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - switch (dwFlags & ~LOCALE_USE_CP_ACP) - { - case 0: - case DATE_SHORTDATE: - if (GetLocaleInfoA(Locale, LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) - lpDateFmtEnumProc(buf); - break; - - case DATE_LONGDATE: - if (GetLocaleInfoA(Locale, LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) - lpDateFmtEnumProc(buf); - break; - - case DATE_YEARMONTH: - if (GetLocaleInfoA(Locale, LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) - lpDateFmtEnumProc(buf); - break; - - default: - FIXME("Unknown date format (%d)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + if (!GetLocaleInfoW(lcid, LOCALE_ICALENDARTYPE|LOCALE_RETURN_NUMBER, (LPWSTR)&cal_id, sizeof(cal_id)/sizeof(WCHAR))) + return FALSE; + + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoA(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf, cal_id); + break; + + case DATE_LONGDATE: + if (GetLocaleInfoA(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf, cal_id); + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoA(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf, cal_id); + break; + + default: + FIXME("Unknown date format (%d)\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; +} + +/************************************************************************** + * EnumDateFormatsExW (KERNEL32.@) + */ +BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW proc, LCID lcid, DWORD flags) +{ + CALID cal_id; + WCHAR buf[256]; + + if (!proc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!GetLocaleInfoW(lcid, LOCALE_ICALENDARTYPE|LOCALE_RETURN_NUMBER, (LPWSTR)&cal_id, sizeof(cal_id)/sizeof(WCHAR))) + return FALSE; + + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoW(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf, cal_id); + break; + + case DATE_LONGDATE: + if (GetLocaleInfoW(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf, cal_id); + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoW(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf, cal_id); + break; + + default: + FIXME("Unknown date format (%d)\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; +} + +/************************************************************************** + * EnumDateFormatsA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? + */ +BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) +{ + char buf[256]; + + if (!proc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoA(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + case DATE_LONGDATE: + if (GetLocaleInfoA(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoA(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + default: + FIXME("Unknown date format (%d)\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } return TRUE; } @@ -1701,180 +1799,99 @@ /************************************************************************** * EnumDateFormatsW (KERNEL32.@) */ -BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags) +BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) { WCHAR buf[256]; - if (!lpDateFmtEnumProc) + if (!proc) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - switch (dwFlags & ~LOCALE_USE_CP_ACP) - { - case 0: - case DATE_SHORTDATE: - if (GetLocaleInfoW(Locale, LOCALE_SSHORTDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) - lpDateFmtEnumProc(buf); - break; - - case DATE_LONGDATE: - if (GetLocaleInfoW(Locale, LOCALE_SLONGDATE | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) - lpDateFmtEnumProc(buf); - break; - - case DATE_YEARMONTH: - if (GetLocaleInfoW(Locale, LOCALE_SYEARMONTH | (dwFlags & LOCALE_USE_CP_ACP), buf, 256)) - lpDateFmtEnumProc(buf); - break; - - default: - FIXME("Unknown date format (%d)\n", dwFlags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoW(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + case DATE_LONGDATE: + if (GetLocaleInfoW(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoW(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + default: + FIXME("Unknown date format (%d)\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } return TRUE; } /************************************************************************** * EnumTimeFormatsA (KERNEL32.@) - */ -BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags ) -{ - LCID Loc = GetUserDefaultLCID(); - if(!lpTimeFmtEnumProc) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if(dwFlags) - { - FIXME("Unknown time format (%ld)\n", dwFlags); - } - - switch( Loc ) - { - case 0x00000407: /* (Loc,"de_DE") */ - { - if(!(*lpTimeFmtEnumProc)("HH.mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)("H.mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)("H.mm'Uhr'")) return TRUE; + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? + */ +BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) +{ + char buf[256]; + + if (!proc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + if (GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + default: + FIXME("Unknown time format (%d)\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return TRUE; - } - - case 0x0000040c: /* (Loc,"fr_FR") */ - case 0x00000c0c: /* (Loc,"fr_CA") */ - { - if(!(*lpTimeFmtEnumProc)("H:mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)("HH.mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)("HH'h'mm")) return TRUE; - return TRUE; - } - - case 0x00000809: /* (Loc,"en_UK") */ - case 0x00000c09: /* (Loc,"en_AU") */ - case 0x00001409: /* (Loc,"en_NZ") */ - case 0x00001809: /* (Loc,"en_IE") */ - { - if(!(*lpTimeFmtEnumProc)("h:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE; - return TRUE; - } - - case 0x00001c09: /* (Loc,"en_ZA") */ - case 0x00002809: /* (Loc,"en_BZ") */ - case 0x00002c09: /* (Loc,"en_TT") */ - { - if(!(*lpTimeFmtEnumProc)("h:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)("hh:mm:ss tt")) return TRUE; - return TRUE; - } - - default: /* default to US style "en_US" */ - { - if(!(*lpTimeFmtEnumProc)("h:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)("hh:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)("H:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)("HH:mm:ss")) return TRUE; - return TRUE; - } - } } /************************************************************************** * EnumTimeFormatsW (KERNEL32.@) */ -BOOL WINAPI EnumTimeFormatsW( TIMEFMT_ENUMPROCW lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags ) -{ - LCID Loc = GetUserDefaultLCID(); - if(!lpTimeFmtEnumProc) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if(dwFlags) - { - FIXME("Unknown time format (%ld)\n", dwFlags); - } - - switch( Loc ) - { - case 0x00000407: /* (Loc,"de_DE") */ - { - if(!(*lpTimeFmtEnumProc)(L"HH.mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"HH:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"H:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"H.mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"H.mm'Uhr'")) return TRUE; +BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) +{ + WCHAR buf[256]; + + if (!proc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + if (GetLocaleInfoW(lcid, LOCALE_STIMEFORMAT | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + default: + FIXME("Unknown time format (%d)\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return TRUE; - } - - case 0x0000040c: /* (Loc,"fr_FR") */ - case 0x00000c0c: /* (Loc,"fr_CA") */ - { - if(!(*lpTimeFmtEnumProc)(L"H:mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"HH:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"H:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"HH.mm")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"HH'h'mm")) return TRUE; - return TRUE; - } - - case 0x00000809: /* (Loc,"en_UK") */ - case 0x00000c09: /* (Loc,"en_AU") */ - case 0x00001409: /* (Loc,"en_NZ") */ - case 0x00001809: /* (Loc,"en_IE") */ - { - if(!(*lpTimeFmtEnumProc)(L"h:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"HH:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"H:mm:ss")) return TRUE; - return TRUE; - } - - case 0x00001c09: /* (Loc,"en_ZA") */ - case 0x00002809: /* (Loc,"en_BZ") */ - case 0x00002c09: /* (Loc,"en_TT") */ - { - if(!(*lpTimeFmtEnumProc)(L"h:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"hh:mm:ss tt")) return TRUE; - return TRUE; - } - - default: /* default to US style "en_US" */ - { - if(!(*lpTimeFmtEnumProc)(L"h:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"hh:mm:ss tt")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"H:mm:ss")) return TRUE; - if(!(*lpTimeFmtEnumProc)(L"HH:mm:ss")) return TRUE; - return TRUE; - } - } } /****************************************************************************** @@ -1940,7 +1957,7 @@ if (opt == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; } if (GetLocaleInfoW(locale, LOCALE_IOPTIONALCALENDAR, opt, optSz)) iter = opt; @@ -1967,14 +1984,14 @@ if (bufSz >= newSz) { ERR("Buffer resizing disorder: was %d, requested %d.\n", bufSz, newSz); - goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; } bufSz = newSz; WARN("Buffer too small; resizing to %d bytes.\n", bufSz); buf = HeapReAlloc(GetProcessHeap(), 0, buf, bufSz); if (buf == NULL) - goto NLS_EnumCalendarInfoAW_Cleanup; - } else goto NLS_EnumCalendarInfoAW_Cleanup; + goto cleanup; + } else goto cleanup; } } while (!ret); @@ -2008,7 +2025,7 @@ } } -NLS_EnumCalendarInfoAW_Cleanup: +cleanup: HeapFree(GetProcessHeap(), 0, opt); HeapFree(GetProcessHeap(), 0, buf); return ret; @@ -2016,12 +2033,14 @@ /****************************************************************************** * EnumCalendarInfoA [KERNEL32.@] + * + * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) { - FIXME("(%p,0x%04lx,0x%08lx,0x%08lx),stub!\n",calinfoproc,locale,calendar,caltype); - return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, FALSE, FALSE); + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); + return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, FALSE, FALSE); } /****************************************************************************** Modified: branches/cmake-bringup/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/profile.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -83,25 +83,6 @@ 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 Modified: branches/cmake-bringup/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -958,6 +958,350 @@ return FALSE; } +BOOL +WINAPI +SetProcessWorkingSetSizeEx(IN HANDLE hProcess, + IN SIZE_T dwMinimumWorkingSetSize, + IN SIZE_T dwMaximumWorkingSetSize, + IN DWORD Flags) +{ + STUB; + return FALSE; +} + + +BOOL +WINAPI +GetProcessWorkingSetSizeEx(IN HANDLE hProcess, + OUT PSIZE_T lpMinimumWorkingSetSize, + OUT PSIZE_T lpMaximumWorkingSetSize, + OUT PDWORD Flags) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetNumaAvailableMemoryNode(IN UCHAR Node, + OUT PULONGLONG AvailableBytes) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetNumaAvailableMemory(PVOID lpInfo, + ULONG Length, + PULONG ReturnLength) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetNumaProcessorMap(PVOID lpInfo, + ULONG Length, + PULONG ReturnLength) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +NlsResetProcessLocale(VOID) +{ + STUB; + return TRUE; +} + +DWORD +WINAPI +AddLocalAlternateComputerNameA(LPSTR lpName, PNTSTATUS Status) +{ + STUB; + return 0; +} + +DWORD +WINAPI +AddLocalAlternateComputerNameW(LPWSTR lpName, PNTSTATUS Status) +{ + STUB; + return 0; +} + +NTSTATUS +WINAPI +BaseCleanupAppcompatCache(VOID) +{ + STUB; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +WINAPI +BaseCleanupAppcompatCacheSupport(PVOID pUnknown) +{ + STUB; + return STATUS_NOT_IMPLEMENTED; +} + +BOOL +WINAPI +BaseInitAppcompatCache(VOID) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +BaseInitAppcompatCacheSupport(VOID) +{ + STUB; + return FALSE; +} + +VOID +WINAPI +CreateProcessInternalWSecure(VOID) +{ + STUB; +} + +DWORD +WINAPI +EnumerateLocalComputerNamesA(PVOID pUnknown, DWORD Size, LPSTR lpBuffer, LPDWORD lpnSize) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD +WINAPI +EnumerateLocalComputerNamesW(PVOID pUnknown, DWORD Size, LPWSTR lpBuffer, LPDWORD lpnSize) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +PVOID +WINAPI +GetComPlusPackageInstallStatus(VOID) +{ + STUB; + return NULL; +} + +BOOL +WINAPI +GetConsoleCharType(HANDLE hConsole, COORD Coord, PDWORD Type) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetConsoleCursorMode(HANDLE hConsole, PBOOL pUnknown1, PBOOL pUnknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetConsoleNlsMode(HANDLE hConsole, LPDWORD lpMode) +{ + STUB; + return FALSE; +} + +VOID +WINAPI +GetDefaultSortkeySize(LPVOID lpUnknown) +{ + STUB; + lpUnknown = NULL; +} + +VOID +WINAPI +GetLinguistLangSize(LPVOID lpUnknown) +{ + STUB; + lpUnknown = NULL; +} + +BOOL +WINAPI +OpenDataFile(HANDLE hFile, DWORD dwUnused) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +PrivMoveFileIdentityW(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +ReadConsoleInputExA(HANDLE hConsole, LPVOID lpBuffer, DWORD dwLen, LPDWORD Unknown1, DWORD Unknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +ReadConsoleInputExW(HANDLE hConsole, LPVOID lpBuffer, DWORD dwLen, LPDWORD Unknown1, DWORD Unknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +RegisterConsoleIME(HWND hWnd, LPDWORD ThreadId) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +RegisterConsoleOS2(BOOL bUnknown) +{ + STUB; + return FALSE; +} + +DWORD +WINAPI +RemoveLocalAlternateComputerNameA(LPSTR lpName, DWORD Unknown) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD +WINAPI +RemoveLocalAlternateComputerNameW(LPWSTR lpName, DWORD Unknown) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL +WINAPI +SetComPlusPackageInstallStatus(LPVOID lpInfo) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleCursorMode(HANDLE hConsole, BOOL Unknown1, BOOL Unknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleLocalEUDC(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleNlsMode(HANDLE hConsole, DWORD dwMode) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleOS2OemFormat(BOOL bUnknown) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +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, @@ -965,297 +1309,73 @@ IN DWORD dwShareMode, IN DWORD dwFlags) { - STUB; - return INVALID_HANDLE_VALUE; -} - -BOOL -WINAPI -SetProcessWorkingSetSizeEx(IN HANDLE hProcess, - IN SIZE_T dwMinimumWorkingSetSize, - IN SIZE_T dwMaximumWorkingSetSize, - IN DWORD Flags) -{ - STUB; - return FALSE; -} - - -BOOL -WINAPI -GetProcessWorkingSetSizeEx(IN HANDLE hProcess, - OUT PSIZE_T lpMinimumWorkingSetSize, - OUT PSIZE_T lpMaximumWorkingSetSize, - OUT PDWORD Flags) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -GetNumaAvailableMemoryNode(IN UCHAR Node, - OUT PULONGLONG AvailableBytes) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -GetNumaAvailableMemory(PVOID lpInfo, - ULONG Length, - PULONG ReturnLength) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -GetNumaProcessorMap(PVOID lpInfo, - ULONG Length, - PULONG ReturnLength) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -NlsResetProcessLocale(VOID) -{ - STUB; - return TRUE; -} - -DWORD -WINAPI -AddLocalAlternateComputerNameA(LPSTR lpName, PNTSTATUS Status) -{ - STUB; - return 0; -} - -DWORD -WINAPI -AddLocalAlternateComputerNameW(LPWSTR lpName, PNTSTATUS Status) -{ - STUB; - return 0; -} - -NTSTATUS -WINAPI -BaseCleanupAppcompatCache(VOID) -{ - STUB; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -WINAPI -BaseCleanupAppcompatCacheSupport(PVOID pUnknown) -{ - STUB; - return STATUS_NOT_IMPLEMENTED; -} - -BOOL -WINAPI -BaseInitAppcompatCache(VOID) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -BaseInitAppcompatCacheSupport(VOID) -{ - STUB; - return FALSE; -} - + 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 -CreateProcessInternalWSecure(VOID) -{ - STUB; -} - -DWORD -WINAPI -EnumerateLocalComputerNamesA(PVOID pUnknown, DWORD Size, LPSTR lpBuffer, LPDWORD lpnSize) -{ - STUB; - return ERROR_CALL_NOT_IMPLEMENTED; -} - -DWORD -WINAPI -EnumerateLocalComputerNamesW(PVOID pUnknown, DWORD Size, LPWSTR lpBuffer, LPDWORD lpnSize) -{ - STUB; - return ERROR_CALL_NOT_IMPLEMENTED; -} - -PVOID -WINAPI -GetComPlusPackageInstallStatus(VOID) -{ - STUB; - return NULL; -} - -BOOL -WINAPI -GetConsoleCharType(HANDLE hConsole, COORD Coord, PDWORD Type) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -GetConsoleCursorMode(HANDLE hConsole, PBOOL pUnknown1, PBOOL pUnknown2) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -GetConsoleNlsMode(HANDLE hConsole, LPDWORD lpMode) -{ - STUB; - return FALSE; -} - -VOID -WINAPI -GetDefaultSortkeySize(LPVOID lpUnknown) -{ - STUB; - lpUnknown = NULL; -} - -VOID -WINAPI -GetLinguistLangSize(LPVOID lpUnknown) -{ - STUB; - lpUnknown = NULL; -} - -BOOL -WINAPI -OpenDataFile(HANDLE hFile, DWORD dwUnused) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -PrivMoveFileIdentityW(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -ReadConsoleInputExA(HANDLE hConsole, LPVOID lpBuffer, DWORD dwLen, LPDWORD Unknown1, DWORD Unknown2) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -ReadConsoleInputExW(HANDLE hConsole, LPVOID lpBuffer, DWORD dwLen, LPDWORD Unknown1, DWORD Unknown2) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -RegisterConsoleIME(HWND hWnd, LPDWORD ThreadId) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -RegisterConsoleOS2(BOOL bUnknown) -{ - STUB; - return FALSE; -} - -DWORD -WINAPI -RemoveLocalAlternateComputerNameA(LPSTR lpName, DWORD Unknown) -{ - STUB; - return ERROR_CALL_NOT_IMPLEMENTED; -} - -DWORD -WINAPI -RemoveLocalAlternateComputerNameW(LPWSTR lpName, DWORD Unknown) -{ - STUB; - return ERROR_CALL_NOT_IMPLEMENTED; -} - -BOOL -WINAPI -SetComPlusPackageInstallStatus(LPVOID lpInfo) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -SetConsoleCursorMode(HANDLE hConsole, BOOL Unknown1, BOOL Unknown2) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -SetConsoleLocalEUDC(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -SetConsoleNlsMode(HANDLE hConsole, DWORD dwMode) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -SetConsoleOS2OemFormat(BOOL bUnknown) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI -UnregisterConsoleIME(VOID) -{ - STUB; - return FALSE; -} +SetTermsrvAppInstallMode(IN BOOL bInstallMode) +{ + STUB; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +TermsrvAppInstallMode(VOID) +{ + STUB; + return FALSE; +} Modified: branches/cmake-bringup/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/misc/version.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/misc/version.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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) Modified: branches/cmake-bringup/dll/win32/kernel32/nls/cym.nls URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/nls/cym.nls [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/nls/cym.nls [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -130,28 +130,28 @@ LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" - LOCALE_SSHORTDATE "dd/MM/yy" + LOCALE_SSHORTDATE "dd/MM/yyyy" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Unol Gorllewin Ewrop a Unedig" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Canolog Ewrop" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltig" + LGRPID_GREEK+LGRPID_RES_BASE "Groeg" LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_JAPANESE+LGRPID_RES_BASE "Siapaneaidd" + LGRPID_KOREAN+LGRPID_RES_BASE "Corea" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Tseiniaidd Traddodiadol" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Tseiniaidd Symleiddiedig" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebraeg" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabeg" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Fietnameg" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenia" } Modified: branches/cmake-bringup/dll/win32/kernel32/nls/lth.nls URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/nls/lth.nls [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/nls/lth.nls [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -20,7 +20,7 @@ #pragma code_page(65001) -STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN { LOCALE_FONTSIGNATURE L"\x0007\x8000\x3848\x1000\x0000\x0000\x0000\x0000\x0080\x0000\x0000\x0800\x0092\x0000\x0000\xcdd4" LOCALE_ICALENDARTYPE "1" Modified: branches/cmake-bringup/dll/win32/kernel32/nls/ukr.nls URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/nls/ukr.nls [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/nls/ukr.nls [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -136,21 +136,21 @@ LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy' ð.'" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Çàõ³äíà ªâðîïà ³ Ñïîëó÷åí³ Øòàòè" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Öåíòðàëüíà ªâðîïà" + LGRPID_BALTIC+LGRPID_RES_BASE "Áàëò³éñüêà" + LGRPID_GREEK+LGRPID_RES_BASE "Ãðåöüêà" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Êèðèëèöÿ" + LGRPID_TURKISH+LGRPID_RES_BASE "Òþðêñüêà" + LGRPID_JAPANESE+LGRPID_RES_BASE "ßïîíñüêà" + LGRPID_KOREAN+LGRPID_RES_BASE "Êîðåéñüêà" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Êèòàéñüêà òðàäèö³éíà" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Êèòàéñüêà ñïðîùåíà" + LGRPID_THAI+LGRPID_RES_BASE "Òàéñüêà" + LGRPID_HEBREW+LGRPID_RES_BASE "²âðèò" + LGRPID_ARABIC+LGRPID_RES_BASE "Àðàáñüêà" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Â'ºòíàìñüêà" + LGRPID_INDIC+LGRPID_RES_BASE "²íä³éñüêà" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Ãðóçèíñüêà" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Â³ðìåíñüêà" } Modified: branches/cmake-bringup/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/process/session.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/process/session.c [iso-8859-1] Fri Aug 13 14:47:01 2010 @@ -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;

14 years, 4 months

[akhaldi] 48529: [NDK] - Mark DbgUiWaitStateChange as NTSYSAPI. [CMAKE] - Don't create an import library for ntdll, we'll ship with one. - Temporarily add the ntdll import library (until RosBE ships with one). - Make the definition file MSVC compatible. - Include every object file in librtl when linking. - NTDLL now compiles successfully with the MSVC compatible definition file.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 13 14:12:45 2010 New Revision: 48529 URL: http://svn.reactos.org/svn/reactos?rev=48529&view=rev Log: [NDK] - Mark DbgUiWaitStateChange as NTSYSAPI. [CMAKE] - Don't create an import library for ntdll, we'll ship with one. - Temporarily add the ntdll import library (until RosBE ships with one). - Make the definition file MSVC compatible. - Include every object file in librtl when linking. - NTDLL now compiles successfully with the MSVC compatible definition file. Added: branches/cmake-bringup/dll/ntdll/libntdll.a (with props) Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/dll/ntdll/def/ntdll.def branches/cmake-bringup/include/ndk/umfuncs.h Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Fri Aug 13 14:12:45 2010 @@ -1,3 +1,5 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") add_definitions(-D__NTDLL__) add_definitions(-D_NTOSKRNL_) @@ -23,7 +25,7 @@ set_target_properties(ntdll PROPERTIES LINK_FLAGS "-Wl,-entry,0") target_link_libraries(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/def/ntdll.def - rtl + -Wl,--whole-archive rtl -Wl,--no-whole-archive ntdllsys libcntpr pseh) Modified: branches/cmake-bringup/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/def/ntd… ============================================================================== --- branches/cmake-bringup/dll/ntdll/def/ntdll.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/def/ntdll.def [iso-8859-1] Fri Aug 13 14:12:45 2010 @@ -353,455 +353,455 @@ NtWriteRequestData NtWriteVirtualMemory NtYieldExecution -RtlAbsoluteToSelfRelativeSD@12 -RtlAcquirePebLock@0 -RtlAcquireResourceExclusive@8 -RtlAcquireResourceShared@8 -RtlAcquireSRWLockExclusive@4 -RtlAcquireSRWLockShared@4 -RtlActivateActivationContext@12 -RtlActivateActivationContextUnsafeFast@8 -RtlAddAccessAllowedAce@16 -RtlAddAccessAllowedAceEx@20 -RtlAddAccessAllowedObjectAce@28 -RtlAddAccessDeniedAce@16 -RtlAddAccessDeniedAceEx@20 -RtlAddAccessDeniedObjectAce@28 -RtlAddAce@20 -RtlAddAtomToAtomTable@12 -RtlAddAuditAccessAce@24 -RtlAddAuditAccessAceEx@28 -RtlAddAuditAccessObjectAce@36 -RtlAddMandatoryAce@24 -RtlAddRefActivationContext@4 -RtlAddVectoredExceptionHandler@8 -RtlAdjustPrivilege@16 -RtlAllocateActivationContextStack@4 -RtlAllocateAndInitializeSid@44 -RtlAllocateHandle@8 -RtlAllocateHeap@12 -RtlAnsiCharToUnicodeChar@4 -RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4 -RtlAnsiStringToUnicodeString@12 -RtlAppendAsciizToString@8 -RtlAppendStringToString@8 -RtlAppendUnicodeStringToString@8 -RtlAppendUnicodeToString@8 -RtlAreAllAccessesGranted@8 -RtlAreAnyAccessesGranted@8 -RtlAreBitsClear@12 -RtlAreBitsSet@12 -RtlAssert@16 -RtlCaptureContext@4 -RtlCaptureStackBackTrace@16 -RtlCharToInteger@12 -RtlCheckRegistryKey@8 -RtlClearAllBits@4 -RtlClearBits@12 -RtlCompactHeap@8 -RtlCompareMemory@12 -RtlCompareMemoryUlong@12 -RtlCompareString@12 -RtlCompareUnicodeString@12 -RtlCompressBuffer@32 -RtlComputeCrc32@12 -RtlConvertExclusiveToShared@4 -RtlConvertLongToLargeInteger@4 -RtlConvertSharedToExclusive@4 -RtlConvertSidToUnicodeString@12 -RtlConvertUlongToLargeInteger@4 -RtlCopyLuid@8 -RtlCopyLuidAndAttributesArray@12 -RtlCopySecurityDescriptor@8 -RtlCopySid@12 -RtlCopySidAndAttributesArray@28 -RtlCopyString@8 -RtlCopyUnicodeString@8 -RtlCreateAcl@12 -RtlCreateActivationContext@8 -RtlCreateAtomTable@8 -RtlCreateBootStatusDataFile@0 -RtlCreateEnvironment@8 -RtlCreateHeap@24 -RtlCreateProcessParameters@40 -RtlCreateQueryDebugBuffer@8 -RtlCreateRegistryKey@8 -RtlCreateSecurityDescriptor@8 -RtlCreateSystemVolumeInformationFolder@4 -RtlCreateTagHeap@16 -RtlCreateTimer@28 -RtlCreateTimerQueue@4 -RtlCreateUnicodeString@8 -RtlCreateUnicodeStringFromAsciiz@8 -RtlCreateUserProcess@40 -RtlCreateUserThread@40 -RtlCustomCPToUnicodeN@24 -RtlCutoverTimeToSystemTime@16 -RtlDeNormalizeProcessParams@4 -RtlDeactivateActivationContext@8 -RtlDeactivateActivationContextUnsafeFast@4 -RtlDecodePointer@4 -RtlDecodeSystemPointer@4=RtlEncodeSystemPointer@4 -RtlDecompressBuffer@24 -RtlDecompressFragment@32 -RtlDelete@4 -RtlDeleteAce@8 -RtlDeleteAtomFromAtomTable@8 -RtlDeleteCriticalSection@4 -RtlDeleteElementGenericTable@8 -RtlDeleteElementGenericTableAvl@8 -RtlDeleteNoSplay@8 -RtlDeleteOwnersRanges@8 -RtlDeleteRange@24 -RtlDeleteRegistryValue@12 -RtlDeleteResource@4 -RtlDeleteSecurityObject@4 -RtlDeleteTimer@12 -RtlDeleteTimerQueue@4 -RtlDeleteTimerQueueEx@8 -RtlDeregisterWait@4 -RtlDeregisterWaitEx@8 -RtlDestroyAtomTable@4 -RtlDestroyEnvironment@4 -RtlDestroyHandleTable@4 -RtlDestroyHeap@4 -RtlDestroyProcessParameters@4 -RtlDestroyQueryDebugBuffer@4 -RtlDetermineDosPathNameType_U@4 -RtlDllShutdownInProgress@0 -RtlDnsHostNameToComputerName@12 -RtlDoesFileExists_U@4 -RtlDosPathNameToNtPathName_U@16 -RtlDosPathNameToRelativeNtPathName_U@16 -RtlDosSearchPath_U@24 -RtlDowncaseUnicodeChar@4 -RtlDowncaseUnicodeString@12 -RtlDumpResource@4 -RtlDuplicateUnicodeString@12 -RtlEmptyAtomTable@8 -RtlEncodePointer@4 -RtlEncodeSystemPointer@4 -RtlEnlargedIntegerMultiply@8 -RtlEnlargedUnsignedDivide@16 -RtlEnlargedUnsignedMultiply@8 -RtlEnterCriticalSection@4 -RtlEnumProcessHeaps@8 -RtlEnumerateGenericTable@8 -RtlEnumerateGenericTableAvl@8 -RtlEnumerateGenericTableLikeADirectory@28 -RtlEnumerateGenericTableWithoutSplaying@8 -RtlEnumerateGenericTableWithoutSplayingAvl@8 -RtlEqualComputerName@8 -RtlEqualDomainName@8 -RtlEqualLuid@8 -RtlEqualPrefixSid@8 -RtlEqualSid@8 -RtlEqualString@12 -RtlEqualUnicodeString@12 -RtlEraseUnicodeString@4 -RtlExitUserThread@4 -RtlExpandEnvironmentStrings_U@16 -RtlExtendHeap@16 -RtlExtendedIntegerMultiply@12 -RtlExtendedLargeIntegerDivide@16 -RtlExtendedMagicDivide@20 -RtlFillMemory@12 -RtlFillMemoryUlong@12 -RtlFindActivationContextSectionString@20 -RtlFindCharInUnicodeString@16 -RtlFindClearBits@12 -RtlFindClearBitsAndSet@12 -RtlFindClearRuns@16 -RtlFindLastBackwardRunClear@12 -RtlFindLeastSignificantBit@8 -RtlFindLongestRunClear@8 -RtlFindLongestRunSet@8 -RtlFindMessage@20 -RtlFindMostSignificantBit@8 -RtlFindNextForwardRunClear@12 -RtlFindRange@48 -RtlFindSetBits@12 -RtlFindSetBitsAndClear@12 -RtlFirstEntrySList@4 -RtlFirstFreeAce@8 -RtlFlushSecureMemoryCache@8 -RtlFormatCurrentUserKeyPath@4 -RtlFormatMessage@32 -RtlFreeAnsiString@4 -RtlFreeHandle@8 -RtlFreeHeap@12 -RtlFreeOemString@4 -RtlFreeRangeList@4 -RtlFreeSid@4 -RtlFreeThreadActivationContextStack@0 -RtlFreeUnicodeString@4 -RtlFreeUserThreadStack@8 -RtlGUIDFromString@8 -RtlGenerate8dot3Name@16 -RtlGetAce@12 -RtlGetActiveActivationContext@4 -RtlGetCallersAddress@8 -RtlGetCompressionWorkSpaceSize@12 -RtlGetControlSecurityDescriptor@12 -RtlGetCurrentDirectory_U@8 -RtlGetCurrentPeb@0 -RtlGetCurrentProcessorNumber@0 -RtlGetDaclSecurityDescriptor@16 -RtlGetElementGenericTable@8 -RtlGetElementGenericTableAvl@8 -RtlGetFirstRange@12 -RtlGetFullPathName_U@16 -RtlGetGroupSecurityDescriptor@12 -RtlGetLastNtStatus@0 -RtlGetLastWin32Error@0 -RtlGetLongestNtPathLength@0 -RtlGetNextRange@12 -RtlGetNtGlobalFlags@0 -RtlGetNtProductType@4 -RtlGetNtVersionNumbers@12 -RtlGetOwnerSecurityDescriptor@12 -RtlGetProcessHeaps@8 -RtlGetSaclSecurityDescriptor@16 -RtlGetSecurityDescriptorRMControl@8 -RtlGetSetBootStatusData@24 -RtlGetUserInfoHeap@20 -RtlGetVersion@4 -RtlHashUnicodeString@16 -RtlIdentifierAuthoritySid@4 -RtlImageDirectoryEntryToData@16 -RtlImageNtHeader@4 -RtlImageRvaToSection@12 -RtlImageRvaToVa@16 -RtlImpersonateSelf@4 -RtlInitAnsiString@8 -RtlInitAnsiStringEx@8 -RtlInitCodePageTable@8 -RtlInitNlsTables@16 -RtlInitString@8 -RtlInitUnicodeString@8 -RtlInitUnicodeStringEx@8 -RtlInitializeBitMap@12 -RtlInitializeContext@20 -RtlInitializeCriticalSection@4 -RtlInitializeCriticalSectionAndSpinCount@8 -RtlInitializeGenericTable@20 -RtlInitializeGenericTableAvl@20 -RtlInitializeHandleTable@12 -RtlInitializeRangeList@4 -RtlInitializeResource@4 -RtlInitializeSListHead@4 -RtlInitializeSid@12 -RtlInitializeSRWLock@4 -RtlInsertElementGenericTable@16 -RtlInsertElementGenericTableAvl@16 -RtlInt64ToUnicodeString@16 -RtlIntegerToChar@16 -RtlIntegerToUnicodeString@12 -RtlInterlockedFlushSList@4 -RtlInterlockedPopEntrySList@4 -RtlInterlockedPushEntrySList@8 -RtlInterlockedPushListSList@16 -RtlInvertRangeList@8 -RtlIpv4AddressToStringA@8 -RtlIpv4AddressToStringExA@16 -RtlIpv4AddressToStringExW@16 -RtlIpv4AddressToStringW@8 -RtlIpv4StringToAddressA@16 -RtlIpv4StringToAddressExA@16 -RtlIpv4StringToAddressExW@16 -RtlIpv4StringToAddressW@16 -RtlIpv6AddressToStringA@8 -RtlIpv6AddressToStringExA@20 -RtlIpv6AddressToStringExW@20 -RtlIpv6AddressToStringW@8 -RtlIpv6StringToAddressA@12 -RtlIpv6StringToAddressExA@16 -RtlIpv6StringToAddressExW@16 -RtlIpv6StringToAddressW@12 -RtlIsActivationContextActive@4 -RtlIsDosDeviceName_U@4 -RtlIsGenericTableEmpty@4 -RtlIsGenericTableEmptyAvl@4 -RtlIsNameLegalDOS8Dot3@12 -RtlIsRangeAvailable@40 -RtlIsTextUnicode@12 -RtlIsThreadWithinLoaderCallout@0 -RtlIsValidHandle@8 -RtlIsValidIndexHandle@12 -RtlLargeIntegerAdd@16 -RtlLargeIntegerArithmeticShift@12 -RtlLargeIntegerDivide@20 -RtlLargeIntegerNegate@8 -RtlLargeIntegerShiftLeft@12 -RtlLargeIntegerShiftRight@12 -RtlLargeIntegerSubtract@16 -RtlLargeIntegerToChar@16 -RtlLeaveCriticalSection@4 -RtlLengthRequiredSid@4 -RtlLengthSecurityDescriptor@4 -RtlLengthSid@4 -RtlLocalTimeToSystemTime@8 -RtlLockBootStatusData@4 -RtlLockHeap@4 -RtlLookupAtomInAtomTable@12 -RtlLookupElementGenericTable@8 -RtlLookupElementGenericTableAvl@8 -RtlMakeSelfRelativeSD@12 -RtlMapGenericMask@8 -RtlMergeRangeLists@16 -RtlMoveMemory@12 -RtlMultiByteToUnicodeN@20 -RtlMultiByteToUnicodeSize@12 -RtlNewSecurityObject@24 -RtlNormalizeProcessParams@4 -RtlNtPathNameToDosPathName@16 -RtlNtStatusToDosError@4 -RtlNtStatusToDosErrorNoTeb@4 -RtlNumberGenericTableElements@4 -RtlNumberGenericTableElementsAvl@4 -RtlNumberOfClearBits@4 -RtlNumberOfSetBits@4 -RtlOemStringToUnicodeString@12 -RtlOemToUnicodeN@20 -RtlOpenCurrentUser@8 -RtlPcToFileHeader@8 -RtlPinAtomInAtomTable@8 -RtlPrefixString@12 -RtlPrefixUnicodeString@12 -RtlProtectHeap@8 -RtlQueryAtomInAtomTable@24 -RtlQueryDepthSList@4 -RtlQueryEnvironmentVariable_U@12 -RtlQueryHeapInformation@20 -RtlQueryInformationAcl@16 -RtlQueryInformationActivationContext@28 -RtlQueryProcessDebugInformation@12 -RtlQueryRegistryValues@20 -RtlQuerySecurityObject@20 -RtlQueryTagHeap@20 -RtlQueryTimeZoneInformation@4 -RtlQueueWorkItem@12 -RtlRaiseException@4 -RtlRaiseStatus@4 -RtlRandom@4 -RtlRandomEx@4 -RtlReAllocateHeap@16 -RtlRealPredecessor@4 -RtlRealSuccessor@4 -RtlRegisterSecureMemoryCacheCallback@4 -RtlRegisterWait@24 -RtlReleaseActivationContext@4 -RtlReleasePebLock@0 -RtlReleaseResource@4 -RtlReleaseSRWLockExclusive@4 -RtlReleaseSRWLockShared@4 -RtlRemoteCall@28 -RtlRemoveVectoredExceptionHandler@4 -RtlResetRtlTranslations@4 -RtlRestoreLastWin32Error@4=RtlSetLastWin32Error@4 -RtlRunDecodeUnicodeString@8 -RtlRunEncodeUnicodeString@8 -RtlSecondsSince1970ToTime@8 -RtlSecondsSince1980ToTime@8 -RtlSelfRelativeToAbsoluteSD2@8 -RtlSelfRelativeToAbsoluteSD@44 -RtlSetAllBits@4 -RtlSetAttributesSecurityDescriptor@12 -RtlSetBits@12 -RtlSetControlSecurityDescriptor@12 -RtlSetCriticalSectionSpinCount@8 -RtlSetCurrentDirectory_U@4 -RtlSetCurrentEnvironment@8 -RtlSetDaclSecurityDescriptor@16 -RtlSetEnvironmentVariable@12 -RtlSetGroupSecurityDescriptor@12 -RtlSetHeapInformation@16 -RtlSetInformationAcl@16 -RtlSetIoCompletionCallback@12 -RtlSetLastWin32Error@4 -RtlSetLastWin32ErrorAndNtStatusFromNtStatus@4 -RtlSetOwnerSecurityDescriptor@12 -RtlSetProcessIsCritical@12 -RtlSetSaclSecurityDescriptor@16 -RtlSetSecurityDescriptorRMControl@8 -RtlSetSecurityObject@20 -RtlSetTimeZoneInformation@4 -RtlSetUnhandledExceptionFilter@4 -RtlSetUserFlagsHeap@16 -RtlSetUserValueHeap@16 -RtlSizeHeap@12 -RtlSleepConditionVariableCS@12 -RtlSleepConditionVariableSRW@16 -RtlSplay@4 -RtlStringFromGUID@8 -RtlSubAuthorityCountSid@4 -RtlSubAuthoritySid@8 -RtlSubtreePredecessor@4 -RtlSubtreeSuccessor@4 -RtlSystemTimeToLocalTime@8 -RtlTimeFieldsToTime@8 -RtlTimeToElapsedTimeFields@8 -RtlTimeToSecondsSince1970@8 -RtlTimeToSecondsSince1980@8 -RtlTimeToTimeFields@8 -RtlTryEnterCriticalSection@4 -@RtlUlongByteSwap@4 -@RtlUlonglongByteSwap@8 -RtlUnhandledExceptionFilter@4 -RtlUnicodeStringToAnsiString@12 -RtlUnicodeStringToCountedOemString@12 -RtlUnicodeStringToInteger@12 -RtlUnicodeStringToOemString@12 -RtlUnicodeToCustomCPN@24 -RtlUnicodeToMultiByteN@20 -RtlUnicodeToMultiByteSize@12 -RtlUnicodeToOemN@20 -RtlUniform@4 -RtlUnlockBootStatusData@4 -RtlUnlockHeap@4 -RtlUnwind@16 -RtlUpcaseUnicodeChar@4 -RtlUpcaseUnicodeString@12 -RtlUpcaseUnicodeStringToAnsiString@12 -RtlUpcaseUnicodeStringToCountedOemString@12 -RtlUpcaseUnicodeStringToOemString@12 -RtlUpcaseUnicodeToCustomCPN@24 -RtlUpcaseUnicodeToMultiByteN@20 -RtlUpcaseUnicodeToOemN@20 -RtlUpdateTimer@16 -RtlUpperChar@4 -RtlUpperString@8 -RtlUsageHeap@12 -@RtlUshortByteSwap@4 -RtlValidAcl@4 -RtlValidRelativeSecurityDescriptor@12 -RtlValidSecurityDescriptor@4 -RtlValidSid@4 -RtlValidateHeap@12 -RtlValidateProcessHeaps@0 -RtlValidateUnicodeString@8 -RtlVerifyVersionInfo@16 -RtlWalkFrameChain@12 -RtlWalkHeap@8 -RtlWakeAllConditionVariable@4 -RtlWakeConditionVariable@4 -RtlWriteRegistryValue@24 -RtlZeroHeap@8 -RtlZeroMemory@8 -RtlZombifyActivationContext@4 -RtlpEnsureBufferSize@12 -RtlpNtCreateKey@24 -RtlpNtEnumerateSubKey@16 -RtlpNtMakeTemporaryKey@4 -RtlpNtOpenKey@16 -RtlpNtQueryValueKey@20 -RtlpNtSetValueKey@16 -RtlpUnWaitCriticalSection@4 -RtlpWaitForCriticalSection@4 -RtlxAnsiStringToUnicodeSize@4 -RtlxOemStringToUnicodeSize@4 -RtlxUnicodeStringToAnsiSize@4 -RtlxUnicodeStringToOemSize@4 +RtlAbsoluteToSelfRelativeSD +RtlAcquirePebLock +RtlAcquireResourceExclusive +RtlAcquireResourceShared +RtlAcquireSRWLockExclusive +RtlAcquireSRWLockShared +RtlActivateActivationContext +RtlActivateActivationContextUnsafeFast +RtlAddAccessAllowedAce +RtlAddAccessAllowedAceEx +RtlAddAccessAllowedObjectAce +RtlAddAccessDeniedAce +RtlAddAccessDeniedAceEx +RtlAddAccessDeniedObjectAce +RtlAddAce +RtlAddAtomToAtomTable +RtlAddAuditAccessAce +RtlAddAuditAccessAceEx +RtlAddAuditAccessObjectAce +RtlAddMandatoryAce +RtlAddRefActivationContext +RtlAddVectoredExceptionHandler +RtlAdjustPrivilege +RtlAllocateActivationContextStack +RtlAllocateAndInitializeSid +RtlAllocateHandle +RtlAllocateHeap +RtlAnsiCharToUnicodeChar +RtlAnsiStringToUnicodeSize=RtlxAnsiStringToUnicodeSize +RtlAnsiStringToUnicodeString +RtlAppendAsciizToString +RtlAppendStringToString +RtlAppendUnicodeStringToString +RtlAppendUnicodeToString +RtlAreAllAccessesGranted +RtlAreAnyAccessesGranted +RtlAreBitsClear +RtlAreBitsSet +RtlAssert +RtlCaptureContext +RtlCaptureStackBackTrace +RtlCharToInteger +RtlCheckRegistryKey +RtlClearAllBits +RtlClearBits +RtlCompactHeap +RtlCompareMemory +RtlCompareMemoryUlong +RtlCompareString +RtlCompareUnicodeString +RtlCompressBuffer +RtlComputeCrc32 +RtlConvertExclusiveToShared +RtlConvertLongToLargeInteger +RtlConvertSharedToExclusive +RtlConvertSidToUnicodeString +RtlConvertUlongToLargeInteger +RtlCopyLuid +RtlCopyLuidAndAttributesArray +RtlCopySecurityDescriptor +RtlCopySid +RtlCopySidAndAttributesArray +RtlCopyString +RtlCopyUnicodeString +RtlCreateAcl +RtlCreateActivationContext +RtlCreateAtomTable +RtlCreateBootStatusDataFile +RtlCreateEnvironment +RtlCreateHeap +RtlCreateProcessParameters +RtlCreateQueryDebugBuffer +RtlCreateRegistryKey +RtlCreateSecurityDescriptor +RtlCreateSystemVolumeInformationFolder +RtlCreateTagHeap +RtlCreateTimer +RtlCreateTimerQueue +RtlCreateUnicodeString +RtlCreateUnicodeStringFromAsciiz +RtlCreateUserProcess +RtlCreateUserThread +RtlCustomCPToUnicodeN +RtlCutoverTimeToSystemTime +RtlDeNormalizeProcessParams +RtlDeactivateActivationContext +RtlDeactivateActivationContextUnsafeFast +RtlDecodePointer +RtlDecodeSystemPointer=RtlEncodeSystemPointer +RtlDecompressBuffer +RtlDecompressFragment +RtlDelete +RtlDeleteAce +RtlDeleteAtomFromAtomTable +RtlDeleteCriticalSection +RtlDeleteElementGenericTable +RtlDeleteElementGenericTableAvl +RtlDeleteNoSplay +RtlDeleteOwnersRanges +RtlDeleteRange +RtlDeleteRegistryValue +RtlDeleteResource +RtlDeleteSecurityObject +RtlDeleteTimer +RtlDeleteTimerQueue +RtlDeleteTimerQueueEx +RtlDeregisterWait +RtlDeregisterWaitEx +RtlDestroyAtomTable +RtlDestroyEnvironment +RtlDestroyHandleTable +RtlDestroyHeap +RtlDestroyProcessParameters +RtlDestroyQueryDebugBuffer +RtlDetermineDosPathNameType_U +RtlDllShutdownInProgress +RtlDnsHostNameToComputerName +RtlDoesFileExists_U +RtlDosPathNameToNtPathName_U +RtlDosPathNameToRelativeNtPathName_U +RtlDosSearchPath_U +RtlDowncaseUnicodeChar +RtlDowncaseUnicodeString +RtlDumpResource +RtlDuplicateUnicodeString +RtlEmptyAtomTable +RtlEncodePointer +RtlEncodeSystemPointer +RtlEnlargedIntegerMultiply +RtlEnlargedUnsignedDivide +RtlEnlargedUnsignedMultiply +RtlEnterCriticalSection +RtlEnumProcessHeaps +RtlEnumerateGenericTable +RtlEnumerateGenericTableAvl +RtlEnumerateGenericTableLikeADirectory +RtlEnumerateGenericTableWithoutSplaying +RtlEnumerateGenericTableWithoutSplayingAvl +RtlEqualComputerName +RtlEqualDomainName +RtlEqualLuid +RtlEqualPrefixSid +RtlEqualSid +RtlEqualString +RtlEqualUnicodeString +RtlEraseUnicodeString +RtlExitUserThread +RtlExpandEnvironmentStrings_U +RtlExtendHeap +RtlExtendedIntegerMultiply +RtlExtendedLargeIntegerDivide +RtlExtendedMagicDivide +RtlFillMemory +RtlFillMemoryUlong +RtlFindActivationContextSectionString +RtlFindCharInUnicodeString +RtlFindClearBits +RtlFindClearBitsAndSet +RtlFindClearRuns +RtlFindLastBackwardRunClear +RtlFindLeastSignificantBit +RtlFindLongestRunClear +RtlFindLongestRunSet +RtlFindMessage +RtlFindMostSignificantBit +RtlFindNextForwardRunClear +RtlFindRange +RtlFindSetBits +RtlFindSetBitsAndClear +RtlFirstEntrySList +RtlFirstFreeAce +RtlFlushSecureMemoryCache +RtlFormatCurrentUserKeyPath +RtlFormatMessage +RtlFreeAnsiString +RtlFreeHandle +RtlFreeHeap +RtlFreeOemString +RtlFreeRangeList +RtlFreeSid +RtlFreeThreadActivationContextStack +RtlFreeUnicodeString +RtlFreeUserThreadStack +RtlGUIDFromString +RtlGenerate8dot3Name +RtlGetAce +RtlGetActiveActivationContext +RtlGetCallersAddress +RtlGetCompressionWorkSpaceSize +RtlGetControlSecurityDescriptor +RtlGetCurrentDirectory_U +RtlGetCurrentPeb +RtlGetCurrentProcessorNumber +RtlGetDaclSecurityDescriptor +RtlGetElementGenericTable +RtlGetElementGenericTableAvl +RtlGetFirstRange +RtlGetFullPathName_U +RtlGetGroupSecurityDescriptor +RtlGetLastNtStatus +RtlGetLastWin32Error +RtlGetLongestNtPathLength +RtlGetNextRange +RtlGetNtGlobalFlags +RtlGetNtProductType +RtlGetNtVersionNumbers +RtlGetOwnerSecurityDescriptor +RtlGetProcessHeaps +RtlGetSaclSecurityDescriptor +RtlGetSecurityDescriptorRMControl +RtlGetSetBootStatusData +RtlGetUserInfoHeap +RtlGetVersion +RtlHashUnicodeString +RtlIdentifierAuthoritySid +RtlImageDirectoryEntryToData +RtlImageNtHeader +RtlImageRvaToSection +RtlImageRvaToVa +RtlImpersonateSelf +RtlInitAnsiString +RtlInitAnsiStringEx +RtlInitCodePageTable +RtlInitNlsTables +RtlInitString +RtlInitUnicodeString +RtlInitUnicodeStringEx +RtlInitializeBitMap +RtlInitializeContext +RtlInitializeCriticalSection +RtlInitializeCriticalSectionAndSpinCount +RtlInitializeGenericTable +RtlInitializeGenericTableAvl +RtlInitializeHandleTable +RtlInitializeRangeList +RtlInitializeResource +RtlInitializeSListHead +RtlInitializeSid +RtlInitializeSRWLock +RtlInsertElementGenericTable +RtlInsertElementGenericTableAvl +RtlInt64ToUnicodeString +RtlIntegerToChar +RtlIntegerToUnicodeString +RtlInterlockedFlushSList +RtlInterlockedPopEntrySList +RtlInterlockedPushEntrySList +RtlInterlockedPushListSList +RtlInvertRangeList +RtlIpv4AddressToStringA +RtlIpv4AddressToStringExA +RtlIpv4AddressToStringExW +RtlIpv4AddressToStringW +RtlIpv4StringToAddressA +RtlIpv4StringToAddressExA +RtlIpv4StringToAddressExW +RtlIpv4StringToAddressW +RtlIpv6AddressToStringA +RtlIpv6AddressToStringExA +RtlIpv6AddressToStringExW +RtlIpv6AddressToStringW +RtlIpv6StringToAddressA +RtlIpv6StringToAddressExA +RtlIpv6StringToAddressExW +RtlIpv6StringToAddressW +RtlIsActivationContextActive +RtlIsDosDeviceName_U +RtlIsGenericTableEmpty +RtlIsGenericTableEmptyAvl +RtlIsNameLegalDOS8Dot3 +RtlIsRangeAvailable +RtlIsTextUnicode +RtlIsThreadWithinLoaderCallout +RtlIsValidHandle +RtlIsValidIndexHandle +RtlLargeIntegerAdd +RtlLargeIntegerArithmeticShift +RtlLargeIntegerDivide +RtlLargeIntegerNegate +RtlLargeIntegerShiftLeft +RtlLargeIntegerShiftRight +RtlLargeIntegerSubtract +RtlLargeIntegerToChar +RtlLeaveCriticalSection +RtlLengthRequiredSid +RtlLengthSecurityDescriptor +RtlLengthSid +RtlLocalTimeToSystemTime +RtlLockBootStatusData +RtlLockHeap +RtlLookupAtomInAtomTable +RtlLookupElementGenericTable +RtlLookupElementGenericTableAvl +RtlMakeSelfRelativeSD +RtlMapGenericMask +RtlMergeRangeLists +RtlMoveMemory +RtlMultiByteToUnicodeN +RtlMultiByteToUnicodeSize +RtlNewSecurityObject +RtlNormalizeProcessParams +RtlNtPathNameToDosPathName +RtlNtStatusToDosError +RtlNtStatusToDosErrorNoTeb +RtlNumberGenericTableElements +RtlNumberGenericTableElementsAvl +RtlNumberOfClearBits +RtlNumberOfSetBits +RtlOemStringToUnicodeString +RtlOemToUnicodeN +RtlOpenCurrentUser +RtlPcToFileHeader +RtlPinAtomInAtomTable +RtlPrefixString +RtlPrefixUnicodeString +RtlProtectHeap +RtlQueryAtomInAtomTable +RtlQueryDepthSList +RtlQueryEnvironmentVariable_U +RtlQueryHeapInformation +RtlQueryInformationAcl +RtlQueryInformationActivationContext +RtlQueryProcessDebugInformation +RtlQueryRegistryValues +RtlQuerySecurityObject +RtlQueryTagHeap +RtlQueryTimeZoneInformation +RtlQueueWorkItem +RtlRaiseException +RtlRaiseStatus +RtlRandom +RtlRandomEx +RtlReAllocateHeap +RtlRealPredecessor +RtlRealSuccessor +RtlRegisterSecureMemoryCacheCallback +RtlRegisterWait +RtlReleaseActivationContext +RtlReleasePebLock +RtlReleaseResource +RtlReleaseSRWLockExclusive +RtlReleaseSRWLockShared +RtlRemoteCall +RtlRemoveVectoredExceptionHandler +RtlResetRtlTranslations +RtlRestoreLastWin32Error=RtlSetLastWin32Error +RtlRunDecodeUnicodeString +RtlRunEncodeUnicodeString +RtlSecondsSince1970ToTime +RtlSecondsSince1980ToTime +RtlSelfRelativeToAbsoluteSD2 +RtlSelfRelativeToAbsoluteSD +RtlSetAllBits +RtlSetAttributesSecurityDescriptor +RtlSetBits +RtlSetControlSecurityDescriptor +RtlSetCriticalSectionSpinCount +RtlSetCurrentDirectory_U +RtlSetCurrentEnvironment +RtlSetDaclSecurityDescriptor +RtlSetEnvironmentVariable +RtlSetGroupSecurityDescriptor +RtlSetHeapInformation +RtlSetInformationAcl +RtlSetIoCompletionCallback +RtlSetLastWin32Error +RtlSetLastWin32ErrorAndNtStatusFromNtStatus +RtlSetOwnerSecurityDescriptor +RtlSetProcessIsCritical +RtlSetSaclSecurityDescriptor +RtlSetSecurityDescriptorRMControl +RtlSetSecurityObject +RtlSetTimeZoneInformation +RtlSetUnhandledExceptionFilter +RtlSetUserFlagsHeap +RtlSetUserValueHeap +RtlSizeHeap +RtlSleepConditionVariableCS +RtlSleepConditionVariableSRW +RtlSplay +RtlStringFromGUID +RtlSubAuthorityCountSid +RtlSubAuthoritySid +RtlSubtreePredecessor +RtlSubtreeSuccessor +RtlSystemTimeToLocalTime +RtlTimeFieldsToTime +RtlTimeToElapsedTimeFields +RtlTimeToSecondsSince1970 +RtlTimeToSecondsSince1980 +RtlTimeToTimeFields +RtlTryEnterCriticalSection +RtlUlongByteSwap +RtlUlonglongByteSwap +RtlUnhandledExceptionFilter +RtlUnicodeStringToAnsiString +RtlUnicodeStringToCountedOemString +RtlUnicodeStringToInteger +RtlUnicodeStringToOemString +RtlUnicodeToCustomCPN +RtlUnicodeToMultiByteN +RtlUnicodeToMultiByteSize +RtlUnicodeToOemN +RtlUniform +RtlUnlockBootStatusData +RtlUnlockHeap +RtlUnwind +RtlUpcaseUnicodeChar +RtlUpcaseUnicodeString +RtlUpcaseUnicodeStringToAnsiString +RtlUpcaseUnicodeStringToCountedOemString +RtlUpcaseUnicodeStringToOemString +RtlUpcaseUnicodeToCustomCPN +RtlUpcaseUnicodeToMultiByteN +RtlUpcaseUnicodeToOemN +RtlUpdateTimer +RtlUpperChar +RtlUpperString +RtlUsageHeap +RtlUshortByteSwap +RtlValidAcl +RtlValidRelativeSecurityDescriptor +RtlValidSecurityDescriptor +RtlValidSid +RtlValidateHeap +RtlValidateProcessHeaps +RtlValidateUnicodeString +RtlVerifyVersionInfo +RtlWalkFrameChain +RtlWalkHeap +RtlWakeAllConditionVariable +RtlWakeConditionVariable +RtlWriteRegistryValue +RtlZeroHeap +RtlZeroMemory +RtlZombifyActivationContext +RtlpEnsureBufferSize +RtlpNtCreateKey +RtlpNtEnumerateSubKey +RtlpNtMakeTemporaryKey +RtlpNtOpenKey +RtlpNtQueryValueKey +RtlpNtSetValueKey +RtlpUnWaitCriticalSection +RtlpWaitForCriticalSection +RtlxAnsiStringToUnicodeSize +RtlxOemStringToUnicodeSize +RtlxUnicodeStringToAnsiSize +RtlxUnicodeStringToOemSize VerSetConditionMask ZwAcceptConnectPort=NtAcceptConnectPort ZwAccessCheck=NtAccessCheck Added: branches/cmake-bringup/dll/ntdll/libntdll.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/libntdl… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/ntdll/libntdll.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/umfun… ============================================================================== --- branches/cmake-bringup/include/ndk/umfuncs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ndk/umfuncs.h [iso-8859-1] Fri Aug 13 14:12:45 2010 @@ -157,6 +157,7 @@ IN HANDLE Process ); +NTSYSAPI NTSTATUS NTAPI DbgUiWaitStateChange(

14 years, 4 months

[akhaldi] 48528: [CMAKE] - Automatically choose the image base for DLLs. - Improve RC compiler invocation. - Add and apply the global linker script.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 13 14:02:58 2010 New Revision: 48528 URL: http://svn.reactos.org/svn/reactos?rev=48528&view=rev Log: [CMAKE] - Automatically choose the image base for DLLs. - Improve RC compiler invocation. - Add and apply the global linker script. Added: branches/cmake-bringup/global.lds (with props) Modified: branches/cmake-bringup/toolchain-mingw32.cmake Added: branches/cmake-bringup/global.lds URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/global.lds?rev=48… ============================================================================== --- branches/cmake-bringup/global.lds (added) +++ branches/cmake-bringup/global.lds [iso-8859-1] Fri Aug 13 14:02:58 2010 @@ -1,0 +1,103 @@ +OUTPUT_FORMAT(pei-i386) +SECTIONS +{ + .text __image_base__ + __section_alignment__ : + { + __text_start__ = .; + *(.init) + *(.text) + *(SORT(.text$*)) + *(.glue_7t) + *(.glue_7) + *(.jcr) + ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; + LONG (-1);*(.ctors); *(.ctor); *(SORT(.ctors.*)); LONG (0); + ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; + LONG (-1);*(.dtors); *(.dtor); *(SORT(.dtors.*)); LONG (0); + *(.fini) + *(.gcc_exc) + __text_end__ = .; + *(.gcc_except_table) + } + init BLOCK(__section_alignment__) : + { + __init_start__ = . ; + *(init) + __init_end__ = . ; + } + .data BLOCK(__section_alignment__) : + { + __data_start__ = . ; + *(.data) + *(.data2) + *(SORT(.data$*)) + __data_end__ = . ; + __bss_start__ = . ; + *(.bss) + *(COMMON) + __bss_end__ = . ; + *(SORT(.CRT$*)) + } + .rdata BLOCK(__section_alignment__) : + { + *(.rdata) + *(SORT(.rdata$*)) + *(.eh_frame) + } + .edata BLOCK(__section_alignment__) : { *(.edata) } + .idata BLOCK(__section_alignment__) : + { + /* This cannot currently be handled with grouped sections. + See pe.em:sort_sections. */ + SORT(*)(.idata$2) + SORT(*)(.idata$3) + /* These zeroes mark the end of the import list. */ + LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); + SORT(*)(.idata$4) + SORT(*)(.idata$5) + SORT(*)(.idata$6) + SORT(*)(.idata$7) + } + .tls BLOCK(__section_alignment__) : + { + *(.tls) + *(.tls$) + *(SORT(.tls$*)) + } + /DISCARD/ : + { + *(.debug$S) + *(.debug$T) + *(.debug$F) + *(.drectve) + *(.debug_loc) + *(.debug_ranges) + *(.debug_aranges) + *(.debug_str) + *(.debug_frame) + *(.debug_pubnames) + *(.debug_pubtypes) + *(.gnu.linkonce.wt.*) + } + .rsrc BLOCK(__section_alignment__) : + { + *(.rsrc) + *(SORT(.rsrc$*)) + } + .reloc BLOCK(__section_alignment__) : + { + *(.reloc) + } + .debug_info BLOCK(__section_alignment__) (NOLOAD) : + { + [ .debug_info ] + } + .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + [ .debug_abbrev ] + } + .debug_line BLOCK(__section_alignment__) (NOLOAD) : + { + [ .debug_line ] + } +} Propchange: branches/cmake-bringup/global.lds ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Fri Aug 13 14:02:58 2010 @@ -1,5 +1,5 @@ -SET(ARCH i386) +set(ARCH i386) # Choose the right MinGW prefix if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) @@ -18,11 +18,12 @@ SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_BINARY_DIR}/include/reactos -i <SOURCE> -o <OBJECT> <DEFINES> -DRC_INVOKED") + +SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") # Use stdcall fixups, and don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES "-lgcc") # We should add the environment libgcc here -SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-stdcall-fixup -Wl,--kill-at -nodefaultlibs -nostdlib") +set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search @@ -30,3 +31,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +

14 years, 4 months

[akhaldi] 48527: [CMAKE] - Skip creating makefile rules for pre-processed files (object.i) and assembly files (object.s). - Improve inclusions. - Add -fno-set-stack-executable. - Add C++ Flags.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 13 13:54:13 2010 New Revision: 48527 URL: http://svn.reactos.org/svn/reactos?rev=48527&view=rev Log: [CMAKE] - Skip creating makefile rules for pre-processed files (object.i) and assembly files (object.s). - Improve inclusions. - Add -fno-set-stack-executable. - Add C++ Flags. Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Aug 13 13:54:13 2010 @@ -7,6 +7,9 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_SHARED_LIBRARY_PREFIX "") +set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) +set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) + add_definitions(-D__REACTOS__) if(NOT CMAKE_CROSSCOMPILING) @@ -15,9 +18,9 @@ add_definitions(-fshort-wchar) include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) -include_directories(./include) -include_directories(./include/reactos) -include_directories(./include/reactos/wine) +include_directories(include) +include_directories(include/reactos) +include_directories(include/reactos/wine) add_subdirectory(tools) add_subdirectory(lib) @@ -61,7 +64,10 @@ add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) # Optimizations -add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-optimize-sibling-calls) +add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) + +# C++ Flags +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") include_directories(include) include_directories(include/psdk)

14 years, 4 months

[cgutman] 48526: [MSWSOCK] - AFD_EVENT_CLOSE also triggers on FD_CLOSE - Fix a deadlock after calling WSPEnumNetworkEvents - Fix a deadlock when calling WSPSend on an unbound socket - Leave the critical section while waiting - Firefox (and many other applications) work now

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 12 22:39:24 2010 New Revision: 48526 URL: http://svn.reactos.org/svn/reactos?rev=48526&view=rev Log: [MSWSOCK] - AFD_EVENT_CLOSE also triggers on FD_CLOSE - Fix a deadlock after calling WSPEnumNetworkEvents - Fix a deadlock when calling WSPSend on an unbound socket - Leave the critical section while waiting - Firefox (and many other applications) work now Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c [iso-8859-1] Thu Aug 12 22:39:24 2010 @@ -27,7 +27,7 @@ HANDLE EventObject = NULL; ULONG AsyncEvents = 0, NetworkEvents = 0; CHAR HelperBuffer[256]; - + /* Set the new state */ AcceptedSocket->SharedData.State = SocketConnected; @@ -82,8 +82,7 @@ HelperContextSize); if (!HelperContext) { - /* Unlock the socket and fail */ - LeaveCriticalSection(&Socket->Lock); + /* Fail */ return WSAENOBUFS; } } @@ -98,9 +97,6 @@ HelperContext, &HelperContextSize); } - - /* We're done with the old socket, so we can release the lock */ - LeaveCriticalSection(&Socket->Lock); /* Get the TDI Handles for the new socket */ ErrorCode = SockGetTdiHandles(AcceptedSocket); @@ -311,6 +307,7 @@ NULL, &Timeout, lpErrno); + if (ReturnValue == SOCKET_ERROR) { /* Fail */ @@ -412,10 +409,13 @@ if (Status == STATUS_PENDING) { /* Wait for completion */ + LeaveCriticalSection(&Socket->Lock); SockWaitForSingleObject(ThreadData->EventHandle, Handle, NO_BLOCKING_HOOK, NO_TIMEOUT); + EnterCriticalSection(&Socket->Lock); + /* Get new status */ Status = IoStatusBlock.Status; } @@ -462,10 +462,13 @@ if (Status == STATUS_PENDING) { /* Wait for completion */ + LeaveCriticalSection(&Socket->Lock); SockWaitForSingleObject(ThreadData->EventHandle, Handle, NO_BLOCKING_HOOK, NO_TIMEOUT); + EnterCriticalSection(&Socket->Lock); + /* Get new status */ Status = IoStatusBlock.Status; } Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c [iso-8859-1] Thu Aug 12 22:39:24 2010 @@ -72,6 +72,7 @@ /* Send close event. Note, this includes both aborts and disconnects */ if (Events & FD_CLOSE) PollInfo.Events |= AFD_EVENT_DISCONNECT | + AFD_EVENT_CLOSE | AFD_EVENT_ABORT; /* Send PnP events related to live network hardware changes */ @@ -99,10 +100,12 @@ if (Status == STATUS_PENDING) { /* Wait for completion */ + LeaveCriticalSection(&Socket->Lock); SockWaitForSingleObject(ThreadData->EventHandle, Socket->Handle, NO_BLOCKING_HOOK, NO_TIMEOUT); + EnterCriticalSection(&Socket->Lock); /* Get new status */ Status = IoStatusBlock.Status; @@ -273,10 +276,12 @@ if (Status == STATUS_PENDING) { /* Wait for completion */ + LeaveCriticalSection(&Socket->Lock); SockWaitForSingleObject(ThreadData->EventHandle, Socket->Handle, NO_BLOCKING_HOOK, NO_TIMEOUT); + EnterCriticalSection(&Socket->Lock); /* Get new status */ Status = IoStatusBlock.Status; @@ -411,7 +416,11 @@ error: /* Dereference the socket, if we have one here */ - if (Socket) SockDereferenceSocket(Socket); + if (Socket) + { + LeaveCriticalSection(&Socket->Lock); + SockDereferenceSocket(Socket); + } /* Check for error */ if (ErrorCode != NO_ERROR) Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c [iso-8859-1] Thu Aug 12 22:39:24 2010 @@ -246,7 +246,7 @@ INT SockaddrLength; PSOCKADDR Sockaddr; SOCKADDR_INFO SocketInfo; - + /* Enter prolog */ ErrorCode = SockEnterApiFast(&ThreadData); if (ErrorCode != NO_ERROR) @@ -377,6 +377,8 @@ /* Make sure it's still unbound */ if (Socket->SharedData.State == SocketOpen) { + LeaveCriticalSection(&Socket->Lock); + /* Bind it */ ReturnValue = WSPBind(Handle, Sockaddr, @@ -387,12 +389,13 @@ { /* It's bound now, fake success */ ReturnValue = NO_ERROR; + + LeaveCriticalSection(&Socket->Lock); } - /* Release the lock and free memory */ - LeaveCriticalSection(&Socket->Lock); + /* Free memory */ RtlFreeHeap(SockPrivateHeap, 0, Sockaddr); - + /* Check if we failed */ if (ReturnValue == SOCKET_ERROR) goto error; }

14 years, 4 months

[fireball] 48525: [FASTFAT_NEW] - Implement asynchronous and delayed close operations. - Fix a logical bug in FatiClose code, which led to always closing the file object (and freeing respective FCB/VCB/CCB), and then checking flags and queuing a delayed close. Instead, it should only try to close if it's not marked as a delayed close. - Support stuff added (queues, mutex for closing lists, etc). - Misc cleanup, debug silencing.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 12 21:59:22 2010 New Revision: 48525 URL: http://svn.reactos.org/svn/reactos?rev=48525&view=rev Log: [FASTFAT_NEW] - Implement asynchronous and delayed close operations. - Fix a logical bug in FatiClose code, which led to always closing the file object (and freeing respective FCB/VCB/CCB), and then checking flags and queuing a delayed close. Instead, it should only try to close if it's not marked as a delayed close. - Support stuff added (queues, mutex for closing lists, etc). - Misc cleanup, debug silencing. Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] Thu Aug 12 21:59:22 2010 @@ -10,6 +10,16 @@ #define NDEBUG #include "fastfat.h" + +VOID NTAPI +FatQueueClose(IN PCLOSE_CONTEXT CloseContext, + IN BOOLEAN DelayClose); + +PCLOSE_CONTEXT NTAPI +FatRemoveClose(PVCB Vcb OPTIONAL, + PVCB LastVcbHint OPTIONAL); + +const ULONG FatMaxDelayedCloseCount = 16; /* FUNCTIONS ****************************************************************/ @@ -246,8 +256,8 @@ PVCB Vcb; PFCB Fcb; PCCB Ccb; - BOOLEAN TopLevel, Wait, VcbDeleted = FALSE; - NTSTATUS Status; + BOOLEAN TopLevel, Wait, VcbDeleted = FALSE, DelayedClose = FALSE; + NTSTATUS Status = STATUS_SUCCESS; PCLOSE_CONTEXT CloseContext = NULL; TopLevel = FatIsTopLevelIrp(Irp); @@ -265,16 +275,57 @@ /* It's possible to wait only if we are top level or not a system process */ Wait = TopLevel && (PsGetCurrentProcess() != FatGlobalData.SystemProcess); - /* Call the common handler */ - Status = FatiCommonClose(Vcb, Fcb, Ccb, TypeOfOpen, Wait, &VcbDeleted); - - if (((TypeOfOpen == UserFileOpen || - TypeOfOpen == UserDirectoryOpen) && + /* Determine if it's a delayed close, by flags first */ + if ((TypeOfOpen == UserFileOpen || TypeOfOpen == UserDirectoryOpen) && (Fcb->State & FCB_STATE_DELAY_CLOSE) && - !FatGlobalData.ShutdownStarted) || - Status == STATUS_PENDING) - { - DPRINT1("TODO: Queue a pending close request\n"); + !FatGlobalData.ShutdownStarted) + { + DelayedClose = TRUE; + } + + /* If close is not delayed, try to perform the close operation */ + if (!DelayedClose) + Status = FatiCommonClose(Vcb, Fcb, Ccb, TypeOfOpen, Wait, &VcbDeleted); + + /* We have to delay close if either it's defined by a flag or it was not possible + to perform it synchronously */ + if (DelayedClose || Status == STATUS_PENDING) + { + DPRINT1("Queuing a pending close, Vcb %p, Fcb %p, Ccb %p\n", Vcb, Fcb, Ccb); + + /* Check if a close context should be allocated */ + if (TypeOfOpen == VirtualVolumeFile) + { + ASSERT(Vcb->CloseContext != NULL); + CloseContext = Vcb->CloseContext; + Vcb->CloseContext = NULL; + CloseContext->Free = TRUE; + } + else if (TypeOfOpen == DirectoryFile || + TypeOfOpen == EaFile) + { + UNIMPLEMENTED; + //CloseContext = FatAllocateCloseContext(Vcb); + //ASSERT(CloseContext != NULL); + CloseContext->Free = TRUE; + } + else + { + //TODO: FatDeallocateCcbStrings( Ccb ); + + /* Set CloseContext to a buffer inside Ccb */ + CloseContext = &Ccb->CloseContext; + CloseContext->Free = FALSE; + SetFlag(Ccb->Flags, CCB_CLOSE_CONTEXT); + } + + /* Save all info in the close context */ + CloseContext->Vcb = Vcb; + CloseContext->Fcb = Fcb; + CloseContext->TypeOfOpen = TypeOfOpen; + + /* Queue the close */ + FatQueueClose(CloseContext, (BOOLEAN)(Fcb && FlagOn(Fcb->State, FCB_STATE_DELAY_CLOSE))); } else { @@ -351,4 +402,250 @@ return Status; } +VOID +NTAPI +FatPendingClose(IN PVCB Vcb OPTIONAL) +{ + PCLOSE_CONTEXT CloseContext; + PVCB CurrentVcb = NULL; + PVCB LastVcb = NULL; + BOOLEAN FreeContext; + ULONG Loops = 0; + + /* Do the top-level IRP trick */ + if (!Vcb) IoSetTopLevelIrp((PIRP)FSRTL_FSP_TOP_LEVEL_IRP); + + while ((CloseContext = FatRemoveClose(Vcb, LastVcb))) + { + if (!Vcb) + { + if (!FatGlobalData.ShutdownStarted) + { + if (CloseContext->Vcb != CurrentVcb) + { + Loops = 0; + + /* Release previous VCB */ + if (CurrentVcb) + ExReleaseResourceLite(&CurrentVcb->Resource); + + /* Lock the new VCB */ + CurrentVcb = CloseContext->Vcb; + (VOID)ExAcquireResourceExclusiveLite(&CurrentVcb->Resource, TRUE); + } + else + { + /* Try to lock */ + if (++Loops >= 20) + { + if (ExGetSharedWaiterCount(&CurrentVcb->Resource) + + ExGetExclusiveWaiterCount(&CurrentVcb->Resource)) + { + ExReleaseResourceLite(&CurrentVcb->Resource); + (VOID)ExAcquireResourceExclusiveLite(&CurrentVcb->Resource, TRUE); + } + + Loops = 0; + } + } + + /* Check open count */ + if (CurrentVcb->OpenFileCount <= 1) + { + ExReleaseResourceLite(&CurrentVcb->Resource); + CurrentVcb = NULL; + } + } + else if (CurrentVcb) + { + ExReleaseResourceLite(&CurrentVcb->Resource); + CurrentVcb = NULL; + } + } + + LastVcb = CurrentVcb; + + /* Remember if we should free the context */ + FreeContext = CloseContext->Free; + + FatiCommonClose(CloseContext->Vcb, + CloseContext->Fcb, + (FreeContext ? NULL : CONTAINING_RECORD(CloseContext, CCB, CloseContext)), + CloseContext->TypeOfOpen, + TRUE, + NULL); + + /* Free context if necessary */ + if (FreeContext) ExFreePool(CloseContext); + } + + /* Release VCB if necessary */ + if (CurrentVcb) ExReleaseResourceLite(&CurrentVcb->Resource); + + /* Reset top level IRP */ + if (!Vcb) IoSetTopLevelIrp( NULL ); +} + +VOID +NTAPI +FatCloseWorker(IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + FsRtlEnterFileSystem(); + + FatPendingClose((PVCB)Context); + + FsRtlExitFileSystem(); +} + +VOID +NTAPI +FatQueueClose(IN PCLOSE_CONTEXT CloseContext, + IN BOOLEAN DelayClose) +{ + BOOLEAN RunWorker = FALSE; + + /* Acquire the close lists mutex */ + ExAcquireFastMutexUnsafe(&FatCloseQueueMutex); + + /* Add it to the desired list */ + if (DelayClose) + { + InsertTailList(&FatGlobalData.DelayedCloseList, + &CloseContext->GlobalLinks); + InsertTailList(&CloseContext->Vcb->DelayedCloseList, + &CloseContext->VcbLinks); + + FatGlobalData.DelayedCloseCount++; + + if (FatGlobalData.DelayedCloseCount > FatMaxDelayedCloseCount && + !FatGlobalData.AsyncCloseActive) + { + FatGlobalData.AsyncCloseActive = TRUE; + RunWorker = TRUE; + } + } + else + { + InsertTailList(&FatGlobalData.AsyncCloseList, + &CloseContext->GlobalLinks); + InsertTailList(&CloseContext->Vcb->AsyncCloseList, + &CloseContext->VcbLinks); + + FatGlobalData.AsyncCloseCount++; + + if (!FatGlobalData.AsyncCloseActive) + { + FatGlobalData.AsyncCloseActive = TRUE; + RunWorker = TRUE; + } + } + + /* Release the close lists mutex */ + ExReleaseFastMutexUnsafe(&FatCloseQueueMutex); + + if (RunWorker) + IoQueueWorkItem(FatGlobalData.FatCloseItem, FatCloseWorker, CriticalWorkQueue, NULL); +} + +PCLOSE_CONTEXT +NTAPI +FatRemoveClose(PVCB Vcb OPTIONAL, + PVCB LastVcbHint OPTIONAL) +{ + PLIST_ENTRY Entry; + PCLOSE_CONTEXT CloseContext; + BOOLEAN IsWorker = FALSE; + + /* Acquire the close lists mutex */ + ExAcquireFastMutexUnsafe(&FatCloseQueueMutex); + + if (!Vcb) IsWorker = TRUE; + + if (Vcb == NULL && LastVcbHint != NULL) + { + // TODO: A very special case of overflowing the queue + UNIMPLEMENTED; + } + + /* Usual processing from a worker thread */ + if (!Vcb) + { +TryToCloseAgain: + + /* Is there anything in the async close list */ + if (!IsListEmpty(&FatGlobalData.AsyncCloseList)) + { + Entry = RemoveHeadList(&FatGlobalData.AsyncCloseList); + FatGlobalData.AsyncCloseCount--; + + CloseContext = CONTAINING_RECORD(Entry, + CLOSE_CONTEXT, + GlobalLinks); + + RemoveEntryList(&CloseContext->VcbLinks); + } else if (!IsListEmpty(&FatGlobalData.DelayedCloseList) && + (FatGlobalData.DelayedCloseCount > FatMaxDelayedCloseCount/2 || + FatGlobalData.ShutdownStarted)) + { + /* In case of a shutdown or when delayed queue is filled at half - perform closing */ + Entry = RemoveHeadList(&FatGlobalData.DelayedCloseList); + FatGlobalData.DelayedCloseCount--; + + CloseContext = CONTAINING_RECORD(Entry, + CLOSE_CONTEXT, + GlobalLinks); + RemoveEntryList(&CloseContext->VcbLinks); + } + else + { + /* Nothing to close */ + CloseContext = NULL; + if (IsWorker) FatGlobalData.AsyncCloseActive = FALSE; + } + } + else + { + if (!IsListEmpty(&Vcb->AsyncCloseList)) + { + /* Is there anything in the async close list */ + Entry = RemoveHeadList(&Vcb->AsyncCloseList); + FatGlobalData.AsyncCloseCount--; + + CloseContext = CONTAINING_RECORD(Entry, + CLOSE_CONTEXT, + VcbLinks); + + RemoveEntryList(&CloseContext->GlobalLinks); + } + else if (!IsListEmpty(&Vcb->DelayedCloseList)) + { + /* Process delayed close list */ + Entry = RemoveHeadList(&Vcb->DelayedCloseList); + FatGlobalData.DelayedCloseCount--; + + CloseContext = CONTAINING_RECORD(Entry, + CLOSE_CONTEXT, + VcbLinks); + + RemoveEntryList(&CloseContext->GlobalLinks); + } + else if (LastVcbHint) + { + /* Try again */ + goto TryToCloseAgain; + } + else + { + /* Nothing to close */ + CloseContext = NULL; + } + } + + /* Release the close lists mutex */ + ExReleaseFastMutexUnsafe(&FatCloseQueueMutex); + + return CloseContext; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Thu Aug 12 21:59:22 2010 @@ -111,13 +111,6 @@ #endif UNIMPLEMENTED; } - - /* Initialize free dirent bitmap */ - RtlInitializeBitMap(&Dcb->Dcb.FreeBitmap, NULL, 0); - - /* Fill the dirent bitmap */ - DPRINT1("Filling the free dirent bitmap is missing\n"); - //FatCheckFreeDirentBitmap( IrpContext, Dcb ); } PFCB Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Thu Aug 12 21:59:22 2010 @@ -14,6 +14,7 @@ /* GLOBALS ******************************************************************/ FAT_GLOBAL_DATA FatGlobalData; +FAST_MUTEX FatCloseQueueMutex; /* FUNCTIONS ****************************************************************/ @@ -109,6 +110,12 @@ /* Initialize synchronization resource for the global data */ ExInitializeResourceLite(&FatGlobalData.Resource); + /* Initialize queued close stuff */ + InitializeListHead(&FatGlobalData.AsyncCloseList); + InitializeListHead(&FatGlobalData.DelayedCloseList); + FatGlobalData.FatCloseItem = IoAllocateWorkItem(DeviceObject); + ExInitializeFastMutex(&FatCloseQueueMutex); + /* Initialize global VCB list */ InitializeListHead(&FatGlobalData.VcbListHead); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Thu Aug 12 21:59:22 2010 @@ -16,6 +16,7 @@ #define TAG_FCB 'BCFV' #define TAG_IRP 'PRIV' #define TAG_VFAT 'TAFV' +#define TAG_FSD_CLOSE_CONTEXT 'CLCV' /* Global resource acquire/release */ @@ -182,6 +183,8 @@ FatNoopRelease(IN PVOID Context); /* --------------------------------------------------------- fastfat.c */ + +extern FAST_MUTEX FatCloseQueueMutex; PFAT_IRP_CONTEXT NTAPI FatBuildIrpContext(PIRP Irp, BOOLEAN CanWait); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Thu Aug 12 21:59:22 2010 @@ -163,6 +163,10 @@ /* Initialize VCB's resource */ ExInitializeResourceLite(&Vcb->Resource); + /* Initialize close queue lists */ + InitializeListHead(&Vcb->AsyncCloseList); + InitializeListHead(&Vcb->DelayedCloseList); + /* Initialize CC */ CcInitializeCacheMap(Vcb->StreamFileObject, (PCC_FILE_SIZES)&Vcb->Header.AllocationSize, @@ -243,6 +247,9 @@ Vcb->StreamFileObject = NULL; } + /* Free ContextClose if it's not freed up already */ + if (Vcb->CloseContext) ExFreePool(Vcb->CloseContext); + /* Free notifications stuff */ FsRtlNotifyUninitializeSync(&Vcb->NotifySync); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Thu Aug 12 21:59:22 2010 @@ -39,6 +39,16 @@ /* Jan 1, 1980 System Time */ LARGE_INTEGER DefaultFileTime; + /* Queued close */ + ULONG AsyncCloseCount; + ULONG DelayedCloseCount; + LIST_ENTRY AsyncCloseList; + LIST_ENTRY DelayedCloseList; + PIO_WORKITEM FatCloseItem; + + /* Various flags */ + BOOLEAN AsyncCloseActive; + /* FullFAT integration */ FF_IOMAN *Ioman; FF_ERROR FF_Error; @@ -171,6 +181,8 @@ VCB_CONDITION Condition; ERESOURCE Resource; struct _CLOSE_CONTEXT *CloseContext; + LIST_ENTRY AsyncCloseList; + LIST_ENTRY DelayedCloseList; /* Direct volume access */ SHARE_ACCESS ShareAccess; @@ -239,6 +251,18 @@ VCB Vcb; /* Must be the last entry! */ }; } VOLUME_DEVICE_OBJECT, *PVOLUME_DEVICE_OBJECT; + +typedef enum _TYPE_OF_OPEN +{ + UnopenedFileObject, + UserFileOpen, + UserDirectoryOpen, + UserVolumeOpen, + VirtualVolumeFile, + DirectoryFile, + EaFile +} TYPE_OF_OPEN; + // // Short name always exists in FAT // @@ -342,8 +366,6 @@ PFILE_OBJECT DirectoryFile; /* Directory data stream (just handy to have it). */ //PFILE_OBJECT StreamFileObject; - /* Bitmap to search for free dirents. */ - RTL_BITMAP FreeBitmap; /* Names */ PRTL_SPLAY_LINKS SplayLinksAnsi; PRTL_SPLAY_LINKS SplayLinksUnicode; @@ -388,28 +410,6 @@ BOOLEAN Valid8dot3Name; } FAT_FIND_DIRENT_CONTEXT, *PFAT_FIND_DIRENT_CONTEXT; -typedef struct _CCB -{ - CSHORT NodeTypeCode; - CSHORT NodeByteSize; - - LARGE_INTEGER CurrentByteOffset; - ULONG Entry; - UNICODE_STRING SearchPattern; - UCHAR Flags; -} CCB, *PCCB; - -typedef enum _TYPE_OF_OPEN -{ - UnopenedFileObject, - UserFileOpen, - UserDirectoryOpen, - UserVolumeOpen, - VirtualVolumeFile, - DirectoryFile, - EaFile -} TYPE_OF_OPEN; - typedef struct _CLOSE_CONTEXT { LIST_ENTRY GlobalLinks; @@ -421,6 +421,18 @@ BOOLEAN Free; } CLOSE_CONTEXT, *PCLOSE_CONTEXT; +typedef struct _CCB +{ + CSHORT NodeTypeCode; + CSHORT NodeByteSize; + + LARGE_INTEGER CurrentByteOffset; + ULONG Entry; + UNICODE_STRING SearchPattern; + UCHAR Flags; + CLOSE_CONTEXT CloseContext; +} CCB, *PCCB; + typedef enum _FILE_TIME_INDEX { FileCreationTime = 0, @@ -432,9 +444,10 @@ #define CCB_SEARCH_RETURN_SINGLE_ENTRY 0x01 #define CCB_SEARCH_PATTERN_LEGAL_8DOT3 0x02 #define CCB_SEARCH_PATTERN_HAS_WILD_CARD 0x04 -#define CCB_DASD_IO 0x10 -#define CCB_READ_ONLY 0x20 -#define CCB_DELETE_ON_CLOSE 0x40 -#define CCB_COMPLETE_DISMOUNT 0x80 +#define CCB_DASD_IO 0x08 +#define CCB_READ_ONLY 0x10 +#define CCB_DELETE_ON_CLOSE 0x20 +#define CCB_COMPLETE_DISMOUNT 0x40 +#define CCB_CLOSE_CONTEXT 0x80 extern FAT_GLOBAL_DATA FatGlobalData; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Thu Aug 12 21:59:22 2010 @@ -171,7 +171,7 @@ break; default: - DPRINT1("FatUserFsCtrl(), unhandled fs control code 0x%x\n", Code); + DPRINT("FatUserFsCtrl(), unhandled fs control code 0x%x\n", Code); Status = STATUS_INVALID_DEVICE_REQUEST; FatCompleteRequest(IrpContext, Irp, Status); }

14 years, 4 months

[cgutman] 48524: [MSWSOCK] - Fix IsSockaddrEqualToZero - Comment out the broken async connect code (as it is in our current msafd) - Fix a deadlock bug and socket descriptor leak when disconnecting a datagram socket - Fix bug in the SO_BROADCAST check

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 12 21:26:28 2010 New Revision: 48524 URL: http://svn.reactos.org/svn/reactos?rev=48524&view=rev Log: [MSWSOCK] - Fix IsSockaddrEqualToZero - Comment out the broken async connect code (as it is in our current msafd) - Fix a deadlock bug and socket descriptor leak when disconnecting a datagram socket - Fix bug in the SO_BROADCAST check Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c [iso-8859-1] Thu Aug 12 21:26:28 2010 @@ -22,7 +22,7 @@ for (i = 0; i < SocketAddressLength; i++) { /* Make sure it's 0 */ - if (*(PULONG)SocketAddress + i)return FALSE; + if (*(PULONG)(SocketAddress + i)) return FALSE; } /* All zeroes, succees! */ @@ -171,6 +171,7 @@ /* Set the SAN State */ ConnectInfo->UseSAN = SockSanEnabled; +#if 0 /* Check if this is a non-blocking streaming socket */ if ((Socket->SharedData.NonBlocking) && !(MSAFD_IS_DGRAM_SOCK(Socket))) { @@ -185,6 +186,7 @@ Status = 0; } else +#endif { /* Start the connect loop */ do @@ -386,8 +388,11 @@ (MSAFD_IS_DGRAM_SOCK(Socket)) && (IsSockaddrEqualToZero(SocketAddress, SocketAddressLength))) { - /* Disconnect the socket and return */ - return UnconnectDatagramSocket(Socket); + /* Disconnect the socket */ + ErrorCode = UnconnectDatagramSocket(Socket); + + /* Cleanup and return */ + goto error; } /* Make sure the Address Family is valid */ @@ -412,6 +417,7 @@ { /* Fail: SO_BROADCAST must be set first in WinSock 2.0+ */ ErrorCode = WSAEACCES; + goto error; } }

14 years, 4 months

[cgutman] 48523: - I hate catching these things as the commit is going out

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 12 13:15:35 2010 New Revision: 48523 URL: http://svn.reactos.org/svn/reactos?rev=48523&view=rev Log: - I hate catching these things as the commit is going out Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Aug 12 13:15:35 2010 @@ -1944,12 +1944,12 @@ } *lpErrno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL); if (*lpErrno != NO_ERROR) + return SOCKET_ERROR; + else { *lpcbBytesReturned = sizeof(ULONG); - return SOCKET_ERROR; + return NO_ERROR; } - else - return NO_ERROR; default: *lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext, Handle,

14 years, 4 months

[cgutman] 48522: [MSAFD] - Update lpcbBytesReturned when FIONREAD is called - Fix the value inside lpErrno when XxxSocketInformation() fails - Pass the unrecognized IOCTLs to the winsock helper (no behavior change for this yet because wshtcpip's WSHIoctl is unimplemented)

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 12 13:13:19 2010 New Revision: 48522 URL: http://svn.reactos.org/svn/reactos?rev=48522&view=rev Log: [MSAFD] - Update lpcbBytesReturned when FIONREAD is called - Fix the value inside lpErrno when XxxSocketInformation() fails - Pass the unrecognized IOCTLs to the winsock helper (no behavior change for this yet because wshtcpip's WSHIoctl is unimplemented) Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Aug 12 13:13:19 2010 @@ -1910,6 +1910,7 @@ OUT LPINT lpErrno) { PSOCKET_INFORMATION Socket = NULL; + BOOLEAN NeedsCompletion; /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); @@ -1918,6 +1919,8 @@ *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } + + *lpcbBytesReturned = 0; switch( dwIoControlCode ) { @@ -1928,17 +1931,44 @@ return SOCKET_ERROR; } Socket->SharedData.NonBlocking = *((PULONG)lpvInBuffer) ? 1 : 0; - return SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, (PULONG)lpvInBuffer, NULL); + *lpErrno = SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, (PULONG)lpvInBuffer, NULL); + if (*lpErrno != NO_ERROR) + return SOCKET_ERROR; + else + return NO_ERROR; case FIONREAD: if( cbOutBuffer < sizeof(INT) || IS_INTRESOURCE(lpvOutBuffer) ) { *lpErrno = WSAEFAULT; return SOCKET_ERROR; } - return GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL); + *lpErrno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, (PULONG)lpvOutBuffer, NULL); + if (*lpErrno != NO_ERROR) + { + *lpcbBytesReturned = sizeof(ULONG); + return SOCKET_ERROR; + } + else + return NO_ERROR; default: - *lpErrno = WSAEINVAL; - return SOCKET_ERROR; + *lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + dwIoControlCode, + lpvInBuffer, + cbInBuffer, + lpvOutBuffer, + cbOutBuffer, + lpcbBytesReturned, + lpOverlapped, + lpCompletionRoutine, + (LPBOOL)&NeedsCompletion); + + if (*lpErrno != NO_ERROR) + return SOCKET_ERROR; + else + return NO_ERROR; } }

14 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010