Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[weiden] 30429: Make opengl initialization thread-safe

by weiden＠svn.reactos.org

Author: weiden Date: Wed Nov 14 02:30:17 2007 New Revision: 30429 URL: http://svn.reactos.org/svn/reactos?rev=30429&view=rev Log: Make opengl initialization thread-safe Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/wingl… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/wingl.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/wingl.c Wed Nov 14 02:30:17 2007 @@ -46,46 +46,61 @@ */ HINSTANCE hOpenGL = NULL; +static BOOL OpenGLInitFunction(PCSTR name, + FARPROC *funcptr) +{ + PVOID func; + + func = (PVOID)GetProcAddress(hOpenGL, name); + if (func != NULL) + { + (void)InterlockedCompareExchangePointer((PVOID*)funcptr, + func, + NULL); + return TRUE; + } + + return FALSE; +} + static BOOL OpenGLEnable(void) { - if(hOpenGL == NULL) - { - hOpenGL = LoadLibraryA("OPENGL32.DLL"); - if(hOpenGL == NULL) - return(FALSE); - } - - if(glChoosePixelFormat == NULL) { - glChoosePixelFormat = (CHOOSEPIXELFMT)GetProcAddress(hOpenGL, "wglChoosePixelFormat"); - if(glChoosePixelFormat == NULL) - return(FALSE); - } - - if(glSetPixelFormat == NULL) { - glSetPixelFormat = (SETPIXELFMT)GetProcAddress(hOpenGL, "wglSetPixelFormat"); - if(glSetPixelFormat == NULL) - return(FALSE); - } - - if(glSwapBuffers == NULL) { - glSwapBuffers = (SWAPBUFFERS)GetProcAddress(hOpenGL, "wglSwapBuffers"); - if(glSwapBuffers == NULL) - return(FALSE); - } - - if(glDescribePixelFormat == NULL) { - glDescribePixelFormat = (DESCRIBEPIXELFMT)GetProcAddress(hOpenGL, "wglDescribePixelFormat"); - if(glDescribePixelFormat == NULL) - return(FALSE); - } - - if(glGetPixelFormat == NULL) { - glGetPixelFormat = (GETPIXELFMT)GetProcAddress(hOpenGL, "wglGetPixelFormat"); - if(glGetPixelFormat == NULL) - return(FALSE); - } - - return(TRUE); /* OpenGL is initialized and enabled*/ + HMODULE hModOpengl32; + BOOL Ret = TRUE; + + hModOpengl32 = LoadLibraryW(L"OPENGL32.DLL"); + if (hModOpengl32 == NULL) + return FALSE; + + if (InterlockedCompareExchangePointer((PVOID*)&hOpenGL, + (PVOID)hModOpengl32, + NULL) != NULL) + { + FreeLibrary(hModOpengl32); + + /* NOTE: Even though another thread was faster loading the + library we can't just bail out here. We really need + to *try* to locate every function. This is slow but + thread-safe */ + } + + + if (!OpenGLInitFunction("wglChoosePixelFormat", &glChoosePixelFormat)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglSetPixelFormat", &glSetPixelFormat)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglSwapBuffers", &glSwapBuffers)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglDescribePixelFormat", &glDescribePixelFormat)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglGetPixelFormat", &glGetPixelFormat)) + Ret = FALSE; + + return Ret; }

16 years, 10 months

[weiden] 30428: Fix freeing lists on process detach

by weiden＠svn.reactos.org

Author: weiden Date: Wed Nov 14 01:59:49 2007 New Revision: 30428 URL: http://svn.reactos.org/svn/reactos?rev=30428&view=rev Log: Fix freeing lists on process detach Modified: trunk/reactos/dll/win32/opengl32/opengl32.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c Wed Nov 14 01:59:49 2007 @@ -155,27 +155,27 @@ { dcdata2 = dcdata; dcdata = dcdata->next; - if (!HeapFree( GetProcessHeap(), 0, dcdata )) + if (!HeapFree( GetProcessHeap(), 0, dcdata2 )) DBGPRINT( "Warning: HeapFree() on DCDATA 0x%08x failed (%d)", - dcdata, GetLastError() ); + dcdata2, GetLastError() ); } for (glrc = OPENGL32_processdata.glrc_list; glrc != NULL;) { glrc2 = glrc; glrc = glrc->next; - if (!HeapFree( GetProcessHeap(), 0, glrc )) + if (!HeapFree( GetProcessHeap(), 0, glrc2 )) DBGPRINT( "Warning: HeapFree() on GLRC 0x%08x failed (%d)", - glrc, GetLastError() ); + glrc2, GetLastError() ); } for (icd = OPENGL32_processdata.driver_list; icd != NULL;) { icd2 = icd; icd = icd->next; - if (!HeapFree( GetProcessHeap(), 0, icd )) + if (!HeapFree( GetProcessHeap(), 0, icd2 )) DBGPRINT( "Warning: HeapFree() on DRIVERDATA 0x%08x failed (%d)", - icd, GetLastError() ); + icd2, GetLastError() ); } /* free mutexes */

16 years, 10 months

[greatlrd] 30427: Bugfix : Do not assume unini value ( OPENGL32_tls ) are set to -1 (0xFFFFFFFF), do not assume DWORD always will be 32bits convert all 0xFFFFFFFF value for OPENGL32_tls to -1

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Nov 13 22:32:36 2007 New Revision: 30427 URL: http://svn.reactos.org/svn/reactos?rev=30427&view=rev Log: Bugfix : Do not assume unini value ( OPENGL32_tls ) are set to -1 (0xFFFFFFFF), do not assume DWORD always will be 32bits convert all 0xFFFFFFFF value for OPENGL32_tls to -1 Modified: trunk/reactos/dll/win32/opengl32/opengl32.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c Tue Nov 13 22:32:36 2007 @@ -29,7 +29,8 @@ /* global vars */ -DWORD OPENGL32_tls; +/* Do not assume it have the free value -1 set, any value can be in here */ +DWORD OPENGL32_tls = -1; GLPROCESSDATA OPENGL32_processdata; @@ -110,7 +111,7 @@ TRUE /* bInheritHandle */ }; OPENGL32_tls = TlsAlloc(); - if (0xFFFFFFFF == OPENGL32_tls) + if (-1 == OPENGL32_tls) return FALSE; memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) ); @@ -186,7 +187,7 @@ CloseHandle( OPENGL32_processdata.dcdata_mutex ); /* free TLS */ - if (OPENGL32_tls != 0xffffffff) + if (OPENGL32_tls != -1) TlsFree(OPENGL32_tls); }

16 years, 10 months

[janderwald] 30426: - call CDefFolderMenu_Create2 to create the context menus - should ignore cidl account as the implementation should handle this automatically - will be enabled for the background context menus later

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Nov 13 22:30:27 2007 New Revision: 30426 URL: http://svn.reactos.org/svn/reactos?rev=30426&view=rev Log: - call CDefFolderMenu_Create2 to create the context menus - should ignore cidl account as the implementation should handle this automatically - will be enabled for the background context menus later Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shfldr_fs.c trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanelfolder.c (original) +++ trunk/reactos/dll/win32/shell32/cpanelfolder.c Tue Nov 13 22:30:27 2007 @@ -611,8 +611,7 @@ *ppvOut = NULL; if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) { - pObj = (LPUNKNOWN) ISvItemCm_Constructor((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; + hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj); } else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl, cidl); hr = S_OK; Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c Tue Nov 13 22:30:27 2007 @@ -487,11 +487,7 @@ if (IsEqualIID (riid, &IID_IContextMenu)) { - if (cidl > 0) - pObj = (LPUNKNOWN) ISvItemCm_Constructor( (IShellFolder *) iface, This->pidlRoot, apidl, cidl); - else - pObj = (LPUNKNOWN) ISvBgCm_Constructor( (IShellFolder *) iface, TRUE); - hr = S_OK; + hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fs.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fs.c Tue Nov 13 22:30:27 2007 @@ -652,9 +652,7 @@ *ppvOut = NULL; if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, - This->pidlRoot, apidl, cidl); - hr = S_OK; + hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Tue Nov 13 22:30:27 2007 @@ -519,9 +519,7 @@ if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, - This->pidlRoot, apidl, cidl); - hr = S_OK; + hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) {

16 years, 10 months

