Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[ion] 59882: [BASESRV]: Fix definition of NLS_USER_INFO so that it matches exactly that of Server 2003 (this now makes BASE_SERVER_STATIC_DATA correct too). [BASESRV]: Implement BaseSrvNlsGetUserInfo.

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 29 21:00:54 2013 New Revision: 59882 URL: http://svn.reactos.org/svn/reactos?rev=59882&view=rev Log: [BASESRV]: Fix definition of NLS_USER_INFO so that it matches exactly that of Server 2003 (this now makes BASE_SERVER_STATIC_DATA correct too). [BASESRV]: Implement BaseSrvNlsGetUserInfo. Modified: trunk/reactos/include/reactos/subsys/win/base.h trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/nls.c Modified: trunk/reactos/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/base.h [iso-8859-1] Thu Aug 29 21:00:54 2013 @@ -17,6 +17,7 @@ typedef struct _NLS_USER_INFO { + WCHAR sLanguage[80]; WCHAR iCountry[80]; WCHAR sCountry[80]; WCHAR sList[80]; @@ -29,7 +30,7 @@ WCHAR iLZero[80]; WCHAR iNegNumber[80]; WCHAR sNativeDigits[80]; - WCHAR iDigitSubstitution[80]; + WCHAR NumShape[80]; WCHAR sCurrency[80]; WCHAR sMonDecSep[80]; WCHAR sMonThouSep[80]; @@ -37,25 +38,29 @@ WCHAR iCurrDigits[80]; WCHAR iCurrency[80]; WCHAR iNegCurr[80]; - WCHAR sPosSign[80]; - WCHAR sNegSign[80]; + WCHAR sPositiveSign[80]; + WCHAR sNegativeSign[80]; WCHAR sTimeFormat[80]; + WCHAR sTime[80]; + WCHAR iTime[80]; + WCHAR iTLZero[80]; + WCHAR iTimePrefix[80]; WCHAR s1159[80]; WCHAR s2359[80]; WCHAR sShortDate[80]; + WCHAR sDate[80]; + WCHAR iDate[80]; WCHAR sYearMonth[80]; WCHAR sLongDate[80]; WCHAR iCalType[80]; - WCHAR iFirstDay[80]; - WCHAR iFirstWeek[80]; - WCHAR sLocale[80]; - WCHAR sLocaleName[85]; + WCHAR iFirstDayOfWeek[80]; + WCHAR iFirstWeekOfYear[80]; + WCHAR Locale[80]; LCID UserLocaleId; LUID InteractiveUserLuid; - CHAR InteractiveUserSid[68]; // SECURITY_MAX_SID_SIZE to make ROS happy ULONG ulCacheUpdateCount; } NLS_USER_INFO, *PNLS_USER_INFO; - +C_ASSERT(sizeof(NLS_USER_INFO) == 0x1870); typedef struct _BASE_STATIC_SERVER_DATA { @@ -82,6 +87,9 @@ BOOLEAN LUIDDeviceMapsEnabled; ULONG TermsrvClientTimeZoneChangeNum; } BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; +C_ASSERT(sizeof(BASE_STATIC_SERVER_DATA) == 0x1AC8); + +VOID WINAPI BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData); #endif // _BASE_H Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 21:00:54 2013 @@ -268,6 +268,12 @@ ULONG LocaleId; } BASE_NLS_CREATE_SECTION, *PBASE_NLS_CREATE_SECTION; +typedef struct +{ + PVOID /*PNLS_USER_INFO*/ NlsUserInfo; + ULONG Size; +} BASE_NLS_GET_USER_INFO, *PBASE_NLS_GET_USER_INFO; + typedef struct _BASE_API_MESSAGE { PORT_MESSAGE Header; @@ -297,6 +303,7 @@ BASE_REFRESH_INIFILE_MAPPING RefreshIniFileMappingRequest; BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest; BASE_NLS_CREATE_SECTION NlsCreateSection; + BASE_NLS_GET_USER_INFO NlsGetUserInfo; } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 21:00:54 2013 @@ -525,6 +525,9 @@ ASSERT(NT_SUCCESS(Status)); } + /* Initialize NLS */ + BaseSrvNLSInit(BaseStaticServerData); + /* Finally, set the pointer */ LoadedServerDll->SharedSection = BaseStaticServerData; } Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Thu Aug 29 21:00:54 2013 @@ -14,6 +14,9 @@ #include <debug.h> /* GLOBALS ********************************************************************/ + +RTL_CRITICAL_SECTION NlsCacheCriticalSection; +PNLS_USER_INFO pNlsRegUserInfo; BOOLEAN BaseSrvKernel32DelayLoadComplete; HANDLE BaseSrvKernel32DllHandle; @@ -102,6 +105,29 @@ return Status; } +VOID +WINAPI +BaseSrvNLSInit(IN PBASE_STATIC_SERVER_DATA StaticData) +{ + /* Initialize the lock */ + RtlInitializeCriticalSection(&NlsCacheCriticalSection); + + /* Initialize the data with all F's */ + pNlsRegUserInfo = &StaticData->NlsUserInfo; + RtlFillMemory(&StaticData->NlsUserInfo, 0xFF, sizeof(StaticData->NlsUserInfo)); + + /* Set empty LCID */ + pNlsRegUserInfo->UserLocaleId = 0; + + /* Reset the cache update counter */ + RtlEnterCriticalSection(&NlsCacheCriticalSection); + pNlsRegUserInfo->ulCacheUpdateCount = 0; + RtlLeaveCriticalSection(&NlsCacheCriticalSection); + + /* Get the LCID */ + NtQueryDefaultLocale(0, &pNlsRegUserInfo->UserLocaleId); +} + /* PUBLIC SERVER APIS *********************************************************/ CSR_API(BaseSrvNlsSetUserInfo) @@ -268,8 +294,32 @@ CSR_API(BaseSrvNlsGetUserInfo) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_NLS_GET_USER_INFO NlsMsg = &((PBASE_API_MESSAGE)ApiMessage)->Data.NlsGetUserInfo; + + /* Make sure the buffer is valid and of the right size */ + if ((CsrValidateMessageBuffer(ApiMessage, &NlsMsg->NlsUserInfo, NlsMsg->Size, TRUE)) && + (NlsMsg->Size == sizeof(NLS_USER_INFO))) + { + /* Acquire the lock to prevent updates while we copy */ + Status = RtlEnterCriticalSection(&NlsCacheCriticalSection); + if (NT_SUCCESS(Status)) + { + /* Do the copy now, then drop the lock */ + RtlCopyMemory(&NlsMsg->NlsUserInfo, pNlsRegUserInfo, NlsMsg->Size); + DPRINT1("NLS Data copy complete\n"); + RtlLeaveCriticalSection(&NlsCacheCriticalSection); + } + } + else + { + /* The data was invalid, bail out */ + DPRINT1("NLS: Size of info is invalid: %lx vs %lx\n", NlsMsg->Size, sizeof(NLS_USER_INFO)); + Status = STATUS_INVALID_PARAMETER; + } + + /* All done */ + return Status; } /* EOF */

