Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 40289: Make cmd able to (sort of) work without a console.
by jmorlan＠svn.reactos.org 30 Mar '09

30 Mar '09

Author: jmorlan Date: Sun Mar 29 23:17:45 2009 New Revision: 40289 URL: http://svn.reactos.org/svn/reactos?rev=40289&view=rev Log: Make cmd able to (sort of) work without a console. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Mar 29 23:17:45 2009 @@ -164,7 +164,6 @@ OSVERSIONINFO osvi; HANDLE hIn; HANDLE hOut; -HANDLE hConsole; LPTSTR lpOriginalEnvironment; HANDLE CMD_ModuleHandle; @@ -1380,7 +1379,12 @@ } } - ReadCommand (readline, CMDLINE_LENGTH - 1); + if (!ReadCommand(readline, CMDLINE_LENGTH - 1)) + { + bExit = TRUE; + return FALSE; + } + if (CheckCtrlBreak(BREAK_INPUT)) { ConOutPuts(_T("\n")); @@ -1805,6 +1809,7 @@ */ int cmd_main (int argc, const TCHAR *argv[]) { + HANDLE hConsole; TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; INT nExitCode; @@ -1821,12 +1826,16 @@ hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - if (GetConsoleScreenBufferInfo(hConsole, &Info) == FALSE) - { - ConErrFormatMessage(GetLastError()); - return(1); - } - wDefColor = Info.wAttributes; + if (hConsole != INVALID_HANDLE_VALUE) + { + if (!GetConsoleScreenBufferInfo(hConsole, &Info)) + { + ConErrFormatMessage(GetLastError()); + return(1); + } + wDefColor = Info.wAttributes; + CloseHandle(hConsole); + } InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sun Mar 29 23:17:45 2009 @@ -53,7 +53,6 @@ /* global variables */ extern HANDLE hOut; extern HANDLE hIn; -extern HANDLE hConsole; extern LPTSTR lpOriginalEnvironment; extern WORD wColor; extern WORD wDefColor; @@ -120,7 +119,7 @@ /* Prototypes for CMDINPUT.C */ -VOID ReadCommand (LPTSTR, INT); +BOOL ReadCommand (LPTSTR, INT); /* Prototypes for CMDTABLE.C */ Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sun Mar 29 23:17:45 2009 @@ -126,8 +126,9 @@ /* read in a command line */ -VOID ReadCommand (LPTSTR str, INT maxlen) +BOOL ReadCommand (LPTSTR str, INT maxlen) { + CONSOLE_SCREEN_BUFFER_INFO csbi; SHORT orgx; /* origin x/y */ SHORT orgy; SHORT curx; /*current x/y cursor position*/ @@ -149,11 +150,30 @@ TCHAR PreviousChar; #endif + if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { + /* No console */ + HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE); + DWORD dwRead; + CHAR chr; + do + { + if (!ReadFile(hStdin, &chr, 1, &dwRead, NULL) || !dwRead) + return FALSE; +#ifdef _UNICODE + MultiByteToWideChar(InputCodePage, 0, &chr, 1, &str[charcount++], 1); +#endif + } while (chr != '\n' && charcount < maxlen); + str[charcount] = _T('\0'); + return TRUE; + } + /* get screen size */ - GetScreenSize (&maxx, &maxy); - - GetCursorXY (&orgx, &orgy); - GetCursorXY (&curx, &cury); + maxx = csbi.dwSize.X; + maxy = csbi.dwSize.Y; + + curx = orgx = csbi.dwCursorPosition.X; + cury = orgy = csbi.dwCursorPosition.Y; memset (str, 0, maxlen * sizeof (TCHAR)); @@ -590,4 +610,5 @@ /* expand all aliases */ ExpandAlias (str, maxlen); #endif /* FEATURE_ALIAS */ + return TRUE; } Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Mar 29 23:17:45 2009 @@ -413,7 +413,7 @@ { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo (hConsole, &csbi); + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); *x = csbi.dwCursorPosition.X; *y = csbi.dwCursorPosition.Y; @@ -424,7 +424,7 @@ { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo (hConsole, &csbi); + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); return csbi.dwCursorPosition.X; } @@ -434,7 +434,7 @@ { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo (hConsole, &csbi); + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); return csbi.dwCursorPosition.Y; } @@ -444,7 +444,11 @@ { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo (hConsole, &csbi); + if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { + csbi.dwSize.X = 80; + csbi.dwSize.Y = 25; + } if (maxx) *maxx = csbi.dwSize.X;

2 1

[dgorbachev] 40295: Do not crash with "Assertion 'Process == PsGetCurrentProcess()' failed" msg.
by dgorbachev＠svn.reactos.org 30 Mar '09

30 Mar '09

Author: dgorbachev Date: Mon Mar 30 13:12:25 2009 New Revision: 40295 URL: http://svn.reactos.org/svn/reactos?rev=40295&view=rev Log: Do not crash with "Assertion 'Process == PsGetCurrentProcess()' failed" msg. Modified: trunk/reactos/ntoskrnl/mm/kmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/kmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/kmap.c?rev=402… ============================================================================== --- trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] Mon Mar 30 13:12:25 2009 @@ -25,7 +25,7 @@ KIRQL Irql; PVOID TempAddress; - Process = (PEPROCESS)KeGetCurrentThread()->ApcState.Process; + Process = PsGetCurrentProcess(); TempAddress = MiMapPageInHyperSpace(Process, Page, &Irql); if (TempAddress == NULL) { @@ -40,15 +40,19 @@ NTAPI MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) { + PEPROCESS Process; + KIRQL Irql; PVOID TempAddress; - TempAddress = MmCreateHyperspaceMapping(DestPage); + Process = PsGetCurrentProcess(); + TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql); if (TempAddress == NULL) { return(STATUS_NO_MEMORY); } memcpy(TempAddress, SourceAddress, PAGE_SIZE); - MmDeleteHyperspaceMapping(TempAddress); + MiUnmapPageInHyperSpace(Process, TempAddress, Irql); return(STATUS_SUCCESS); } +/* EOF */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Mar 30 13:12:25 2009 @@ -657,8 +657,11 @@ } else { + PEPROCESS Process; + KIRQL Irql; PVOID PageAddr; ULONG CacheSegOffset; + /* * Allocate a page, this is rather complicated by the possibility * we might have to move other things out of memory @@ -692,7 +695,8 @@ } } - PageAddr = MmCreateHyperspaceMapping(*Page); + Process = PsGetCurrentProcess(); + PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql); CacheSegOffset = BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset; Length = RawLength - SegOffset; if (Length <= CacheSegOffset && Length <= PAGE_SIZE) @@ -706,7 +710,7 @@ else { memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, CacheSegOffset); - MmDeleteHyperspaceMapping(PageAddr); + MiUnmapPageInHyperSpace(Process, PageAddr, Irql); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); Status = CcRosGetCacheSegment(Bcb, FileOffset + CacheSegOffset, @@ -731,7 +735,7 @@ return Status; } } - PageAddr = MmCreateHyperspaceMapping(*Page); + PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql); if (Length < PAGE_SIZE) { memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, Length - CacheSegOffset); @@ -741,7 +745,7 @@ memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, PAGE_SIZE - CacheSegOffset); } } - MmDeleteHyperspaceMapping(PageAddr); + MiUnmapPageInHyperSpace(Process, PageAddr, Irql); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); } return(STATUS_SUCCESS);