[cwittich] 30425: don't delete the CriticalSection twice when FindClose is called twice - fixes a crash in Photoshop CS installer

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Nov 13 19:50:44 2007 New Revision: 30425 URL: http://svn.reactos.org/svn/reactos?rev=30425&view=rev Log: don't delete the CriticalSection twice when FindClose is called twice - fixes a crash in Photoshop CS installer Modified: trunk/reactos/dll/win32/kernel32/file/find.c Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c Tue Nov 13 19:50:44 2007 @@ -618,6 +618,7 @@ CloseHandle (IData->DirectoryHandle); if (IData->LockInitialized) RtlDeleteCriticalSection(&IData->Lock); + IData->LockInitialized = FALSE; break; }

16 years, 10 months

[fireball] 30424: - Make file lock and unlock operations succeed without doing actual locking (enough to make some apps work even if they don't have proper locking). DPRINT1s are inserted, so that this is not going to be forgotten.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 13 18:45:33 2007 New Revision: 30424 URL: http://svn.reactos.org/svn/reactos?rev=30424&view=rev Log: - Make file lock and unlock operations succeed without doing actual locking (enough to make some apps work even if they don't have proper locking). DPRINT1s are inserted, so that this is not going to be forgotten. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c Tue Nov 13 18:45:33 2007 @@ -77,8 +77,34 @@ IN PVOID Context OPTIONAL, IN BOOLEAN AlreadySynchronized) { - KEBUGCHECK(0); - return FALSE; + NTSTATUS Status; + + DPRINT1("FsRtlPrivateLock() is stubplemented!\n"); + + /* Initialize the lock, if necessary */ + if (!FileLock->LockInformation) + { + DPRINT("LockInformation is uninitialized!\n"); + } + + /* Assume all is cool, and lock is set */ + IoStatus->Status = STATUS_SUCCESS; + + if (Irp) + { + /* Complete the request */ + FsRtlCompleteLockIrpReal(FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + + /* Update the status */ + IoStatus->Status = Status; + } + + return TRUE; } /* @@ -151,8 +177,9 @@ IN PVOID Context OPTIONAL, IN BOOLEAN AlreadySynchronized) { - KEBUGCHECK(0); - return STATUS_UNSUCCESSFUL; + DPRINT1("FsRtlFastUnlockSingle() is stubplemented!\n"); + + return STATUS_SUCCESS; } /*

16 years, 10 months

[fireball] 30423: - Fix code formatting. - Add TRACEs.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Nov 13 18:41:22 2007 New Revision: 30423 URL: http://svn.reactos.org/svn/reactos?rev=30423&view=rev Log: - Fix code formatting. - Add TRACEs. Modified: trunk/reactos/dll/win32/kernel32/file/lock.c Modified: trunk/reactos/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lock.c (original) +++ trunk/reactos/dll/win32/kernel32/file/lock.c Tue Nov 13 18:41:22 2007 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/file/file.c + * FILE: dll/win32/kernel32/file/lock.c * PURPOSE: Directory functions * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) * UPDATE HISTORY: @@ -15,8 +15,8 @@ #include <k32.h> -#define NDEBUG -#include <debug.h> +//#define YDEBUG +#include <wine/debug.h> /* FUNCTIONS ****************************************************************/ @@ -25,24 +25,27 @@ */ BOOL STDCALL -LockFile( - HANDLE hFile, - DWORD dwFileOffsetLow, - DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToLockLow, - DWORD nNumberOfBytesToLockHigh - ) +LockFile(HANDLE hFile, + DWORD dwFileOffsetLow, + DWORD dwFileOffsetHigh, + DWORD nNumberOfBytesToLockLow, + DWORD nNumberOfBytesToLockHigh) { - DWORD dwReserved; - OVERLAPPED Overlapped; + DWORD dwReserved; + OVERLAPPED Overlapped; - Overlapped.Offset = dwFileOffsetLow; - Overlapped.OffsetHigh = dwFileOffsetHigh; - Overlapped.hEvent = NULL; - dwReserved = 0; + Overlapped.Offset = dwFileOffsetLow; + Overlapped.OffsetHigh = dwFileOffsetHigh; + Overlapped.hEvent = NULL; + dwReserved = 0; - return LockFileEx(hFile, LOCKFILE_FAIL_IMMEDIATELY|LOCKFILE_EXCLUSIVE_LOCK,dwReserved,nNumberOfBytesToLockLow, nNumberOfBytesToLockHigh, &Overlapped ) ; - + return LockFileEx(hFile, + LOCKFILE_FAIL_IMMEDIATELY | + LOCKFILE_EXCLUSIVE_LOCK, + dwReserved, + nNumberOfBytesToLockLow, + nNumberOfBytesToLockHigh, + &Overlapped ) ; } @@ -51,63 +54,65 @@ */ BOOL STDCALL -LockFileEx( - HANDLE hFile, - DWORD dwFlags, - DWORD dwReserved, - DWORD nNumberOfBytesToLockLow, - DWORD nNumberOfBytesToLockHigh, - LPOVERLAPPED lpOverlapped /* required! */ - ) +LockFileEx(HANDLE hFile, + DWORD dwFlags, + DWORD dwReserved, + DWORD nNumberOfBytesToLockLow, + DWORD nNumberOfBytesToLockHigh, + LPOVERLAPPED lpOverlapped /* required! */) { - LARGE_INTEGER BytesToLock; - BOOL LockImmediate; - BOOL LockExclusive; - NTSTATUS errCode; - LARGE_INTEGER Offset; + LARGE_INTEGER BytesToLock; + BOOL LockImmediate; + BOOL LockExclusive; + NTSTATUS errCode; + LARGE_INTEGER Offset; - if(dwReserved != 0 || lpOverlapped==NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if(dwReserved != 0 || lpOverlapped==NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - lpOverlapped->Internal = STATUS_PENDING; + TRACE( "%p %x%08x %x%08x flags %x\n", + hFile, lpOverlapped->OffsetHigh, lpOverlapped->Offset, + nNumberOfBytesToLockHigh, nNumberOfBytesToLockLow, dwFlags ); - Offset.u.LowPart = lpOverlapped->Offset; - Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; - if ( (dwFlags & LOCKFILE_FAIL_IMMEDIATELY) == LOCKFILE_FAIL_IMMEDIATELY ) - LockImmediate = TRUE; - else - LockImmediate = FALSE; + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; - if ( (dwFlags & LOCKFILE_EXCLUSIVE_LOCK) == LOCKFILE_EXCLUSIVE_LOCK ) - LockExclusive = TRUE; - else - LockExclusive = FALSE; + if ( (dwFlags & LOCKFILE_FAIL_IMMEDIATELY) == LOCKFILE_FAIL_IMMEDIATELY ) + LockImmediate = TRUE; + else + LockImmediate = FALSE; - BytesToLock.u.LowPart = nNumberOfBytesToLockLow; - BytesToLock.u.HighPart = nNumberOfBytesToLockHigh; + if ( (dwFlags & LOCKFILE_EXCLUSIVE_LOCK) == LOCKFILE_EXCLUSIVE_LOCK ) + LockExclusive = TRUE; + else + LockExclusive = FALSE; - errCode = NtLockFile(hFile, - lpOverlapped->hEvent, - NULL, - NULL, - (PIO_STATUS_BLOCK)lpOverlapped, - &Offset, - &BytesToLock, - 0, - (BOOLEAN)LockImmediate, - (BOOLEAN)LockExclusive); - if ( !NT_SUCCESS(errCode) ) - { - SetLastErrorByStatus (errCode); - return FALSE; - } + BytesToLock.u.LowPart = nNumberOfBytesToLockLow; + BytesToLock.u.HighPart = nNumberOfBytesToLockHigh; - return TRUE; + errCode = NtLockFile(hFile, + lpOverlapped->hEvent, + NULL, + NULL, + (PIO_STATUS_BLOCK)lpOverlapped, + &Offset, + &BytesToLock, + 0, + (BOOLEAN)LockImmediate, + (BOOLEAN)LockExclusive); + if ( !NT_SUCCESS(errCode) ) + { + SetLastErrorByStatus(errCode); + return FALSE; + } + + return TRUE; } @@ -116,21 +121,23 @@ */ BOOL STDCALL -UnlockFile( - HANDLE hFile, - DWORD dwFileOffsetLow, - DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToUnlockLow, - DWORD nNumberOfBytesToUnlockHigh - ) +UnlockFile(HANDLE hFile, + DWORD dwFileOffsetLow, + DWORD dwFileOffsetHigh, + DWORD nNumberOfBytesToUnlockLow, + DWORD nNumberOfBytesToUnlockHigh) { - OVERLAPPED Overlapped; - DWORD dwReserved; - Overlapped.Offset = dwFileOffsetLow; - Overlapped.OffsetHigh = dwFileOffsetHigh; - dwReserved = 0; + OVERLAPPED Overlapped; + DWORD dwReserved; + Overlapped.Offset = dwFileOffsetLow; + Overlapped.OffsetHigh = dwFileOffsetHigh; + dwReserved = 0; - return UnlockFileEx(hFile, dwReserved, nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh, &Overlapped); + return UnlockFileEx(hFile, + dwReserved, + nNumberOfBytesToUnlockLow, + nNumberOfBytesToUnlockHigh, + &Overlapped); } @@ -139,41 +146,45 @@ */ BOOL STDCALL -UnlockFileEx( - HANDLE hFile, - DWORD dwReserved, - DWORD nNumberOfBytesToUnLockLow, - DWORD nNumberOfBytesToUnLockHigh, - LPOVERLAPPED lpOverlapped /* required! */ - ) +UnlockFileEx(HANDLE hFile, + DWORD dwReserved, + DWORD nNumberOfBytesToUnLockLow, + DWORD nNumberOfBytesToUnLockHigh, + LPOVERLAPPED lpOverlapped /* required! */) { - LARGE_INTEGER BytesToUnLock; - LARGE_INTEGER StartAddress; - NTSTATUS errCode; + LARGE_INTEGER BytesToUnLock; + LARGE_INTEGER StartAddress; + NTSTATUS errCode; - if(dwReserved != 0 || lpOverlapped == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if(dwReserved != 0 || lpOverlapped == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - BytesToUnLock.u.LowPart = nNumberOfBytesToUnLockLow; - BytesToUnLock.u.HighPart = nNumberOfBytesToUnLockHigh; + TRACE( "%p %x%08x %x%08x\n", + hFile, lpOverlapped->OffsetHigh, lpOverlapped->Offset, + nNumberOfBytesToUnLockHigh, nNumberOfBytesToUnLockLow); - StartAddress.u.LowPart = lpOverlapped->Offset; - StartAddress.u.HighPart = lpOverlapped->OffsetHigh; + BytesToUnLock.u.LowPart = nNumberOfBytesToUnLockLow; + BytesToUnLock.u.HighPart = nNumberOfBytesToUnLockHigh; - errCode = NtUnlockFile(hFile, - (PIO_STATUS_BLOCK)lpOverlapped, - &StartAddress, - &BytesToUnLock, - 0); - if ( !NT_SUCCESS(errCode) ) { - SetLastErrorByStatus (errCode); - return FALSE; - } + StartAddress.u.LowPart = lpOverlapped->Offset; + StartAddress.u.HighPart = lpOverlapped->OffsetHigh; - return TRUE; + errCode = NtUnlockFile(hFile, + (PIO_STATUS_BLOCK)lpOverlapped, + &StartAddress, + &BytesToUnLock, + 0); + + if ( !NT_SUCCESS(errCode) ) + { + SetLastErrorByStatus(errCode); + return FALSE; + } + + return TRUE; } /* EOF */

16 years, 10 months

[tkreuzer] 30422: charmap: scroll 1 position on SB_LINEDOWN and 1 page on SB_PAGEDOWN, update window on SB_THUMPTRACK, use ScrollWindowEx on scrolling.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Nov 13 17:18:44 2007 New Revision: 30422 URL: http://svn.reactos.org/svn/reactos?rev=30422&view=rev Log: charmap: scroll 1 position on SB_LINEDOWN and 1 page on SB_PAGEDOWN, update window on SB_THUMPTRACK, use ScrollWindowEx on scrolling. Modified: trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Tue Nov 13 17:18:44 2007 @@ -91,7 +91,7 @@ for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { - ch = (WCHAR)((256 * infoPtr->iPage) + (XCELLS * y) + x); + ch = (WCHAR)((XCELLS * (y + infoPtr->iYStart)) + x); TagFontToCell(&infoPtr->Cells[y][x], ch); @@ -348,43 +348,67 @@ INT Value, INT Pos) { + INT iYDiff, iOldYStart = infoPtr->iYStart; + switch (Value) { case SB_LINEUP: - infoPtr->iPage -= 1; + infoPtr->iYStart -= 1; break; case SB_LINEDOWN: - infoPtr->iPage += 1; + infoPtr->iYStart += 1; break; case SB_PAGEUP: - infoPtr->iPage -= 16; + infoPtr->iYStart -= YCELLS; break; case SB_PAGEDOWN: - infoPtr->iPage += 16; - break; - - case SB_THUMBPOSITION: - infoPtr->iPage = Pos; + infoPtr->iYStart += YCELLS; + break; + + case SB_THUMBTRACK: + infoPtr->iYStart = Pos; break; default: break; } - infoPtr->iPage = max(0, - min(infoPtr->iPage, 255)); - - SetScrollPos(infoPtr->hMapWnd, - SB_VERT, - infoPtr->iPage, - TRUE); - - InvalidateRect(infoPtr->hMapWnd, - NULL, - TRUE); + infoPtr->iYStart = max(0, + min(infoPtr->iYStart, 255*16)); + + iYDiff = iOldYStart - infoPtr->iYStart; + if (iYDiff) + { + SetScrollPos(infoPtr->hMapWnd, + SB_VERT, + infoPtr->iYStart, + TRUE); + + if (abs(iYDiff) < YCELLS) + { + RECT rect; + GetClientRect(infoPtr->hMapWnd, &rect); + rect.top += 2; + rect.bottom -= 2; + ScrollWindowEx(infoPtr->hMapWnd, + 0, + iYDiff * infoPtr->CellSize.cy, + &rect, + &rect, + NULL, + NULL, + SW_INVALIDATE); + } + else + { + InvalidateRect(infoPtr->hMapWnd, + NULL, + TRUE); + } + } } Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h (original) +++ trunk/reactos/base/applications/charmap/precomp.h Tue Nov 13 17:18:44 2007 @@ -36,7 +36,7 @@ PCELL pActiveCell; HFONT hFont; LOGFONTW CurrentFont; - INT iPage; + INT iYStart; } MAP, *PMAP; typedef struct {

16 years, 10 months

[gedmurphy] 30421: add remote desktop client to the start menu

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Nov 13 16:41:08 2007 New Revision: 30421 URL: http://svn.reactos.org/svn/reactos?rev=30421&view=rev Log: add remote desktop client to the start menu Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Tue Nov 13 16:41:08 2007 @@ -759,6 +759,7 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, FALSE); } /* Creacte System Tools subfolder and fill if the exe is available */ Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc Tue Nov 13 16:41:08 2007 @@ -204,6 +204,7 @@ IDS_CMT_SCREENSHOT "Sejmout obrazovku" IDS_CMT_DEVMGMT "Spustit Správce zaøízení" IDS_CMT_SERVMAN "Spustit Správce slueb" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -255,6 +256,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Tue Nov 13 16:41:08 2007 @@ -205,6 +205,7 @@ IDS_CMT_SCREENSHOT "Screenshot erstellen" IDS_CMT_DEVMGMT "Starte Geräte-Manager" IDS_CMT_SERVMAN "Starte Dienst-Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -255,7 +256,8 @@ IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Zeichentabelle.lnk" - IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc Tue Nov 13 16:41:08 2007 @@ -206,6 +206,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -257,6 +258,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Tue Nov 13 16:41:08 2007 @@ -206,6 +206,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -254,8 +255,9 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "Character Map.lnk" - IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Tue Nov 13 16:41:08 2007 @@ -227,6 +227,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -278,6 +279,7 @@ IDS_SHORT_WINEMINE "Buscaminas.lnk" IDS_SHORT_CHARMAP "Mapa de caracteres.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Tue Nov 13 16:41:08 2007 @@ -206,6 +206,7 @@ IDS_CMT_SCREENSHOT "Faire une capture d'écran" IDS_CMT_DEVMGMT "Lancer le gestionnaire de périphériques" IDS_CMT_SERVMAN "Lancer le gestionnaire de services" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -256,6 +257,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Table des Caractères.lnk" IDS_SHORT_MAGNIFY "Loupe.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc Tue Nov 13 16:41:08 2007 @@ -218,6 +218,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -269,6 +270,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc Tue Nov 13 16:41:08 2007 @@ -204,6 +204,7 @@ IDS_CMT_SCREENSHOT "Ambil foto layar" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -254,6 +255,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Tue Nov 13 16:41:08 2007 @@ -197,6 +197,7 @@ IDS_CMT_SCREENSHOT "Salva una schermata" IDS_CMT_DEVMGMT "Lancia la Gestione periferiche" IDS_CMT_SERVMAN "Lancia la Gestione dei servizi" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -247,6 +248,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Tue Nov 13 16:41:08 2007 @@ -206,6 +206,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -256,6 +257,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc Tue Nov 13 16:41:08 2007 @@ -209,6 +209,7 @@ IDS_CMT_SCREENSHOT "Ta skjermbilde" IDS_CMT_DEVMGMT "Start Enhetsbehandler" IDS_CMT_SERVMAN "Start Tjenestebehandler" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -259,6 +260,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc Tue Nov 13 16:41:08 2007 @@ -206,6 +206,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -256,6 +257,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Tue Nov 13 16:41:08 2007 @@ -209,6 +209,7 @@ IDS_CMT_SCREENSHOT "Zrzut ekranu" IDS_CMT_DEVMGMT "Uruchom Mened¿er urz¹dzeñ" IDS_CMT_SERVMAN "Uruchom Mened¿er us³ug" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END @@ -253,6 +254,7 @@ IDS_SHORT_SOLITAIRE "Pasjans.lnk" IDS_SHORT_WINEMINE "Saper.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Tue Nov 13 16:41:08 2007 @@ -187,6 +187,8 @@ IDS_CMT_SCREENSHOT "Ñäåëàòü ñíèìîê ýêðàíà" IDS_CMT_DEVMGMT "Çàïóñòèòü äèñïåò÷åð óñòðîéñòâ" IDS_CMT_SERVMAN "Çàïóñòèòü äèñïåò÷åð ñëóæá" + IDS_CMT_RDESKTOP "Launch Remote Desktop" + END STRINGTABLE @@ -238,6 +240,7 @@ IDS_SHORT_WINEMINE "Ñàïåð.lnk" IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Tue Nov 13 16:41:08 2007 @@ -195,6 +195,7 @@ IDS_CMT_SCREENSHOT "Çðîáèòè çí³ìîê åêðàíà" IDS_CMT_DEVMGMT "Çàïóñòèòè Äèñïåò÷åð ïðèñòðî¿â" IDS_CMT_SERVMAN "Çàïóñòèòè Äèñïåò÷åð êåðóâàííÿ ñëóæáàìè" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -246,6 +247,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Tue Nov 13 16:41:08 2007 @@ -194,6 +194,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_RDESKTOP "Launch Remote Desktop" END STRINGTABLE @@ -244,6 +245,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Tue Nov 13 16:41:08 2007 @@ -106,6 +106,7 @@ #define IDS_CMT_DEVMGMT 3223 #define IDS_CMT_CHARMAP 3224 #define IDS_CMT_MAGNIFY 3225 +#define IDS_CMT_RDESKTOP 3226 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -131,6 +132,7 @@ #define IDS_SHORT_WINEMINE 3412 #define IDS_SHORT_CHARMAP 3413 #define IDS_SHORT_MAGNIFY 3414 +#define IDS_SHORT_RDESKTOP 3415 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

16 years, 10 months

[gedmurphy] 30420: add remote desktop to the bootcd as it's now working, but still unfinished.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Nov 13 16:19:04 2007 New Revision: 30420 URL: http://svn.reactos.org/svn/reactos?rev=30420&view=rev Log: add remote desktop to the bootcd as it's now working, but still unfinished. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Nov 13 16:19:04 2007 @@ -45,6 +45,7 @@ base\applications\hostname\hostname.exe 1 base\applications\logoff\logoff.exe 1 base\applications\msconfig\msconfig.exe 1 +base\applications\mstsc\mstsc.exe 1 base\applications\network\arp\arp.exe 1 base\applications\network\dwnl\dwnl.exe 1 base\applications\network\route\route.exe 1

16 years, 10 months

← Newer
1
...
47
48
49
50
51
52
53
...
89
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 November 2007