Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[ion] 52763: [KERNEL32]: Don't know how to fix this without breaking the synch... but this should fix CMAKE.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 17:28:21 2011 New Revision: 52763 URL: http://svn.reactos.org/svn/reactos?rev=52763&view=rev Log: [KERNEL32]: Don't know how to fix this without breaking the synch... but this should fix CMAKE. Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] Thu Jul 21 17:28:21 2011 @@ -483,7 +483,7 @@ /* not compressed? just copy */ if (!IS_LZ_HANDLE(src)) - xread=_lread; + xread=(_readfun)_hread; // ROSHACK else xread=(_readfun)LZRead; len=0;

13 years, 2 months

[ion] 52762: [KERNEL32]: C'mon cmake..you can do it!

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 17:21:43 2011 New Revision: 52762 URL: http://svn.reactos.org/svn/reactos?rev=52762&view=rev Log: [KERNEL32]: C'mon cmake..you can do it! Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c trunk/reactos/dll/win32/kernel32/client/vista.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.spec Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -56,6 +56,8 @@ #define HeapAlloc RtlAllocateHeap #define HeapReAlloc RtlReAllocateHeap #define HeapFree RtlFreeHeap +#define _lread(a, b, c) (long)(_hread(a, b, (long)c)) +#define _lwrite(a, b, c) (long)(_hwrite(a, b, (long)c)) WINE_DEFAULT_DEBUG_CHANNEL(file); /* The readahead length of the decompressor. Reading single bytes Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -307,29 +307,6 @@ { UNIMPLEMENTED; return E_FAIL; -} - -/* - * @implemented - */ -ULONGLONG -WINAPI -GetTickCount64(VOID) -{ - ULARGE_INTEGER TickCount; - - while (TRUE) - { - TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; - TickCount.LowPart = SharedUserData->TickCount.LowPart; - - if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; - - YieldProcessor(); - } - - return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + - (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); } /*-------------------------------------------------------------- @@ -869,3 +846,25 @@ #endif +/* + * @implemented + */ +ULONGLONG +WINAPI +GetTickCount64(VOID) +{ + ULARGE_INTEGER TickCount; + + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; + TickCount.LowPart = SharedUserData->TickCount.LowPart; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; + + YieldProcessor(); + } + + return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + + (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); +} Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -773,7 +773,6 @@ ;@ stdcall InitializeConditionVariable ntdll.RtlInitializeConditionVariable ; Win 7 @ stdcall InitializeCriticalSection(ptr) ; FIXME: ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) ;@ stdcall InitializeExtendedContext ; Win 7 ;@ stdcall InitializeProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @@ -971,8 +970,6 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stdcall QueryFullProcessImageNameA(ptr long str ptr) ; Vista and later -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) ; Vista and later ;@ stdcall QueryIdleProcessorCycleTime ; Win 7 ;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @@ -1053,7 +1050,6 @@ ;@ stdcall RegUnLoadKeyA ; Win 7 ;@ stdcall RegUnLoadKeyW ; Win 7 ;@ stdcall RegisterApplicationRecoveryCallback ; Win 7 -@ stdcall RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Jul 21 17:21:43 2011 @@ -771,7 +771,6 @@ ;@ stdcall InitializeConditionVariable ntdll.RtlInitializeConditionVariable ; Win 7 @ stdcall InitializeCriticalSection(ptr) ; FIXME: ntdll.RtlInitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) ;@ stdcall InitializeExtendedContext ; Win 7 ;@ stdcall InitializeProcThreadAttributeList api-ms-win-core-processthreads-l1-1-0.InitializeProcThreadAttributeList ; Win 7 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @@ -969,8 +968,6 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stdcall QueryFullProcessImageNameA(ptr long str ptr) ; Vista and later -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) ; Vista and later ;@ stdcall QueryIdleProcessorCycleTime ; Win 7 ;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @@ -1051,7 +1048,6 @@ ;@ stdcall RegUnLoadKeyA ; Win 7 ;@ stdcall RegUnLoadKeyW ; Win 7 ;@ stdcall RegisterApplicationRecoveryCallback ; Win 7 -@ stdcall RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long)

13 years, 2 months