1 0

[jimtabor] 40294: - Move W32PROCESSINFO to PROCESSINFO.
by jimtabor＠svn.reactos.org 30 Mar '09

30 Mar '09

Author: jimtabor Date: Mon Mar 30 09:45:08 2009 New Revision: 40294 URL: http://svn.reactos.org/svn/reactos?rev=40294&view=rev Log: - Move W32PROCESSINFO to PROCESSINFO. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -48,8 +48,8 @@ LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); BOOL FASTCALL IsMetaFile(HDC); -extern PW32PROCESSINFO g_pi; -extern PW32PROCESSINFO g_kpi; +extern PPROCESSINFO g_pi; +extern PPROCESSINFO g_kpi; extern PSERVERINFO g_psi; static __inline PVOID Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -209,7 +209,7 @@ { PVOID pi; PW32THREADINFO pti; // pointer to Win32ThreadInfo - PW32PROCESSINFO ppi; // pointer to W32ProcessInfo + PPROCESSINFO ppi; // pointer to W32ProcessInfo }; unsigned short type; /* object type (0 if free) */ unsigned short generation; /* generation counter */ Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -9,12 +9,12 @@ HINSTANCE User32Instance; PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; -PW32PROCESSINFO g_pi = NULL; /* User Mode Pointer */ -PW32PROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */ +PPROCESSINFO g_pi = NULL; /* User Mode Pointer */ +PPROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */ PSERVERINFO g_psi = NULL; WCHAR szAppInit[KEY_LENGTH]; -PW32PROCESSINFO +PPROCESSINFO GetW32ProcessInfo(VOID); PUSER32_THREAD_DATA @@ -324,7 +324,7 @@ FASTCALL GetConnected(VOID) { - PW32PROCESSINFO pi; + PPROCESSINFO pi; if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) NtUserGetThreadState(THREADSTATE_GETTHREADINFO); Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -120,11 +120,11 @@ return ti; } -PW32PROCESSINFO +PPROCESSINFO GetW32ProcessInfo(VOID) { PW32THREADINFO ti; - PW32PROCESSINFO pi = NULL; + PPROCESSINFO pi = NULL; ti = GetW32ThreadInfo(); if (ti != NULL) Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -1,7 +1,7 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H -struct _W32PROCESSINFO; +struct _PROCESSINFO; struct _W32THREADINFO; struct _WINDOW; @@ -92,7 +92,7 @@ typedef struct _CALLPROC { USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is implemented */ - struct _W32PROCESSINFO *pi; + struct _PROCESSINFO *pi; WNDPROC WndProc; struct _CALLPROC *Next; UINT Unicode : 1; @@ -148,7 +148,7 @@ eventually replace WINDOW_OBJECT. Right now WINDOW_OBJECT keeps a reference to this structure until all the information is moved to this structure */ - struct _W32PROCESSINFO *pi; /* FIXME: Move to object header some day */ + struct _PROCESSINFO *pi; /* FIXME: Move to object header some day */ struct _W32THREADINFO *ti; struct _DESKTOP *pdesktop; RECT WindowRect; @@ -335,7 +335,7 @@ DWORD SrvEventActivity; } SERVERINFO, *PSERVERINFO; -typedef struct _W32PROCESSINFO +typedef struct _PROCESSINFO { PVOID UserHandleTable; HANDLE hUserHeap; @@ -349,7 +349,7 @@ PSERVERINFO psi; -} W32PROCESSINFO, *PW32PROCESSINFO; +} PROCESSINFO, *PPROCESSINFO; #define CTI_INSENDMESSAGE 0x0002 @@ -366,8 +366,8 @@ typedef struct _W32THREADINFO { - PW32PROCESSINFO pi; /* [USER] */ - PW32PROCESSINFO kpi; /* [KERNEL] */ + PPROCESSINFO pi; /* [USER] */ + PPROCESSINFO kpi; /* [KERNEL] */ PDESKTOPINFO Desktop; // PVOID DesktopHeapBase; // ULONG_PTR DesktopHeapLimit; @@ -467,7 +467,7 @@ } BROADCASTPARM, *PBROADCASTPARM; PW32THREADINFO GetW32ThreadInfo(VOID); -PW32PROCESSINFO GetW32ProcessInfo(VOID); +PPROCESSINFO GetW32ProcessInfo(VOID); typedef struct _WNDMSG { Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -35,7 +35,7 @@ CreateCallProc(IN PDESKTOPINFO Desktop, IN WNDPROC WndProc, IN BOOL Unicode, - IN PW32PROCESSINFO pi); + IN PPROCESSINFO pi); BOOL UserGetCallProcInfo(IN HANDLE hCallProc, @@ -52,7 +52,7 @@ VOID IntDereferenceClass(IN OUT PWINDOWCLASS Class, IN PDESKTOPINFO Desktop, - IN PW32PROCESSINFO pi); + IN PPROCESSINFO pi); RTL_ATOM UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, @@ -74,7 +74,7 @@ RTL_ATOM IntGetClassAtom(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance OPTIONAL, - IN PW32PROCESSINFO pi OPTIONAL, + IN PPROCESSINFO pi OPTIONAL, OUT PWINDOWCLASS *BaseClass OPTIONAL, OUT PWINDOWCLASS **Link OPTIONAL); Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -23,7 +23,7 @@ { PVOID pi; PW32THREADINFO pti; // pointer to Win32ThreadInfo - PW32PROCESSINFO ppi; // pointer to W32ProcessInfo + PPROCESSINFO ppi; // pointer to W32ProcessInfo }; unsigned short type; /* object type (0 if free) */ unsigned short generation; /* generation counter */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -88,7 +88,7 @@ LIST_ENTRY DriverObjListHead; struct _KBL* KeyboardLayout; W32HEAP_USER_MAPPING HeapMappings; - PW32PROCESSINFO ProcessInfo; + PPROCESSINFO ProcessInfo; } W32PROCESS, *PW32PROCESS; #endif /* __INCLUDE_NAPI_WIN32_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -81,7 +81,7 @@ CreateCallProc(IN PDESKTOPINFO Desktop, IN WNDPROC WndProc, IN BOOL Unicode, - IN PW32PROCESSINFO pi) + IN PPROCESSINFO pi) { PCALLPROC NewCallProc; HANDLE Handle; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -101,7 +101,7 @@ void FASTCALL DestroyProcessClasses(PW32PROCESS Process ) { PWINDOWCLASS Class; - PW32PROCESSINFO pi = Process->ProcessInfo; + PPROCESSINFO pi = Process->ProcessInfo; if (pi != NULL) { @@ -266,7 +266,7 @@ static WNDPROC IntGetClassWndProc(IN PWINDOWCLASS Class, - IN PW32PROCESSINFO pi, + IN PPROCESSINFO pi, IN BOOL Ansi) { ASSERT(UserIsEnteredExclusive() == TRUE); @@ -564,7 +564,7 @@ VOID IntDereferenceClass(IN OUT PWINDOWCLASS Class, IN PDESKTOPINFO Desktop, - IN PW32PROCESSINFO pi) + IN PPROCESSINFO pi) { PWINDOWCLASS *PrevLink, BaseClass, CurrentClass; @@ -752,7 +752,7 @@ IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IN BOOL FreeOnFailure) { - PW32PROCESSINFO pi; + PPROCESSINFO pi; BOOL Ret = TRUE; pi = GetW32ProcessInfo(); @@ -793,7 +793,7 @@ IN WNDPROC wpExtra, IN DWORD dwFlags, IN PDESKTOP Desktop, - IN PW32PROCESSINFO pi) + IN PPROCESSINFO pi) { SIZE_T ClassSize; PWINDOWCLASS Class = NULL; @@ -1046,7 +1046,7 @@ RTL_ATOM IntGetClassAtom(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance OPTIONAL, - IN PW32PROCESSINFO pi OPTIONAL, + IN PPROCESSINFO pi OPTIONAL, OUT PWINDOWCLASS *BaseClass OPTIONAL, OUT PWINDOWCLASS **Link OPTIONAL) { @@ -1133,7 +1133,7 @@ { PTHREADINFO pti; PW32THREADINFO ti; - PW32PROCESSINFO pi; + PPROCESSINFO pi; PWINDOWCLASS Class; RTL_ATOM ClassAtom; RTL_ATOM Ret = (RTL_ATOM)0; @@ -1215,7 +1215,7 @@ IN HINSTANCE hInstance) { PWINDOWCLASS *Link; - PW32PROCESSINFO pi; + PPROCESSINFO pi; RTL_ATOM ClassAtom; PWINDOWCLASS Class; @@ -1775,7 +1775,7 @@ IN BOOL Ansi, HINSTANCE hInstance) { - PW32PROCESSINFO pi; + PPROCESSINFO pi; lpwcx->style = Class->Style; @@ -1814,7 +1814,7 @@ /* NOTE: This routine may raise exceptions! */ UINT i; UNICODE_STRING ClassName, MenuName; - PW32PROCESSINFO pi = GetW32ProcessInfo(); + PPROCESSINFO pi = GetW32ProcessInfo(); WNDCLASSEXW wc; PWINDOWCLASS Class; BOOL Ret = TRUE; @@ -2136,7 +2136,7 @@ ULONG_PTR dwNewLong, BOOL Ansi) { - PW32PROCESSINFO pi; + PPROCESSINFO pi; PWINDOW_OBJECT Window; ULONG_PTR Ret = 0; @@ -2281,7 +2281,7 @@ UNICODE_STRING CapturedClassName; PWINDOWCLASS Class; RTL_ATOM ClassAtom; - PW32PROCESSINFO pi; + PPROCESSINFO pi; BOOL Ret = FALSE; /* NOTE: need exclusive lock because getting the wndproc might require the Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Mar 30 09:45:08 2009 @@ -435,10 +435,10 @@ } } -PW32PROCESSINFO +PPROCESSINFO GetW32ProcessInfo(VOID) { - PW32PROCESSINFO pi; + PPROCESSINFO pi; PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); if (W32Process == NULL) @@ -449,11 +449,11 @@ if (W32Process->ProcessInfo == NULL) { - pi = UserHeapAlloc(sizeof(W32PROCESSINFO)); + pi = UserHeapAlloc(sizeof(PROCESSINFO)); if (pi != NULL) { RtlZeroMemory(pi, - sizeof(W32PROCESSINFO)); + sizeof(PROCESSINFO)); /* initialize it */ pi->UserHandleTable = gHandleTable;