11 years

[akhaldi] 59881: [KERNEL32] * Fix several print specifiers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Aug 29 20:37:02 2013 New Revision: 59881 URL: http://svn.reactos.org/svn/reactos?rev=59881&view=rev Log: [KERNEL32] * Fix several print specifiers. Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/dll/win32/kernel32/client/console/readwrite.c trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/file/copy.c trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/file/disk.c trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c trunk/reactos/dll/win32/kernel32/client/file/find.c trunk/reactos/dll/win32/kernel32/client/file/move.c trunk/reactos/dll/win32/kernel32/client/file/rw.c trunk/reactos/dll/win32/kernel32/client/file/volume.c trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/thread.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/baseheap.h trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -351,7 +351,7 @@ DWORD nFontCount, PCONSOLE_FONT_INFO lpConsoleFontInfo) { - DPRINT1("GetConsoleFontInfo(0x%x, %d, %d, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, nFontCount, lpConsoleFontInfo); + DPRINT1("GetConsoleFontInfo(0x%p, %d, %lu, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, nFontCount, lpConsoleFontInfo); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -366,7 +366,7 @@ DWORD nFont) { COORD Empty = {0, 0}; - DPRINT1("GetConsoleFontSize(0x%x, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, nFont); + DPRINT1("GetConsoleFontSize(0x%p, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, nFont); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return Empty; } @@ -385,7 +385,7 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETHWSTATE HardwareStateRequest = &ApiMessage.Data.HardwareStateRequest; - DPRINT1("GetConsoleHardwareState(%d, 0x%p) UNIMPLEMENTED!\n", Flags, State); + DPRINT1("GetConsoleHardwareState(%lu, 0x%p) UNIMPLEMENTED!\n", Flags, State); if (State == NULL) { @@ -430,7 +430,7 @@ BOOL bMaximumWindow, PCONSOLE_FONT_INFO lpConsoleCurrentFont) { - DPRINT1("GetCurrentConsoleFont(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFont); + DPRINT1("GetCurrentConsoleFont(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", hConsoleOutput, bMaximumWindow, lpConsoleCurrentFont); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -613,7 +613,7 @@ SetConsoleFont(HANDLE hConsoleOutput, DWORD nFont) { - DPRINT1("SetConsoleFont(0x%x, %d) UNIMPLEMENTED!\n", hConsoleOutput, nFont); + DPRINT1("SetConsoleFont(0x%p, %lu) UNIMPLEMENTED!\n", hConsoleOutput, nFont); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -632,7 +632,7 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETHWSTATE HardwareStateRequest = &ApiMessage.Data.HardwareStateRequest; - DPRINT1("SetConsoleHardwareState(%d, %d) UNIMPLEMENTED!\n", Flags, State); + DPRINT1("SetConsoleHardwareState(%lu, %lu) UNIMPLEMENTED!\n", Flags, State); HardwareStateRequest->OutputHandle = hConsoleOutput; HardwareStateRequest->State = State; @@ -677,7 +677,7 @@ SetConsoleMaximumWindowSize(HANDLE hConsoleOutput, COORD dwMaximumSize) { - DPRINT1("SetConsoleMaximumWindowSize(0x%x, {%d, %d}) does nothing\n", + DPRINT1("SetConsoleMaximumWindowSize(0x%p, {%d, %d}) does nothing\n", hConsoleOutput, dwMaximumSize.X, dwMaximumSize.Y); return TRUE; } @@ -1268,7 +1268,7 @@ WINAPI GetNumberOfConsoleMouseButtons(LPDWORD lpNumberOfMouseButtons) { - DPRINT1("GetNumberOfConsoleMouseButtons(0x%x) UNIMPLEMENTED!\n", lpNumberOfMouseButtons); + DPRINT1("GetNumberOfConsoleMouseButtons(0x%p) UNIMPLEMENTED!\n", lpNumberOfMouseButtons); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -179,7 +179,7 @@ ULONG ConnectInfoSize = sizeof(ConnectInfo); DPRINT("BasepInitConsole for : %wZ\n", &Parameters->ImagePathName); - DPRINT("Our current console handles are: %lx, %lx, %lx %lx\n", + DPRINT("Our current console handles are: %p, %p, %p %p\n", Parameters->ConsoleHandle, Parameters->StandardInput, Parameters->StandardOutput, Parameters->StandardError); @@ -240,7 +240,7 @@ { Parameters->ConsoleHandle = NULL; } - DPRINT("Using existing console: %x\n", Parameters->ConsoleHandle); + DPRINT("Using existing console: %p\n", Parameters->ConsoleHandle); } } @@ -309,7 +309,7 @@ InputWaitHandle = ConnectInfo.InputWaitHandle; - DPRINT("Console setup: %lx, %lx, %lx, %lx\n", + DPRINT("Console setup: %p, %p, %p, %p\n", Parameters->ConsoleHandle, Parameters->StandardInput, Parameters->StandardOutput, Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -275,7 +275,7 @@ } /* Return the read region */ - DPRINT("read region: %lx\n", ReadOutputRequest->ReadRegion); + DPRINT("read region: %p\n", ReadOutputRequest->ReadRegion); *lpReadRegion = ReadOutputRequest->ReadRegion; /* Release the capture buffer */ @@ -592,7 +592,7 @@ } /* Return the read region */ - DPRINT("read region: %lx\n", WriteOutputRequest->WriteRegion); + DPRINT("read region: %p\n", WriteOutputRequest->WriteRegion); *lpWriteRegion = WriteOutputRequest->WriteRegion; /* Release the capture buffer */ Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -92,7 +92,7 @@ ULONG DummySize = sizeof(Dummy); WCHAR SessionDir[256]; - DPRINT("DllMain(hInst %lx, dwReason %lu)\n", + DPRINT("DllMain(hInst %p, dwReason %lu)\n", hDll, dwReason); Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -149,7 +149,7 @@ } else { - TRACE("Error 0x%08x allocating buffer of %d bytes\n", errCode, RegionSize); + TRACE("Error 0x%08x allocating buffer of %lu bytes\n", errCode, RegionSize); } return errCode; @@ -293,7 +293,7 @@ } else { - WARN("Error %d during opening of dest file\n", GetLastError()); + WARN("Error %lu during opening of dest file\n", GetLastError()); } } } @@ -301,7 +301,7 @@ } else { - WARN("Error %d during opening of source file\n", GetLastError()); + WARN("Error %lu during opening of source file\n", GetLastError()); } return RC; 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 Aug 29 20:37:02 2013 @@ -394,7 +394,7 @@ PWCHAR FilePart; ULONG Len; - TRACE("OpenFile('%s', lpReOpenBuff %x, uStyle %x)\n", lpFileName, lpReOpenBuff, uStyle); + TRACE("OpenFile('%s', lpReOpenBuff %p, uStyle %x)\n", lpFileName, lpReOpenBuff, uStyle); if (lpReOpenBuff == NULL) { Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -416,7 +416,7 @@ return DRIVE_FIXED; } - ERR("Returning DRIVE_UNKNOWN for device type %d\n", FileFsDevice.DeviceType); + ERR("Returning DRIVE_UNKNOWN for device type %lu\n", FileFsDevice.DeviceType); return DRIVE_UNKNOWN; } Modified: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -210,7 +210,7 @@ IO_STATUS_BLOCK IoStatusBlock; LARGE_INTEGER Distance; - TRACE("SetFilePointer(hFile %x, lDistanceToMove %d, dwMoveMethod %d)\n", + TRACE("SetFilePointer(hFile %p, lDistanceToMove %d, dwMoveMethod %lu)\n", hFile,lDistanceToMove,dwMoveMethod); if(IsConsoleHandle(hFile)) Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -383,7 +383,7 @@ NTSTATUS Status = STATUS_SUCCESS; DIR_INFORMATION FoundFile = {NULL}; - TRACE("FindNextFileW(%lx, 0x%p)\n", hFindFile, lpFindFileData); + TRACE("FindNextFileW(%p, 0x%p)\n", hFindFile, lpFindFileData); if (hFindFile != FIND_DEVICE_HANDLE) { @@ -499,7 +499,7 @@ WINAPI FindClose(HANDLE hFindFile) { - TRACE("FindClose(hFindFile %x)\n", hFindFile); + TRACE("FindClose(hFindFile %p)\n", hFindFile); if (hFindFile == FIND_DEVICE_HANDLE) return TRUE; Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -91,7 +91,7 @@ WCHAR *p; NTSTATUS Status; - TRACE("add_boot_rename_entry( %S, %S, %d ) \n", source, dest, flags); + TRACE("add_boot_rename_entry( %S, %S, %lu ) \n", source, dest, flags); if(dest) DestLen = wcslen(dest); @@ -990,7 +990,7 @@ /* If there was an error, set the error code */ if(!Ret) { - TRACE("ReplaceFileW failed (error=%d)\n", Error); + TRACE("ReplaceFileW failed (error=%lu)\n", Error); SetLastError(Error); } return Ret; Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -29,7 +29,7 @@ { NTSTATUS Status; - TRACE("WriteFile(hFile %x)\n", hFile); + TRACE("WriteFile(hFile %p)\n", hFile); if (lpNumberOfBytesWritten != NULL) *lpNumberOfBytesWritten = 0; @@ -128,7 +128,7 @@ { NTSTATUS Status; - TRACE("ReadFile(hFile %x)\n", hFile); + TRACE("ReadFile(hFile %p)\n", hFile); if (lpNumberOfBytesRead != NULL) *lpNumberOfBytesRead = 0; if (!nNumberOfBytesToRead) return TRUE; Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -253,7 +253,7 @@ return FALSE; } - TRACE("hFile: %x\n", hFile); + TRACE("hFile: %p\n", hFile); errCode = NtQueryVolumeInformationFile(hFile, &IoStatusBlock, FileFsVolume, Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -1123,7 +1123,7 @@ IN PVOID Unknown3, IN PVOID Unknown4) { - DPRINT1("BaseQueryModuleData called: %s %s %x %x %x\n", + DPRINT1("BaseQueryModuleData called: %s %s %p %p %p\n", ModuleName, Unknown, Unknown2, Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -503,7 +503,7 @@ BASE_API_MESSAGE ApiMessage; PBASE_CREATE_THREAD CreateThreadRequest = &ApiMessage.Data.CreateThreadRequest; - DPRINT("BasepNotifyCsrOfThread: Thread: %lx, Handle %lx\n", + DPRINT("BasepNotifyCsrOfThread: Thread: %p, Handle %p\n", ClientId->UniqueThread, ThreadHandle); /* Fill out the request */ @@ -2891,7 +2891,7 @@ } /* Now use the path name, and the root path, to try opening the app */ - DPRINT1("Path: %wZ. Dir: %lx\n", &PathName, SxsWin32RelativePath.ContainingDirectory); + DPRINT1("Path: %wZ. Dir: %p\n", &PathName, SxsWin32RelativePath.ContainingDirectory); InitializeObjectAttributes(&LocalObjectAttributes, &PathName, OBJ_CASE_INSENSITIVE, @@ -3722,7 +3722,7 @@ if (!Result) { /* It was not, bail out */ - DPRINT1("Invalid subsystem version: %d.%d\n", + DPRINT1("Invalid subsystem version: %hu.%hu\n", ImageInformation.SubSystemMajorVersion, ImageInformation.SubSystemMinorVersion); SetLastError(ERROR_BAD_EXE_FORMAT); @@ -4657,8 +4657,8 @@ BOOL bRetVal; STARTUPINFOW StartupInfo; - DPRINT("dwCreationFlags %x, lpEnvironment %x, lpCurrentDirectory %x, " - "lpStartupInfo %x, lpProcessInformation %x\n", + DPRINT("dwCreationFlags %x, lpEnvironment %p, lpCurrentDirectory %p, " + "lpStartupInfo %p, lpProcessInformation %p\n", dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation); Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -175,8 +175,8 @@ ACTIVATION_CONTEXT_BASIC_INFORMATION ActCtxInfo; ULONG_PTR Cookie; ULONG ReturnLength; - DPRINT("CreateRemoteThread: hProcess: %ld dwStackSize: %ld lpStartAddress" - ": %p lpParameter: %lx, dwCreationFlags: %lx\n", hProcess, + DPRINT("CreateRemoteThread: hProcess: %p dwStackSize: %lu lpStartAddress" + ": %p lpParameter: %p, dwCreationFlags: %lx\n", hProcess, dwStackSize, lpStartAddress, lpParameter, dwCreationFlags); /* Clear the Context */ Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -340,7 +340,7 @@ Attributes, RootDirectory, SecurityDescriptor); - DPRINT("Attributes: %lx, RootDirectory: %lx, SecurityDescriptor: %p\n", + DPRINT("Attributes: %lx, RootDirectory: %p, SecurityDescriptor: %p\n", Attributes, RootDirectory, SecurityDescriptor); return ObjectAttributes; } @@ -361,7 +361,7 @@ BOOLEAN UseGuard; ULONG PageSize, Dummy, AllocationGranularity; SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, GuaranteedStackCommit; - DPRINT("BaseCreateStack (hProcess: %lx, Max: %lx, Current: %lx)\n", + DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", hProcess, StackReserve, StackCommit); /* Read page size */ @@ -709,7 +709,7 @@ NtClose(hFile); /* Return status */ - DPRINT("Section: %lx for file: %lx\n", *hSection, hFile); + DPRINT("Section: %p for file: %p\n", *hSection, hFile); return Status; } Modified: trunk/reactos/dll/win32/kernel32/include/baseheap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/baseheap.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/baseheap.h [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -48,7 +48,7 @@ BH_PRINT("[BASE_HEAP] %s : Allocated %p\n", \ __FUNCTION__, x) #define BASE_TRACE_PTR(x, y) \ - BH_PRINT("[BASE_HEAP] %s : Using handle: %lx for pointer: %p\n", \ + BH_PRINT("[BASE_HEAP] %s : Using handle: %p for pointer: %p\n", \ __FUNCTION__, x, y) #define BASE_TRACE_HANDLE(x, y) \ BH_PRINT("[BASE_HEAP] %s : Using handle: %lx for block: %p\n", \ 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 Aug 29 20:37:02 2013 @@ -2702,7 +2702,7 @@ NTSTATUS Status; int Ret; - swprintf(szPath, L"\\REGISTRY\\Machine\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Country List\\%d", Location); + swprintf(szPath, L"\\REGISTRY\\Machine\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Country List\\%lu", Location); hKey = NLS_RegOpenKey(0, szPath); if (!hKey) Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Thu Aug 29 20:37:02 2013 @@ -1713,7 +1713,7 @@ } } - DPRINT1("Could not get codepage name. dwResId = %ld\n", dwResId); + DPRINT1("Could not get codepage name. dwResId = %lu\n", dwResId); return FALSE; }