[ion] 52761: [KERNEL32]: Add the #defines only to Winesynched code. Should fix CMAKE build... [KERNEL32]: Move more Vista APIs out of the way and un-export some functions. Reset the WINNT_VERSION t...

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 17:02:48 2011 New Revision: 52761 URL: http://svn.reactos.org/svn/reactos?rev=52761&view=rev Log: [KERNEL32]: Add the #defines only to Winesynched code. Should fix CMAKE build... [KERNEL32]: Move more Vista APIs out of the way and un-export some functions. Reset the WINNT_VERSION to 0x502 instead of 0x600, except for synch.c (TBD). [KERNEL32]: Fix casts and math in GetTickCount and GetTickCount64. GetTickCount64 is Vista, but Wine-synched DLLs need it, so leave it exported. Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/file/console.c trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/misc/comm.c trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c trunk/reactos/dll/win32/kernel32/client/misc/profile.c trunk/reactos/dll/win32/kernel32/client/misc/res.c trunk/reactos/dll/win32/kernel32/client/misc/time.c trunk/reactos/dll/win32/kernel32/client/synch.c trunk/reactos/dll/win32/kernel32/client/vista.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -1,12 +1,5 @@ add_definitions(-D_KERNEL32_) - -add_definitions(-DHeapAlloc=RtlAllocateHeap) -add_definitions(-DHeapFree=RtlFreeHeap) -add_definitions(-DGetProcessHeap=RtlGetProcessHeap) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -4195,145 +4195,4 @@ return Ret; } - -/*-------------------------------------------------------------- - * GetConsoleHistoryInfo - * - * @implemented - */ -BOOL -WINAPI -GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) -{ - CSR_API_MESSAGE Request; - ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); - NTSTATUS Status; - if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - lpConsoleHistoryInfo->HistoryBufferSize = Request.Data.GetHistoryInfo.HistoryBufferSize; - lpConsoleHistoryInfo->NumberOfHistoryBuffers = Request.Data.GetHistoryInfo.NumberOfHistoryBuffers; - lpConsoleHistoryInfo->dwFlags = Request.Data.GetHistoryInfo.dwFlags; - return TRUE; -} - - -/*-------------------------------------------------------------- - * SetConsoleHistoryInfo - * - * @implemented - */ -BOOL -WINAPI -SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) -{ - CSR_API_MESSAGE Request; - ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); - NTSTATUS Status; - if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - Request.Data.SetHistoryInfo.HistoryBufferSize = lpConsoleHistoryInfo->HistoryBufferSize; - Request.Data.SetHistoryInfo.NumberOfHistoryBuffers = lpConsoleHistoryInfo->NumberOfHistoryBuffers; - Request.Data.SetHistoryInfo.dwFlags = lpConsoleHistoryInfo->dwFlags; - Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - return TRUE; -} - - -/*-------------------------------------------------------------- - * GetConsoleOriginalTitleW - * - * @unimplemented - */ -DWORD -WINAPI -GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle, - IN DWORD nSize) -{ - DPRINT1("GetConsoleOriginalTitleW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/*-------------------------------------------------------------- - * GetConsoleOriginalTitleA - * - * @unimplemented - */ -DWORD -WINAPI -GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle, - IN DWORD nSize) -{ - DPRINT1("GetConsoleOriginalTitleA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/*-------------------------------------------------------------- - * GetConsoleScreenBufferInfoEx - * - * @unimplemented - */ -BOOL -WINAPI -GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, - OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) -{ - DPRINT1("GetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/*-------------------------------------------------------------- - * SetConsoleScreenBufferInfoEx - * - * @unimplemented - */ -BOOL -WINAPI -SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, - IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) -{ - DPRINT1("SetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/*-------------------------------------------------------------- - * GetCurrentConsoleFontEx - * - * @unimplemented - */ -BOOL -WINAPI -GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput, - IN BOOL bMaximumWindow, - OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx) -{ - DPRINT1("GetCurrentConsoleFontEx(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFontEx); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -371,243 +371,4 @@ return FileHandle; } - -/* - * @implemented - */ -BOOLEAN -WINAPI -CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, - IN LPCWSTR lpTargetFileName, - IN DWORD dwFlags) -{ - IO_STATUS_BLOCK IoStatusBlock; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hSymlink = NULL; - UNICODE_STRING SymlinkFileName = { 0, 0, NULL }; - UNICODE_STRING TargetFileName = { 0, 0, NULL }; - BOOLEAN bAllocatedTarget = FALSE, bRelativePath = FALSE; - LPWSTR lpTargetFullFileName = NULL; - SIZE_T cbPrintName; - SIZE_T cbReparseData; - PREPARSE_DATA_BUFFER pReparseData = NULL; - PBYTE pBufTail; - NTSTATUS Status; - ULONG dwCreateOptions; - DWORD dwErr; - - if(!lpSymlinkFileName || !lpTargetFileName || (dwFlags | SYMBOLIC_LINK_FLAG_DIRECTORY) != SYMBOLIC_LINK_FLAG_DIRECTORY) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if(dwFlags & SYMBOLIC_LINK_FLAG_DIRECTORY) - dwCreateOptions = FILE_DIRECTORY_FILE; - else - dwCreateOptions = FILE_NON_DIRECTORY_FILE; - - switch(RtlDetermineDosPathNameType_U(lpTargetFileName)) - { - case RtlPathTypeUnknown: - case RtlPathTypeRooted: - case RtlPathTypeRelative: - bRelativePath = TRUE; - RtlInitUnicodeString(&TargetFileName, lpTargetFileName); - break; - - case RtlPathTypeDriveRelative: - { - LPWSTR FilePart; - SIZE_T cchTargetFullFileName; - - cchTargetFullFileName = GetFullPathNameW(lpTargetFileName, 0, NULL, &FilePart); - - if(cchTargetFullFileName == 0) - { - dwErr = GetLastError(); - goto Cleanup; - } - - lpTargetFullFileName = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchTargetFullFileName * sizeof(WCHAR)); - - if(lpTargetFullFileName == NULL) - { - dwErr = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } - - if(GetFullPathNameW(lpTargetFileName, cchTargetFullFileName, lpTargetFullFileName, &FilePart) == 0) - { - dwErr = GetLastError(); - goto Cleanup; - } - } - - lpTargetFileName = lpTargetFullFileName; - - // fallthrough - - case RtlPathTypeUncAbsolute: - case RtlPathTypeDriveAbsolute: - case RtlPathTypeLocalDevice: - case RtlPathTypeRootLocalDevice: - default: - if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) - { - bAllocatedTarget = TRUE; - dwErr = ERROR_INVALID_PARAMETER; - goto Cleanup; - } - } - - cbPrintName = wcslen(lpTargetFileName) * sizeof(WCHAR); - cbReparseData = FIELD_OFFSET(REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer) + TargetFileName.Length + cbPrintName; - pReparseData = RtlAllocateHeap(RtlGetProcessHeap(), 0, cbReparseData); - - if(pReparseData == NULL) - { - dwErr = ERROR_NOT_ENOUGH_MEMORY; - goto Cleanup; - } - - pBufTail = (PBYTE)(pReparseData->SymbolicLinkReparseBuffer.PathBuffer); - - pReparseData->ReparseTag = (ULONG)IO_REPARSE_TAG_SYMLINK; - pReparseData->ReparseDataLength = (USHORT)cbReparseData - REPARSE_DATA_BUFFER_HEADER_SIZE; - pReparseData->Reserved = 0; - - pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset = 0; - pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength = TargetFileName.Length; - pBufTail += pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset; - RtlCopyMemory(pBufTail, TargetFileName.Buffer, TargetFileName.Length); - - pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset = pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength; - pReparseData->SymbolicLinkReparseBuffer.PrintNameLength = (USHORT)cbPrintName; - pBufTail += pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset; - RtlCopyMemory(pBufTail, lpTargetFileName, cbPrintName); - - pReparseData->SymbolicLinkReparseBuffer.Flags = 0; - - if(bRelativePath) - pReparseData->SymbolicLinkReparseBuffer.Flags |= 1; // TODO! give this lone flag a name - - if(!RtlDosPathNameToNtPathName_U(lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) - { - dwErr = ERROR_PATH_NOT_FOUND; - goto Cleanup; - } - - InitializeObjectAttributes(&ObjectAttributes, &SymlinkFileName, OBJ_CASE_INSENSITIVE, NULL, NULL); - - Status = NtCreateFile - ( - &hSymlink, - FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_CREATE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT | dwCreateOptions, - NULL, - 0 - ); - - if(!NT_SUCCESS(Status)) - { - dwErr = RtlNtStatusToDosError(Status); - goto Cleanup; - } - - Status = NtFsControlFile - ( - hSymlink, - NULL, - NULL, - NULL, - &IoStatusBlock, - FSCTL_SET_REPARSE_POINT, - pReparseData, - cbReparseData, - NULL, - 0 - ); - - if(!NT_SUCCESS(Status)) - { - FILE_DISPOSITION_INFORMATION DispInfo; - DispInfo.DeleteFile = TRUE; - NtSetInformationFile(hSymlink, &IoStatusBlock, &DispInfo, sizeof(DispInfo), FileDispositionInformation); - - dwErr = RtlNtStatusToDosError(Status); - goto Cleanup; - } - - dwErr = NO_ERROR; - -Cleanup: - if(hSymlink) - NtClose(hSymlink); - - RtlFreeUnicodeString(&SymlinkFileName); - if (bAllocatedTarget) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - TargetFileName.Buffer); - } - - if(lpTargetFullFileName) - RtlFreeHeap(RtlGetProcessHeap(), 0, lpTargetFullFileName); - - if(pReparseData) - RtlFreeHeap(RtlGetProcessHeap(), 0, pReparseData); - - if(dwErr) - { - SetLastError(dwErr); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOLEAN -NTAPI -CreateSymbolicLinkA(IN LPCSTR lpSymlinkFileName, - IN LPCSTR lpTargetFileName, - IN DWORD dwFlags) -{ - PWCHAR SymlinkW, TargetW; - BOOLEAN Ret; - - if(!lpSymlinkFileName || !lpTargetFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (!(SymlinkW = FilenameA2W(lpSymlinkFileName, FALSE))) - return FALSE; - - if (!(TargetW = FilenameA2W(lpTargetFileName, TRUE))) - return FALSE; - - Ret = CreateSymbolicLinkW(SymlinkW, - TargetW, - dwFlags); - - RtlFreeHeap(RtlGetProcessHeap(), 0, SymlinkW); - RtlFreeHeap(RtlGetProcessHeap(), 0, TargetW); - - return Ret; -} - - /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -1816,166 +1816,6 @@ return TRUE; } - -/* - * @implemented - */ -DWORD -WINAPI -GetFinalPathNameByHandleA(IN HANDLE hFile, - OUT LPSTR lpszFilePath, - IN DWORD cchFilePath, - IN DWORD dwFlags) -{ - WCHAR FilePathW[MAX_PATH]; - UNICODE_STRING FilePathU; - DWORD PrevLastError; - DWORD Ret = 0; - - if (cchFilePath != 0 && - cchFilePath > sizeof(FilePathW) / sizeof(FilePathW[0])) - { - FilePathU.Length = 0; - FilePathU.MaximumLength = (USHORT)cchFilePath * sizeof(WCHAR); - FilePathU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - FilePathU.MaximumLength); - if (FilePathU.Buffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - } - else - { - FilePathU.Length = 0; - FilePathU.MaximumLength = sizeof(FilePathW); - FilePathU.Buffer = FilePathW; - } - - /* save the last error code */ - PrevLastError = GetLastError(); - SetLastError(ERROR_SUCCESS); - - /* call the unicode version that does all the work */ - Ret = GetFinalPathNameByHandleW(hFile, - FilePathU.Buffer, - cchFilePath, - dwFlags); - - if (GetLastError() == ERROR_SUCCESS) - { - /* no error, restore the last error code and convert the string */ - SetLastError(PrevLastError); - - Ret = FilenameU2A_FitOrFail(lpszFilePath, - cchFilePath, - &FilePathU); - } - - /* free allocated memory if necessary */ - if (FilePathU.Buffer != FilePathW) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - FilePathU.Buffer); - } - - return Ret; -} - - -/* - * @unimplemented - */ -DWORD -WINAPI -GetFinalPathNameByHandleW(IN HANDLE hFile, - OUT LPWSTR lpszFilePath, - IN DWORD cchFilePath, - IN DWORD dwFlags) -{ - if (dwFlags & ~(VOLUME_NAME_DOS | VOLUME_NAME_GUID | VOLUME_NAME_NT | - VOLUME_NAME_NONE | FILE_NAME_NORMALIZED | FILE_NAME_OPENED)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SetFileBandwidthReservation(IN HANDLE hFile, - IN DWORD nPeriodMilliseconds, - IN DWORD nBytesPerPeriod, - IN BOOL bDiscardable, - OUT LPDWORD lpTransferSize, - OUT LPDWORD lpNumOutstandingRequests) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -GetFileBandwidthReservation(IN HANDLE hFile, - OUT LPDWORD lpPeriodMilliseconds, - OUT LPDWORD lpBytesPerPeriod, - OUT LPBOOL pDiscardable, - OUT LPDWORD lpTransferSize, - OUT LPDWORD lpNumOutstandingRequests) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SetFileCompletionNotificationModes(IN HANDLE FileHandle, - IN UCHAR Flags) -{ - if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HANDLE -WINAPI -OpenFileById(IN HANDLE hFile, - IN LPFILE_ID_DESCRIPTOR lpFileID, - IN DWORD dwDesiredAccess, - IN DWORD dwShareMode, - IN LPSECURITY_ATTRIBUTES lpSecurityAttributes OPTIONAL, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return INVALID_HANDLE_VALUE; -} - /* * @implemented */ Modified: trunk/reactos/dll/win32/kernel32/client/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/comm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/comm.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -59,6 +59,9 @@ #include "wine/debug.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(comm); /*********************************************************************** Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -52,6 +52,10 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "winternl.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(file); /* The readahead length of the decompressor. Reading single bytes Modified: trunk/reactos/dll/win32/kernel32/client/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/profile.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -34,6 +34,9 @@ #include "wine/library.h" #include "wine/debug.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(profile); static const char bom_utf8[] = {0xEF,0xBB,0xBF}; Modified: trunk/reactos/dll/win32/kernel32/client/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/res.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/res.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -37,6 +37,9 @@ #include "wine/unicode.h" #include "wine/list.h" +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(resource); /* we don't want to include winuser.h just for this */ Modified: trunk/reactos/dll/win32/kernel32/client/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/time.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -602,39 +602,23 @@ WINAPI GetTickCount(VOID) { - /* Call the 64-bit version */ - return (DWORD)GetTickCount64(); -} - - -/* - * @implemented - */ -ULONGLONG -WINAPI -GetTickCount64(VOID) -{ - ULONG Multiplier; - LARGE_INTEGER TickCount; - - /* Loop until we get a perfect match */ - for (;;) - { - /* Read the tick count value */ - TickCount.HighPart = SharedUserData->TickCount.High1Time; + ULARGE_INTEGER TickCount; + + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; TickCount.LowPart = SharedUserData->TickCount.LowPart; - if (TickCount.HighPart == SharedUserData->TickCount.High2Time) break; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) + break; + YieldProcessor(); } - /* Get the multiplier */ - Multiplier = SharedUserData->TickCountMultiplier; - - /* Convert to milliseconds and return */ - return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) + - (Multiplier * (TickCount.HighPart << 8))); -} - + return (ULONG)((UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + + UInt32x32To64((TickCount.HighPart << 8) & 0xFFFFFFFF, SharedUserData->TickCountMultiplier)); + +} /* * @implemented Modified: trunk/reactos/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/synch.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -7,7 +7,8 @@ */ /* INCLUDES *****************************************************************/ - +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x600 #include <k32.h> #define NDEBUG Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -8,6 +8,8 @@ #define NDEBUG #include <debug.h> + +#if _WIN32_WINNT >= 0x600 /* FIXME: Move these RTL declarations to the NDK */ NTSTATUS @@ -307,3 +309,563 @@ return E_FAIL; } +/* + * @implemented + */ +ULONGLONG +WINAPI +GetTickCount64(VOID) +{ + ULARGE_INTEGER TickCount; + + while (TRUE) + { + TickCount.HighPart = (ULONG)SharedUserData->TickCount.High1Time; + TickCount.LowPart = SharedUserData->TickCount.LowPart; + + if (TickCount.HighPart == (ULONG)SharedUserData->TickCount.High2Time) break; + + YieldProcessor(); + } + + return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + + (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); +} + +/*-------------------------------------------------------------- + * GetConsoleHistoryInfo + * + * @implemented + */ +BOOL +WINAPI +GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); + NTSTATUS Status; + if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + lpConsoleHistoryInfo->HistoryBufferSize = Request.Data.GetHistoryInfo.HistoryBufferSize; + lpConsoleHistoryInfo->NumberOfHistoryBuffers = Request.Data.GetHistoryInfo.NumberOfHistoryBuffers; + lpConsoleHistoryInfo->dwFlags = Request.Data.GetHistoryInfo.dwFlags; + return TRUE; +} + + +/*-------------------------------------------------------------- + * SetConsoleHistoryInfo + * + * @implemented + */ +BOOL +WINAPI +SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) +{ + CSR_API_MESSAGE Request; + ULONG CsrRequest = MAKE_CSR_API(GET_HISTORY_INFO, CSR_CONSOLE); + NTSTATUS Status; + if (lpConsoleHistoryInfo->cbSize != sizeof(CONSOLE_HISTORY_INFO)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + Request.Data.SetHistoryInfo.HistoryBufferSize = lpConsoleHistoryInfo->HistoryBufferSize; + Request.Data.SetHistoryInfo.NumberOfHistoryBuffers = lpConsoleHistoryInfo->NumberOfHistoryBuffers; + Request.Data.SetHistoryInfo.dwFlags = lpConsoleHistoryInfo->dwFlags; + Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + return TRUE; +} + + +/*-------------------------------------------------------------- + * GetConsoleOriginalTitleW + * + * @unimplemented + */ +DWORD +WINAPI +GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle, + IN DWORD nSize) +{ + DPRINT1("GetConsoleOriginalTitleW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*-------------------------------------------------------------- + * GetConsoleOriginalTitleA + * + * @unimplemented + */ +DWORD +WINAPI +GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle, + IN DWORD nSize) +{ + DPRINT1("GetConsoleOriginalTitleA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpConsoleTitle, nSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*-------------------------------------------------------------- + * GetConsoleScreenBufferInfoEx + * + * @unimplemented + */ +BOOL +WINAPI +GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, + OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) +{ + DPRINT1("GetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * SetConsoleScreenBufferInfoEx + * + * @unimplemented + */ +BOOL +WINAPI +SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, + IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) +{ + DPRINT1("SetConsoleScreenBufferInfoEx(0x%p, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, lpConsoleScreenBufferInfoEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/*-------------------------------------------------------------- + * GetCurrentConsoleFontEx + * + * @unimplemented + */ +BOOL +WINAPI +GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput, + IN BOOL bMaximumWindow, + OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx) +{ + DPRINT1("GetCurrentConsoleFontEx(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFontEx); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @implemented + */ +BOOLEAN +WINAPI +CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, + IN LPCWSTR lpTargetFileName, + IN DWORD dwFlags) +{ + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hSymlink = NULL; + UNICODE_STRING SymlinkFileName = { 0, 0, NULL }; + UNICODE_STRING TargetFileName = { 0, 0, NULL }; + BOOLEAN bAllocatedTarget = FALSE, bRelativePath = FALSE; + LPWSTR lpTargetFullFileName = NULL; + SIZE_T cbPrintName; + SIZE_T cbReparseData; + PREPARSE_DATA_BUFFER pReparseData = NULL; + PBYTE pBufTail; + NTSTATUS Status; + ULONG dwCreateOptions; + DWORD dwErr; + + if(!lpSymlinkFileName || !lpTargetFileName || (dwFlags | SYMBOLIC_LINK_FLAG_DIRECTORY) != SYMBOLIC_LINK_FLAG_DIRECTORY) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if(dwFlags & SYMBOLIC_LINK_FLAG_DIRECTORY) + dwCreateOptions = FILE_DIRECTORY_FILE; + else + dwCreateOptions = FILE_NON_DIRECTORY_FILE; + + switch(RtlDetermineDosPathNameType_U(lpTargetFileName)) + { + case RtlPathTypeUnknown: + case RtlPathTypeRooted: + case RtlPathTypeRelative: + bRelativePath = TRUE; + RtlInitUnicodeString(&TargetFileName, lpTargetFileName); + break; + + case RtlPathTypeDriveRelative: + { + LPWSTR FilePart; + SIZE_T cchTargetFullFileName; + + cchTargetFullFileName = GetFullPathNameW(lpTargetFileName, 0, NULL, &FilePart); + + if(cchTargetFullFileName == 0) + { + dwErr = GetLastError(); + goto Cleanup; + } + + lpTargetFullFileName = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchTargetFullFileName * sizeof(WCHAR)); + + if(lpTargetFullFileName == NULL) + { + dwErr = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + if(GetFullPathNameW(lpTargetFileName, cchTargetFullFileName, lpTargetFullFileName, &FilePart) == 0) + { + dwErr = GetLastError(); + goto Cleanup; + } + } + + lpTargetFileName = lpTargetFullFileName; + + // fallthrough + + case RtlPathTypeUncAbsolute: + case RtlPathTypeDriveAbsolute: + case RtlPathTypeLocalDevice: + case RtlPathTypeRootLocalDevice: + default: + if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) + { + bAllocatedTarget = TRUE; + dwErr = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + } + + cbPrintName = wcslen(lpTargetFileName) * sizeof(WCHAR); + cbReparseData = FIELD_OFFSET(REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer) + TargetFileName.Length + cbPrintName; + pReparseData = RtlAllocateHeap(RtlGetProcessHeap(), 0, cbReparseData); + + if(pReparseData == NULL) + { + dwErr = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + pBufTail = (PBYTE)(pReparseData->SymbolicLinkReparseBuffer.PathBuffer); + + pReparseData->ReparseTag = (ULONG)IO_REPARSE_TAG_SYMLINK; + pReparseData->ReparseDataLength = (USHORT)cbReparseData - REPARSE_DATA_BUFFER_HEADER_SIZE; + pReparseData->Reserved = 0; + + pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset = 0; + pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength = TargetFileName.Length; + pBufTail += pReparseData->SymbolicLinkReparseBuffer.SubstituteNameOffset; + RtlCopyMemory(pBufTail, TargetFileName.Buffer, TargetFileName.Length); + + pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset = pReparseData->SymbolicLinkReparseBuffer.SubstituteNameLength; + pReparseData->SymbolicLinkReparseBuffer.PrintNameLength = (USHORT)cbPrintName; + pBufTail += pReparseData->SymbolicLinkReparseBuffer.PrintNameOffset; + RtlCopyMemory(pBufTail, lpTargetFileName, cbPrintName); + + pReparseData->SymbolicLinkReparseBuffer.Flags = 0; + + if(bRelativePath) + pReparseData->SymbolicLinkReparseBuffer.Flags |= 1; // TODO! give this lone flag a name + + if(!RtlDosPathNameToNtPathName_U(lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) + { + dwErr = ERROR_PATH_NOT_FOUND; + goto Cleanup; + } + + InitializeObjectAttributes(&ObjectAttributes, &SymlinkFileName, OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = NtCreateFile + ( + &hSymlink, + FILE_WRITE_ATTRIBUTES | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_CREATE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT | dwCreateOptions, + NULL, + 0 + ); + + if(!NT_SUCCESS(Status)) + { + dwErr = RtlNtStatusToDosError(Status); + goto Cleanup; + } + + Status = NtFsControlFile + ( + hSymlink, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + pReparseData, + cbReparseData, + NULL, + 0 + ); + + if(!NT_SUCCESS(Status)) + { + FILE_DISPOSITION_INFORMATION DispInfo; + DispInfo.DeleteFile = TRUE; + NtSetInformationFile(hSymlink, &IoStatusBlock, &DispInfo, sizeof(DispInfo), FileDispositionInformation); + + dwErr = RtlNtStatusToDosError(Status); + goto Cleanup; + } + + dwErr = NO_ERROR; + +Cleanup: + if(hSymlink) + NtClose(hSymlink); + + RtlFreeUnicodeString(&SymlinkFileName); + if (bAllocatedTarget) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + TargetFileName.Buffer); + } + + if(lpTargetFullFileName) + RtlFreeHeap(RtlGetProcessHeap(), 0, lpTargetFullFileName); + + if(pReparseData) + RtlFreeHeap(RtlGetProcessHeap(), 0, pReparseData); + + if(dwErr) + { + SetLastError(dwErr); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOLEAN +NTAPI +CreateSymbolicLinkA(IN LPCSTR lpSymlinkFileName, + IN LPCSTR lpTargetFileName, + IN DWORD dwFlags) +{ + PWCHAR SymlinkW, TargetW; + BOOLEAN Ret; + + if(!lpSymlinkFileName || !lpTargetFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(SymlinkW = FilenameA2W(lpSymlinkFileName, FALSE))) + return FALSE; + + if (!(TargetW = FilenameA2W(lpTargetFileName, TRUE))) + return FALSE; + + Ret = CreateSymbolicLinkW(SymlinkW, + TargetW, + dwFlags); + + RtlFreeHeap(RtlGetProcessHeap(), 0, SymlinkW); + RtlFreeHeap(RtlGetProcessHeap(), 0, TargetW); + + return Ret; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleW(IN HANDLE hFile, + OUT LPWSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + if (dwFlags & ~(VOLUME_NAME_DOS | VOLUME_NAME_GUID | VOLUME_NAME_NT | + VOLUME_NAME_NONE | FILE_NAME_NORMALIZED | FILE_NAME_OPENED)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + UNIMPLEMENTED; + return 0; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetFinalPathNameByHandleA(IN HANDLE hFile, + OUT LPSTR lpszFilePath, + IN DWORD cchFilePath, + IN DWORD dwFlags) +{ + WCHAR FilePathW[MAX_PATH]; + UNICODE_STRING FilePathU; + DWORD PrevLastError; + DWORD Ret = 0; + + if (cchFilePath != 0 && + cchFilePath > sizeof(FilePathW) / sizeof(FilePathW[0])) + { + FilePathU.Length = 0; + FilePathU.MaximumLength = (USHORT)cchFilePath * sizeof(WCHAR); + FilePathU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + FilePathU.MaximumLength); + if (FilePathU.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + else + { + FilePathU.Length = 0; + FilePathU.MaximumLength = sizeof(FilePathW); + FilePathU.Buffer = FilePathW; + } + + /* save the last error code */ + PrevLastError = GetLastError(); + SetLastError(ERROR_SUCCESS); + + /* call the unicode version that does all the work */ + Ret = GetFinalPathNameByHandleW(hFile, + FilePathU.Buffer, + cchFilePath, + dwFlags); + + if (GetLastError() == ERROR_SUCCESS) + { + /* no error, restore the last error code and convert the string */ + SetLastError(PrevLastError); + + Ret = FilenameU2A_FitOrFail(lpszFilePath, + cchFilePath, + &FilePathU); + } + + /* free allocated memory if necessary */ + if (FilePathU.Buffer != FilePathW) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FilePathU.Buffer); + } + + return Ret; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFileBandwidthReservation(IN HANDLE hFile, + IN DWORD nPeriodMilliseconds, + IN DWORD nBytesPerPeriod, + IN BOOL bDiscardable, + OUT LPDWORD lpTransferSize, + OUT LPDWORD lpNumOutstandingRequests) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +GetFileBandwidthReservation(IN HANDLE hFile, + OUT LPDWORD lpPeriodMilliseconds, + OUT LPDWORD lpBytesPerPeriod, + OUT LPBOOL pDiscardable, + OUT LPDWORD lpTransferSize, + OUT LPDWORD lpNumOutstandingRequests) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFileCompletionNotificationModes(IN HANDLE FileHandle, + IN UCHAR Flags) +{ + if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +HANDLE +WINAPI +OpenFileById(IN HANDLE hFile, + IN LPFILE_ID_DESCRIPTOR lpFileID, + IN DWORD dwDesiredAccess, + IN DWORD dwShareMode, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes OPTIONAL, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return INVALID_HANDLE_VALUE; +} + +#endif + Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -186,10 +186,8 @@ @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() -@ stdcall CreateSymbolicLinkA(str str long) ;@ stdcall CreateSymbolicLinkTransactedA ; Win 7 ;@ stdcall CreateSymbolicLinkTransactedW ; Win 7 -@ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) ;@ stdcall CreateThreadpool ; Win 7 @@ -441,7 +439,6 @@ @ stdcall GetConsoleFontInfo(long long long ptr) @ stdcall GetConsoleFontSize(long long) @ stdcall GetConsoleHardwareState(long long ptr) -@ stdcall GetConsoleHistoryInfo(ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @@ -514,7 +511,6 @@ ;@ stdcall GetFileAttributesTransactedA ; Win 7 ;@ stdcall GetFileAttributesTransactedW ; Win 7 @ stdcall GetFileAttributesW(wstr) -@ stdcall GetFileBandwidthReservation(long ptr ptr ptr ptr ptr) @ stdcall GetFileInformationByHandle(long ptr) ;@ stdcall GetFileInformationByHandleEx ; Win 7 ;@ stdcall GetFileMUIInfo ; Win 7 @@ -523,8 +519,6 @@ @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @ stdcall GetFileType(long) -@ stdcall GetFinalPathNameByHandleA(long str long long) -@ stdcall GetFinalPathNameByHandleW(long wstr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @@ -693,7 +687,7 @@ @ stdcall GetThreadTimes(long ptr ptr ptr ptr) ;@ stdcall GetThreadUILanguage ; Win 7 @ stdcall GetTickCount() -@ stdcall -ret64 GetTickCount64() +@ stdcall GetTickCount64() ; FOR WINE @ stdcall GetTimeFormatA(long long ptr str ptr long) ;@ stdcall GetTimeFormatEx ; Win 7 @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @@ -1144,7 +1138,6 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stdcall SetConsoleFont(long long) @ stdcall SetConsoleHardwareState(long long long) -@ stdcall SetConsoleHistoryInfo(ptr) @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -10,7 +10,6 @@ <library>wine</library> <library>ntdll</library> <define name="_KERNEL32_" /> - <redefine name="_WIN32_WINNT">0x0600</redefine> <dependency>errcodes</dependency> <pch>k32.h</pch> <directory name="client"> Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -184,10 +184,8 @@ @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() -@ stdcall CreateSymbolicLinkA(str str long) ;@ stdcall CreateSymbolicLinkTransactedA ; Win 7 ;@ stdcall CreateSymbolicLinkTransactedW ; Win 7 -@ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) ;@ stdcall CreateThreadpool ; Win 7 @@ -439,7 +437,6 @@ @ stdcall GetConsoleFontInfo(long long long ptr) @ stdcall GetConsoleFontSize(long long) @ stdcall GetConsoleHardwareState(long long ptr) -@ stdcall GetConsoleHistoryInfo(ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @@ -512,7 +509,6 @@ ;@ stdcall GetFileAttributesTransactedA ; Win 7 ;@ stdcall GetFileAttributesTransactedW ; Win 7 @ stdcall GetFileAttributesW(wstr) -@ stdcall GetFileBandwidthReservation(long ptr ptr ptr ptr ptr) @ stdcall GetFileInformationByHandle(long ptr) ;@ stdcall GetFileInformationByHandleEx ; Win 7 ;@ stdcall GetFileMUIInfo ; Win 7 @@ -521,8 +517,6 @@ @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @ stdcall GetFileType(long) -@ stdcall GetFinalPathNameByHandleA(long str long long) -@ stdcall GetFinalPathNameByHandleW(long wstr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @@ -691,7 +685,7 @@ @ stdcall GetThreadTimes(long ptr ptr ptr ptr) ;@ stdcall GetThreadUILanguage ; Win 7 @ stdcall GetTickCount() -@ stdcall -ret64 GetTickCount64() +@ stdcall GetTickCount64() ; FOR WINE @ stdcall GetTimeFormatA(long long ptr str ptr long) ;@ stdcall GetTimeFormatEx ; Win 7 @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @@ -1142,7 +1136,6 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stdcall SetConsoleFont(long long) @ stdcall SetConsoleHardwareState(long long long) -@ stdcall SetConsoleHistoryInfo(ptr) @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -36,6 +36,9 @@ extern HMODULE kernel32_handle; +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(resource); struct format_args Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -55,6 +55,9 @@ return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(nls); extern HMODULE kernel32_handle; Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] Thu Jul 21 17:02:48 2011 @@ -39,6 +39,10 @@ #define CRITICAL_SECTION RTL_CRITICAL_SECTION #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG #define CALINFO_MAX_YEAR 2029 + +#define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap +#define HeapFree RtlFreeHeap WINE_DEFAULT_DEBUG_CHANNEL(nls);