1 0

[jimtabor] 40293: - Update W32PROCESS and related code.
by jimtabor＠svn.reactos.org 30 Mar '09

30 Mar '09

Author: jimtabor Date: Mon Mar 30 07:56:53 2009 New Revision: 40293 URL: http://svn.reactos.org/svn/reactos?rev=40293&view=rev Log: - Update W32PROCESS and related code. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Mon Mar 30 07:56:53 2009 @@ -64,19 +64,21 @@ typedef struct _W32PROCESS { - PEPROCESS peProcess; - DWORD RefCount; - ULONG Flags; /* W32PF_flags; */ - PKEVENT InputIdleEvent; - DWORD StartCursorHideTime; - DWORD NextStart; - PVOID pDCAttrList; - PVOID pBrushAttrList; - DWORD W32Pid; - LONG GDIObjects; - LONG UserObjects; - DWORD cSimpleLock; /* Locking Process during access to structure. */ - RTL_AVL_TABLE rtlAvlTable; /* Process AVL Table. */ + PEPROCESS peProcess; + DWORD RefCount; + ULONG W32PF_flags; + PKEVENT InputIdleEvent; + DWORD StartCursorHideTime; + DWORD NextStart; + PVOID pDCAttrList; + PVOID pBrushAttrList; + DWORD W32Pid; + LONG GDIHandleCount; + LONG UserHandleCount; + DWORD cSimpleLock; /* Locking Process during access to structure. */ + RTL_AVL_TABLE rtlAvlTable; /* Process AVL Table. */ + LIST_ENTRY leDCAttrList; + LIST_ENTRY leObjAttrList; /* ReactOS */ LIST_ENTRY ClassList; LIST_ENTRY MenuListHead; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Mar 30 07:56:53 2009 @@ -129,7 +129,7 @@ } /* setup process flags */ - Win32Process->Flags = 0; + Win32Process->W32PF_flags = 0; } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] Mon Mar 30 07:56:53 2009 @@ -47,7 +47,7 @@ static BOOL FASTCALL co_AddGuiApp(PW32PROCESS W32Data) { - W32Data->Flags |= W32PF_CREATEDWINORDC; + W32Data->W32PF_flags |= W32PF_CREATEDWINORDC; if (InterlockedIncrement(&NrGuiAppsRunning) == 1) { BOOL Initialized; @@ -56,7 +56,7 @@ if (!Initialized) { - W32Data->Flags &= ~W32PF_CREATEDWINORDC; + W32Data->W32PF_flags &= ~W32PF_CREATEDWINORDC; InterlockedDecrement(&NrGuiAppsRunning); return FALSE; } @@ -67,7 +67,7 @@ static void FASTCALL RemoveGuiApp(PW32PROCESS W32Data) { - W32Data->Flags &= ~W32PF_CREATEDWINORDC; + W32Data->W32PF_flags &= ~W32PF_CREATEDWINORDC; if (InterlockedDecrement(&NrGuiAppsRunning) == 0) { IntEndDesktopGraphics(); @@ -82,14 +82,14 @@ W32Data = PsGetCurrentProcessWin32Process(); if (Create) { - if (! (W32Data->Flags & W32PF_CREATEDWINORDC) && ! (W32Data->Flags & W32PF_MANUALGUICHECK)) + if (! (W32Data->W32PF_flags & W32PF_CREATEDWINORDC) && ! (W32Data->W32PF_flags & W32PF_MANUALGUICHECK)) { return co_AddGuiApp(W32Data); } } else { - if ((W32Data->Flags & W32PF_CREATEDWINORDC) && ! (W32Data->Flags & W32PF_MANUALGUICHECK)) + if ((W32Data->W32PF_flags & W32PF_CREATEDWINORDC) && ! (W32Data->W32PF_flags & W32PF_MANUALGUICHECK)) { RemoveGuiApp(W32Data); } @@ -109,18 +109,18 @@ W32Data = PsGetCurrentProcessWin32Process(); if (0 == Check) { - W32Data->Flags |= W32PF_MANUALGUICHECK; + W32Data->W32PF_flags |= W32PF_MANUALGUICHECK; } else if (0 < Check) { - if (! (W32Data->Flags & W32PF_CREATEDWINORDC)) + if (! (W32Data->W32PF_flags & W32PF_CREATEDWINORDC)) { co_AddGuiApp(W32Data); } } else { - if (W32Data->Flags & W32PF_CREATEDWINORDC) + if (W32Data->W32PF_flags & W32PF_CREATEDWINORDC) { RemoveGuiApp(W32Data); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Mar 30 07:56:53 2009 @@ -283,12 +283,12 @@ { case GR_GDIOBJECTS: { - Ret = (DWORD)W32Process->GDIObjects; + Ret = (DWORD)W32Process->GDIHandleCount; break; } case GR_USEROBJECTS: { - Ret = (DWORD)W32Process->UserObjects; + Ret = (DWORD)W32Process->UserHandleCount; break; } default: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Mon Mar 30 07:56:53 2009 @@ -342,11 +342,11 @@ if(Enable) { - Process->Flags &= ~W32PF_NOWINDOWGHOSTING; + Process->W32PF_flags &= ~W32PF_NOWINDOWGHOSTING; } else { - Process->Flags |= W32PF_NOWINDOWGHOSTING; + Process->W32PF_flags |= W32PF_NOWINDOWGHOSTING; } RETURN( TRUE); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Mon Mar 30 07:56:53 2009 @@ -355,7 +355,7 @@ W32Process = PsGetCurrentProcessWin32Process(); /* HACK HACK HACK: simplest-possible quota implementation - don't allow a process to take too many GDI objects, itself. */ - if (W32Process && W32Process->GDIObjects >= 0x2710) + if (W32Process && W32Process->GDIHandleCount >= 0x2710) { DPRINT1("Too many objects for process!!!\n"); GDIDBG_DUMPHANDLETABLE(); @@ -426,7 +426,7 @@ if (W32Process != NULL) { - InterlockedIncrement(&W32Process->GDIObjects); + InterlockedIncrement(&W32Process->GDIHandleCount); } DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, newObject); @@ -559,7 +559,7 @@ if (W32Process != NULL) { - InterlockedDecrement(&W32Process->GDIObjects); + InterlockedDecrement(&W32Process->GDIHandleCount); } /* call the cleanup routine. */ @@ -688,7 +688,7 @@ W32Process = (PW32PROCESS)Process->Win32Process; ASSERT(W32Process); - if (W32Process->GDIObjects > 0) + if (W32Process->GDIHandleCount > 0) { ProcId = Process->UniqueProcessId; @@ -719,7 +719,7 @@ DPRINT1("Failed to delete object %p!\n", ObjectHandle); } - if (W32Process->GDIObjects == 0) + if (W32Process->GDIHandleCount == 0) { /* there are no more gdi handles for this process, bail */ break; @@ -768,9 +768,9 @@ #endif DPRINT("Completed cleanup for process %d\n", Process->UniqueProcessId); - if (W32Process->GDIObjects > 0) - { - DPRINT1("Leaking %d handles!\n", W32Process->GDIObjects); + if (W32Process->GDIHandleCount > 0) + { + DPRINT1("Leaking %d handles!\n", W32Process->GDIHandleCount); } return TRUE; @@ -1140,7 +1140,7 @@ W32Process = (PW32PROCESS)OldProcess->Win32Process; if (W32Process != NULL) { - InterlockedDecrement(&W32Process->GDIObjects); + InterlockedDecrement(&W32Process->GDIHandleCount); } ObDereferenceObject(OldProcess); } @@ -1243,7 +1243,7 @@ W32Process = (PW32PROCESS)OldProcess->Win32Process; if (W32Process != NULL) { - InterlockedDecrement(&W32Process->GDIObjects); + InterlockedDecrement(&W32Process->GDIHandleCount); } ObDereferenceObject(OldProcess); } @@ -1257,7 +1257,7 @@ W32Process = (PW32PROCESS)NewOwner->Win32Process; if (W32Process != NULL) { - InterlockedIncrement(&W32Process->GDIObjects); + InterlockedIncrement(&W32Process->GDIHandleCount); } } else