11 years

[ion] 59880: [KERNEL32]: Passing flag 0 to QueryActCtx is valid, don't fail.

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 29 20:14:43 2013 New Revision: 59880 URL: http://svn.reactos.org/svn/reactos?rev=59880&view=rev Log: [KERNEL32]: Passing flag 0 to QueryActCtx is valid, don't fail. Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Thu Aug 29 20:14:43 2013 @@ -385,6 +385,8 @@ break; case QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS: NativeFlags = RTL_QUERY_ACTIVATION_CONTEXT_FLAG_IS_ADDRESS; + break; + case 0: break; /* More than one flag is set... */

11 years

[ion] 59879: [BASESRV]: The last few APIs were off-by-one due to an unimplmented (in Windows) or deprecated api.c [BASESRV]: Implement BaseSrvNlsCreateSection, which is needed by Windows kernel32.d...

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 29 20:13:31 2013 New Revision: 59879 URL: http://svn.reactos.org/svn/reactos?rev=59879&view=rev Log: [BASESRV]: The last few APIs were off-by-one due to an unimplmented (in Windows) or deprecated api.c [BASESRV]: Implement BaseSrvNlsCreateSection, which is needed by Windows kernel32.dll. Also implement the delay-loading functionality it needs. Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/nls.c trunk/reactos/subsystems/win32/csrsrv/api.c Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -46,6 +46,7 @@ BasepNlsUpdateCacheCount, BasepSetTermsrvClientTimeZone, BasepSxsCreateActivationContext, + BasepUnknown, BasepRegisterThread, BasepNlsGetUserInfo, BasepMaxApiNumber @@ -260,6 +261,13 @@ UNICODE_STRING TargetPath; } BASE_DEFINE_DOS_DEVICE, *PBASE_DEFINE_DOS_DEVICE; +typedef struct +{ + HANDLE SectionHandle; + ULONG Type; + ULONG LocaleId; +} BASE_NLS_CREATE_SECTION, *PBASE_NLS_CREATE_SECTION; + typedef struct _BASE_API_MESSAGE { PORT_MESSAGE Header; @@ -288,6 +296,7 @@ BASE_SOUND_SENTRY SoundSentryRequest; BASE_REFRESH_INIFILE_MAPPING RefreshIniFileMappingRequest; BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest; + BASE_NLS_CREATE_SECTION NlsCreateSection; } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -24,6 +24,32 @@ #include <win/basemsg.h> #include <win/base.h> +typedef struct _BASESRV_KERNEL_IMPORTS +{ + PCHAR FunctionName; + PVOID* FunctionPointer; +} BASESRV_KERNEL_IMPORTS, *PBASESRV_KERNEL_IMPORTS; + +/* FIXME: BASENLS.H */ +typedef NTSTATUS(*WINAPI POPEN_DATA_FILE) (HANDLE hFile, + PWCHAR FileName + ); + +typedef BOOL(*WINAPI PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, + LPWSTR FileName, + ULONG FileNameSize + ); + +typedef BOOL(*WINAPI PGET_NLS_SECTION_NAME)(UINT CodePage, + UINT Base, + ULONG Unknown, + LPSTR BaseName, + LPSTR Result, + ULONG ResultSize + ); + +typedef BOOL(*WINAPI PVALIDATE_LOCALE)(IN ULONG LocaleId); +typedef NTSTATUS(*WINAPI PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, IN ULONG BufferSize, IN ULONG AceType); /* Globals */ extern HANDLE BaseSrvHeap; Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -17,6 +17,7 @@ /* GLOBALS ********************************************************************/ HANDLE BaseSrvDllInstance = NULL; +extern UNICODE_STRING BaseSrvKernel32DllPath; /* Memory */ HANDLE BaseSrvHeap = NULL; // Our own heap. @@ -54,6 +55,7 @@ BaseSrvNlsUpdateCacheCount, BaseSrvSetTermsrvClientTimeZone, BaseSrvSxsCreateActivationContext, + BaseSrvDebugProcess, BaseSrvRegisterThread, BaseSrvNlsGetUserInfo, }; @@ -84,12 +86,13 @@ TRUE, // BaseSrvSoundSentryNotification TRUE, // BaseSrvRefreshIniFileMapping TRUE, // BaseSrvDefineDosDevice - FALSE, // BaseSrvSetTermsrvAppInstallMode - FALSE, // BaseSrvNlsUpdateCacheCount - FALSE, // BaseSrvSetTermsrvClientTimeZone - FALSE, // BaseSrvSxsCreateActivationContext - FALSE, // BaseSrvRegisterThread - FALSE, // BaseSrvNlsGetUserInfo + TRUE, // BaseSrvSetTermsrvAppInstallMode + TRUE, // BaseSrvNlsUpdateCacheCount + TRUE, // BaseSrvSetTermsrvClientTimeZone + TRUE, // BaseSrvSxsCreateActivationContext + TRUE, // BasepDebugProcess + TRUE, // BaseSrvRegisterThread + TRUE, // BaseSrvNlsGetUserInfo }; PCHAR BaseServerApiNameTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = @@ -311,6 +314,12 @@ SystemRootString.Buffer); ASSERT(NT_SUCCESS(Status)); + /* Create the kernel32 path */ + wcscat(SystemRootString.Buffer, L"\\kernel32.dll"); + Status = RtlCreateUnicodeString(&BaseSrvKernel32DllPath, + SystemRootString.Buffer); + ASSERT(NT_SUCCESS(Status)); + /* FIXME: Check Session ID */ wcscpy(Buffer, L"\\BaseNamedObjects"); RtlInitUnicodeString(&BnoString, Buffer); Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -13,6 +13,95 @@ #define NDEBUG #include <debug.h> +/* GLOBALS ********************************************************************/ + +BOOLEAN BaseSrvKernel32DelayLoadComplete; +HANDLE BaseSrvKernel32DllHandle; +UNICODE_STRING BaseSrvKernel32DllPath; + +POPEN_DATA_FILE pOpenDataFile; +PVOID /*PGET_DEFAULT_SORTKEY_SIZE */ pGetDefaultSortkeySize; +PVOID /*PGET_LINGUIST_LANG_SIZE*/ pGetLinguistLangSize; +PVOID /*PNLS_CONVERT_INTEGER_TO_STRING*/ pNlsConvertIntegerToString; +PVOID /*PVALIDATE_LCTYPE*/ pValidateLCType; +PVALIDATE_LOCALE pValidateLocale; +PGET_NLS_SECTION_NAME pGetNlsSectionName; +PVOID /*PGET_USER_DEFAULT_LANGID*/ pGetUserDefaultLangID; +PGET_CP_FILE_NAME_FROM_REGISTRY pGetCPFileNameFromRegistry; +PCREATE_NLS_SECURTY_DESCRIPTOR pCreateNlsSecurityDescriptor; + +BASESRV_KERNEL_IMPORTS BaseSrvKernel32Imports[10] = +{ + { "OpenDataFile", (PVOID*) &pOpenDataFile }, + { "GetDefaultSortkeySize", (PVOID*) &pGetDefaultSortkeySize }, + { "GetLinguistLangSize", (PVOID*) &pGetLinguistLangSize }, + { "NlsConvertIntegerToString", (PVOID*) &pNlsConvertIntegerToString }, + { "ValidateLCType", (PVOID*) &pValidateLCType }, + { "ValidateLocale", (PVOID*) &pValidateLocale }, + { "GetNlsSectionName", (PVOID*) &pGetNlsSectionName }, + { "GetUserDefaultLangID", (PVOID*) &pGetUserDefaultLangID }, + { "GetCPFileNameFromRegistry", (PVOID*) &pGetCPFileNameFromRegistry }, + { "CreateNlsSecurityDescriptor", (PVOID*) &pCreateNlsSecurityDescriptor }, +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +BaseSrvDelayLoadKernel32(VOID) +{ + NTSTATUS Status; + ULONG i; + ANSI_STRING ProcedureName; + + /* Only do this once */ + if (BaseSrvKernel32DelayLoadComplete) return STATUS_SUCCESS; + + /* Loop all imports */ + for (i = 0; i < RTL_NUMBER_OF(BaseSrvKernel32Imports); i++) + { + /* Only look them up once */ + if (!*BaseSrvKernel32Imports[i].FunctionPointer) + { + /* If we haven't loaded the DLL yet, do it now */ + if (!BaseSrvKernel32DllHandle) + { + Status = LdrLoadDll(0, + 0, + &BaseSrvKernel32DllPath, + &BaseSrvKernel32DllHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to load %wZ\n", &BaseSrvKernel32DllPath); + return Status; + } + } + + /* Get the address of the routine being looked up*/ + RtlInitAnsiString(&ProcedureName, BaseSrvKernel32Imports[i].FunctionName); + Status = LdrGetProcedureAddress(BaseSrvKernel32DllHandle, + &ProcedureName, + 0, + BaseSrvKernel32Imports[i].FunctionPointer); + DPRINT1("NLS: Found %Z at 0x%p\n", + &ProcedureName, + BaseSrvKernel32Imports[i].FunctionPointer); + if (!NT_SUCCESS(Status)) break; + } + } + + /* Did we find them all? */ + if (i == RTL_NUMBER_OF(BaseSrvKernel32Imports)) + { + /* Excellent */ + BaseSrvKernel32DelayLoadComplete = TRUE; + return STATUS_SUCCESS; + } + + /* Nope, fail */ + return Status; +} + /* PUBLIC SERVER APIS *********************************************************/ CSR_API(BaseSrvNlsSetUserInfo) @@ -28,10 +117,147 @@ } CSR_API(BaseSrvNlsCreateSection) - -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; +{ + NTSTATUS Status; + HANDLE SectionHandle, ProcessHandle, FileHandle; + ULONG LocaleId; + UNICODE_STRING NlsSectionName; + PWCHAR NlsFileName; + UCHAR SecurityDescriptor[52]; + OBJECT_ATTRIBUTES ObjectAttributes; + PBASE_NLS_CREATE_SECTION NlsMsg = &((PBASE_API_MESSAGE)ApiMessage)->Data.NlsCreateSection; + + /* Load kernel32 first and import the NLS routines */ + Status = BaseSrvDelayLoadKernel32(); + if (!NT_SUCCESS(Status)) return Status; + + /* Assume failure */ + NlsMsg->SectionHandle = NULL; + + /* Check and validate the locale ID, if one is present */ + LocaleId = NlsMsg->LocaleId; + DPRINT1("NLS: Create Section with LCID: %lx for Type: %d\n", LocaleId, NlsMsg->Type); + if (LocaleId) + { + if (!pValidateLocale(LocaleId)) return STATUS_INVALID_PARAMETER; + } + + /* Check which NLS section is being created */ + switch (NlsMsg->Type) + { + /* For each one, set the correct filename and object name */ + case 1: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionUnicode"); + NlsFileName = L"unicode.nls"; + break; + case 2: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionLocale"); + NlsFileName = L"locale.nls"; + break; + case 3: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionCType"); + NlsFileName = L"ctype.nls"; + break; + case 4: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionSortkey"); + NlsFileName = L"sortkey.nls"; + break; + case 5: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionSortTbls"); + NlsFileName = L"sorttbls.nls"; + break; + case 6: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionCP437"); + NlsFileName = L"c_437.nls"; + break; + case 7: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionCP1252"); + NlsFileName = L"c_1252.nls"; + break; + case 8: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionLANG_EXCEPT"); + NlsFileName = L"l_except.nls"; + break; + case 9: + DPRINT1("This type not yet supported\n"); + return STATUS_NOT_IMPLEMENTED; + case 10: + DPRINT1("This type not yet supported\n"); + return STATUS_NOT_IMPLEMENTED; + case 11: + DPRINT1("This type not yet supported\n"); + return STATUS_NOT_IMPLEMENTED; + case 12: + RtlInitUnicodeString(&NlsSectionName, L"\\NLS\\NlsSectionGeo"); + NlsFileName = L"geo.nls"; + break; + default: + DPRINT1("NLS: Invalid NLS type!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Open the specified NLS file */ + Status = pOpenDataFile(&FileHandle, NlsFileName); + if (Status != STATUS_SUCCESS) + { + DPRINT1("NLS: Failed to open file: %lx\n", Status); + return Status; + } + + /* Create an SD for the section object */ + Status = pCreateNlsSecurityDescriptor(&SecurityDescriptor, + sizeof(SecurityDescriptor), + 0x80000000); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NLS: CreateNlsSecurityDescriptor FAILED!: %lx\n", Status); + NtClose(FileHandle); + return Status; + } + + /* Create the section object proper */ + InitializeObjectAttributes(&ObjectAttributes, + &NlsSectionName, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT | OBJ_OPENIF, + NULL, + &SecurityDescriptor); + Status = NtCreateSection(&SectionHandle, + SECTION_MAP_READ, + &ObjectAttributes, + 0, + PAGE_READONLY, + SEC_COMMIT, + FileHandle); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NLS: Failed to create section! %lx\n", Status); + return Status; + } + + /* Open a handle to the calling process */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&ProcessHandle, + PROCESS_DUP_HANDLE, + &ObjectAttributes, + &ApiMessage->Header.ClientId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NLS: Failed to open process! %lx\n", Status); + NtClose(SectionHandle); + return Status; + } + + /* Duplicate the handle to the section object into it */ + Status = NtDuplicateObject(NtCurrentProcess(), + SectionHandle, + ProcessHandle, + &NlsMsg->SectionHandle, + 0, + 0, + 3); + NtClose(ProcessHandle); + return Status; } CSR_API(BaseSrvNlsUpdateCacheCount) Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Aug 29 20:13:31 2013 @@ -76,11 +76,13 @@ ((ServerDll->ValidTable) && !(ServerDll->ValidTable[ApiId]))) { /* We are beyond the Maximum API ID, or it doesn't exist */ + DPRINT1("API: %d\n", ApiId); DPRINT1("CSRSS: %lx (%s) is invalid ApiTableIndex for %Z or is an " "invalid API to call from the server.\n", - ServerDll->ValidTable[ApiId], + ApiId, ((ServerDll->NameTable) && (ServerDll->NameTable[ApiId])) ? - ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", &ServerDll->Name); + ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", + &ServerDll->Name); // DbgBreakPoint(); ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION;