13 years, 2 months

[ion] 52760: [NLS]: Kill this directory from the build. It produced nothing other than a Vista-calling DLL which was never even on the BootCD. [KERNEL32]: Remove GetLocaleInfoEx again. [KERNEL32]: ...

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 15:39:28 2011 New Revision: 52760 URL: http://svn.reactos.org/svn/reactos?rev=52760&view=rev Log: [NLS]: Kill this directory from the build. It produced nothing other than a Vista-calling DLL which was never even on the BootCD. [KERNEL32]: Remove GetLocaleInfoEx again. [KERNEL32]: It seems CMAKE build doesn't like kernel32 code calling "HeapAlloc" because HeapAlloc doesn't exist -- it's a forward to RtlAllocateHeap. As a hack, add compiler defines to do the forwarding in C code as well. Modified: trunk/reactos/dll/CMakeLists.txt trunk/reactos/dll/dll.rbuild trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=527… ============================================================================== --- trunk/reactos/dll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/CMakeLists.txt [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -3,7 +3,6 @@ add_subdirectory(cpl) add_subdirectory(directx) add_subdirectory(keyboard) -add_subdirectory(nls) add_subdirectory(ntdll) add_subdirectory(shellext) add_subdirectory(win32) Modified: trunk/reactos/dll/dll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/dll.rbuild?rev=52760&r… ============================================================================== --- trunk/reactos/dll/dll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/dll.rbuild [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -13,9 +13,6 @@ <directory name="keyboard"> <xi:include href="keyboard/keyboard.rbuild" /> </directory> -<directory name="nls"> - <xi:include href="nls/nls.rbuild" /> -</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.rbuild" /> </directory> Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -1,5 +1,9 @@ add_definitions(-D_KERNEL32_) + +add_definitions(-DHeapAlloc=RtlAllocateHeap) +add_definitions(-DHeapFree=RtlFreeHeap) +add_definitions(-DGetProcessHeap=RtlGetProcessHeap) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -544,7 +544,6 @@ @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives()