1 0

[dreimer] 40292: Sync WinHLP32 and WordPad with Wine HEAD. Bug 4306 by Paolo Devoti. Update for Italian Translations.
by dreimer＠svn.reactos.org 29 Mar '09

29 Mar '09

Author: dreimer Date: Mon Mar 30 03:28:29 2009 New Revision: 40292 URL: http://svn.reactos.org/svn/reactos?rev=40292&view=rev Log: Sync WinHLP32 and WordPad with Wine HEAD. Bug 4306 by Paolo Devoti. Update for Italian Translations. Modified: trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp.h trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Mon Mar 30 03:28:29 2009 @@ -136,7 +136,7 @@ SendMessage(hTextWnd, EM_SETSCROLLPOS, 0, (LPARAM)&pt); } SendMessage(hTextWnd, WM_SETREDRAW, TRUE, 0); - InvalidateRect(hTextWnd, NULL, TRUE); + RedrawWindow(hTextWnd, NULL, NULL, RDW_FRAME|RDW_INVALIDATE); } /*********************************************************************** @@ -581,6 +581,64 @@ /*********************************************************************** * + * WINHELP_FindLink + */ +static HLPFILE_LINK* WINHELP_FindLink(WINHELP_WINDOW* win, LPARAM pos) +{ + HLPFILE_LINK* link; + POINTL mouse_ptl, char_ptl, char_next_ptl; + DWORD cp; + + if (!win->page) return NULL; + + mouse_ptl.x = (short)LOWORD(pos); + mouse_ptl.y = (short)HIWORD(pos); + cp = SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_CHARFROMPOS, + 0, (LPARAM)&mouse_ptl); + + for (link = win->page->first_link; link; link = link->next) + { + if (link->cpMin <= cp && cp <= link->cpMax) + { + /* check whether we're at end of line */ + SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, + (LPARAM)&char_ptl, cp); + SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, + (LPARAM)&char_next_ptl, cp + 1); + if (char_next_ptl.y != char_ptl.y || mouse_ptl.x >= char_next_ptl.x) + link = NULL; + break; + } + } + return link; +} + +static LRESULT CALLBACK WINHELP_RicheditWndProc(HWND hWnd, UINT msg, + WPARAM wParam, LPARAM lParam) +{ + WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLongPtr(GetParent(hWnd), 0); + DWORD messagePos; + POINT pt; + switch(msg) + { + case WM_SETCURSOR: + messagePos = GetMessagePos(); + pt.x = (short)LOWORD(messagePos); + pt.y = (short)HIWORD(messagePos); + ScreenToClient(hWnd, &pt); + if (win->page && WINHELP_FindLink(win, MAKELPARAM(pt.x, pt.y))) + { + SetCursor(win->hHandCur); + return 0; + } + /* fall through */ + default: + return CallWindowProcA(win->origRicheditWndProc, hWnd, msg, wParam, lParam); + } +} + +/*********************************************************************** + * * WINHELP_CreateHelpWindow */ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remember) @@ -701,6 +759,8 @@ 0, 0, 0, 0, win->hMainWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, NULL); SendMessage(hTextWnd, EM_SETEVENTMASK, 0, SendMessage(hTextWnd, EM_GETEVENTMASK, 0, 0) | ENM_MOUSEEVENTS); + win->origRicheditWndProc = (WNDPROC)SetWindowLongPtr(hTextWnd, GWLP_WNDPROC, + (LONG_PTR)WINHELP_RicheditWndProc); } hIcon = (wpage->page) ? wpage->page->file->hIcon : NULL; @@ -769,40 +829,6 @@ return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } -/*********************************************************************** - * - * WINHELP_FindLink - */ -static HLPFILE_LINK* WINHELP_FindLink(WINHELP_WINDOW* win, LPARAM pos) -{ - HLPFILE_LINK* link; - POINTL mouse_ptl, char_ptl, char_next_ptl; - DWORD cp; - - if (!win->page) return NULL; - - mouse_ptl.x = (short)LOWORD(pos); - mouse_ptl.y = (short)HIWORD(pos); - cp = SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_CHARFROMPOS, - 0, (LPARAM)&mouse_ptl); - - for (link = win->page->first_link; link; link = link->next) - { - if (link->cpMin <= cp && cp <= link->cpMax) - { - /* check whether we're at end of line */ - SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, - (LPARAM)&char_ptl, cp); - SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, - (LPARAM)&char_next_ptl, cp + 1); - if (char_next_ptl.y != char_ptl.y || mouse_ptl.x >= char_next_ptl.x) - link = NULL; - break; - } - } - return link; -} - /****************************************************************** * WINHELP_HandleTextMouse * @@ -815,20 +841,8 @@ switch (msg) { - case WM_MOUSEMOVE: - if (WINHELP_FindLink(win, lParam)) - SetCursor(win->hHandCur); - else - SetCursor(LoadCursor(0, IDC_ARROW)); - break; - - case WM_LBUTTONDOWN: - if ((win->current_link = WINHELP_FindLink(win, lParam))) - ret = TRUE; - break; - - case WM_LBUTTONUP: - if ((link = WINHELP_FindLink(win, lParam)) && link == win->current_link) + case WM_LBUTTONDOWN: + if ((link = WINHELP_FindLink(win, lParam))) { HLPFILE_WINDOWINFO* wi; @@ -863,7 +877,6 @@ } ret = TRUE; } - win->current_link = NULL; break; } return ret; @@ -898,11 +911,11 @@ (HWND)lParam == Globals.active_popup->hMainWnd || GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd) break; - case WM_LBUTTONUP: case WM_LBUTTONDOWN: - if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam) && msg == WM_LBUTTONDOWN) + if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam)) return FALSE; /* fall through */ + case WM_LBUTTONUP: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: case WM_NCLBUTTONDOWN: Modified: trunk/reactos/base/applications/winhlp32/winhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] Mon Mar 30 03:28:29 2009 @@ -80,6 +80,8 @@ HWND hShadowWnd; HWND hHistoryWnd; + WNDPROC origRicheditWndProc; + HFONT* fonts; UINT fonts_len; @@ -88,7 +90,6 @@ HBRUSH hBrush; HLPFILE_WINDOWINFO* info; - HLPFILE_LINK* current_link; WINHELP_PAGESET back; unsigned font_scale; /* 0 = small, 1 = normal, 2 = large */ Modified: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] Mon Mar 30 03:28:29 2009 @@ -22,7 +22,7 @@ IDM_MAINMENU MENU DISCARDABLE BEGIN - POPUP "&Fil" + POPUP "&Arkiv" BEGIN MENUITEM "&Nytt...\tCtrl+N", ID_FILE_NEW MENUITEM "&Ãppna...\tCtrl+O", ID_FILE_OPEN @@ -151,7 +151,7 @@ Caption "Tabulatorer" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90 + GROUPBOX "Tabbstopp", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE DEFPUSHBUTTON "LÃ¤gg &till", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "Ta &bort", ID_TAB_DEL, 72, 80, 45, 15 @@ -242,6 +242,7 @@ STRING_OPEN_FAILED, "Kunde inte Ã¶ppna filen." STRING_OPEN_ACCESS_DENIED, "Du har inte tillgÃ¥ng till att Ã¶ppna filen." STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." + STRING_MAX_TAB_STOPS, "Kan ej lÃ¤gga till mer Ã¤n 32 tabbstopp." END #pragma code_page(default) Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Mon Mar 30 03:28:29 2009 @@ -8,7 +8,7 @@ LTEXT "Benvenuto al wizard di installazione di ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Non è ancora possibile installare ReactOS direttamente da questo CD! "\ "E' necessario riavviare il computer da questo CD per procedere "\ - "alla instalazione di ReactOS.", IDC_STATIC, 115, 40, 195, 100 + "alla installazione di ReactOS.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Cliccare Fine per uscire.", IDC_STATIC, 115, 169, 195, 17 END @@ -128,8 +128,8 @@ LTEXT "Quando verrà premuto fine il computer si riavvierà.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Se presente rimuovere il CD dal lettore e per riavviare "\ - "il computer cliccare Fine.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Se presente rimuovere il CD dal lettore e cliccare Fine "\ + "per riavviare il computer.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE @@ -146,8 +146,8 @@ IDS_PROCESSSUBTITLE "Creazione e formattazione della partizione, copia dei file, installazione del Boot loader" IDS_RESTARTTITLE "Prima fase della installazione completata" IDS_RESTARTSUBTITLE "La prima fase della installazione è stata completata, riavviare il computer per procedere alla seconda fase" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_SUMMARYTITLE "Sintesi della installazione" + IDS_SUMMARYSUBTITLE "Elencare le proprietà della installazione da controllare prima che siano eseguite sul dispositivo di installazione" IDS_ABORTSETUP "ReactOS non è installato completamente sul computer. Se interropete l'installazione ora sarà necessario eseguire l'installazione di nuovo. Volete procedere?" IDS_ABORTSETUP2 "Volete interrompere l'installazione?" END Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Mon Mar 30 03:28:29 2009 @@ -5,13 +5,13 @@ STRINGTABLE DISCARDABLE BEGIN -STRING_ASSOC_HELP, "Modify file extension associations.\n\n\ +STRING_ASSOC_HELP, "Modifica le associazioni per le estensioni dei file.\n\n\ assoc [.ext[=[FileType]]]\n\ \n\ -assoc (print all associations)\n\ -assoc .ext (print specific association)\n\ -assoc .ext= (remove specific association)\n\ -assoc .ext=FileType (add new association)\n" +assoc (mostra tutte le associazioni)\n\ +assoc .ext (mostra una specifica associazione)\n\ +assoc .ext= (rimuove una specifica associazione)\n\ +assoc .ext=FileType (aggiung una associazione)\n" STRING_ATTRIB_HELP, "Visualizza o modifica gli attributi dei file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ @@ -72,7 +72,7 @@ STRING_CLS_HELP, "Cancella lo schermo.\n\nCLS\n" -STRING_CMD_HELP1, "\nComandi interni disponibilin:\n" +STRING_CMD_HELP1, "\nComandi interni disponibili:\n" STRING_CMD_HELP2, "\nFunzioni disponibili:" @@ -154,10 +154,10 @@ /Q Tacito.\n\ /W Sovrascive con valori casuali prima di cancellare.\n\ /Y Cancella anche *.* senza chiedere conferma.\n\ - /F Forza la cancellazione di file nascost, di sistema o in sola lettura.\n\ + /F Forza la cancellazione di file nascosti, di sistema o in sola lettura.\n\ /S Cancella i file anche nelle sottocartelle\n\ /A Seleziona i file da cancellare in base agli attributi.\n\ - attributes\n\ + attributi\n\ R Sola lettura\n\ S Sistema\n\ A Archiviabile\n\ @@ -219,7 +219,7 @@ PUSHD [percorso | ..]\n\n\ percorso Indica la cartella che deve diventare quella corrente\n" -STRING_DIRSTACK_HELP2, "cambia alla cartella memorizzata da PUSHD.\n\nPOPD" +STRING_DIRSTACK_HELP2, "Cambia alla cartella memorizzata da PUSHD.\n\nPOPD" STRING_DIRSTACK_HELP3, "Visualizza il contenuto dello stack delle cartelle.\n\nDIRS" @@ -301,12 +301,12 @@ STRING_MKDIR_HELP, "Crea una cartella.\n\n\ MKDIR [disco:]percorso\nMD [disco:]percorso" -STRING_MKLINK_HELP, "Creates a filesystem link object.\n\n\ -MKLINK [/D | /H | /J] linkname target\n\n\ - /D Indicates that the symbolic link target is a directory.\n\ - /H Create a hard link.\n\ - /J Create a directory junction.\n\n\ -If neither /H or /J is specified, a symbolic link is created." +STRING_MKLINK_HELP, "Crea un oggetto di collegamento nel filesystem.\n\n\ +MKLINK [/D | /H | /J] nomelink target\n\n\ + /D Indica che il link simbolico è riferito a una cartella.\n\ + /H Crea un hard link.\n\ + /J Crea una directory junction.\n\n\ +Se non sono specificati ne /H ne /J verrà creato un link simbolico." STRING_MEMMORY_HELP1, "Visualizza la quantità della memoria di sistema.\n\n\ MEMORY" @@ -347,7 +347,7 @@ YES : 10 | NO : 11\n\ OK : 10 | CANCEL : 12\n" -STRING_PATH_HELP1, "visualizza o imposta i percorsi di ricerca per\n\ +STRING_PATH_HELP1, "Visualizza o imposta i percorsi di ricerca per\n\ gli eseguibili.\n\n\ PATH [[disco:][percorso[;...]]\n\ PATH ;\n\n\ @@ -394,8 +394,8 @@ STRING_RMDIR_HELP2, "La cartella non è vuota!\n" STRING_REN_HELP1, "Rinomina file/cartella or file/cartelle.\n\n\ -RENAME [/E /N /P /Q /S /T] vecchi_onome ... novo_nome\n\ -REN [/E /N /P /Q /S /T] vecchi_onome ... novo_nome\n\n\ +RENAME [/E /N /P /Q /S /T] vecchio_nome ... nuovo_nome\n\ +REN [/E /N /P /Q /S /T] vecchio_nome ... nuovo_nome\n\n\ /E Nessun messaggio di errore.\n\ /N Nulla.\n\ /P Chiede conferma per ogni file.\n\ @@ -549,7 +549,7 @@ STRING_VOL_HELP4, "Visualizza l'etichetta del volume del disco e il numero di serie se disponibili.\n\n\ VOL [disco:]" -STRING_WINDOW_HELP1, "cambia l'aspetto della finestra della console\n\n\ +STRING_WINDOW_HELP1, "Cambia l'aspetto della finestra della console\n\n\ WINDOW [/POS[=]sinistra,alto,larghezza,altezza]\n\ [MIN|MAX|RESTORE] ['titolo']\n\n\ /POS specifica la posizione e la dimensione della finestra\n\ @@ -557,7 +557,7 @@ MAX massimizza la finestra\n\ RESTORE ripristina la finestra" -STRING_WINDOW_HELP2, "cambia l'aspetto della finestra della console\n\n\ +STRING_WINDOW_HELP2, "Cambia l'aspetto della finestra della console\n\n\ ACTIVATE 'window' [/POS[=]sinistra,alto,larghezza,altezza]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window finestra su cui eseguire l'azione\n\ @@ -572,6 +572,7 @@ comando /? Per i dettagli su uno specifico comando\n\n\ ? Elenco di tutti i comandi disponibili.\n\ ALIAS Imposta, toglie o visualizza gli alias.\n\ +ASSOC Modifica le associazioni per le estensioni dei file.\n\ ATTRIB Visualizza o modifica gli attributi dei file.\n\ BEEP Segnale acustico.\n\ CALL Chiama un batch da un'altro.\n\ @@ -597,7 +598,7 @@ LABEL Crea, modifica, o cancella l'etichetta di un disco.\n\ MD Crea una cartella.\n\ MKDIR Crea una cartella.\n\ -MKLINK Creates a filesystem link object.\n\ +MKLINK Crea un oggetto di collegamento nel filesystem.\n\ MOVE Muove uno o più file da una cartella a un'altra\n\ PATH Visualizza o imposta i percorsi di ricerca per gli eseguibili.\n\ PAUSE Ferma l'esecuzione di un batch e visualizza un messaggio.\n\ @@ -714,11 +715,11 @@ STRING_SCREEN_COL, "valore non valido per colonna" STRING_SCREEN_ROW, "valore non valido per riga" STRING_TIMER_TIME "Timer %d è %s: " -STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" -STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" -STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" -STRING_MORE, "More? " -STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Si/No/Tutti) " +STRING_MKLINK_CREATED_SYMBOLIC, "Link simbolico creato per %s <<===>> %s\n" +STRING_MKLINK_CREATED_HARD, "Hard link creato per %s <<===>> %s\n" +STRING_MKLINK_CREATED_JUNCTION, "Junction creato per %s <<===>> %s\n" +STRING_MORE, "Avanti? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break. Interrompere il file batch? (Si/No/Tutti)" STRING_INVALID_OPERAND, "Operando non valido." STRING_EXPECTED_CLOSE_PAREN, "Attesa una ')'." 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Mon Mar 30 03:28:29 2009 @@ -198,8 +198,8 @@ IDS_CMT_DEVMGMT "Lancia la Gestione periferiche" IDS_CMT_SERVMAN "Lancia la Gestione dei servizi" IDS_CMT_RDESKTOP "Avvia il Desktop remoto" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_EVENTVIEW "Lancia il visualizzatore degli eventi" + IDS_CMT_MSCONFIG "Lancia il programma di configurazione del sistema" END STRINGTABLE @@ -213,8 +213,8 @@ BEGIN IDS_SYS_TOOLS "Strumenti di sistema" IDS_CMT_CHARMAP "Mappa dei caratteri" - IDS_CMT_KBSWITCH "Keyboard Layout Switcher" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" + IDS_CMT_KBSWITCH "Cambia la disposizione della tastiera" + IDS_CMT_DXDIAG "Esegui il programma di diagnostica ReactX-" END STRINGTABLE @@ -225,9 +225,9 @@ STRINGTABLE BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" + IDS_SYS_ENTERTAINMENT "Divertimento" + IDS_CMT_MPLAY32 "Esegui Multimedia Player" + IDS_CMT_SNDVOL32 "Esegui Conrollo Volume" END STRINGTABLE @@ -245,27 +245,27 @@ STRINGTABLE BEGIN - IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_CMD "Prompt dei comandi.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" - IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_CALC "Calcolatrice.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNAP "SnapShot.lnk" - IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_SOLITAIRE "Solitario.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" IDS_SHORT_RDESKTOP "Remote Desktop.lnk" - IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" - IDS_SHORT_EVENTVIEW "Event Viewer.lnk" - IDS_SHORT_MSCONFIG "System Configuration.lnk" - IDS_SHORT_SNDVOL32 "Volume Control.lnk" - IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_KBSWITCH "Disposizione della tastiera.lnk" + IDS_SHORT_EVENTVIEW "Visualizzatore Eventi.lnk" + IDS_SHORT_MSCONFIG "Configuratione del sistema.lnk" + IDS_SHORT_SNDVOL32 "Controllo Volume.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostica.lnk" END STRINGTABLE