11 years

[ion] 59878: [NLS]. Add NLS files.

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 29 19:07:10 2013 New Revision: 59878 URL: http://svn.reactos.org/svn/reactos?rev=59878&view=rev Log: [NLS]. Add NLS files. Added: trunk/reactos/media/nls/ctype.nls (with props) trunk/reactos/media/nls/geo.nls (with props) trunk/reactos/media/nls/l_except.nls (with props) trunk/reactos/media/nls/locale.nls (with props) trunk/reactos/media/nls/sortkey.nls (with props) trunk/reactos/media/nls/sorttbls.nls (with props) trunk/reactos/media/nls/unicode.nls (with props) Modified: trunk/reactos/media/nls/CMakeLists.txt Modified: trunk/reactos/media/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/nls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/nls/CMakeLists.txt [iso-8859-1] Thu Aug 29 19:07:10 2013 @@ -60,6 +60,13 @@ c_28604.nls c_28605.nls c_28606.nls + unicode.nls + geo.nls + sorttbls.nls + locale.nls + sortkey.nls + ctype.nls + l_except.nls ) Added: trunk/reactos/media/nls/ctype.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/ctype.nls?rev=59… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/ctype.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/geo.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/geo.nls?rev=59878 ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/geo.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/l_except.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/l_except.nls?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/l_except.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/locale.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/locale.nls?rev=5… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/locale.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/sortkey.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/sortkey.nls?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/sortkey.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/sorttbls.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/sorttbls.nls?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/sorttbls.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/nls/unicode.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/unicode.nls?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/unicode.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