13 years, 2 months

[ion] 52759: [NTDLL]: Export RtlActivateActivationContextEx.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 15:38:05 2011 New Revision: 52759 URL: http://svn.reactos.org/svn/reactos?rev=52759&view=rev Log: [NTDLL]: Export RtlActivateActivationContextEx. Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Thu Jul 21 15:38:05 2011 @@ -418,7 +418,7 @@ @ stdcall RtlAcquireSRWLockExclusive(ptr) @ stdcall RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) -//@ stdcall RtlActivateActivationContextEx +@ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr)

13 years, 2 months

[tkreuzer] 52758: [CMAKE] Add msconfig to build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 21 14:20:50 2011 New Revision: 52758 URL: http://svn.reactos.org/svn/reactos?rev=52758&view=rev Log: [CMAKE] Add msconfig to build Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Thu Jul 21 14:20:50 2011 @@ -18,7 +18,7 @@ add_subdirectory(magnify) add_subdirectory(mmc) add_subdirectory(mplay32) -# add_subdirectory(msconfig) +add_subdirectory(msconfig) add_subdirectory(mscutils) add_subdirectory(mstsc) add_subdirectory(network)

13 years, 2 months

[gedmurphy] 52757: [KERNEL32] Add GetLocaleInfoEx back to the exports, idndl needs it. Should fix default (rbuild) build. No idea (and don't care) about the cmake build, the cmake boys will have to...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jul 21 13:40:57 2011 New Revision: 52757 URL: http://svn.reactos.org/svn/reactos?rev=52757&view=rev Log: [KERNEL32] Add GetLocaleInfoEx back to the exports, idndl needs it. Should fix default (rbuild) build. No idea (and don't care) about the cmake build, the cmake boys will have to deal with that if it breaks. Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 13:40:57 2011 @@ -544,6 +544,7 @@ @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) +@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives()