1 0

[dreimer] 40291: Sync write with Wine HEAD
by dreimer＠svn.reactos.org 29 Mar '09

29 Mar '09

Author: dreimer Date: Mon Mar 30 03:17:43 2009 New Revision: 40291 URL: http://svn.reactos.org/svn/reactos?rev=40291&view=rev Log: Sync write with Wine HEAD Modified: trunk/rosapps/applications/write/lang/fr-FR.rc Modified: trunk/rosapps/applications/write/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/fr… ============================================================================== --- trunk/rosapps/applications/write/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/lang/fr-FR.rc [iso-8859-1] Mon Mar 30 03:17:43 2009 @@ -17,10 +17,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_FAILED, "Wordpad n'a pas pu être démarré" + IDS_FAILED, "Wordpad n'a pas pu Ãªtre dÃ©marrÃ©" } + +#pragma code_page(default)

1 0

[fireball] 40290: [FORMATTING] - Change comments to match kernel coding style - Remove EOL spaces.
by fireball＠svn.reactos.org 29 Mar '09

29 Mar '09

Author: fireball Date: Sun Mar 29 23:32:37 2009 New Revision: 40290 URL: http://svn.reactos.org/svn/reactos?rev=40290&view=rev Log: [FORMATTING] - Change comments to match kernel coding style - Remove EOL spaces. Modified: trunk/reactos/ntoskrnl/mm/hypermap.c Modified: trunk/reactos/ntoskrnl/mm/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] Sun Mar 29 23:32:37 2009 @@ -28,15 +28,11 @@ { PMMPTE PointerPte; - // - // Get the hyperspace PTE and zero out the page table - // + /* Get the hyperspace PTE and zero out the page table */ PointerPte = MiAddressToPte(HYPER_SPACE); RtlZeroMemory(PointerPte, PAGE_SIZE); - // - // Setup mapping PTEs - // + /* Setup mapping PTEs */ MmFirstReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_START); MmLastReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_END); MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; @@ -51,59 +47,41 @@ MMPTE TempPte; PMMPTE PointerPte; PFN_NUMBER Offset; - PVOID Address; - - // - // Never accept page 0 - // + PVOID Address; + + /* Never accept page 0 */ ASSERT(Page != 0); - - // - // Build the PTE - // + + /* Build the PTE */ TempPte = HyperTemplatePte; TempPte.u.Hard.PageFrameNumber = Page; - - // - // Pick the first hyperspace PTE - // + + /* Pick the first hyperspace PTE */ PointerPte = MmFirstReservedMappingPte; - // - // Acquire the hyperlock - // + /* Acquire the hyperlock */ ASSERT(Process == PsGetCurrentProcess()); KeAcquireSpinLock(&Process->HyperSpaceLock, OldIrql); - - // - // Now get the first free PTE - // + + /* Now get the first free PTE */ Offset = PFN_FROM_PTE(PointerPte); if (!Offset) { - // - // Reset the PTEs - // + /* Reset the PTEs */ Offset = MI_HYPERSPACE_PTES; KeFlushProcessTb(); } - - // - // Prepare the next PTE - // + + /* Prepare the next PTE */ PointerPte->u.Hard.PageFrameNumber = Offset - 1; - - // - // Write the current PTE - // + + /* Write the current PTE */ PointerPte += Offset; ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte; - - // - // Return the address - // + + /* Return the address */ Address = (PVOID)((ULONG_PTR)PointerPte << 10); return Address; } @@ -116,14 +94,10 @@ { ASSERT(Process == PsGetCurrentProcess()); - // - // Blow away the mapping - // + /* Blow away the mapping */ MiAddressToPte(Address)->u.Long = 0; - - // - // Release the hyperlock - // + + /* Release the hyperlock */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); KeReleaseSpinLock(&Process->HyperSpaceLock, OldIrql); } @@ -136,36 +110,24 @@ PMMPTE PointerPte; PVOID Address; - // - // Never accept page 0 - // + /* Never accept page 0 */ ASSERT(Page != 0); - // - // Build the PTE - // + /* Build the PTE */ TempPte = HyperTemplatePte; TempPte.u.Hard.PageFrameNumber = Page; - // - // Get the Zero PTE and its address - // + /* Get the Zero PTE and its address */ PointerPte = MiAddressToPte(MI_ZERO_PTE); Address = (PVOID)((ULONG_PTR)PointerPte << 10); - // - // Invalidate the old address - // + /* Invalidate the old address */ __invlpg(Address); - // - // Write the current PTE - // + /* Write the current PTE */ TempPte.u.Hard.PageFrameNumber = Page; *PointerPte = TempPte; - // - // Return the address - // + /* Return the address */ return Address; }

