Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[mpiulachs] 30569: add scrnsave to build

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Nov 19 03:44:52 2007 New Revision: 30569 URL: http://svn.reactos.org/svn/reactos?rev=30569&view=rev Log: add scrnsave to build Modified: trunk/reactos/lib/sdk/sdk.rbuild Modified: trunk/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=305… ============================================================================== --- trunk/reactos/lib/sdk/sdk.rbuild (original) +++ trunk/reactos/lib/sdk/sdk.rbuild Mon Nov 19 03:44:52 2007 @@ -20,4 +20,7 @@ <directory name="wdmguid"> <xi:include href="wdmguid/wdmguid.rbuild" /> </directory> + <directory name="scrnsave"> + <xi:include href="scrnsave/scrnsave.rbuild" /> + </directory> </group>

16 years, 10 months

[mpiulachs] 30568: Move scrnsave to a more correct location as it's a static library part of MS DDK

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Nov 19 03:35:39 2007 New Revision: 30568 URL: http://svn.reactos.org/svn/reactos?rev=30568&view=rev Log: Move scrnsave to a more correct location as it's a static library part of MS DDK Added: trunk/reactos/lib/sdk/scrnsave/ - copied from r30567, trunk/reactos/dll/win32/scrnsave/ Removed: trunk/reactos/dll/win32/scrnsave/ Modified: trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Nov 19 03:35:39 2007 @@ -331,7 +331,4 @@ <directory name="wtsapi32"> <xi:include href="wtsapi32/wtsapi32.rbuild" /> </directory> -<directory name="scrnsave"> - <xi:include href="scrnsave/scrnsave.rbuild" /> -</directory> </group>

16 years, 10 months

[arty] 30567: When doing NtAllocateVirtualMemory, you need to MEM_RELEASE if you intend to free the memory, otherwise you'll get stray address space hanging around. This was noticeable as a leak if you just left the command prompt sitting, because every DC allocated to blink the cursor kept address space that was never freed.

by arty＠svn.reactos.org

Author: arty Date: Mon Nov 19 02:59:48 2007 New Revision: 30567 URL: http://svn.reactos.org/svn/reactos?rev=30567&view=rev Log: When doing NtAllocateVirtualMemory, you need to MEM_RELEASE if you intend to free the memory, otherwise you'll get stray address space hanging around. This was noticeable as a leak if you just left the command prompt sitting, because every DC allocated to blink the cursor kept address space that was never freed. Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mem.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mem.c Mon Nov 19 02:59:48 2007 @@ -102,7 +102,7 @@ PUSERMEMHEADER Header = ((PUSERMEMHEADER) pv) - 1; ULONG MemSize = sizeof(USERMEMHEADER) + Header->MemSize; - ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &Header, &MemSize, MEM_DECOMMIT); + ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &Header, &MemSize, MEM_RELEASE); } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Mon Nov 19 02:59:48 2007 @@ -887,7 +887,7 @@ if (! NT_SUCCESS(Status)) { ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, - &Info.LParamSize, MEM_DECOMMIT); + &Info.LParamSize, MEM_RELEASE); SetLastNtError(Status); RETURN( (BOOL) -1); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Nov 19 02:59:48 2007 @@ -2418,7 +2418,7 @@ NTSTATUS Status = ZwFreeVirtualMemory(Pid, &Entry->UserData, &MemSize, - MEM_DECOMMIT); + MEM_RELEASE); if (NT_SUCCESS(Status)) { DPRINT("DC_FreeDC DC_ATTR 0x%x\n", Entry->UserData);

16 years, 10 months