13 years, 2 months

[ion] 52756: [KERNEL32]: Try to fix CMAKE build. I love how the RBUILD build is fine though.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 05:56:31 2011 New Revision: 52756 URL: http://svn.reactos.org/svn/reactos?rev=52756&view=rev Log: [KERNEL32]: Try to fix CMAKE build. I love how the RBUILD build is fine though. Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 05:56:31 2011 @@ -543,7 +543,6 @@ @ stdcall GetLinguistLangSize(ptr) ; missing in Win 7 @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLocaleInfoW(long long ptr long) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @@ -853,7 +852,6 @@ ;@ stdcall K32InitializeProcessForWsWatch ; Win 7 ;@ stdcall K32QueryWorkingSet ; Win 7 ;@ stdcall K32QueryWorkingSetEx ; Win 7 -@ stdcall LCIDToLocaleName(long wstr long long) ; needed for wine gecko; missing in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) ;@ stdcall LCMapStringEx ; Win 7 @ stdcall LCMapStringW(long long wstr long ptr long) @@ -996,7 +994,6 @@ ;@ stdcall QueryThreadpoolStackInformation ; Win 7 ;@ stdcall -arch=x86_64 QueryUmsThreadInformation ;@ stdcall QueryUnbiasedInterruptTime ; Win 7 -@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) ; missing in Win 7 @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Jul 21 05:56:31 2011 @@ -541,7 +541,6 @@ @ stdcall GetLinguistLangSize(ptr) ; missing in Win 7 @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLocaleInfoW(long long ptr long) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @@ -851,7 +850,6 @@ ;@ stdcall K32InitializeProcessForWsWatch ; Win 7 ;@ stdcall K32QueryWorkingSet ; Win 7 ;@ stdcall K32QueryWorkingSetEx ; Win 7 -@ stdcall LCIDToLocaleName(long wstr long long) ; needed for wine gecko; missing in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) ;@ stdcall LCMapStringEx ; Win 7 @ stdcall LCMapStringW(long long wstr long ptr long) @@ -994,7 +992,6 @@ ;@ stdcall QueryThreadpoolStackInformation ; Win 7 ;@ stdcall -arch=x86_64 QueryUmsThreadInformation ;@ stdcall QueryUnbiasedInterruptTime ; Win 7 -@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) ; missing in Win 7 @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] Thu Jul 21 05:56:31 2011 @@ -38,6 +38,7 @@ #define CRITICAL_SECTION RTL_CRITICAL_SECTION #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG +#define CALINFO_MAX_YEAR 2029 WINE_DEFAULT_DEBUG_CHANNEL(nls); @@ -2085,3 +2086,213 @@ TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, TRUE, TRUE); } + +/********************************************************************* + * GetCalendarInfoA (KERNEL32.@) + * + */ +int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, + LPSTR lpCalData, int cchData, LPDWORD lpValue) +{ + int ret; + LPWSTR lpCalDataW = NULL; + + if (NLS_IsUnicodeOnlyLcid(lcid)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (cchData && + !(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchData*sizeof(WCHAR)))) + return 0; + + ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); + if(ret && lpCalDataW && lpCalData) + WideCharToMultiByte(CP_ACP, 0, lpCalDataW, cchData, lpCalData, cchData, NULL, NULL); + else if (CalType & CAL_RETURN_NUMBER) + ret *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, lpCalDataW); + + return ret; +} + +/********************************************************************* + * GetCalendarInfoW (KERNEL32.@) + * + */ +int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, + LPWSTR lpCalData, int cchData, LPDWORD lpValue) +{ + if (CalType & CAL_NOUSEROVERRIDE) + FIXME("flag CAL_NOUSEROVERRIDE used, not fully implemented\n"); + if (CalType & CAL_USE_CP_ACP) + FIXME("flag CAL_USE_CP_ACP used, not fully implemented\n"); + + if (CalType & CAL_RETURN_NUMBER) { + if (!lpValue) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (lpCalData != NULL) + WARN("lpCalData not NULL (%p) when it should!\n", lpCalData); + if (cchData != 0) + WARN("cchData not 0 (%d) when it should!\n", cchData); + } else { + if (lpValue != NULL) + WARN("lpValue not NULL (%p) when it should!\n", lpValue); + } + + /* FIXME: No verification is made yet wrt Locale + * for the CALTYPES not requiring GetLocaleInfoA */ + switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { + case CAL_ICALINTVALUE: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_SCALNAME: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_IYEAROFFSETRANGE: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_SERASTRING: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_SSHORTDATE: + return GetLocaleInfoW(Locale, LOCALE_SSHORTDATE, lpCalData, cchData); + case CAL_SLONGDATE: + return GetLocaleInfoW(Locale, LOCALE_SLONGDATE, lpCalData, cchData); + case CAL_SDAYNAME1: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME1, lpCalData, cchData); + case CAL_SDAYNAME2: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME2, lpCalData, cchData); + case CAL_SDAYNAME3: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME3, lpCalData, cchData); + case CAL_SDAYNAME4: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME4, lpCalData, cchData); + case CAL_SDAYNAME5: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME5, lpCalData, cchData); + case CAL_SDAYNAME6: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME6, lpCalData, cchData); + case CAL_SDAYNAME7: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME7, lpCalData, cchData); + case CAL_SABBREVDAYNAME1: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME1, lpCalData, cchData); + case CAL_SABBREVDAYNAME2: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME2, lpCalData, cchData); + case CAL_SABBREVDAYNAME3: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME3, lpCalData, cchData); + case CAL_SABBREVDAYNAME4: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME4, lpCalData, cchData); + case CAL_SABBREVDAYNAME5: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME5, lpCalData, cchData); + case CAL_SABBREVDAYNAME6: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME6, lpCalData, cchData); + case CAL_SABBREVDAYNAME7: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME7, lpCalData, cchData); + case CAL_SMONTHNAME1: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME1, lpCalData, cchData); + case CAL_SMONTHNAME2: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME2, lpCalData, cchData); + case CAL_SMONTHNAME3: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME3, lpCalData, cchData); + case CAL_SMONTHNAME4: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME4, lpCalData, cchData); + case CAL_SMONTHNAME5: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME5, lpCalData, cchData); + case CAL_SMONTHNAME6: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME6, lpCalData, cchData); + case CAL_SMONTHNAME7: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME7, lpCalData, cchData); + case CAL_SMONTHNAME8: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME8, lpCalData, cchData); + case CAL_SMONTHNAME9: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME9, lpCalData, cchData); + case CAL_SMONTHNAME10: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME10, lpCalData, cchData); + case CAL_SMONTHNAME11: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME11, lpCalData, cchData); + case CAL_SMONTHNAME12: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME12, lpCalData, cchData); + case CAL_SMONTHNAME13: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME13, lpCalData, cchData); + case CAL_SABBREVMONTHNAME1: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME1, lpCalData, cchData); + case CAL_SABBREVMONTHNAME2: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME2, lpCalData, cchData); + case CAL_SABBREVMONTHNAME3: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME3, lpCalData, cchData); + case CAL_SABBREVMONTHNAME4: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME4, lpCalData, cchData); + case CAL_SABBREVMONTHNAME5: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME5, lpCalData, cchData); + case CAL_SABBREVMONTHNAME6: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME6, lpCalData, cchData); + case CAL_SABBREVMONTHNAME7: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME7, lpCalData, cchData); + case CAL_SABBREVMONTHNAME8: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME8, lpCalData, cchData); + case CAL_SABBREVMONTHNAME9: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME9, lpCalData, cchData); + case CAL_SABBREVMONTHNAME10: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME10, lpCalData, cchData); + case CAL_SABBREVMONTHNAME11: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME11, lpCalData, cchData); + case CAL_SABBREVMONTHNAME12: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME12, lpCalData, cchData); + case CAL_SABBREVMONTHNAME13: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME13, lpCalData, cchData); + case CAL_SYEARMONTH: + return GetLocaleInfoW(Locale, LOCALE_SYEARMONTH, lpCalData, cchData); + case CAL_ITWODIGITYEARMAX: + if (CalType & CAL_RETURN_NUMBER) + { + *lpValue = CALINFO_MAX_YEAR; + return sizeof(DWORD) / sizeof(WCHAR); + } + else + { + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR buffer[10]; + int ret = snprintfW( buffer, 10, fmtW, CALINFO_MAX_YEAR ) + 1; + if (!lpCalData) return ret; + if (ret <= cchData) + { + strcpyW( lpCalData, buffer ); + return ret; + } + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + break; + default: + FIXME("Unknown caltype %d\n",CalType & 0xffff); + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + return 0; +} + +/********************************************************************* + * SetCalendarInfoA (KERNEL32.@) + * + */ +int WINAPI SetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, LPCSTR lpCalData) +{ + FIXME("(%08x,%08x,%08x,%s): stub\n", + Locale, Calendar, CalType, debugstr_a(lpCalData)); + return 0; +} + +/********************************************************************* + * SetCalendarInfoW (KERNEL32.@) + * + * + */ +int WINAPI SetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPCWSTR lpCalData) +{ + FIXME("(%08x,%08x,%08x,%s): stub\n", + Locale, Calendar, CalType, debugstr_w(lpCalData)); + return 0; +}