11 years

[hbelusca] 59877: Formatting fix only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 29 18:13:24 2013 New Revision: 59877 URL: http://svn.reactos.org/svn/reactos?rev=59877&view=rev Log: Formatting fix only. Modified: trunk/reactos/subsystems/win/basesrv/init.c Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Thu Aug 29 18:13:24 2013 @@ -123,7 +123,7 @@ "BaseSetTermsrvClientTimeZone", "BaseSxsCreateActivationContext", "BaseRegisterThread", - "BaseNlsGetUserInfo", + "BaseNlsGetUserInfo", };

11 years

[aandrejevic] 59876: [SOFT386] Implement the CLC, STC, CLI, STI, CLD and STD instructions.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Aug 29 17:48:32 2013 New Revision: 59876 URL: http://svn.reactos.org/svn/reactos?rev=59876&view=rev Log: [SOFT386] Implement the CLC, STC, CLI, STI, CLD and STD instructions. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 29 17:48:32 2013 @@ -272,12 +272,12 @@ NULL, // TODO: OPCODE 0xF5 NOT SUPPORTED NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED - NULL, // TODO: OPCODE 0xF8 NOT SUPPORTED - NULL, // TODO: OPCODE 0xF9 NOT SUPPORTED - NULL, // TODO: OPCODE 0xFA NOT SUPPORTED - NULL, // TODO: OPCODE 0xFB NOT SUPPORTED - NULL, // TODO: OPCODE 0xFC NOT SUPPORTED - NULL, // TODO: OPCODE 0xFD NOT SUPPORTED + Soft386OpcodeClearCarry, + Soft386OpcodeSetCarry, + Soft386OpcodeClearInt, + Soft386OpcodeSetInt, + Soft386OpcodeClearDir, + Soft386OpcodeSetDir, NULL, // TODO: OPCODE 0xFE NOT SUPPORTED NULL, // TODO: OPCODE 0xFF NOT SUPPORTED }; @@ -740,3 +740,117 @@ /* Return success */ return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeClearCarry(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF8); + + /* Clear CF and return success */ + State->Flags.Cf = FALSE; + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeSetCarry(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xF9); + + /* Set CF and return success*/ + State->Flags.Cf = TRUE; + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeClearInt(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFA); + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + /* Check IOPL */ + if (State->Flags.Iopl >= State->SegmentRegs[SOFT386_REG_CS].Dpl) + { + /* Clear the interrupt flag */ + State->Flags.If = FALSE; + } + else + { + /* General Protection Fault */ + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + } + else + { + /* Just clear the interrupt flag */ + State->Flags.If = FALSE; + } + + /* Return success */ + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeSetInt(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFB); + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + /* Check IOPL */ + if (State->Flags.Iopl >= State->SegmentRegs[SOFT386_REG_CS].Dpl) + { + /* Set the interrupt flag */ + State->Flags.If = TRUE; + } + else + { + /* General Protection Fault */ + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + } + else + { + /* Just set the interrupt flag */ + State->Flags.If = TRUE; + } + + /* Return success */ + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeClearDir(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFC); + + /* Clear DF and return success */ + State->Flags.Df = FALSE; + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeSetDir(PSOFT386_STATE State, UCHAR Opcode) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xFD); + + /* Set DF and return success*/ + State->Flags.Df = TRUE; + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Aug 29 17:48:32 2013 @@ -87,4 +87,52 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeClearCarry +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeSetCarry +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeClearInt +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeSetInt +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeClearDir +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeSetDir +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