[mpiulachs] 30566: This library is (hopefully) compatible with Microsoft's screen saver library.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon Nov 19 02:27:54 2007 New Revision: 30566 URL: http://svn.reactos.org/svn/reactos?rev=30566&view=rev Log: This library is (hopefully) compatible with Microsoft's screen saver library. Added: trunk/reactos/dll/win32/scrnsave/ trunk/reactos/dll/win32/scrnsave/scrnsave.c (with props) trunk/reactos/dll/win32/scrnsave/scrnsave.rbuild (with props) Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrnsave/scrnsav… ============================================================================== --- trunk/reactos/dll/win32/scrnsave/scrnsave.c (added) +++ trunk/reactos/dll/win32/scrnsave/scrnsave.c Mon Nov 19 02:27:54 2007 @@ -1,0 +1,408 @@ +/* + Screen saver library by Anders Norlander <anorland(a)hem2.passagen.se> + + This library is (hopefully) compatible with Microsoft's + screen saver library. + + This is public domain software. + + */ +#include <windows.h> +#include <scrnsave.h> +#include <regstr.h> + +/* screen saver window class */ +#define CLASS_SCRNSAVE TEXT("WindowsScreenSaverClass") + +/* globals */ +HWND hMainWindow = NULL; +BOOL fChildPreview = FALSE; +HINSTANCE hMainInstance; +TCHAR szName[TITLEBARNAMELEN]; +TCHAR szAppName[APPNAMEBUFFERLEN]; +TCHAR szIniFile[MAXFILELEN]; +TCHAR szScreenSaver[22]; +TCHAR szHelpFile[MAXFILELEN]; +TCHAR szNoHelpMemory[BUFFLEN]; +UINT MyHelpMessage; + +/* local house keeping */ +static HINSTANCE hPwdLib = NULL; +static POINT pt_orig; +static BOOL checking_pwd = FALSE; +static BOOL closing = FALSE; +static BOOL w95 = FALSE; + +typedef BOOL (WINAPI *VERIFYPWDPROC)(HWND); +typedef DWORD (WINAPI *CHPWDPROC)(LPCTSTR, HWND, DWORD, PVOID); +static VERIFYPWDPROC VerifyScreenSavePwd = NULL; + +/* function names */ +#define szVerifyPassword "VerifyScreenSavePwd" + +#ifdef UNICODE +#define szPwdChangePassword "PwdChangePasswordW" +#else +#define szPwdChangePassword "PwdChangePasswordA" +#endif + +static void TerminateScreenSaver(HWND hWnd); +static BOOL RegisterClasses(void); +static LRESULT WINAPI SysScreenSaverProc(HWND,UINT,WPARAM,LPARAM); +static int LaunchScreenSaver(HWND hParent); +static void LaunchConfig(void); + +static int ISSPACE(char c) +{ + return (c == ' ' || c == '\t'); +} + +#define ISNUM(c) ((c) >= '0' && c <= '9') +static unsigned long +_toul(const char *s) +{ + unsigned long res; + unsigned long n; + const char *p; + for (p = s; *p; p++) + if (!ISNUM(*p)) break; + p--; + res = 0; + for (n = 1; p >= s; p--, n *= 10) + res += (*p - '0') * n; + return res; +} + +/* screen saver entry point */ +int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, + LPSTR CmdLine, int nCmdShow) +{ + LPSTR p; + OSVERSIONINFO vi; + + /* initialize */ + hMainInstance = hInst; + + vi.dwOSVersionInfoSize = sizeof(vi); + GetVersionEx(&vi); + /* check if we are going to check for passwords */ + if (vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) + { + HKEY hKey; + /* we are using windows 95 */ + w95 = TRUE; + if (RegOpenKey(HKEY_CURRENT_USER, REGSTR_PATH_SCREENSAVE ,&hKey) == + ERROR_SUCCESS) + { + DWORD check_pwd; + DWORD size = sizeof(DWORD); + DWORD type; + LONG res; + res = RegQueryValueEx(hKey, REGSTR_VALUE_USESCRPASSWORD, + NULL, &type, (PBYTE) &check_pwd, &size); + if (check_pwd && res == ERROR_SUCCESS) + { + hPwdLib = LoadLibrary(TEXT("PASSWORD.CPL")); + if (hPwdLib) + VerifyScreenSavePwd = GetProcAddress(hPwdLib, szVerifyPassword); + } + RegCloseKey(hKey); + } + } + + /* parse arguments */ + for (p = CmdLine; *p; p++) + { + switch (*p) + { + case 'S': + case 's': + /* start screen saver */ + return LaunchScreenSaver(NULL); + + case 'P': + case 'p': + { + /* start screen saver in preview window */ + HWND hParent; + fChildPreview = TRUE; + while (ISSPACE(*++p)); + hParent = (HWND) _toul(p); + if (hParent && IsWindow(hParent)) + return LaunchScreenSaver(hParent); + } + return 0; + + case 'C': + case 'c': + /* display configure dialog */ + LaunchConfig(); + return 0; + + case 'A': + case 'a': + { + /* change screen saver password */ + HWND hParent; + while (ISSPACE(*++p)); + hParent = (HWND) _toul(p); + if (!hParent || !IsWindow(hParent)) + hParent = GetForegroundWindow(); + ScreenSaverChangePassword(hParent); + } + return 0; + + case '-': + case '/': + case ' ': + default: + break; + } + } + LaunchConfig(); + return 0; +} + +static void LaunchConfig(void) +{ + /* FIXME: should this be called */ + RegisterDialogClasses(hMainInstance); + /* display configure dialog */ + DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), + GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); +} + + +static int LaunchScreenSaver(HWND hParent) +{ + BOOL foo; + UINT style; + RECT rc; + MSG msg; + + /* don't allow other tasks to get into the foreground */ + if (w95 && !fChildPreview) + SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0); + + msg.wParam = 0; + + /* register classes, both user defined and classes used by screen saver + library */ + if (!RegisterClasses()) + { + MessageBox(NULL, TEXT("RegisterClasses() failed"), NULL, MB_ICONHAND); + goto restore; + } + + /* a slightly different approach needs to be used when displaying + in a preview window */ + if (hParent) + { + style = WS_CHILD; + GetClientRect(hParent, &rc); + } + else + { + style = WS_POPUP; + rc.right = GetSystemMetrics(SM_CXSCREEN); + rc.bottom = GetSystemMetrics(SM_CYSCREEN); + style |= WS_VISIBLE; + } + + /* create main screen saver window */ + hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, + TEXT("SCREENSAVER"), style, + 0, 0, rc.right, rc.bottom, hParent, NULL, + hMainInstance, NULL); + + /* display window and start pumping messages */ + if (hMainWindow) + { + UpdateWindow(hMainWindow); + ShowWindow(hMainWindow, SW_SHOW); + + while (GetMessage(&msg, NULL, 0, 0) == TRUE) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + +restore: + /* restore system */ + if (w95 && !fChildPreview) + SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0); + FreeLibrary(hPwdLib); + return msg.wParam; +} + +/* this function takes care of *must* do tasks, like terminating + screen saver */ +static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT msg, + WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_CREATE: + if (!fChildPreview) + SetCursor(NULL); + /* mouse is not supposed to move from this position */ + GetCursorPos(&pt_orig); + break; + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_TIMER: + if (closing) + return 0; + break; + case WM_PAINT: + if (closing) + return DefWindowProc(hWnd, msg, wParam, lParam); + break; + case WM_SYSCOMMAND: + if (!fChildPreview) + switch (wParam) + { + case SC_CLOSE: + case SC_SCREENSAVE: + case SC_NEXTWINDOW: + case SC_PREVWINDOW: + return FALSE; + } + break; + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_ACTIVATEAPP: + if (closing) + return DefWindowProc(hWnd, msg, wParam, lParam); + break; + } + return ScreenSaverProc(hWnd, msg, wParam, lParam); +} + +LONG WINAPI DefScreenSaverProc(HWND hWnd, UINT msg, + WPARAM wParam, LPARAM lParam) +{ + /* don't do any special processing when in preview mode */ + if (fChildPreview || closing) + return DefWindowProc(hWnd, msg, wParam, lParam); + + switch (msg) + { + case WM_CLOSE: + TerminateScreenSaver(hWnd); + /* do NOT pass this to DefWindowProc; it will terminate even if + an invalid password was given. + */ + return 0; + case SCRM_VERIFYPW: + /* verify password or return TRUE if password checking is turned off */ + if (VerifyScreenSavePwd) + return VerifyScreenSavePwd(hWnd); + else + return TRUE; + case WM_SETCURSOR: + if (checking_pwd) + break; + SetCursor(NULL); + return TRUE; + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_ACTIVATEAPP: + if (wParam != FALSE) + break; + case WM_MOUSEMOVE: + { + POINT pt; + GetCursorPos(&pt); + if (pt.x == pt_orig.x && pt.y == pt_orig.y) + break; + } + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + /* try to terminate screen saver */ + if (!checking_pwd) + PostMessage(hWnd, WM_CLOSE, 0, 0); + break; + } + return DefWindowProc(hWnd, msg, wParam, lParam); +} + +static void TerminateScreenSaver(HWND hWnd) +{ + /* don't allow recursion */ + if (checking_pwd || closing) + return; + + /* verify password */ + if (VerifyScreenSavePwd) + { + checking_pwd = TRUE; + closing = SendMessage(hWnd, SCRM_VERIFYPW, 0, 0); + checking_pwd = FALSE; + } + else + closing = TRUE; + + /* are we closing? */ + if (closing) + { + DestroyWindow(hWnd); + } + else + GetCursorPos(&pt_orig); /* if not: get new mouse position */ +} + +/* + Register screen saver window class and call user + supplied hook. + */ +static BOOL RegisterClasses(void) +{ + WNDCLASS cls; + ZeroMemory(&cls, sizeof(cls)); + cls.hCursor = NULL; + cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); + cls.lpszMenuName = NULL; + cls.lpszClassName = CLASS_SCRNSAVE; + cls.hbrBackground = NULL; //(HBRUSH)GetStockObject(BLACK_BRUSH); + cls.hInstance = hMainInstance; + cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; + cls.lpfnWndProc = (WNDPROC) SysScreenSaverProc; + cls.cbWndExtra = 0; + cls.cbClsExtra = 0; + + if (!RegisterClass(&cls)) + return FALSE; + + return RegisterDialogClasses(hMainInstance); +} + +void WINAPI ScreenSaverChangePassword(HWND hParent) +{ + /* load Master Password Router (MPR) */ + HINSTANCE hMpr = LoadLibrary(TEXT("MPR.DLL")); + + if (hMpr) + { + CHPWDPROC ChangePassword; + ChangePassword = (CHPWDPROC) GetProcAddress(hMpr, szPwdChangePassword); + + /* change password for screen saver provider */ + if (ChangePassword) + ChangePassword(TEXT("SCRSAVE"), hParent, 0, NULL); + + FreeLibrary(hMpr); + } +} + Propchange: trunk/reactos/dll/win32/scrnsave/scrnsave.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrnsave/scrnsav… ============================================================================== --- trunk/reactos/dll/win32/scrnsave/scrnsave.rbuild (added) +++ trunk/reactos/dll/win32/scrnsave/scrnsave.rbuild Mon Nov 19 02:27:54 2007 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="scrnsavelib" type="staticlibrary" allowwarnings="true"> + <file>scrnsave.c</file> +</module> +</group> Propchange: trunk/reactos/dll/win32/scrnsave/scrnsave.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Nov 19 02:27:54 2007 @@ -331,4 +331,7 @@ <directory name="wtsapi32"> <xi:include href="wtsapi32/wtsapi32.rbuild" /> </directory> +<directory name="scrnsave"> + <xi:include href="scrnsave/scrnsave.rbuild" /> +</directory> </group>