13 years, 2 months

[ion] 52755: [KERNEL32]: Now really kill combdcb.c, as the Wine implementation is now in comm.c

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 05:26:12 2011 New Revision: 52755 URL: http://svn.reactos.org/svn/reactos?rev=52755&view=rev Log: [KERNEL32]: Now really kill combdcb.c, as the Wine implementation is now in comm.c Removed: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu Jul 21 05:26:12 2011 @@ -62,7 +62,6 @@ client/file/volume.c client/misc/actctx.c client/misc/comm.c - client/misc/commdcb.c client/misc/lzexpand.c client/misc/muldiv.c client/misc/profile.c Removed: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c (removed) @@ -1,674 +1,0 @@ -/* - Copyright (c) 2008 KJK::Hyperion - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/* Parses a mode string for a serial port, in the same syntax as the mode.com command */ -#if 0 -#if defined(__REACTOS__) && defined(_KERNEL32_) -#include <k32.h> - -#define DCB_BuildCommDCBA BuildCommDCBA -#define DCB_BuildCommDCBAndTimeoutsA BuildCommDCBAndTimeoutsA -#define DCB_BuildCommDCBW BuildCommDCBW -#define DCB_BuildCommDCBAndTimeoutsW BuildCommDCBAndTimeoutsW -#else -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif - -static -void DCB_SkipSpace(const char ** ppTail) -{ - while(**ppTail && isspace(**ppTail)) - ++ *ppTail; -} - -static -size_t DCB_SkipNonSpace(const char ** ppTail) -{ - const char * pOriginal = *ppTail; - - while(**ppTail && !isspace(**ppTail)) - ++ *ppTail; - - return *ppTail - pOriginal; -} - -static -BOOL DCB_SetBaudRate(unsigned long baudRate, LPDCB lpDCB) -{ - switch(baudRate) - { - case 11: lpDCB->BaudRate = 110; break; - case 15: lpDCB->BaudRate = 150; break; - case 30: lpDCB->BaudRate = 300; break; - case 60: lpDCB->BaudRate = 600; break; - case 12: lpDCB->BaudRate = 1200; break; - case 24: lpDCB->BaudRate = 2400; break; - case 48: lpDCB->BaudRate = 4800; break; - case 96: lpDCB->BaudRate = 9600; break; - case 19: lpDCB->BaudRate = 19200; break; - default: lpDCB->BaudRate = baudRate; break; - } - - return TRUE; -} - -static -BYTE DCB_SetParity(char parity, LPDCB lpDCB) -{ - switch(parity) - { - case 'N': - case 'n': - lpDCB->Parity = 0; - break; - - case 'O': - case 'o': - lpDCB->Parity = 1; - break; - - case 'E': - case 'e': - lpDCB->Parity = 2; - break; - - case 'M': - case 'm': - lpDCB->Parity = 3; - break; - - case 'S': - case 's': - lpDCB->Parity = 4; - break; - - default: - return FALSE; - } - - return TRUE; -} - -static -BYTE DCB_SetDataBits(unsigned long dataBits, LPDCB lpDCB) -{ - BOOL bRet; - - bRet = dataBits >= 5 && dataBits <= 8; - - if(!bRet) - return bRet; - - lpDCB->ByteSize = (BYTE)dataBits; - return bRet; -} - -static -BOOL DCB_ParseOldSeparator(const char ** ppTail) -{ - BOOL bRet; - - bRet = **ppTail == 0; - - if(bRet) - return bRet; - - bRet = **ppTail == ','; - - if(bRet) - { - ++ *ppTail; - return bRet; - } - - return bRet; -} - -static -unsigned long DCB_ParseOldNumber(const char ** ppTail, unsigned long nDefault) -{ - char * pNumTail; - unsigned long number; - - DCB_SkipSpace(ppTail); - - if(!isdigit(**ppTail)) - return nDefault; - - number = strtoul(*ppTail, &pNumTail, 10); - *ppTail = pNumTail; - - DCB_SkipSpace(ppTail); - return number; -} - -static -char DCB_ParseOldCharacter(const char ** ppTail, char cDefault) -{ - char character; - - DCB_SkipSpace(ppTail); - - if(**ppTail == 0 || **ppTail == ',') - return cDefault; - - character = **ppTail; - ++ *ppTail; - - DCB_SkipSpace(ppTail); - return character; -} - -static -const char * DCB_ParseOldString(const char ** ppTail, const char * pDefault, size_t * pLength) -{ - const char * string; - - DCB_SkipSpace(ppTail); - - if(**ppTail == 0 || **ppTail == ',') - return pDefault; - - string = *ppTail; - - *pLength = 0; - - while(**ppTail != 0 && **ppTail != ',' && !isspace(**ppTail)) - { - ++ *ppTail; - ++ *pLength; - } - - DCB_SkipSpace(ppTail); - return string; -} - -static -BOOL -DCB_ParseOldMode(const char * pTail, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - - unsigned long baudRate; - char parity; - unsigned long dataBits; - size_t stopBitsLength; - const char * stopBits; - char retry; - - /* Baud rate */ - baudRate = DCB_ParseOldNumber(&pTail, 0); - bRet = DCB_ParseOldSeparator(&pTail); - bRet = bRet && DCB_SetBaudRate(baudRate, lpDCB); - - if(!bRet) - return bRet; - - /* Parity */ - parity = DCB_ParseOldCharacter(&pTail, 'E'); - bRet = DCB_ParseOldSeparator(&pTail); - bRet = bRet && DCB_SetParity(parity, lpDCB); - - if(!bRet) - return bRet; - - /* Data bits */ - dataBits = DCB_ParseOldNumber(&pTail, 7); - bRet = DCB_ParseOldSeparator(&pTail); - bRet = bRet && DCB_SetDataBits(dataBits, lpDCB); - - if(!bRet) - return bRet; - - /* Stop bits */ - stopBitsLength = 1; - stopBits = DCB_ParseOldString(&pTail, baudRate == 110 ? "2" : "1", &stopBitsLength); - bRet = DCB_ParseOldSeparator(&pTail); - - if(!bRet) - return bRet; - - if(strncmp(stopBits, "1", stopBitsLength) == 0) - lpDCB->StopBits = 0; - else if(strncmp(stopBits, "1.5", stopBitsLength) == 0) - lpDCB->StopBits = 1; - else if(strncmp(stopBits, "2", stopBitsLength) == 0) - lpDCB->StopBits = 2; - else - return FALSE; - - /* Retry */ - retry = DCB_ParseOldCharacter(&pTail, 0); - bRet = *pTail == 0; - - if(!bRet) - return bRet; - - switch(retry) - { - case 0: - lpDCB->fInX = FALSE; - lpDCB->fOutX = FALSE; - lpDCB->fOutxCtsFlow = FALSE; - lpDCB->fOutxDsrFlow = FALSE; - lpDCB->fDtrControl = DTR_CONTROL_ENABLE; - lpDCB->fRtsControl = RTS_CONTROL_ENABLE; - break; - - case 'p': - case 'P': - lpDCB->fInX = FALSE; - lpDCB->fOutX = FALSE; - lpDCB->fOutxCtsFlow = TRUE; - lpDCB->fOutxDsrFlow = TRUE; - lpDCB->fDtrControl = DTR_CONTROL_HANDSHAKE; - lpDCB->fRtsControl = RTS_CONTROL_HANDSHAKE; - break; - - case 'x': - case 'X': - lpDCB->fInX = TRUE; - lpDCB->fOutX = TRUE; - lpDCB->fOutxCtsFlow = FALSE; - lpDCB->fOutxDsrFlow = FALSE; - lpDCB->fDtrControl = DTR_CONTROL_ENABLE; - lpDCB->fRtsControl = RTS_CONTROL_ENABLE; - break; - - default: - return FALSE; - } - - return bRet; -} - -static -BOOL DCB_ParseNewNumber(const char * pString, size_t cchString, unsigned long * pNumber) -{ - BOOL bRet; - char * pStringEnd; - unsigned long number; - - bRet = cchString > 0; - - if(!bRet) - return bRet; - - number = strtoul(pString, &pStringEnd, 10); - - bRet = pStringEnd - pString == cchString; - - if(!bRet) - return bRet; - - *pNumber = number; - return bRet; -} - -static -BOOL DCB_ParseNewBoolean(const char * pString, size_t cchString, BOOL * pBoolean) -{ - BOOL bRet; - - bRet = _strnicmp(pString, "on", cchString) == 0; - - if(bRet) - { - *pBoolean = bRet; - return bRet; - } - - bRet = _strnicmp(pString, "off", cchString) == 0; - - if(bRet) - { - *pBoolean = !bRet; - return bRet; - } - - return bRet; -} - -static -BOOL -DCB_ParseNewMode(const char * pTail, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - BOOL stopBitsSet = FALSE; - - lpDCB->StopBits = 0; - - while(*pTail) - { - const char * pArg; - size_t cchArg; - size_t cchArgName; - size_t cchArgValue; - const char * pArgName; - const char * pArgValue; - unsigned long nArgValue; - BOOL fArgValue; - - pArg = pTail; - cchArg = DCB_SkipNonSpace(&pTail); - DCB_SkipSpace(&pTail); - - for(cchArgName = 0; cchArgName < cchArg; ++ cchArgName) - { - if(pArg[cchArgName] == '=') - break; - } - - bRet = cchArgName < cchArg; - - if(!bRet) - return bRet; - - cchArgValue = cchArg - cchArgName - 1; - pArgName = pArg; - pArgValue = pArg + cchArgName + 1; - - if(_strnicmp(pArgName, "baud", cchArgName) == 0) - { - bRet = DCB_ParseNewNumber(pArgValue, cchArgValue, &nArgValue); - bRet = bRet && DCB_SetBaudRate(nArgValue, lpDCB); - - if(bRet) - { - if(lpDCB->BaudRate == 110 && !stopBitsSet) - lpDCB->StopBits = 2; - else - lpDCB->StopBits = 0; - } - } - else if(_strnicmp(pArgName, "parity", cchArgName) == 0) - { - bRet = cchArgValue == 1; - bRet = bRet && DCB_SetParity(pArgValue[0], lpDCB); - } - else if(_strnicmp(pArgName, "data", cchArgName) == 0) - { - bRet = DCB_ParseNewNumber(pArgValue, cchArgValue, &nArgValue); - bRet = bRet && DCB_SetDataBits(nArgValue, lpDCB); - } - else if(_strnicmp(pArgName, "stop", cchArgName) == 0) - { - stopBitsSet = TRUE; - - if(strncmp(pArgValue, "1", cchArgValue) == 0) - lpDCB->StopBits = 0; - else if(strncmp(pArgValue, "1.5", cchArgValue) == 0) - lpDCB->StopBits = 1; - else if(strncmp(pArgValue, "2", cchArgValue) == 0) - lpDCB->StopBits = 2; - else - bRet = FALSE; - } - else if(_strnicmp(pArgName, "to", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - if(lpCommTimeouts) - { - memset(lpCommTimeouts, 0, sizeof(*lpCommTimeouts)); - - if(fArgValue) - lpCommTimeouts->WriteTotalTimeoutConstant = 60000; - } - } - } - else if(_strnicmp(pArgName, "xon", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - lpDCB->fInX = !!fArgValue; - lpDCB->fOutX = !!fArgValue; - } - } - else if(_strnicmp(pArgName, "odsr", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - lpDCB->fOutxDsrFlow = !!fArgValue; - } - else if(_strnicmp(pArgName, "octs", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - lpDCB->fOutxCtsFlow = !!fArgValue; - } - else if(_strnicmp(pArgName, "dtr", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - if(fArgValue) - lpDCB->fDtrControl = DTR_CONTROL_ENABLE; - else - lpDCB->fDtrControl = DTR_CONTROL_DISABLE; - } - else - { - bRet = _strnicmp(pArgValue, "hs", cchArgValue) == 0; - - if(bRet) - lpDCB->fDtrControl = DTR_CONTROL_HANDSHAKE; - } - } - else if(_strnicmp(pArgName, "rts", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - if(fArgValue) - lpDCB->fRtsControl = RTS_CONTROL_ENABLE; - else - lpDCB->fRtsControl = RTS_CONTROL_DISABLE; - } - else - { - bRet = _strnicmp(pArgValue, "hs", cchArgValue) == 0; - - if(bRet) - lpDCB->fRtsControl = RTS_CONTROL_HANDSHAKE; - else - { - bRet = _strnicmp(pArgValue, "tg", cchArgValue) == 0; - - if(bRet) - lpDCB->fRtsControl = RTS_CONTROL_TOGGLE; - } - } - } - else if(_strnicmp(pArgName, "idsr", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - lpDCB->fDsrSensitivity = !!fArgValue; - } - else - bRet = FALSE; - - if(!bRet) - return bRet; - } - - return TRUE; -} - -static -BOOL -DCB_ValidPort(unsigned long nPort) -{ - BOOL bRet; - DWORD dwErr; - WCHAR szPort[3 + 10 + 1]; - - dwErr = GetLastError(); - - _snwprintf(szPort, sizeof(szPort) / sizeof(szPort[0]), L"COM%lu", nPort); - - bRet = QueryDosDeviceW(szPort, NULL, 0) == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER; - - if(!bRet) - dwErr = ERROR_INVALID_PARAMETER; - - SetLastError(dwErr); - return bRet; -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBAndTimeoutsA(LPCSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - LPCSTR pTail = lpDef; - DCB DCBCopy; - - if(_strnicmp(pTail, "COM", 3) == 0) - { - char * pNumTail; - unsigned long nPort; - - pTail += 3; - - if(!isdigit(*pTail)) - return FALSE; - - nPort = strtoul(pTail, &pNumTail, 10); - pTail = pNumTail; - - bRet = DCB_ValidPort(nPort); - - if(!bRet) - return bRet; - - DCB_SkipSpace(&pTail); - - if(*pTail == ':') - ++ pTail; - - DCB_SkipSpace(&pTail); - } - - DCBCopy = *lpDCB; - - if(isdigit(*pTail)) - bRet = DCB_ParseOldMode(pTail, &DCBCopy, lpCommTimeouts); - else - bRet = DCB_ParseNewMode(pTail, &DCBCopy, lpCommTimeouts); - - if(!bRet) - SetLastError(ERROR_INVALID_PARAMETER); - else - *lpDCB = DCBCopy; - - return bRet; -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBA(LPCSTR lpDef, LPDCB lpDCB) -{ - return DCB_BuildCommDCBAndTimeoutsA(lpDef, lpDCB, NULL); -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBAndTimeoutsW(LPCWSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - HANDLE hHeap; - BOOL bInvalidChars; - LPSTR pszAscii; - int cchAscii; - DWORD dwErr; - - dwErr = ERROR_INVALID_PARAMETER; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, NULL, 0, NULL, NULL); - - bRet = cchAscii > 0; - - if(bRet) - { - hHeap = GetProcessHeap(); - pszAscii = HeapAlloc(hHeap, 0, cchAscii); - - bRet = pszAscii != NULL; - - if(bRet) - { - bInvalidChars = FALSE; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); - - bRet = cchAscii > 0 && !bInvalidChars; - - if(bRet) - bRet = DCB_BuildCommDCBAndTimeoutsA(pszAscii, lpDCB, lpCommTimeouts); - - HeapFree(hHeap, 0, pszAscii); - } - else - dwErr = ERROR_OUTOFMEMORY; - } - - if(!bRet) - SetLastError(dwErr); - - return bRet; -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBW(LPCWSTR lpDef, LPDCB lpDCB) -{ - return DCB_BuildCommDCBAndTimeoutsW(lpDef, lpDCB, NULL); -} - -/* EOF */ -#endif Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Thu Jul 21 05:26:12 2011 @@ -80,7 +80,6 @@ <directory name="misc"> <file>actctx.c</file> <file>comm.c</file> - <file>commdcb.c</file> <file>lzexpand.c</file> <file>muldiv.c</file> <file>profile.c</file>