1 0

[jimtabor] 40288: - Fix W32PROCESS, replaced pointer with structure.
by jimtabor＠svn.reactos.org 29 Mar '09

29 Mar '09

Author: jimtabor Date: Sun Mar 29 20:31:27 2009 New Revision: 40288 URL: http://svn.reactos.org/svn/reactos?rev=40288&view=rev Log: - Fix W32PROCESS, replaced pointer with structure. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Mar 29 20:31:27 2009 @@ -75,8 +75,8 @@ DWORD W32Pid; LONG GDIObjects; LONG UserObjects; - DWORD cSimpleLock; /* Locking Process during access to structure. */ - PVOID pvAvlTable; /* Pointer to AVL Table. */ + DWORD cSimpleLock; /* Locking Process during access to structure. */ + RTL_AVL_TABLE rtlAvlTable; /* Process AVL Table. */ /* ReactOS */ LIST_ENTRY ClassList; LIST_ENTRY MenuListHead;

1 0

[khornicek] 40287: - return WSAEMSGSIZE on both STATUS_BUFFER_TOO_SMALL / STATUS_BUFFER_OVERFLOW:
by khornicek＠svn.reactos.org 29 Mar '09

29 Mar '09

Author: khornicek Date: Sun Mar 29 19:56:08 2009 New Revision: 40287 URL: http://svn.reactos.org/svn/reactos?rev=40287&view=rev Log: - return WSAEMSGSIZE on both STATUS_BUFFER_TOO_SMALL / STATUS_BUFFER_OVERFLOW: Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Mar 29 19:56:08 2009 @@ -326,6 +326,7 @@ case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; + case STATUS_BUFFER_TOO_SMALL: case STATUS_BUFFER_OVERFLOW: DbgPrint("MSAFD: STATUS_BUFFER_TOO_SMALL/STATUS_BUFFER_OVERFLOW\n"); *Errno = WSAEMSGSIZE;