16 years, 10 months

[cfinck] 30565: Also commit the previously left out translation for mstsc by Marc Tormo i Bochaca (mtbochaca AT ya DOT com) See issue #2831 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 19 02:22:09 2007 New Revision: 30565 URL: http://svn.reactos.org/svn/reactos?rev=30565&view=rev Log: Also commit the previously left out translation for mstsc by Marc Tormo i Bochaca (mtbochaca AT ya DOT com) See issue #2831 for more details. Added: trunk/reactos/base/applications/mstsc/lang/ca-CA.rc (with props) Modified: trunk/reactos/base/applications/mstsc/rsrc.rc Added: trunk/reactos/base/applications/mstsc/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ca-CA.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/ca-CA.rc Mon Nov 19 02:22:09 2007 @@ -1,0 +1,63 @@ +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Paràmetres d'entrada",IDC_STATIC,7,7,228,89 + GROUPBOX "Paràmetres de connexió",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "Entreu l'adreça del servidor",IDC_STATIC,47,24,81,8 + LTEXT "Servidor:",IDC_STATIC,47,41,25,8 + LTEXT "Nom d'usuari:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Desa",IDC_SAVE,67,139,50,14 + PUSHBUTTON "Desa com...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Obre...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "Guarda els paràmetres de la connexió actual o obre una configuració existent",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tamany de l'escriptori Remot",IDC_STATIC,7,7,228,68 + GROUPBOX "Colors",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "Trieu el tamany de pantalla del escriptori remot. Arrossegueu el cursor al extrem dret per a pantalla complerta",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "Nota: La configuració del equip remot pot canviar aquestes configuracions.",IDC_STATIC,56,143,165,18 + LTEXT "Menys",IDC_STATIC,35,42,15,8 + LTEXT "Més",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Remote Desktop Connection" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Connectar",IDOK,147,245,50,14 + PUSHBUTTON "Cancel·lar",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "General" + IDS_TAB_DISPLAY "Pantalla" + IDS_256COLORS "256 Colors" + IDS_HIGHCOLOR15 "High Color (15 bit)" + IDS_HIGHCOLOR16 "High Color (16 bit)" + IDS_HIGHCOLOR24 "Color Real (24 bit)" + IDS_PIXEL "%lux%lu Pixels" + IDS_FULLSCREEN "Pantalla Complerta" + IDS_BROWSESERVER "<Navega per més...>" + IDS_HEADERTEXT1 "Remote Desktop" + IDS_HEADERTEXT2 "Connection" +END Propchange: trunk/reactos/base/applications/mstsc/lang/ca-CA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Mon Nov 19 02:22:09 2007 @@ -14,6 +14,7 @@ IDB_HEADER BITMAP "res/header.bmp" IDB_SPECT BITMAP "res/spectrum.bmp" +#include "lang/ca-CA.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc"

16 years, 10 months

[fireball] 30564: - Reference/dereference the file object when working with it in the context of MPW thread. This prevents massive file operations (like copying) to crash ReactOS with writing to a freed memory exception.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 19 02:11:20 2007 New Revision: 30564 URL: http://svn.reactos.org/svn/reactos?rev=30564&view=rev Log: - Reference/dereference the file object when working with it in the context of MPW thread. This prevents massive file operations (like copying) to crash ReactOS with writing to a freed memory exception. Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=305… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Mon Nov 19 02:11:20 2007 @@ -237,10 +237,16 @@ current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, DirtySegmentListEntry); current_entry = current_entry->Flink; - + + /* This Ros-specific function needs FileObject to be referenced, + ohterwise it may be deleted while this function still works + with it */ + ObReferenceObject(current->Bcb->FileObject); + Locked = ExTryToAcquireResourceExclusiveLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->FileObject->FsContext))->Resource); if (!Locked) { + ObDereferenceObject(current->Bcb->FileObject); continue; } @@ -248,6 +254,7 @@ if (!Locked) { ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->FileObject->FsContext))->Resource); + ObDereferenceObject(current->Bcb->FileObject); continue; } @@ -256,6 +263,7 @@ { ExReleasePushLock(&current->Lock); ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->FileObject->FsContext))->Resource); + ObDereferenceObject(current->Bcb->FileObject); continue; } @@ -267,6 +275,7 @@ ExReleasePushLock(&current->Lock); ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->FileObject->FsContext))->Resource); + ObDereferenceObject(current->Bcb->FileObject); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) {

16 years, 10 months

[cfinck] 30563: MSVC compatibility fix (inline -> __inline) This makes building rbuild with VS possible again.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 19 02:00:21 2007 New Revision: 30563 URL: http://svn.reactos.org/svn/reactos?rev=30563&view=rev Log: MSVC compatibility fix (inline -> __inline) This makes building rbuild with VS possible again. Modified: trunk/reactos/include/host/typedefs.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Mon Nov 19 02:00:21 2007 @@ -125,7 +125,7 @@ // // List Functions // -static inline +static __inline VOID InitializeListHead( IN PLIST_ENTRY ListHead @@ -134,7 +134,7 @@ ListHead->Flink = ListHead->Blink = ListHead; } -static inline +static __inline VOID InsertHeadList( IN PLIST_ENTRY ListHead, @@ -149,7 +149,7 @@ ListHead->Flink = Entry; } -static inline +static __inline VOID InsertTailList( IN PLIST_ENTRY ListHead, @@ -165,7 +165,7 @@ } BOOLEAN -static inline +static __inline IsListEmpty( IN const LIST_ENTRY * ListHead ) @@ -173,7 +173,7 @@ return (BOOLEAN)(ListHead->Flink == ListHead); } -static inline +static __inline BOOLEAN RemoveEntryList( IN PLIST_ENTRY Entry) @@ -188,7 +188,7 @@ return (BOOLEAN)(OldFlink == OldBlink); } -static inline +static __inline PLIST_ENTRY RemoveHeadList( IN PLIST_ENTRY ListHead) @@ -203,7 +203,7 @@ return Entry; } -static inline +static __inline PLIST_ENTRY RemoveTailList( IN PLIST_ENTRY ListHead)

16 years, 10 months

[cfinck] 30562: Some Catalan translations by Marc Tormo i Bochaca (mtbochaca AT ya DOT com) See issue #2831 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 19 01:55:58 2007 New Revision: 30562 URL: http://svn.reactos.org/svn/reactos?rev=30562&view=rev Log: Some Catalan translations by Marc Tormo i Bochaca (mtbochaca AT ya DOT com) See issue #2831 for more details. Added: trunk/reactos/base/applications/logoff/lang/ca-CA.rc (with props) trunk/reactos/base/applications/mmc/lang/ca-CA.rc (with props) Modified: trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc Added: trunk/reactos/base/applications/logoff/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/ca-CA.rc (added) +++ trunk/reactos/base/applications/logoff/lang/ca-CA.rc Mon Nov 19 01:55:58 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Finalitza una sessió.\n\n\ + /v\t\tMostra informació en quant a les accions dutes a terme.\n\ + /?\t\tMostra aquesta informació.\n\n" + +IDS_LOGOFF_REMOTE, "Finalitzant sessió en un equip remot." +IDS_LOGOFF_LOCAL, "Finalitzant la sessió actual en aquesta equip." + +IDS_ILLEGAL_PARAM, "Parametre(s) no vàlid(s)\n" +} +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/ca-CA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc Mon Nov 19 01:55:58 2007 @@ -2,6 +2,7 @@ #include "resource.h" #include "lang/bg-BG.rc" +#include "lang/ca-CA.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Added: trunk/reactos/base/applications/mmc/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ca-CA.rc (added) +++ trunk/reactos/base/applications/mmc/lang/ca-CA.rc Mon Nov 19 01:55:58 2007 @@ -1,0 +1,21 @@ +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Fitxer" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Sortida\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Ajuda" + BEGIN + MENUITEM "&En quant a Consola d'administracio de ReactOS...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Consola d'administracio de ReactOS" + IDS_CONSOLETITLE "Consola%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/ca-CA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Mon Nov 19 01:55:58 2007 @@ -3,6 +3,7 @@ #include "resource.h" #include "lang/bg-BG.rc" +#include "lang/ca-CA.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc"

16 years, 10 months

[weiden] 30561: Get rid of string pool helper routines

by weiden＠svn.reactos.org

Author: weiden Date: Mon Nov 19 01:53:30 2007 New Revision: 30561 URL: http://svn.reactos.org/svn/reactos?rev=30561&view=rev Log: Get rid of string pool helper routines Removed: trunk/reactos/dll/win32/user32/include/strpool.h trunk/reactos/dll/win32/user32/misc/strpool.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/wsprintf.c trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/clipboard.c trunk/reactos/dll/win32/user32/windows/messagebox.c Removed: trunk/reactos/dll/win32/user32/include/strpool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/s… ============================================================================== --- trunk/reactos/dll/win32/user32/include/strpool.h (original) +++ trunk/reactos/dll/win32/user32/include/strpool.h (removed) @@ -1,35 +1,0 @@ -// strpool.h - -#ifndef __USER32_INTERNAL_STRING_POOL_H -#define __USER32_INTERNAL_STRING_POOL_H - -extern HANDLE hProcessHeap; - -PVOID -HEAP_alloc ( DWORD len ); - -VOID -HEAP_free ( LPVOID memory ); - -LPWSTR -HEAP_strdupW ( LPCWSTR src, DWORD len ); - -NTSTATUS -HEAP_strcpyWtoA ( LPSTR lpszA, LPCWSTR lpszW, DWORD len ); - -NTSTATUS -HEAP_strcpyAtoW ( LPWSTR lpszW, LPCSTR lpszA, DWORD len ); - -NTSTATUS -HEAP_strdupWtoA ( LPSTR* ppszA, LPCWSTR lpszW, DWORD len ); - -NTSTATUS -HEAP_strdupAtoW ( LPWSTR* ppszW, LPCSTR lpszA, UINT* NewLen ); - -char* -heap_string_poolA ( const wchar_t* pstrW, DWORD length ); - -wchar_t* -heap_string_poolW ( const wchar_t* pstrWSrc, DWORD length ); - -#endif//__USER32_INTERNAL_STRING_POOL_H 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 (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h Mon Nov 19 01:53:30 2007 @@ -22,7 +22,6 @@ #include "regcontrol.h" #include "resource.h" #include "scroll.h" -#include "strpool.h" #include "window.h" #include "winpos.h" #include "winsta.h" 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 (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c Mon Nov 19 01:53:30 2007 @@ -111,7 +111,6 @@ return FALSE; } - hProcessHeap = RtlGetProcessHeap(); if (!Init()) return FALSE; if (!InitThread()) Removed: trunk/reactos/dll/win32/user32/misc/strpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/strp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/strpool.c (original) +++ trunk/reactos/dll/win32/user32/misc/strpool.c (removed) @@ -1,164 +1,0 @@ -// strpool.c - -#include <user32.h> - -#include <wine/debug.h> - -typedef struct tagHEAP_STRING_POOLA -{ - char* data; - struct tagHEAP_STRING_POOLA* next; -} HEAP_STRING_POOLA, *PHEAP_STRING_POOLA; - -typedef struct tagHEAP_STRING_POOLW -{ - wchar_t* data; - struct tagHEAP_STRING_POOLW* next; -} HEAP_STRING_POOLW, *PHEAP_STRING_POOLW; - -PHEAP_STRING_POOLA heap_string_Apool = NULL; - -PHEAP_STRING_POOLW heap_string_Wpool = NULL; - -HANDLE hProcessHeap = NULL; - -PVOID -HEAP_alloc ( DWORD len ) -{ - return RtlAllocateHeap ( hProcessHeap, 0, len ); -} - -VOID -HEAP_free ( LPVOID memory ) -{ - RtlFreeHeap ( hProcessHeap, 0, memory ); -} - -LPWSTR -HEAP_strdupW ( LPCWSTR src, DWORD len ) -{ - LPWSTR dst; - - if ( !src ) - return NULL; - - dst = HEAP_alloc ( (len+1) * sizeof(WCHAR) ); - if ( !dst ) - return NULL; - memcpy ( dst, src, (len+1)*sizeof(WCHAR) ); - return dst; -} - -NTSTATUS -HEAP_strcpyWtoA ( LPSTR lpszA, LPCWSTR lpszW, DWORD len ) -{ - NTSTATUS Status = - RtlUnicodeToMultiByteN ( lpszA, len, NULL, (LPWSTR)lpszW, len*sizeof(WCHAR) ); - lpszA[len] = '\0'; - return Status; -} - -NTSTATUS -HEAP_strcpyAtoW ( LPWSTR lpszW, LPCSTR lpszA, DWORD len ) -{ - NTSTATUS Status = - RtlMultiByteToUnicodeN ( lpszW, len*sizeof(WCHAR), NULL, (LPSTR)lpszA, len ); - lpszW[len] = L'\0'; - return Status; -} - -NTSTATUS -HEAP_strdupWtoA ( LPSTR* ppszA, LPCWSTR lpszW, DWORD len ) -{ - *ppszA = NULL; - - if ( !lpszW ) - return STATUS_SUCCESS; - - *ppszA = HEAP_alloc ( len + 1 ); - - if ( !*ppszA ) - return STATUS_NO_MEMORY; - - return HEAP_strcpyWtoA ( *ppszA, lpszW, len ); -} - -NTSTATUS -HEAP_strdupAtoW ( LPWSTR* ppszW, LPCSTR lpszA, UINT* NewLen ) -{ - ULONG len; - - *ppszW = NULL; - - if ( !lpszA ) - return STATUS_SUCCESS; - - len = lstrlenA ( lpszA ); - - *ppszW = HEAP_alloc ( (len+1) * sizeof(WCHAR) ); - - if ( !*ppszW ) - return STATUS_NO_MEMORY; - - if ( NewLen ) *NewLen = (UINT)len; - - return HEAP_strcpyAtoW ( *ppszW, lpszA, len ); -} - -char* heap_string_poolA ( const wchar_t* pstrW, DWORD length ) -{ - PHEAP_STRING_POOLA pPoolEntry = heap_string_Apool; - char* pstrA = NULL; - HEAP_strdupWtoA ( &pstrA, pstrW, length ); - if ( !pstrA ) - return NULL; - while ( pPoolEntry ) - { - if ( !strcmp ( pPoolEntry->data, pstrA ) ) - { - HEAP_free ( pstrA ); - return pPoolEntry->data; - } - pPoolEntry = pPoolEntry->next; - } - pPoolEntry = (PHEAP_STRING_POOLA)HEAP_alloc ( sizeof(HEAP_STRING_POOLA) ); - pPoolEntry->data = pstrA; - - // IMHO, synchronization is *not* needed here. This data is process- - // local, so the only possible contention is among threads. If a - // conflict does occur, the only problem will be a small memory - // leak that gets cleared up when the heap is destroyed by the - // process exiting. - pPoolEntry->next = heap_string_Apool; - heap_string_Apool = pPoolEntry; - return pPoolEntry->data; -} - -wchar_t* heap_string_poolW ( const wchar_t* pstrWSrc, DWORD length ) -{ - PHEAP_STRING_POOLW pPoolEntry = heap_string_Wpool; - wchar_t* pstrW = NULL; - pstrW = HEAP_strdupW ( (LPWSTR)pstrWSrc, length ); - if ( !pstrW ) - return NULL; - while ( pPoolEntry ) - { - if ( !wcscmp (pPoolEntry->data, pstrW ) ) - { - HEAP_free ( pstrW ); - return pPoolEntry->data; - } - pPoolEntry = pPoolEntry->next; - } - pPoolEntry = (PHEAP_STRING_POOLW)HEAP_alloc ( sizeof(HEAP_STRING_POOLW) ); - pPoolEntry->data = pstrW; - - // IMHO, synchronization is *not* needed here. This data is process- - // local, so the only possible contention is among threads. If a - // conflict does occur, the only problem will be a small memory - // leak that gets cleared up when the heap is destroyed by the - // process exiting. - pPoolEntry->next = heap_string_Wpool; - heap_string_Wpool = pPoolEntry; - return pPoolEntry->data; -} Modified: trunk/reactos/dll/win32/user32/misc/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wspr… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/wsprintf.c (original) +++ trunk/reactos/dll/win32/user32/misc/wsprintf.c Mon Nov 19 01:53:30 2007 @@ -598,11 +598,3 @@ } return Size; } -const LPWSTR strings[14] = {L"OK",L"Cancel",L"&Abort",L"&Retry",L"&Ignore",L"&Yes",L"&No",L"&Close",L"Help",L"&Try Again",L"&Continue"}; -/* - * @implemented - */ -LPWSTR STDCALL MB_GetString(DWORD string) -{ - return heap_string_poolW(strings[string],wcslen(strings[string])); -} Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild Mon Nov 19 01:53:30 2007 @@ -41,7 +41,6 @@ <file>misc.c</file> <file>object.c</file> <file>resources.c</file> - <file>strpool.c</file> <file>stubs.c</file> <file>timer.c</file> <file>winhelp.c</file> Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Mon Nov 19 01:53:30 2007 @@ -1200,7 +1200,6 @@ HINSTANCE hInstance) { UNICODE_STRING ClassName = {0}; - NTSTATUS Status; BOOL Ret; TRACE("class/atom: %s/%04x %p\n", @@ -1210,15 +1209,12 @@ if (!IS_ATOM(lpClassName)) { - Status = HEAP_strdupAtoW(&ClassName.Buffer, lpClassName, NULL); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - RtlInitUnicodeString(&ClassName, - ClassName.Buffer); + if (!RtlCreateUnicodeStringFromAsciiz(&ClassName, + lpClassName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } } else ClassName.Buffer = (PWSTR)((ULONG_PTR)lpClassName); @@ -1226,8 +1222,8 @@ Ret = NtUserUnregisterClass(&ClassName, hInstance); - if(!IS_ATOM(lpClassName) && ClassName.Buffer != NULL) - HEAP_free(ClassName.Buffer); + if (!IS_ATOM(lpClassName)) + RtlFreeUnicodeString(&ClassName); return Ret; } Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c Mon Nov 19 01:53:30 2007 @@ -114,14 +114,14 @@ { LPWSTR lpBuffer; UNICODE_STRING FormatName; + ANSI_STRING FormatNameA; INT Length; ANSI_STRING ClassName; ClassName.MaximumLength = cchMaxCount; ClassName.Buffer = lpszFormatName; - lpBuffer = HEAP_alloc(cchMaxCount * sizeof(WCHAR)); - + lpBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, cchMaxCount * sizeof(WCHAR)); if (!lpBuffer) { SetLastError(ERROR_OUTOFMEMORY); @@ -135,9 +135,18 @@ /* we need a UNICODE string */ Length = NtUserGetClipboardFormatName(format, &FormatName, cchMaxCount); - HEAP_strcpyWtoA(lpszFormatName, FormatName.Buffer, Length); - - return strlen(lpszFormatName); + if (Length != 0) + { + FormatNameA.Length = 0; + FormatNameA.MaximumLength = cchMaxCount; + FormatNameA.Buffer = lpszFormatName; + + RtlUnicodeStringToAnsiString(&FormatNameA, &FormatName, FALSE); + + return FormatNameA.Length; + } + + return 0; } /* Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c Mon Nov 19 01:53:30 2007 @@ -922,4 +922,14 @@ #endif } + +/* + * @implemented + */ +LPWSTR STDCALL MB_GetString(DWORD string) +{ + UNIMPLEMENTED; + return NULL; +} + /* EOF */

16 years, 10 months

[cfinck] 30560: - Add a "Saved Searches" list to the left menu - Remove the language switcher TODO If this should be possible, we would need to add localized Bugzilla templates for every language (effectively a huge overkill)

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 19 01:23:25 2007 New Revision: 30560 URL: http://svn.reactos.org/svn/reactos?rev=30560&view=rev Log: - Add a "Saved Searches" list to the left menu - Remove the language switcher TODO If this should be possible, we would need to add localized Bugzilla templates for every language (effectively a huge overkill) Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… Mon Nov 19 01:23:25 2007 @@ -269,29 +269,29 @@ </ol> <p></p> -[%# TODO we don't support switching languages yet -<div class="navTitle">Language</div> - <ol> - <li> - <div align="center"> - <select id="select" size="1" name="select" class="selectbox" onchange="window.open(this.options[this.selectedIndex].value,'_main')"> - <optgroup label="current language"> - <option value="#" selected="selected">English</option> - </optgroup> - <optgroup label="most popular"> - <option value="http://www.reactos.org/./[#inc_path_lang]../en/developer.htm">English</option> - <option value="http://www.reactos.org/./[#inc_path_lang]../de/developer.htm">Deutsch</option> - <option value="http://www.reactos.org/./[#inc_path_lang]../fr/developer.htm">Français</option> - </optgroup> - <optgroup label="other languages"> - <option value="#"><placeholder></option> - </optgroup> - </select> - </div> - </li> - </ol> - <p></p> -%] +[% IF user.login %] +<div class="navTitle">Saved Searches</div> + <ol> + [% IF user.showmybugslink %] + [% filtered_username = user.login FILTER url_quote %] + <li><a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My [% terms.Bugs %]</a></li> + [% print_pipe = 1 %] + [% END %] + + [% FOREACH q = user.queries %] + [% IF q.link_in_footer %] + <li><a href="buglist.cgi?cmdtype=runnamed&namedcmd=[% q.name FILTER url_quote %]">[% q.name FILTER html %]</a></li> + [% print_pipe = 1 %] + [% END %] + [% END %] + + [% FOREACH q = user.queries_subscribed %] + <li><a href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=[% q.name FILTER url_quote %]&sharer_id=[% q.user.id FILTER url_quote %]" title="Shared by [% q.user.identity FILTER html %]">[% q.name FILTER html FILTER no_break %]</a></li> + [% print_pipe = 1 %] + [% END %] + </ol> + <p></p> +[% END %] <div class="navTitle">Account</div> <ol>

16 years, 10 months

← Newer
1
...
33
34
35
36
37
38
39
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007