13 years, 2 months

[ion] 52754: [KERNEL32]: Winesync all there is to Winesync in ReactOS' kernel32. This mainly affects LZ*, Comm*, *ProfileString* (INI), and *Resource* APIs, however the changes in there are relativ...

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 21 05:24:59 2011 New Revision: 52754 URL: http://svn.reactos.org/svn/reactos?rev=52754&view=rev Log: [KERNEL32]: Winesync all there is to Winesync in ReactOS' kernel32. This mainly affects LZ*, Comm*, *ProfileString* (INI), and *Resource* APIs, however the changes in there are relatively minor. More substantial changes affect the locale/NLS/language functions, many which were bitrotting for 6+ years. In theory, this code is "better" than before, and it is closer to Wine (which arguably has better compatibility). It also resets things in sync with Wine however, and may lose and "fixes" ReactOS may have added over the years. But this is a good thing, since these fixes have been "lost" (they obviously never made it into Wine), and if regressions are now found due to this, actual upstream patches can be sent and picked up on the next sync. This avoids maintaining duplicate code, at the expenses of some potential short-term regressions in i18n. Finally, note that much of /string seems to be taken from Wine's Unicode library (which a host "unicode" already exists in ReactOS' tools/. It may be better (for someone with more experience as to these wine-isms) to simply just pull-in whatever winelib files are not currently present in ReactOS, and have kernel32 and tools/unicode use winelib, instead of having 2 or 3 copies of the code. Modified: trunk/reactos/dll/win32/kernel32/client/misc/comm.c trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c trunk/reactos/dll/win32/kernel32/client/misc/profile.c trunk/reactos/dll/win32/kernel32/client/misc/res.c trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c trunk/reactos/dll/win32/kernel32/winnls/string/chartype.c trunk/reactos/dll/win32/kernel32/winnls/string/collation.c trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/client/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/chartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/collation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/…

13 years, 2 months

← Newer
1
...
23
24
25
26
27
28
29
...
52
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 July 2011