1 0

[khornicek] 40286: - fix possible memory leak (patch from Mesa3D by Daniel Zimmermann)
by khornicek＠svn.reactos.org 29 Mar '09

29 Mar '09

Author: khornicek Date: Sun Mar 29 17:39:18 2009 New Revision: 40286 URL: http://svn.reactos.org/svn/reactos?rev=40286&view=rev Log: - fix possible memory leak (patch from Mesa3D by Daniel Zimmermann) Modified: trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc Modified: trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc [iso-8859-1] Sun Mar 29 17:39:18 2009 @@ -105,23 +105,22 @@ int dimension; int the_ustride; int the_vstride; - - bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh)); - assert(ret); - - ret->bpatch = NULL; - ret->bpatch_normal = NULL; - ret->bpatch_color = NULL; - ret->bpatch_texcoord = NULL; - + if(maptype == GL_MAP2_VERTEX_3) dimension = 3; else if (maptype==GL_MAP2_VERTEX_4) dimension = 4; else { fprintf(stderr, "error in inMap2f, maptype=%i is wrong, maptype,map is invalid\n", maptype); return NULL; } - + + bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh)); + assert(ret); + + ret->bpatch_normal = NULL; + ret->bpatch_color = NULL; + ret->bpatch_texcoord = NULL; ret->bpatch = bezierPatchMake(umin, vmin, umax, vmax, uorder, vorder, dimension); + /*copy the control points there*/ the_ustride = vorder * dimension; the_vstride = dimension;

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