11 years

[ion] 59875: moar failz

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 29 17:46:26 2013 New Revision: 59875 URL: http://svn.reactos.org/svn/reactos?rev=59875&view=rev Log: moar failz Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Thu Aug 29 17:46:26 2013 @@ -392,6 +392,7 @@ /* Bail out */ DPRINT1("SXS: %s(dwFlags=0x%lx) more than one flag in 0x%lx was passed\n", __FUNCTION__, + dwFlags, 0x1C); BaseSetLastNTError(STATUS_INVALID_PARAMETER_1); return FALSE;

11 years

[ion] 59874: fix a dprint

by ion＠svn.reactos.org

Author: ion Date: Thu Aug 29 17:44:34 2013 New Revision: 59874 URL: http://svn.reactos.org/svn/reactos?rev=59874&view=rev Log: fix a dprint Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Thu Aug 29 17:44:34 2013 @@ -390,7 +390,9 @@ /* More than one flag is set... */ default: /* Bail out */ - DPRINT1("SXS: %s(dwFlags=0x%lx) more than one flag in 0x%lx was passed\n", 0x1C); + DPRINT1("SXS: %s(dwFlags=0x%lx) more than one flag in 0x%lx was passed\n", + __FUNCTION__, + 0x1C); BaseSetLastNTError(STATUS_INVALID_PARAMETER_1); return FALSE; }

11 years

[hbelusca] 59873: Fix variable naming.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 29 17:40:21 2013 New Revision: 59873 URL: http://svn.reactos.org/svn/reactos?rev=59873&view=rev Log: Fix variable naming. Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Aug 29 17:40:21 2013 @@ -130,7 +130,7 @@ ULONG CodePage; ULONG dwCreationFlags; PCHAR CmdLine; - PCHAR appName; + PCHAR AppName; PCHAR PifFile; PCHAR CurDirectory; PCHAR Env;

11 years

← Newer
1
2
3
4
5
6
7
8
9
...
33
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 2013