Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 13 Nov '07

13 Nov '07

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); }

1 0

[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 13 Nov '07

13 Nov '07

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)) {

1 0

[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 13 Nov '07

13 Nov '07

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; }

1 0

[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 13 Nov '07

13 Nov '07

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; } /*

1 0

[fireball] 30423: - Fix code formatting. - Add TRACEs.
by fireball＠svn.reactos.org 13 Nov '07

13 Nov '07

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 */

1 0

[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 13 Nov '07

13 Nov '07

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 {

1 0

[gedmurphy] 30421: add remote desktop client to the start menu
by gedmurphy＠svn.reactos.org 13 Nov '07

13 Nov '07

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

1 0

[gedmurphy] 30420: add remote desktop to the bootcd as it's now working, but still unfinished.
by gedmurphy＠svn.reactos.org 13 Nov '07

13 Nov '07

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

1 0

[gedmurphy] 30419: fix remaining warnings and add it to the build
by gedmurphy＠svn.reactos.org 13 Nov '07

13 Nov '07

Author: gedmurphy Date: Tue Nov 13 16:16:17 2007 New Revision: 30419 URL: http://svn.reactos.org/svn/reactos?rev=30419&view=rev Log: fix remaining warnings and add it to the build Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/base/applications/mstsc/pstcache.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Tue Nov 13 16:16:17 2007 @@ -34,6 +34,9 @@ <directory name="mscutils"> <xi:include href="mscutils/directory.rbuild" /> </directory> +<directory name="mstsc"> + <xi:include href="mstsc/mstsc.rbuild" /> +</directory> <directory name="network"> <xi:include href="network/network.rbuild" /> </directory> Modified: trunk/reactos/base/applications/mstsc/pstcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ps… ============================================================================== --- trunk/reactos/base/applications/mstsc/pstcache.c (original) +++ trunk/reactos/base/applications/mstsc/pstcache.c Tue Nov 13 16:16:17 2007 @@ -53,7 +53,7 @@ { uint8 *celldata; int fd; - CELLHEADER cellhdr = {0,}; + CELLHEADER cellhdr; HBITMAP bitmap; if (!g_bitmap_cache_persist_enable) @@ -61,6 +61,8 @@ if (!IS_PERSISTENT(cache_id) || cache_idx >= BMPCACHE2_NUM_PSTCELLS) return False; + + memset(&cellhdr, 0, sizeof(CELLHEADER)); fd = g_pstcache_fd[cache_id]; rd_lseek_file(fd, cache_idx * (g_pstcache_Bpp * MAX_CELL_SIZE + sizeof(CELLHEADER))); Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Tue Nov 13 16:16:17 2007 @@ -92,7 +92,7 @@ len = _tcslen(size1); for (i = 0; i < len; i++) { - sizex[i] = (char *)size1[i]; + sizex[i] = (char)size1[i]; } sizex[len] = 0; }

1 0

[gedmurphy] 30418: silence a load of gcc warnings
by gedmurphy＠svn.reactos.org 13 Nov '07

13 Nov '07

Author: gedmurphy Date: Tue Nov 13 16:10:07 2007 New Revision: 30418 URL: http://svn.reactos.org/svn/reactos?rev=30418&view=rev Log: silence a load of gcc warnings Modified: trunk/reactos/base/applications/mstsc/bsops.c trunk/reactos/base/applications/mstsc/cache.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/pstcache.c trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/settings.c trunk/reactos/base/applications/mstsc/ssl_calls.c trunk/reactos/base/applications/mstsc/tcp.c trunk/reactos/base/applications/mstsc/uimain.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/bsops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… ============================================================================== --- trunk/reactos/base/applications/mstsc/bsops.c (original) +++ trunk/reactos/base/applications/mstsc/bsops.c Tue Nov 13 16:10:07 2007 @@ -38,7 +38,7 @@ static int g_clip_bottom1 = 600; /* for bs_patblt */ -static unsigned char g_hatch_patterns[] = +static char g_hatch_patterns[] = { 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0 - bsHorizontal */ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, /* 1 - bsVertical */ Modified: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… ============================================================================== --- trunk/reactos/base/applications/mstsc/cache.c (original) +++ trunk/reactos/base/applications/mstsc/cache.c Tue Nov 13 16:10:07 2007 @@ -25,7 +25,7 @@ extern int g_pstcache_fd[]; #define NUM_ELEMENTS(array) (sizeof(array) / sizeof(array[0])) -#define IS_PERSISTENT(id) (g_pstcache_fd[id] > 0) +//#define IS_PERSISTENT(id) (g_pstcache_fd[id] > 0) #define TO_TOP -1 #define NOT_SET -1 #define IS_SET(idx) (idx >= 0) Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Tue Nov 13 16:10:07 2007 @@ -984,7 +984,7 @@ MAKEINTRESOURCEW(IDD_GENERAL), pInfo->hTab, (DLGPROC)GeneralDlgProc, - pInfo)) + (LPARAM)pInfo)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -999,7 +999,7 @@ MAKEINTRESOURCEW(IDD_DISPLAY), pInfo->hTab, (DLGPROC)DisplayDlgProc, - pInfo)) + (LPARAM)pInfo)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… ============================================================================== --- trunk/reactos/base/applications/mstsc/licence.c (original) +++ trunk/reactos/base/applications/mstsc/licence.c Tue Nov 13 16:10:07 2007 @@ -174,8 +174,8 @@ /* Now encrypt the HWID */ crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, g_licence_key, 16); - ssl_rc4_crypt(crypt_key, hwid, hwid, sizeof(hwid)); + ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + ssl_rc4_crypt(crypt_key, (char *)hwid, (char *)hwid, sizeof(hwid)); ssl_rc4_info_delete(crypt_key); licence_present(null_data, null_data, licence_data, licence_size, hwid, signature); @@ -239,7 +239,7 @@ static void licence_process_authreq(STREAM s) { - uint8 *in_token, *in_sig; + uint8 *in_token = NULL, *in_sig; uint8 out_token[LICENCE_TOKEN_SIZE], decrypt_token[LICENCE_TOKEN_SIZE]; uint8 hwid[LICENCE_HWID_SIZE], crypt_hwid[LICENCE_HWID_SIZE]; uint8 sealed_buffer[LICENCE_TOKEN_SIZE + LICENCE_HWID_SIZE]; @@ -252,8 +252,8 @@ /* Decrypt the token. It should read TEST in Unicode. */ crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, g_licence_key, 16); - ssl_rc4_crypt(crypt_key, in_token, decrypt_token, LICENCE_TOKEN_SIZE); + ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + ssl_rc4_crypt(crypt_key, (char *)in_token, (char *)decrypt_token, LICENCE_TOKEN_SIZE); ssl_rc4_info_delete(crypt_key); /* Generate a signature for a buffer of token and HWID */ @@ -264,8 +264,8 @@ /* Now encrypt the HWID */ crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, g_licence_key, 16); - ssl_rc4_crypt(crypt_key, hwid, crypt_hwid, LICENCE_HWID_SIZE); + ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + ssl_rc4_crypt(crypt_key, (char *)hwid, (char *)crypt_hwid, LICENCE_HWID_SIZE); ssl_rc4_info_delete(crypt_key); licence_send_authresp(out_token, crypt_hwid, out_sig); @@ -286,8 +286,8 @@ return; crypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(crypt_key, g_licence_key, 16); - ssl_rc4_crypt(crypt_key, s->p, s->p, length); + ssl_rc4_set_key(crypt_key, (char *)g_licence_key, 16); + ssl_rc4_crypt(crypt_key, (char *)s->p, (char *)s->p, length); ssl_rc4_info_delete(crypt_key); in_uint16(s, check); Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h (original) +++ trunk/reactos/base/applications/mstsc/precomp.h Tue Nov 13 16:10:07 2007 @@ -13,6 +13,7 @@ #ifndef __TODO_MSTSC_H #define __TODO_MSTSC_H +#define IS_PERSISTENT(id) (id < 8 && g_pstcache_fd[id] > 0) #define MAXKEY 256 #define MAXVALUE 256 Modified: trunk/reactos/base/applications/mstsc/pstcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ps… ============================================================================== --- trunk/reactos/base/applications/mstsc/pstcache.c (original) +++ trunk/reactos/base/applications/mstsc/pstcache.c Tue Nov 13 16:10:07 2007 @@ -21,8 +21,6 @@ #include <precomp.h> #define MAX_CELL_SIZE 0x1000 /* pixels */ - -#define IS_PERSISTENT(id) (id < 8 && g_pstcache_fd[id] > 0) extern int g_server_depth; extern BOOL g_bitmap_cache; @@ -55,7 +53,7 @@ { uint8 *celldata; int fd; - CELLHEADER cellhdr; + CELLHEADER cellhdr = {0,}; HBITMAP bitmap; if (!g_bitmap_cache_persist_enable) Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp.c (original) +++ trunk/reactos/base/applications/mstsc/rdp.c Tue Nov 13 16:10:07 2007 @@ -120,7 +120,7 @@ static STREAM rdp_init_data(int maxlen) { - STREAM s; + STREAM s = NULL; s = sec_init(g_encryption ? SEC_ENCRYPT : 0, maxlen + 18); s_push_layer(s, rdp_hdr, 18); @@ -285,17 +285,17 @@ rdp_send_logon_info(uint32 flags, char *domain, char *user, char *password, char *program, char *directory) { - char *ipaddr = tcp_get_address(); + //char *ipaddr = tcp_get_address(); int len_domain = 2 * strlen(domain); int len_user = 2 * strlen(user); int len_password = 2 * strlen(password); int len_program = 2 * strlen(program); int len_directory = 2 * strlen(directory); - int len_ip = 2 * strlen(ipaddr); - int len_dll = 2 * strlen("C:\\WINNT\\System32\\mstscax.dll"); - int packetlen = 0; + //int len_ip = 2 * strlen(ipaddr); + //int len_dll = 2 * strlen("C:\\WINNT\\System32\\mstscax.dll"); + //int packetlen = 0; uint32 sec_flags = g_encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO; - STREAM s; + STREAM s = NULL; //time_t t = time(NULL); //time_t tzone; Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/secure.c (original) +++ trunk/reactos/base/applications/mstsc/secure.c Tue Nov 13 16:10:07 2007 @@ -125,17 +125,17 @@ memset(pad, salt + i, i + 1); sha = ssl_sha1_info_create(); ssl_sha1_clear(sha); - ssl_sha1_transform(sha, pad, i + 1); - ssl_sha1_transform(sha, in, 48); - ssl_sha1_transform(sha, salt1, 32); - ssl_sha1_transform(sha, salt2, 32); - ssl_sha1_complete(sha, shasig); + ssl_sha1_transform(sha, (char *)pad, i + 1); + ssl_sha1_transform(sha, (char *)in, 48); + ssl_sha1_transform(sha, (char *)salt1, 32); + ssl_sha1_transform(sha, (char *)salt2, 32); + ssl_sha1_complete(sha, (char *)shasig); ssl_sha1_info_delete(sha); md5 = ssl_md5_info_create(); ssl_md5_clear(md5); - ssl_md5_transform(md5, in, 48); - ssl_md5_transform(md5, shasig, 20); - ssl_md5_complete(md5, out + i * 16); + ssl_md5_transform(md5, (char *)in, 48); + ssl_md5_transform(md5, (char *)shasig, 20); + ssl_md5_complete(md5, (char *)out + i * 16); ssl_md5_info_delete(md5); } } @@ -150,10 +150,10 @@ md5 = ssl_md5_info_create(); ssl_md5_clear(md5); - ssl_md5_transform(md5, in, 16); - ssl_md5_transform(md5, salt1, 32); - ssl_md5_transform(md5, salt2, 32); - ssl_md5_complete(md5, out); + ssl_md5_transform(md5, (char *)in, 16); + ssl_md5_transform(md5, (char *)salt1, 32); + ssl_md5_transform(md5, (char *)salt2, 32); + ssl_md5_complete(md5, (char *)out); ssl_md5_info_delete(md5); } @@ -211,11 +211,11 @@ ssl_rc4_info_delete(rc4_decrypt_key); rc4_decrypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(rc4_decrypt_key, sec_decrypt_key, rc4_key_len); + ssl_rc4_set_key(rc4_decrypt_key, (char *)sec_decrypt_key, rc4_key_len); ssl_rc4_info_delete(rc4_encrypt_key); rc4_encrypt_key = ssl_rc4_info_create(); - ssl_rc4_set_key(rc4_encrypt_key, sec_encrypt_key, rc4_key_len); + ssl_rc4_set_key(rc4_encrypt_key, (char *)sec_encrypt_key, rc4_key_len); } static uint8 pad_54[40] = { @@ -256,20 +256,20 @@ sha = ssl_sha1_info_create(); ssl_sha1_clear(sha); - ssl_sha1_transform(sha, session_key, keylen); - ssl_sha1_transform(sha, pad_54, 40); - ssl_sha1_transform(sha, lenhdr, 4); - ssl_sha1_transform(sha, data, datalen); - ssl_sha1_complete(sha, shasig); + ssl_sha1_transform(sha, (char *)session_key, keylen); + ssl_sha1_transform(sha, (char *)pad_54, 40); + ssl_sha1_transform(sha, (char *)lenhdr, 4); + ssl_sha1_transform(sha, (char *)data, datalen); + ssl_sha1_complete(sha, (char *)shasig); ssl_sha1_info_delete(sha); md5 = ssl_md5_info_create(); ssl_md5_clear(md5); - ssl_md5_transform(md5, session_key, keylen); - ssl_md5_transform(md5, pad_92, 48); - ssl_md5_transform(md5, shasig, 20); - ssl_md5_complete(md5, md5sig); - ssl_md5_info_delete(md5); + ssl_md5_transform(md5, (char *)session_key, keylen); + ssl_md5_transform(md5, (char *)pad_92, 48); + ssl_md5_transform(md5, (char *)shasig, 20); + ssl_md5_complete(md5, (char *)md5sig); + ssl_md5_info_delete(md5); memcpy(signature, md5sig, siglen); } @@ -285,24 +285,24 @@ sha = ssl_sha1_info_create(); ssl_sha1_clear(sha); - ssl_sha1_transform(sha, update_key, rc4_key_len); - ssl_sha1_transform(sha, pad_54, 40); - ssl_sha1_transform(sha, key, rc4_key_len); - ssl_sha1_complete(sha, shasig); + ssl_sha1_transform(sha, (char *)update_key, rc4_key_len); + ssl_sha1_transform(sha, (char *)pad_54, 40); + ssl_sha1_transform(sha, (char *)key, rc4_key_len); + ssl_sha1_complete(sha, (char *)shasig); ssl_sha1_info_delete(sha); md5 = ssl_md5_info_create(); ssl_md5_clear(md5); - ssl_md5_transform(md5, update_key, rc4_key_len); - ssl_md5_transform(md5, pad_92, 48); - ssl_md5_transform(md5, shasig, 20); - ssl_md5_complete(md5, key); + ssl_md5_transform(md5, (char *)update_key, rc4_key_len); + ssl_md5_transform(md5, (char *)pad_92, 48); + ssl_md5_transform(md5, (char *)shasig, 20); + ssl_md5_complete(md5, (char *)key); ssl_md5_info_delete(md5); update = ssl_rc4_info_create(); - ssl_rc4_set_key(update, key, rc4_key_len); - ssl_rc4_crypt(update, key, key, rc4_key_len); + ssl_rc4_set_key(update, (char *)key, rc4_key_len); + ssl_rc4_crypt(update, (char *)key, (char *)key, rc4_key_len); ssl_rc4_info_delete(update); if (rc4_key_len == 8) @@ -316,10 +316,10 @@ if (sec_encrypt_use_count == 4096) { sec_update(sec_encrypt_key, sec_encrypt_update_key); - ssl_rc4_set_key(rc4_encrypt_key, sec_encrypt_key, rc4_key_len); + ssl_rc4_set_key(rc4_encrypt_key, (char *)sec_encrypt_key, rc4_key_len); sec_encrypt_use_count = 0; } - ssl_rc4_crypt(rc4_encrypt_key, data, data, length); + ssl_rc4_crypt(rc4_encrypt_key, (char *)data, (char *)data, length); sec_encrypt_use_count++; } @@ -330,10 +330,10 @@ if (sec_decrypt_use_count == 4096) { sec_update(sec_decrypt_key, sec_decrypt_update_key); - ssl_rc4_set_key(rc4_decrypt_key, sec_decrypt_key, rc4_key_len); + ssl_rc4_set_key(rc4_decrypt_key, (char *)sec_decrypt_key, rc4_key_len); sec_decrypt_use_count = 0; } - ssl_rc4_crypt(rc4_decrypt_key, data, data, length); + ssl_rc4_crypt(rc4_decrypt_key, (char *)data, (char *)data, length); sec_decrypt_use_count++; } @@ -355,7 +355,7 @@ static void sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent) { - ssl_mod_exp(out, 64, in, 32, modulus, 64, exponent, 4); + ssl_mod_exp((char *)out, 64, (char *)in, 32, (char *)modulus, 64, (char *)exponent, 4); /* BN_CTX *ctx; BIGNUM mod, exp, x, y; @@ -746,7 +746,7 @@ static void sec_process_crypt_info(STREAM s) { - uint8 *server_random, *modulus, *exponent; + uint8 *server_random, *modulus = NULL, *exponent = NULL; uint8 client_random[SEC_RANDOM_SIZE]; uint32 rc4_key_size; uint8 inr[SEC_MODULUS_SIZE]; Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c (original) +++ trunk/reactos/base/applications/mstsc/settings.c Tue Nov 13 16:10:07 2007 @@ -14,7 +14,6 @@ SaveAllSettings(PINFO pInfo) { INT ret; - WCHAR szKey[MAXKEY]; WCHAR szValue[MAXVALUE]; /* server */ Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… ============================================================================== --- trunk/reactos/base/applications/mstsc/ssl_calls.c (original) +++ trunk/reactos/base/applications/mstsc/ssl_calls.c Tue Nov 13 16:10:07 2007 @@ -435,7 +435,7 @@ PUT_UINT32(low, msglen, 4); last = ctx->total[0] & 0x3F; padn = (last < 56) ? (56 - last) : (120 - last); - ssl_sha1_transform(ctx, sha1_padding, padn); + ssl_sha1_transform(ctx, (char *)sha1_padding, padn); ssl_sha1_transform(ctx, msglen, 8); PUT_UINT32(ctx->state[0], data, 0); PUT_UINT32(ctx->state[1], data, 4); @@ -705,7 +705,7 @@ PUT_UINT32(high, msglen, 4); last = ctx->total[0] & 0x3F; padn = (last < 56) ? (56 - last) : (120 - last); - ssl_md5_transform(ctx, md5_padding, padn); + ssl_md5_transform(ctx, (char *)md5_padding, padn); ssl_md5_transform(ctx, msglen, 8); PUT_UINT32(ctx->state[0], data, 0); PUT_UINT32(ctx->state[1], data, 4); Modified: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… ============================================================================== --- trunk/reactos/base/applications/mstsc/tcp.c (original) +++ trunk/reactos/base/applications/mstsc/tcp.c Tue Nov 13 16:10:07 2007 @@ -67,7 +67,7 @@ while (total < length) { - sent = send(sock, s->data + total, length - total, 0); + sent = send(sock, (char *)s->data + total, length - total, 0); if (sent <= 0) { if (sent == -1 && TCP_BLOCKS) @@ -124,7 +124,7 @@ /* User quit */ return NULL; - rcvd = recv(sock, s->end, length, 0); + rcvd = recv(sock, (char *)s->end, length, 0); if (rcvd < 0) { if (rcvd == -1 && TCP_BLOCKS) Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.c (original) +++ trunk/reactos/base/applications/mstsc/uimain.c Tue Nov 13 16:10:07 2007 @@ -170,17 +170,17 @@ { for (j = 0; j < 32; j++) { - if (bs_is_pixel_on(andmask, j, i, 32, 1)) + if (bs_is_pixel_on((char *)andmask, j, i, 32, 1)) { bs_set_pixel_on(am, j, 31 - i, 32, 1, 1); } - if (bs_is_pixel_on(xormask, j, i, 32, 24)) + if (bs_is_pixel_on((char *)xormask, j, i, 32, 24)) { bs_set_pixel_on(xm, j, 31 - i, 32, 1, 1); } } } - return (void *) mi_create_cursor(x, y, width, height, am, xm); + return (void *) mi_create_cursor(x, y, width, height, (unsigned char *)am, (unsigned char *)xm); } /*****************************************************************************/ @@ -219,12 +219,12 @@ memset(the_glyph, 0, sizeof(struct bitmap)); the_glyph->width = width; the_glyph->height = height; - the_glyph->data = glyph_data; + the_glyph->data = (uint8 *)glyph_data; for (i = 0; i < height; i++) { for (j = 0; j < width; j++) { - if (bs_is_pixel_on(data, j, i, width, 1)) + if (bs_is_pixel_on((char *)data, j, i, width, 1)) { bs_set_pixel_on(glyph_data, j, i, width, 8, 255); } @@ -337,7 +337,7 @@ struct bitmap * b; b = glyph; - bs_draw_glyph(x, y, b->data, b->width, b->height, fgcolor); + bs_draw_glyph(x, y, (char *)b->data, b->width, b->height, fgcolor); } /*****************************************************************************/ @@ -572,7 +572,7 @@ ui_patblt(uint8 opcode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour, int fgcolour) { - bs_patblt(opcode, x, y, cx, cy, brush->style, brush->pattern, + bs_patblt(opcode, x, y, cx, cy, brush->style, (char *)brush->pattern, brush->xorigin, brush->yorigin, bgcolour, fgcolour); ui_invalidate(x, y, cx, cy); } Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Tue Nov 13 16:10:07 2007 @@ -58,7 +58,7 @@ static int g_workarea = 0; static int g_mousex = 0; /* in client coords */ static int g_mousey = 0; -static int g_width_height_set = 0; +//static int g_width_height_set = 0; static int g_clip_left = 0; static int g_clip_top = 0; @@ -92,7 +92,7 @@ len = _tcslen(size1); for (i = 0; i < len; i++) { - sizex[i] = size1[i]; + sizex[i] = (char *)size1[i]; } sizex[len] = 0; } @@ -965,6 +965,7 @@ } +#if 0 /*****************************************************************************/ static int mi_process_a_param(char * param1, int state) @@ -1121,6 +1122,7 @@ g_width = g_width & (~3); return 1; } + /*****************************************************************************/ static int @@ -1208,6 +1210,7 @@ return rv; } + /*****************************************************************************/ /* process the command line parameters */ /* returns boolean, non zero is ok */ @@ -1288,7 +1291,7 @@ } return (state == 0); } - +#endif /*****************************************************************************/ int WINAPI

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs