Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 2 19:04:21 2008 New Revision: 35052 URL: http://svn.reactos.org/svn/reactos?rev=35052&view=rev Log: - fix build Modified: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] Sat Aug 2 19:04:21 2008 @@ -1,4 +1,15 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: subsys/csrss/win32csr/appswitch.c + * PURPOSE: app switching functionality + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + #include "w32csr.h" +//#define NDEBUG +#include <debug.h> typedef struct APPSWITCH_ITEM {

16 years, 4 months

[janderwald] 35051: - start implementing the alt-tab app switching dialog - requires WH_KEYBOARD_LL hook which is not yet ready - add missing resource constant

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 2 18:49:02 2008 New Revision: 35051 URL: http://svn.reactos.org/svn/reactos?rev=35051&view=rev Log: - start implementing the alt-tab app switching dialog - requires WH_KEYBOARD_LL hook which is not yet ready - add missing resource constant Added: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c (with props) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc trunk/reactos/subsystems/win32/csrss/win32csr/resource.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Added: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -1,0 +1,255 @@ +#include "w32csr.h" + +typedef struct APPSWITCH_ITEM +{ + HWND hwndDlg; + DWORD zPos; + HICON hIcon; + BOOL bFocus; + struct APPSWITCH_ITEM * Next; + WCHAR szText[1]; +}APPSWITCH_ITEM, *PAPPSWITCH_ITEM; + +static PAPPSWITCH_ITEM pRoot = NULL; +static DWORD NumOfWindows = 0; +static HWND hAppWindowDlg = NULL; +static HHOOK hhk = NULL; + +BOOL +CALLBACK +EnumWindowEnumProc( + HWND hwnd, + LPARAM lParam +) +{ + PAPPSWITCH_ITEM pItem; + UINT Length; + HICON hIcon; + PAPPSWITCH_ITEM pCurItem; + DWORD dwPid; + HANDLE hProcess; + WCHAR szFileName[MAX_PATH] = {0}; + + /* check if the enumerated window is visible */ + if (!IsWindowVisible(hwnd)) + return TRUE; + /* get window icon */ + hIcon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_BIG, 0); + if (!hIcon) + { + GetWindowThreadProcessId(hwnd, &dwPid); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ, FALSE, dwPid); + if (hProcess) + { + if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) + { + szFileName[MAX_PATH-1] = L'\0'; + ExtractIconExW(szFileName, 0, &hIcon, NULL, 1); + } + } + } + else + { + /* icons from WM_GETICON need to be copied */ + hIcon = CopyIcon(hIcon); + } + /* get the text length */ + Length = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + /* allocate item structure for it */ + pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); + if (!pItem) + return TRUE; + if (Length) + { + /* retrieve the window text when available */ + SendMessageW(hwnd, WM_GETTEXT, Length+1, (LPARAM)pItem->szText); + } + /* copy the window icon */ + pItem->hIcon = hIcon; + /* store window handle */ + pItem->hwndDlg = hwnd; + /* is the window the active window */ + if (GetActiveWindow() == hwnd) + pItem->bFocus = TRUE; + + if (!pRoot) + { + /* first item */ + pRoot = pItem; + return TRUE; + } + + /* enumerate the last item */ + pCurItem = pRoot; + while(pCurItem->Next) + pCurItem = pCurItem->Next; + + /* insert it into the list */ + pCurItem->Next = pItem; + NumOfWindows++; + return TRUE; +} + +VOID +EnumerateAppWindows(HDESK hDesk, HWND hwndDlg) +{ + /* initialize defaults */ + pRoot = NULL; + NumOfWindows = 0; + hAppWindowDlg = hwndDlg; + /* enumerate all windows */ + EnumDesktopWindows(hDesk, EnumWindowEnumProc, (LPARAM)NULL); + if (NumOfWindows > 7) + { + /* FIXME resize window */ + } +} + +VOID +MarkNextEntryAsActive() +{ + PAPPSWITCH_ITEM pItem; + + pItem = pRoot; + if (!pRoot) + return; + + while(pItem) + { + if (pItem->bFocus) + { + pItem->bFocus = FALSE; + if (pItem->Next) + pItem->Next->bFocus = TRUE; + else + pRoot->bFocus = TRUE; + } + pItem = pItem->Next; + } + + InvalidateRgn(hAppWindowDlg, NULL, TRUE); +} + + +LRESULT +CALLBACK +KeyboardHookProc( + int nCode, + WPARAM wParam, + LPARAM lParam +) +{ + PKBDLLHOOKSTRUCT hk = (PKBDLLHOOKSTRUCT) lParam; + + if (wParam == WM_SYSKEYUP) + { + /* is tab key pressed */ + if (hk->vkCode == VK_TAB) + { + if (hAppWindowDlg == NULL) + { + /* FIXME + * launch window + */ + DPRINT1("launch alt-tab window\n"); + } + else + { + MarkNextEntryAsActive(); + } + } + } + return CallNextHookEx(hhk, nCode, wParam, lParam); +} + +VOID +PaintAppWindows(HWND hwndDlg, HDC hDc) +{ + DWORD dwIndex, X, Y; + PAPPSWITCH_ITEM pCurItem; + RECT Rect; + DWORD XSize, YSize, XMax; + HBRUSH hBrush; + + X = 10; + Y = 10; + XSize = GetSystemMetrics(SM_CXICON); + YSize = GetSystemMetrics(SM_CYICON); + XMax = (XSize+(XSize/2)) * 7 + X; + pCurItem = pRoot; + + for (dwIndex = 0; dwIndex < NumOfWindows; dwIndex++) + { + if (X >= XMax) + { + X = 10; + Y += YSize + (YSize/2); + } + if (pCurItem->bFocus) + { + hBrush = CreateSolidBrush(RGB(30, 30, 255)); + SetRect(&Rect, X-5, Y-5, X + XSize + 5, Y + YSize + 5); + FillRect(hDc, &Rect, hBrush); + DeleteObject((HGDIOBJ)hBrush); + SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); + } + + DrawIcon(hDc, X, Y, pCurItem->hIcon); + pCurItem = pCurItem->Next; + X += XSize +(XSize/2); + } +} +VOID +DestroyAppWindows() +{ + PAPPSWITCH_ITEM pCurItem, pNextItem; + + pCurItem = pRoot; + while(pCurItem) + { + pNextItem = pCurItem->Next; + DestroyIcon(pCurItem->hIcon); + HeapFree(Win32CsrApiHeap, 0, pCurItem); + pCurItem = pNextItem; + } + pRoot = NULL; + hAppWindowDlg = NULL; + NumOfWindows = 0; +} + +INT_PTR +CALLBACK +SwitchWindowDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + PAINTSTRUCT Paint; + HDESK hInput; + + switch (message) + { + case WM_INITDIALOG: + hInput = OpenInputDesktop(0,0, GENERIC_ALL); + if (hInput) + { + EnumerateAppWindows(hInput, hwndDlg); + CloseDesktop(hInput); + } + return TRUE; + case WM_PAINT: + BeginPaint(hwndDlg, &Paint); + PaintAppWindows(hwndDlg, Paint.hdc); + EndPaint(hwndDlg, &Paint); + break; + case WM_DESTROY: + DestroyAppWindows(); + break; + } + return FALSE; +} + +VOID +STDCALL +InitializeAppSwitchHook() +{ + hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); + DPRINT("InitializeAppSwitchHook hhk %p\n", hhk); +} Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -16,6 +16,7 @@ /* Not defined in any header file */ extern VOID STDCALL PrivateCsrssManualGuiCheck(LONG Check); extern VOID STDCALL PrivateCsrssInitialized(); +extern VOID STDCALL InitializeAppSwitchHook(); /* GLOBALS *******************************************************************/ @@ -95,6 +96,7 @@ if (DLL_PROCESS_ATTACH == dwReason) { Win32CsrDllHandle = hDll; + InitializeAppSwitchHook(); } return TRUE; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -33,6 +33,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Îáðàáîòêà" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -27,6 +27,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Bearbeiten" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -27,6 +27,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Åðåîåñãáóßá" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -27,6 +27,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Edit" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -32,6 +32,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Editar" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -27,6 +27,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + /* Fixme : Translation could be really improved, with context La traduction pourrait réellement être améliorée grâce au contexte */ STRINGTABLE Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -27,6 +27,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Edit" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -36,6 +36,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Modifica" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -32,6 +32,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Edytuj" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -27,6 +27,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Èçìåíèòü" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -31,6 +31,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Upravi" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -35,6 +35,14 @@ IDC_STATIC,7,53,178,26 END +IDD_SWITCH_APP DIALOGEX 90, 90, 265, 170 +STYLE DS_SYSMODAL | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +EXSTYLE WS_EX_TOPMOST | WS_EX_WINDOWEDGE +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_STATIC_CUR_APP,39,139,204,16,SS_SUNKEN,WS_EX_STATICEDGE +END + STRINGTABLE BEGIN IDS_EDIT "Ðåäàãóâàòè" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/resource.h [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -10,10 +10,14 @@ #define WIN32CSR_RESOURCE_H_INCLUDED #define IDD_END_NOW 10 +#define IDD_NOT_RESPONDING 11 +#define IDD_SWITCH_APP 12 #define IDC_STATIC 100 #define IDC_PROGRESS 101 #define IDC_END_NOW 102 +#define IDC_STATIC_CUR_APP 103 + #define ID_SYSTEM_EDIT_MARK 1001 #define ID_SYSTEM_EDIT_COPY 1002 Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Aug 2 18:49:02 2008 @@ -16,6 +16,8 @@ <library>advapi32</library> <library>psapi</library> <library>msvcrt</library> + <library>psapi</library> + <library>shell32</library> <pch>w32csr.h</pch> <file>alias.c</file> <file>conio.c</file> @@ -24,5 +26,6 @@ <file>exitros.c</file> <file>guiconsole.c</file> <file>tuiconsole.c</file> + <file>appswitch.c</file> <file>win32csr.rc</file> </module>

16 years, 4 months

[mkupfer] 35050: revert to 35046, sorry for mistake

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Aug 2 17:33:58 2008 New Revision: 35050 URL: http://svn.reactos.org/svn/reactos?rev=35050&view=rev Log: revert to 35046, sorry for mistake Added: trunk/reactos/dll/win32/shdocvw/Bg.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/shdocvw/Cs.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Cs.rc trunk/reactos/dll/win32/shdocvw/De.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/En.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/Es.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/Fi.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Fi.rc trunk/reactos/dll/win32/shdocvw/Fr.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/Hu.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Hu.rc trunk/reactos/dll/win32/shdocvw/Ja.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Ja.rc trunk/reactos/dll/win32/shdocvw/Ko.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/Nl.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/No.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/No.rc trunk/reactos/dll/win32/shdocvw/Pl.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/shdocvw/Pt.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/Ru.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Ru.rc trunk/reactos/dll/win32/shdocvw/Sk.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Sk.rc trunk/reactos/dll/win32/shdocvw/Sv.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/Uk.rc - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/Uk.rc trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff - copied unchanged from r35046, trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff Removed: trunk/reactos/dll/win32/shdocvw/lang/ Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] Sat Aug 2 17:33:58 2008 @@ -23,21 +23,21 @@ #include "version.rc" -#include "lang/bg-BG.rc" -#include "lang/cz-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fi-FI.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/ja-JP.rc" -#include "lang/ko-KO.rc" -#include "lang/nl-NL.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/pt-PT.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "Bg.rc" +#include "Cs.rc" +#include "De.rc" +#include "En.rc" +#include "Es.rc" +#include "Fi.rc" +#include "Fr.rc" +#include "Hu.rc" +#include "Ja.rc" +#include "Ko.rc" +#include "Nl.rc" +#include "No.rc" +#include "Pl.rc" +#include "Pt.rc" +#include "Ru.rc" +#include "Sk.rc" +#include "Sv.rc" +#include "Uk.rc"

16 years, 4 months

[jmorlan] 35049: - Remove some redundant ProcessData == NULL checks - ClientConnectionThread already checks this for every request. - CsrApiCallHandler: Get rid of "Found" variable and just return when the right definition is found. - Make CsrApiCallHandler use the return value from the function (previously unused) to set Request->Status, and trim the now-redundant Request->Status setting from tons of CSR_API functions. - CsrCreateProcess: Don't set shutdown parameters again - already set in Csr

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Aug 2 17:09:22 2008 New Revision: 35049 URL: http://svn.reactos.org/svn/reactos?rev=35049&view=rev Log: - Remove some redundant ProcessData == NULL checks - ClientConnectionThread already checks this for every request. - CsrApiCallHandler: Get rid of "Found" variable and just return when the right definition is found. - Make CsrApiCallHandler use the return value from the function (previously unused) to set Request->Status, and trim the now-redundant Request->Status setting from tons of CSR_API functions. - CsrCreateProcess: Don't set shutdown parameters again - already set in CsrCreateProcessData. Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/api/user.c trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/win32csr/alias.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -66,10 +66,6 @@ ULONG h = (ULONG)Handle >> 2; DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize || (*Object = ProcessData->HandleTable[h].Object) == NULL @@ -117,10 +113,6 @@ ULONG h = (ULONG)Handle >> 2; Object_t *Object; - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (h >= ProcessData->HandleTableSize || (Object = ProcessData->HandleTable[h].Object) == NULL) @@ -142,11 +134,6 @@ { ULONG i; PVOID* Block; - - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -188,9 +175,7 @@ { ULONG i; - if (SourceProcessData == NULL || - TargetProcessData == NULL || - TargetProcessData->HandleTableSize) + if (TargetProcessData->HandleTableSize) { return STATUS_INVALID_PARAMETER; } @@ -225,10 +210,6 @@ { ULONG h = (ULONG)Handle >> 2; - if (ProcessData == NULL) - { - return STATUS_INVALID_PARAMETER; - } if (h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h].Object == NULL) { Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -228,7 +228,6 @@ NewProcessData = CsrCreateProcessData(Request->Data.CreateProcessRequest.NewProcessId); if (NewProcessData == NULL) { - Request->Status = STATUS_NO_MEMORY; return(STATUS_NO_MEMORY); } @@ -251,11 +250,6 @@ NewProcessData->ProcessGroup = ProcessData->ProcessGroup; } - /* Set default shutdown parameters */ - NewProcessData->ShutdownLevel = 0x280; - NewProcessData->ShutdownFlags = 0; - - Request->Status = STATUS_SUCCESS; return(STATUS_SUCCESS); } @@ -264,13 +258,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - return(Request->Status = STATUS_INVALID_PARAMETER); - } - ProcessData->Terminated = TRUE; - Request->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } @@ -278,8 +266,6 @@ { Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - - Request->Status = STATUS_SUCCESS; return(STATUS_SUCCESS); } @@ -289,16 +275,9 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - return(Request->Status = STATUS_INVALID_PARAMETER); - } - Request->Data.GetShutdownParametersRequest.Level = ProcessData->ShutdownLevel; Request->Data.GetShutdownParametersRequest.Flags = ProcessData->ShutdownFlags; - Request->Status = STATUS_SUCCESS; - return(STATUS_SUCCESS); } @@ -307,16 +286,9 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - return(Request->Status = STATUS_INVALID_PARAMETER); - } - ProcessData->ShutdownLevel = Request->Data.SetShutdownParametersRequest.Level; ProcessData->ShutdownFlags = Request->Data.SetShutdownParametersRequest.Flags; - Request->Status = STATUS_SUCCESS; - return(STATUS_SUCCESS); } @@ -325,12 +297,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - Request->Data.GetInputHandleRequest.InputHandle = INVALID_HANDLE_VALUE; - Request->Status = STATUS_INVALID_PARAMETER; - } - else if (ProcessData->Console) + if (ProcessData->Console) { Request->Status = CsrInsertObject(ProcessData, &Request->Data.GetInputHandleRequest.InputHandle, @@ -352,12 +319,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - Request->Data.GetOutputHandleRequest.OutputHandle = INVALID_HANDLE_VALUE; - Request->Status = STATUS_INVALID_PARAMETER; - } - else if (ProcessData->Console) + if (ProcessData->Console) { RtlEnterCriticalSection(&ProcessDataLock); Request->Status = CsrInsertObject(ProcessData, @@ -381,15 +343,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - } - else - { - Request->Status = CsrReleaseObject(ProcessData, Request->Data.CloseHandleRequest.Handle); - } - return Request->Status; + return CsrReleaseObject(ProcessData, Request->Data.CloseHandleRequest.Handle); } CSR_API(CsrVerifyHandle) @@ -414,13 +368,6 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - - if (NULL == ProcessData) - { - DPRINT1("Invalid source process\n"); - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } Index = (ULONG)Request->Data.DuplicateHandleRequest.Handle >> 2; RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -428,9 +375,8 @@ || (Entry = &ProcessData->HandleTable[Index])->Object == NULL) { DPRINT1("Couldn't dup invalid handle %p\n", Request->Data.DuplicateHandleRequest.Handle); - Request->Status = STATUS_INVALID_HANDLE; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Request->Status; + return STATUS_INVALID_HANDLE; } if (Request->Data.DuplicateHandleRequest.Options & DUPLICATE_SAME_ACCESS) @@ -445,9 +391,8 @@ { DPRINT1("Handle %p only has access %X; requested %X\n", Request->Data.DuplicateHandleRequest.Handle, Entry->Access, DesiredAccess); - Request->Status = STATUS_INVALID_PARAMETER; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return Request->Status; + return STATUS_INVALID_PARAMETER; } } @@ -473,18 +418,8 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - - Request->Data.GetConsoleInputWaitHandle.InputWaitHandle = INVALID_HANDLE_VALUE; - Request->Status = STATUS_INVALID_PARAMETER; - } - else - { - Request->Data.GetConsoleInputWaitHandle.InputWaitHandle = ProcessData->ConsoleEvent; - Request->Status = STATUS_SUCCESS; - } - return Request->Status; + Request->Data.GetConsoleInputWaitHandle.InputWaitHandle = ProcessData->ConsoleEvent; + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/api/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/user.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/user.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -26,26 +26,20 @@ CSR_API(CsrRegisterServicesProcess) { - NTSTATUS Status; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (ServicesProcessIdValid == TRUE) { /* Only accept a single call */ - Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } else { ServicesProcessId = (ULONG)Request->Data.RegisterServicesProcessRequest.ProcessId; ServicesProcessIdValid = TRUE; - Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } - - Request->Status = Status; - - return(Status); } /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -70,7 +70,6 @@ CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData, PCSR_API_MESSAGE Request) { - BOOL Found = FALSE; unsigned DefIndex; ULONG Type; @@ -79,7 +78,7 @@ DPRINT("CSR: API Number: %x ServerID: %x\n",Type, Request->Type >> 16); /* FIXME: Extract DefIndex instead of looping */ - for (DefIndex = 0; ! Found && DefIndex < ApiDefinitionsCount; DefIndex++) + for (DefIndex = 0; DefIndex < ApiDefinitionsCount; DefIndex++) { if (ApiDefinitions[DefIndex].Type == Type) { @@ -92,18 +91,15 @@ } else { - (ApiDefinitions[DefIndex].Handler)(ProcessData, Request); - Found = TRUE; + Request->Status = (ApiDefinitions[DefIndex].Handler)(ProcessData, Request); } - } - } - if (! Found) - { - DPRINT1("CSR: Unknown request type 0x%x\n", Request->Type); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Status = STATUS_INVALID_SYSTEM_SERVICE; - } + return; + } + } + DPRINT1("CSR: Unknown request type 0x%x\n", Request->Type); + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + Request->Status = STATUS_INVALID_SYSTEM_SERVICE; } BOOL Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -312,8 +312,7 @@ if (lpExeName == NULL || lpSource == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -328,9 +327,8 @@ Header = IntCreateAliasHeader(lpExeName); if (!Header) { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_INSUFFICIENT_RESOURCES; } IntInsertAliasHeader(&Console->Aliases, Header); } @@ -355,15 +353,13 @@ if (!Entry) { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_INSUFFICIENT_RESOURCES; } IntInsertAliasEntry(Header, Entry); - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetConsoleAlias) @@ -387,8 +383,7 @@ if (Request->Data.GetConsoleAlias.ExeLength == 0 || lpTarget == NULL || Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.SourceLength == 0) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -400,39 +395,34 @@ Header = IntFindAliasHeader(Console->Aliases, lpExeName); if (!Header) { - Request->Status = STATUS_INVALID_PARAMETER; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; } Entry = IntGetAliasEntry(Header, lpSource); if (!Entry) { - Request->Status = STATUS_INVALID_PARAMETER; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; } Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); if (Length > Request->Data.GetConsoleAlias.TargetBufferLength) { - Request->Status = STATUS_BUFFER_TOO_SMALL; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_BUFFER_TOO_SMALL; } if (!ValidateBuffer(ProcessData, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength)) { - Request->Status = STATUS_ACCESS_VIOLATION; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_ACCESS_VIOLATION; } wcscpy(lpTarget, Entry->lpTarget); Request->Data.GetConsoleAlias.BytesWritten = Length; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetAllConsoleAliases) @@ -443,8 +433,7 @@ if (Request->Data.GetAllConsoleAlias.lpExeName == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -456,25 +445,22 @@ Header = IntFindAliasHeader(Console->Aliases, Request->Data.GetAllConsoleAlias.lpExeName); if (!Header) { - Request->Status = STATUS_INVALID_PARAMETER; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; } if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) { - Request->Status = STATUS_BUFFER_OVERFLOW; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_BUFFER_OVERFLOW; } if (!ValidateBuffer(ProcessData, Request->Data.GetAllConsoleAlias.AliasBuffer, Request->Data.GetAllConsoleAlias.AliasBufferLength)) { - Request->Status = STATUS_ACCESS_VIOLATION; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_ACCESS_VIOLATION; } BytesWritten = IntGetAllConsoleAliases(Header, @@ -482,9 +468,8 @@ Request->Data.GetAllConsoleAlias.AliasBufferLength); Request->Data.GetAllConsoleAlias.BytesWritten = BytesWritten; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetAllConsoleAliasesLength) @@ -495,8 +480,7 @@ if (Request->Data.GetAllConsoleAliasesLength.lpExeName == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; + return STATUS_INVALID_PARAMETER; } Request->Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -508,17 +492,14 @@ Header = IntFindAliasHeader(Console->Aliases, Request->Data.GetAllConsoleAliasesLength.lpExeName); if (!Header) { - Request->Status = STATUS_INVALID_PARAMETER; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; } Length = IntGetAllConsoleAliasesLength(Header); Request->Data.GetAllConsoleAliasesLength.Length = Length; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; - + return STATUS_SUCCESS; } CSR_API(CsrGetConsoleAliasesExes) @@ -539,25 +520,22 @@ if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) { - Request->Status = STATUS_BUFFER_OVERFLOW; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_BUFFER_OVERFLOW; } if (Request->Data.GetConsoleAliasesExes.ExeNames == NULL) { - Request->Status = STATUS_INVALID_PARAMETER; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; } if (!ValidateBuffer(ProcessData, Request->Data.GetConsoleAliasesExes.ExeNames, Request->Data.GetConsoleAliasesExes.Length)) { - Request->Status = STATUS_ACCESS_VIOLATION; - ConioUnlockConsole(Console); - return Request->Status; + ConioUnlockConsole(Console); + return STATUS_ACCESS_VIOLATION; } BytesWritten = IntGetConsoleAliasesExes(Console->Aliases, @@ -565,9 +543,8 @@ Request->Data.GetConsoleAliasesExes.Length); Request->Data.GetConsoleAliasesExes.BytesWritten = BytesWritten; - Request->Status = STATUS_SUCCESS; ConioUnlockConsole(Console); - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrGetConsoleAliasesExesLength) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -245,21 +245,11 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL) - { - DPRINT1("No process data\n"); - return Request->Status = STATUS_INVALID_PARAMETER; - } - if (ProcessData->Console) { DPRINT1("Process already has a console\n"); - Request->Status = STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER; } - - /* Assume success */ - Request->Status = STATUS_SUCCESS; /* If we don't need a console, then get out of here */ if (!Request->Data.AllocConsoleRequest.ConsoleNeeded) @@ -278,7 +268,6 @@ if (NULL == Console) { DPRINT1("Not enough memory for console\n"); - Request->Status = STATUS_NO_MEMORY; return STATUS_NO_MEMORY; } /* initialize list head */ @@ -286,12 +275,12 @@ /* insert process data required for GUI initialization */ InsertHeadList(&Console->ProcessList, &ProcessData->ProcessEntry); /* Initialize the Console */ - Request->Status = CsrInitConsole(Console); - if (!NT_SUCCESS(Request->Status)) + Status = CsrInitConsole(Console); + if (!NT_SUCCESS(Status)) { DPRINT1("Console init failed\n"); HeapFree(Win32CsrApiHeap, 0, Console); - return Request->Status; + return Status; } } else @@ -322,7 +311,7 @@ DPRINT1("Failed to insert object\n"); ConioDeleteConsole((Object_t *) Console); ProcessData->Console = 0; - return Request->Status = Status; + return Status; } Status = Win32CsrInsertObject(ProcessData, @@ -337,7 +326,7 @@ Win32CsrReleaseObject(ProcessData, Request->Data.AllocConsoleRequest.InputHandle); ProcessData->Console = 0; - return Request->Status = Status; + return Status; } } @@ -360,7 +349,7 @@ Request->Data.AllocConsoleRequest.InputHandle); } ProcessData->Console = 0; - return Request->Status = Status; + return Status; } /* Set the Ctrl Dispatcher */ @@ -384,9 +373,9 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ProcessData == NULL || ProcessData->Console == NULL) - { - return Request->Status = STATUS_INVALID_PARAMETER; + if (ProcessData->Console == NULL) + { + return STATUS_INVALID_PARAMETER; } Console = ProcessData->Console; @@ -576,7 +565,7 @@ &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Data.ReadConsoleRequest.EventHandle = ProcessData->ConsoleEvent; for (i = 0; i < nNumberOfCharsToRead && Console->InputEvents.Flink != &Console->InputEvents; i++) @@ -619,7 +608,6 @@ ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); Request->Data.ReadConsoleRequest.NrCharactersRead = 0; - Request->Status = STATUS_NOTIFY_CLEANUP; return STATUS_NOTIFY_CLEANUP; } @@ -653,27 +641,27 @@ Request->Data.ReadConsoleRequest.NrCharactersRead = i; if (0 == i) { - Request->Status = STATUS_PENDING; /* we didn't read anything */ + Status = STATUS_PENDING; /* we didn't read anything */ } else if (0 != (Console->Mode & ENABLE_LINE_INPUT)) { if (0 == Console->WaitingLines || (Request->Data.ReadConsoleRequest.Unicode ? (L'\n' != UnicodeBuffer[i - 1]) : ('\n' != Buffer[i - 1]))) { - Request->Status = STATUS_PENDING; /* line buffered, didn't get a complete line */ + Status = STATUS_PENDING; /* line buffered, didn't get a complete line */ } else { Console->WaitingLines--; - Request->Status = STATUS_SUCCESS; /* line buffered, did get a complete line */ + Status = STATUS_SUCCESS; /* line buffered, did get a complete line */ } } else { - Request->Status = STATUS_SUCCESS; /* not line buffered, did read something */ - } - - if (Request->Status == STATUS_PENDING) + Status = STATUS_SUCCESS; /* not line buffered, did read something */ + } + + if (Status == STATUS_PENDING) { Console->EchoCount = nNumberOfCharsToRead - i; } @@ -690,7 +678,7 @@ Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); } - return Request->Status; + return Status; } BOOLEAN __inline ConioGetIntersection( @@ -846,7 +834,7 @@ DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -855,7 +843,7 @@ if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } if(Request->Data.WriteConsoleRequest.Unicode) @@ -887,8 +875,8 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (NT_SUCCESS(Status)) { - Request->Status = ConioWriteConsole(Console, Buff, Buffer, - Request->Data.WriteConsoleRequest.NrCharactersToWrite, TRUE); + Status = ConioWriteConsole(Console, Buff, Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, TRUE); if (NT_SUCCESS(Status)) { Written = Request->Data.WriteConsoleRequest.NrCharactersToWrite; @@ -904,7 +892,7 @@ Request->Data.WriteConsoleRequest.NrCharactersWritten = Written; - return Request->Status = Status; + return Status; } VOID STDCALL @@ -1304,13 +1292,13 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.ScreenBufferInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } pInfo = &Request->Data.ScreenBufferInfoRequest.Info; pInfo->dwSize.X = Buff->MaxX; @@ -1327,9 +1315,7 @@ ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrSetCursor) @@ -1345,7 +1331,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -1355,7 +1341,7 @@ if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } NewCursorX = Request->Data.SetCursorRequest.Position.X; @@ -1365,7 +1351,7 @@ { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } OldCursorX = Buff->CurrentX; OldCursorY = Buff->CurrentY; @@ -1377,14 +1363,14 @@ { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } static VOID FASTCALL @@ -1435,7 +1421,7 @@ DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -1514,7 +1500,7 @@ ConioUnlockConsole(Console); } Request->Data.WriteConsoleOutputCharRequest.NrCharactersWritten = Written; - return Request->Status = Status; + return Status; } CSR_API(CsrFillOutputChar) @@ -1535,14 +1521,14 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } X = Request->Data.FillOutputRequest.Position.X; @@ -1580,7 +1566,7 @@ ConioUnlockConsole(Console); Length = Request->Data.FillOutputRequest.Length; Request->Data.FillOutputRequest.NrCharactersWritten = Length; - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrReadInputEvent) @@ -1600,7 +1586,7 @@ Status = ConioLockConsole(ProcessData, Request->Data.ReadInputRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } /* only get input if there is any */ @@ -1659,7 +1645,7 @@ ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } CSR_API(CsrWriteConsoleOutputAttrib) @@ -1681,7 +1667,7 @@ DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -1689,7 +1675,7 @@ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, @@ -1699,7 +1685,7 @@ if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } X = Request->Data.WriteConsoleOutputAttribRequest.Coord.X; @@ -1736,7 +1722,7 @@ ConioUnlockScreenBuffer(Buff); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrFillOutputAttrib) @@ -1754,7 +1740,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -1763,7 +1749,7 @@ if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } X = Request->Data.FillOutputAttribRequest.Coord.X; @@ -1796,7 +1782,7 @@ ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } @@ -1813,13 +1799,13 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.GetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Data.GetCursorInfoRequest.Info.bVisible = Buff->CursorInfo.bVisible; Request->Data.GetCursorInfoRequest.Info.dwSize = Buff->CursorInfo.dwSize; ConioUnlockScreenBuffer(Buff); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetCursorInfo) @@ -1838,14 +1824,14 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } Size = Request->Data.SetCursorInfoRequest.Info.dwSize; @@ -1869,14 +1855,14 @@ { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetTextAttrib) @@ -1890,14 +1876,14 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } Buff->DefaultAttrib = Request->Data.SetAttribRequest.Attrib; @@ -1907,14 +1893,14 @@ { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleMode) @@ -1932,7 +1918,7 @@ (Object_t **) &Console, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Buff = (PCSRSS_SCREEN_BUFFER)Console; @@ -1951,7 +1937,7 @@ Win32CsrReleaseObjectByPointer((Object_t *)Console); - return Request->Status = Status; + return Status; } CSR_API(CsrGetConsoleMode) @@ -1968,9 +1954,9 @@ (Object_t **) &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; - } - Request->Status = STATUS_SUCCESS; + return Status; + } + Status = STATUS_SUCCESS; Buff = (PCSRSS_SCREEN_BUFFER) Console; if (CONIO_CONSOLE_MAGIC == Console->Header.Type) { @@ -1982,11 +1968,11 @@ } else { - Request->Status = STATUS_INVALID_HANDLE; + Status = STATUS_INVALID_HANDLE; } Win32CsrReleaseObjectByPointer((Object_t *)Console); - return Request->Status; + return Status; } CSR_API(CsrCreateScreenBuffer) @@ -1997,15 +1983,10 @@ DPRINT("CsrCreateScreenBuffer\n"); - if (ProcessData == NULL) - { - return Request->Status = STATUS_INVALID_PARAMETER; - } - Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2039,13 +2020,9 @@ } Status = CsrInitConsoleScreenBuffer(Console, Buff); - if(! NT_SUCCESS(Status)) - { - Request->Status = Status; - } - else - { - Request->Status = Win32CsrInsertObject(ProcessData, + if(NT_SUCCESS(Status)) + { + Status = Win32CsrInsertObject(ProcessData, &Request->Data.CreateScreenBufferRequest.OutputHandle, &Buff->Header, Request->Data.CreateScreenBufferRequest.Access, @@ -2054,11 +2031,11 @@ } else { - Request->Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; } ConioUnlockConsole(Console); - return Request->Status; + return Status; } CSR_API(CsrSetScreenBuffer) @@ -2072,7 +2049,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2082,14 +2059,14 @@ if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } if (Buff == Console->ActiveBuffer) { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } /* drop reference to old buffer, maybe delete */ @@ -2107,7 +2084,7 @@ ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetTitle) @@ -2125,17 +2102,13 @@ DPRINT1("Invalid request size\n"); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if(! NT_SUCCESS(Status)) - { - Request->Status = Status; - } - else + if(NT_SUCCESS(Status)) { Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Request->Data.SetTitleRequest.Length); if (Buffer) @@ -2147,21 +2120,21 @@ memcpy(Console->Title.Buffer, Request->Data.SetTitleRequest.Title, Console->Title.Length); if (! ConioChangeTitle(Console)) { - Request->Status = STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; } else { - Request->Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; } } else { - Request->Status = STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; } ConioUnlockConsole(Console); } - return Request->Status; + return Status; } CSR_API(CsrGetTitle) @@ -2178,7 +2151,7 @@ if (! NT_SUCCESS(Status)) { DPRINT1("Can't get console\n"); - return Request->Status = Status; + return Status; } /* Copy title of the console to the user title buffer */ @@ -2195,9 +2168,7 @@ Request->Header.u1.s1.TotalLength = Length; Request->Header.u1.s1.DataLength = Length - sizeof(PORT_MESSAGE); } - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrWriteConsoleOutput) @@ -2220,7 +2191,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2232,7 +2203,7 @@ if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } BufferSize = Request->Data.WriteConsoleOutputRequest.BufferSize; @@ -2245,7 +2216,7 @@ { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_ACCESS_VIOLATION; + return STATUS_ACCESS_VIOLATION; } WriteRegion.left = Request->Data.WriteConsoleOutputRequest.WriteRegion.Left; WriteRegion.top = Request->Data.WriteConsoleOutputRequest.WriteRegion.Top; @@ -2266,7 +2237,7 @@ /* It is okay to have a WriteRegion completely outside the screen buffer. No data is written then. */ - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } for (i = 0, Y = WriteRegion.top; Y <= WriteRegion.bottom; i++, Y++) @@ -2300,7 +2271,7 @@ Request->Data.WriteConsoleOutputRequest.WriteRegion.Left = WriteRegion.left; Request->Data.WriteConsoleOutputRequest.WriteRegion.Top = WriteRegion.top; - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrFlushInputBuffer) @@ -2320,7 +2291,7 @@ GENERIC_WRITE); if(! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } /* Discard all entries in the input event queue */ @@ -2336,7 +2307,7 @@ ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrScrollConsoleScreenBuffer) @@ -2366,7 +2337,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -2375,7 +2346,7 @@ if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } ScrollRectangle.left = Request->Data.ScrollConsoleScreenBufferRequest.ScrollRectangle.Left; @@ -2389,7 +2360,7 @@ { ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } /* If the source was clipped on the left or top, adjust the destination accordingly */ @@ -2412,7 +2383,7 @@ { ConioUnlockConsole(Console); ConioUnlockScreenBuffer(Buff); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } } else @@ -2446,7 +2417,7 @@ ConioUnlockScreenBuffer(Buff); ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrReadConsoleOutputChar) @@ -2471,14 +2442,14 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } Xpos = Request->Data.ReadConsoleOutputCharRequest.ReadCoord.X; @@ -2511,7 +2482,6 @@ } *ReadBuffer = 0; - Request->Status = STATUS_SUCCESS; Request->Data.ReadConsoleOutputCharRequest.EndCoord.X = Xpos; Request->Data.ReadConsoleOutputCharRequest.EndCoord.Y = (Ypos - Buff->VirtualY + Buff->MaxY) % Buff->MaxY; @@ -2525,7 +2495,7 @@ Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); } - return Request->Status; + return STATUS_SUCCESS; } @@ -2547,7 +2517,7 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputAttribRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Xpos = Request->Data.ReadConsoleOutputAttribRequest.ReadCoord.X; @@ -2574,7 +2544,6 @@ *ReadBuffer = 0; - Request->Status = STATUS_SUCCESS; Request->Data.ReadConsoleOutputAttribRequest.EndCoord.X = Xpos; Request->Data.ReadConsoleOutputAttribRequest.EndCoord.Y = (Ypos - Buff->VirtualY + Buff->MaxY) % Buff->MaxY; @@ -2588,7 +2557,7 @@ Request->Header.u1.s1.DataLength = CurrentLength - sizeof(PORT_MESSAGE); } - return Request->Status; + return STATUS_SUCCESS; } @@ -2608,7 +2577,7 @@ Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } CurrentItem = Console->InputEvents.Flink; @@ -2627,10 +2596,9 @@ ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; Request->Data.GetNumInputEventsRequest.NumInputEvents = NumEvents; - return Request->Status; + return STATUS_SUCCESS; } @@ -2653,7 +2621,7 @@ Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if(! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } InputRecord = Request->Data.PeekConsoleInputRequest.InputRecord; @@ -2664,8 +2632,7 @@ || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockConsole(Console); - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status ; + return STATUS_ACCESS_VIOLATION; } NumItems = 0; @@ -2699,10 +2666,9 @@ ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; Request->Data.PeekConsoleInputRequest.Length = NumItems; - return Request->Status; + return STATUS_SUCCESS; } @@ -2732,7 +2698,7 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } CharInfo = Request->Data.ReadConsoleOutputRequest.CharInfo; @@ -2752,8 +2718,7 @@ || (((ULONG_PTR)CharInfo + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockScreenBuffer(Buff); - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status ; + return STATUS_ACCESS_VIOLATION; } SizeY = min(BufferSize.Y - BufferCoord.Y, ConioRectHeight(&ReadRegion)); @@ -2765,8 +2730,7 @@ if (! ConioGetIntersection(&ReadRegion, &ScreenRect, &ReadRegion)) { ConioUnlockScreenBuffer(Buff); - Request->Status = STATUS_SUCCESS; - return Request->Status; + return STATUS_SUCCESS; } for (i = 0, Y = ReadRegion.top; Y < ReadRegion.bottom; ++i, ++Y) @@ -2793,13 +2757,12 @@ ConioUnlockScreenBuffer(Buff); - Request->Status = STATUS_SUCCESS; Request->Data.ReadConsoleOutputRequest.ReadRegion.Right = ReadRegion.left + SizeX - 1; Request->Data.ReadConsoleOutputRequest.ReadRegion.Bottom = ReadRegion.top + SizeY - 1; Request->Data.ReadConsoleOutputRequest.ReadRegion.Left = ReadRegion.left; Request->Data.ReadConsoleOutputRequest.ReadRegion.Top = ReadRegion.top; - return Request->Status; + return STATUS_SUCCESS; } @@ -2821,7 +2784,7 @@ Status = ConioLockConsole(ProcessData, Request->Data.WriteConsoleInputRequest.ConsoleHandle, &Console, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } InputRecord = Request->Data.WriteConsoleInputRequest.InputRecord; @@ -2832,8 +2795,7 @@ || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) { ConioUnlockConsole(Console); - Request->Status = STATUS_ACCESS_VIOLATION; - return Request->Status ; + return STATUS_ACCESS_VIOLATION; } for (i = 0; i < Length; i++) @@ -2842,8 +2804,7 @@ if (NULL == Record) { ConioUnlockConsole(Console); - Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return Request->Status; + return STATUS_INSUFFICIENT_RESOURCES; } Record->Echoed = FALSE; @@ -2859,10 +2820,9 @@ ConioUnlockConsole(Console); - Request->Status = STATUS_SUCCESS; Request->Data.WriteConsoleInputRequest.Length = i; - return Request->Status; + return STATUS_SUCCESS; } /********************************************************************** @@ -2917,7 +2877,7 @@ if (! NT_SUCCESS(Status)) { DPRINT1("Failed to get console handle in SetConsoleHardwareState\n"); - return Request->Status = Status; + return Status; } switch (Request->Data.ConsoleHardwareStateRequest.SetGet) @@ -2928,17 +2888,17 @@ case CONSOLE_HARDWARE_STATE_SET: DPRINT("Setting console hardware state.\n"); - Request->Status = SetConsoleHardwareState(Console, Request->Data.ConsoleHardwareStateRequest.State); + Status = SetConsoleHardwareState(Console, Request->Data.ConsoleHardwareStateRequest.State); break; default: - Request->Status = STATUS_INVALID_PARAMETER_2; /* Client: (handle, [set_get], mode) */ + Status = STATUS_INVALID_PARAMETER_2; /* Client: (handle, [set_get], mode) */ break; } ConioUnlockConsole(Console); - return Request->Status; + return Status; } CSR_API(CsrGetConsoleWindow) @@ -2954,13 +2914,13 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Data.GetConsoleWindowRequest.WindowHandle = Console->hWindow; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleIcon) @@ -2976,14 +2936,14 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; - } - - Request->Status = (ConioChangeIcon(Console, Request->Data.SetConsoleIconRequest.WindowIcon) - ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); + return Status; + } + + Status = (ConioChangeIcon(Console, Request->Data.SetConsoleIconRequest.WindowIcon) + ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); ConioUnlockConsole(Console); - return Request->Status; + return Status; } CSR_API(CsrGetConsoleCodePage) @@ -2996,14 +2956,14 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.GetConsoleCodePage.CodePage = Console->CodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleCodePage) @@ -3016,7 +2976,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -3025,10 +2985,10 @@ { Console->CodePage = Request->Data.SetConsoleCodePage.CodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } CSR_API(CsrGetConsoleOutputCodePage) @@ -3041,14 +3001,14 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.GetConsoleOutputCodePage.CodePage = Console->OutputCodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrSetConsoleOutputCodePage) @@ -3061,7 +3021,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -3070,10 +3030,10 @@ { Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage; ConioUnlockConsole(Console); - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } ConioUnlockConsole(Console); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } CSR_API(CsrGetProcessList) @@ -3098,7 +3058,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } DPRINT1("Console_Api Ctrl-C\n"); @@ -3126,7 +3086,7 @@ Request->Header.u1.s1.TotalLength = Length; Request->Header.u1.s1.DataLength = Length - sizeof(PORT_MESSAGE); } - return Request->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } CSR_API(CsrGenerateCtrlEvent) @@ -3143,7 +3103,7 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { - return Request->Status = Status; + return Status; } Group = Request->Data.GenerateCtrlEvent.ProcessGroup; @@ -3162,7 +3122,7 @@ ConioUnlockConsole(Console); - return Request->Status = Status; + return Status; } /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -209,7 +209,7 @@ BgInitialized = TRUE; if (! DtbgInit()) { - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } @@ -222,7 +222,7 @@ if (NULL == ThreadData.Event) { DPRINT1("Failed to create event (error %d)\n", GetLastError()); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } ThreadHandle = CreateThread(NULL, 0, @@ -234,16 +234,14 @@ { CloseHandle(ThreadData.Event); DPRINT1("Failed to create desktop window thread.\n"); - return Request->Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } CloseHandle(ThreadHandle); WaitForSingleObject(ThreadData.Event, INFINITE); CloseHandle(ThreadData.Event); - Request->Status = ThreadData.Status; - - return Request->Status; + return ThreadData.Status; } CSR_API(CsrShowDesktop) @@ -261,13 +259,11 @@ nmh.ShowDesktop.Width = (int)Request->Data.ShowDesktopRequest.Width; nmh.ShowDesktop.Height = (int)Request->Data.ShowDesktopRequest.Height; - Request->Status = SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, - WM_NOTIFY, - (WPARAM)nmh.hdr.hwndFrom, - (LPARAM)&nmh) - ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; - - return Request->Status; + return SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, + WM_NOTIFY, + (WPARAM)nmh.hdr.hwndFrom, + (LPARAM)&nmh) + ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; } CSR_API(CsrHideDesktop) @@ -282,13 +278,11 @@ nmh.hdr.idFrom = 0; nmh.hdr.code = PM_HIDE_DESKTOP; - Request->Status = SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, - WM_NOTIFY, - (WPARAM)nmh.hdr.hwndFrom, - (LPARAM)&nmh) - ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; - - return Request->Status; + return SendMessageW(Request->Data.ShowDesktopRequest.DesktopWindow, + WM_NOTIFY, + (WPARAM)nmh.hdr.hwndFrom, + (LPARAM)&nmh) + ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS; } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Sat Aug 2 17:09:22 2008 @@ -27,8 +27,7 @@ { if (0 != LogonProcess) { - Request->Status = STATUS_LOGON_SESSION_EXISTS; - return Request->Status; + return STATUS_LOGON_SESSION_EXISTS; } LogonProcess = Request->Data.RegisterLogonProcessRequest.ProcessId; } @@ -38,15 +37,12 @@ { DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n", LogonProcess, Request->Header.ClientId.UniqueProcess); - Request->Status = STATUS_NOT_LOGON_PROCESS; - return Request->Status; + return STATUS_NOT_LOGON_PROCESS; } LogonProcess = 0; } - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } CSR_API(CsrSetLogonNotifyWindow) @@ -61,21 +57,17 @@ &WindowCreator)) { DPRINT1("Can't get window creator\n"); - Request->Status = STATUS_INVALID_HANDLE; - return Request->Status; + return STATUS_INVALID_HANDLE; } if (WindowCreator != (DWORD)LogonProcess) { DPRINT1("Trying to register window not created by winlogon as notify window\n"); - Request->Status = STATUS_ACCESS_DENIED; - return Request->Status; + return STATUS_ACCESS_DENIED; } LogonNotifyWindow = Request->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow; - Request->Status = STATUS_SUCCESS; - - return Request->Status; + return STATUS_SUCCESS; } typedef struct tagSHUTDOWN_SETTINGS @@ -938,17 +930,15 @@ if (0 == (Request->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) { - Request->Status = UserExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, - Request->Data.ExitReactosRequest.Flags); + return UserExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, + Request->Data.ExitReactosRequest.Flags); } else { - Request->Status = InternalExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, - (DWORD) Request->Header.ClientId.UniqueThread, - Request->Data.ExitReactosRequest.Flags); - } - - return Request->Status; + return InternalExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, + (DWORD) Request->Header.ClientId.UniqueThread, + Request->Data.ExitReactosRequest.Flags); + } } /* EOF */

16 years, 4 months

[arty] 35048: Fix step and next commands. Not perfect, but working. Also, make all printing go through KdbpPrint, and switch to KeStallExecutionProcessor for checking on messages from the terminal. Use the classic unix 100ms time limit for messages. We need to refactor debug entry. There's a whole bunch of intermixed code that basically handles 5 distinct states here: 1) Unexpected stop against a loose breakpoint instruction 2) Expected stop against a breakpoint instruction we placed 3) Singlest

by arty＠svn.reactos.org

Author: arty Date: Sat Aug 2 17:01:46 2008 New Revision: 35048 URL: http://svn.reactos.org/svn/reactos?rev=35048&view=rev Log: Fix step and next commands. Not perfect, but working. Also, make all printing go through KdbpPrint, and switch to KeStallExecutionProcessor for checking on messages from the terminal. Use the classic unix 100ms time limit for messages. We need to refactor debug entry. There's a whole bunch of intermixed code that basically handles 5 distinct states here: 1) Unexpected stop against a loose breakpoint instruction 2) Expected stop against a breakpoint instruction we placed 3) Singlestep after an expected breakpoint, user was not stepping 4) Singlestep after an expected breakpoint, user was stepping 5) Singlestep trap, user was not stepping (memory breakpoint). Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Aug 2 17:01:46 2008 @@ -1203,9 +1203,9 @@ Thread->Tcb.StackLimit = (ULONG)KdbStack; Thread->Tcb.KernelStack = (char*)KdbStack + KDB_STACK_SIZE; - /*KdbpPrint("Switching to KDB stack 0x%08x-0x%08x\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase);*/ - - KdbpStackSwitchAndCall(Thread->Tcb.KernelStack, KdbpCallMainLoop); + /*KdbpPrint("Switching to KDB stack 0x%08x-0x%08x (Current Stack is 0x%08x)\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Esp);*/ + + KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - sizeof(ULONG), KdbpCallMainLoop); Thread->Tcb.InitialStack = SavedInitialStack; Thread->Tcb.StackBase = SavedStackBase; @@ -1330,7 +1330,7 @@ if (!NT_SUCCESS(KdbpOverwriteInstruction(KdbCurrentProcess, BreakPoint->Address, BreakPoint->Data.SavedInstruction, NULL))) { - DbgPrint("Couldn't restore original instruction after INT3! Cannot continue execution.\n"); + KdbpPrint("Couldn't restore original instruction after INT3! Cannot continue execution.\n"); KEBUGCHECK(0); } } @@ -1361,7 +1361,7 @@ if ((KdbSingleStepOver && !KdbpStepOverInstruction(TrapFrame->Eip)) || (!KdbSingleStepOver && !KdbpStepIntoInstruction(TrapFrame->Eip))) { - TrapFrame->EFlags |= X86_EFLAGS_TF; + Context->EFlags |= X86_EFLAGS_TF; } goto continue_execution; /* return */ } @@ -1377,7 +1377,7 @@ BreakPoint->Type == KdbBreakPointTemporary) { ASSERT(ExceptionCode == STATUS_BREAKPOINT); - TrapFrame->EFlags |= X86_EFLAGS_TF; + Context->EFlags |= X86_EFLAGS_TF; KdbBreakPointToReenable = BreakPoint; } @@ -1410,12 +1410,12 @@ if (BreakPoint->Type == KdbBreakPointSoftware) { - DbgPrint("Entered debugger on breakpoint #%d: EXEC 0x%04x:0x%08x\n", + KdbpPrint("Entered debugger on breakpoint #%d: EXEC 0x%04x:0x%08x\n", KdbLastBreakPointNr, TrapFrame->SegCs & 0xffff, TrapFrame->Eip); } else if (BreakPoint->Type == KdbBreakPointHardware) { - DbgPrint("Entered debugger on breakpoint #%d: %s 0x%08x\n", + KdbpPrint("Entered debugger on breakpoint #%d: %s 0x%08x\n", KdbLastBreakPointNr, (BreakPoint->Data.Hw.AccessType == KdbAccessRead) ? "READ" : ((BreakPoint->Data.Hw.AccessType == KdbAccessWrite) ? "WRITE" : @@ -1444,36 +1444,38 @@ if (!NT_SUCCESS(KdbpOverwriteInstruction(KdbCurrentProcess, BreakPoint->Address, 0xCC, &BreakPoint->Data.SavedInstruction))) { - DbgPrint("Warning: Couldn't reenable breakpoint %d\n", + KdbpPrint("Warning: Couldn't reenable breakpoint %d\n", BreakPoint - KdbBreakPoints); } /* Unset TF if we are no longer single stepping. */ if (KdbNumSingleSteps == 0) - TrapFrame->EFlags &= ~X86_EFLAGS_TF; + Context->EFlags &= ~X86_EFLAGS_TF; goto continue_execution; /* return */ } /* Check if we expect a single step */ if ((TrapFrame->Dr6 & 0xf) == 0 && KdbNumSingleSteps > 0) { - /*ASSERT((TrapFrame->Eflags & X86_EFLAGS_TF) != 0);*/ + /*ASSERT((Context->Eflags & X86_EFLAGS_TF) != 0);*/ if (--KdbNumSingleSteps > 0) { if ((KdbSingleStepOver && KdbpStepOverInstruction(TrapFrame->Eip)) || (!KdbSingleStepOver && KdbpStepIntoInstruction(TrapFrame->Eip))) { - TrapFrame->EFlags &= ~X86_EFLAGS_TF; + Context->EFlags &= ~X86_EFLAGS_TF; } else { - TrapFrame->EFlags |= X86_EFLAGS_TF; + Context->EFlags |= X86_EFLAGS_TF; } - goto continue_execution; /* return */ + goto continue_execution; /* return */ } - - TrapFrame->EFlags &= ~X86_EFLAGS_TF; - KdbEnteredOnSingleStep = TRUE; + else + { + Context->EFlags &= ~X86_EFLAGS_TF; + KdbEnteredOnSingleStep = TRUE; + } } else { @@ -1481,7 +1483,7 @@ { return kdHandleException; } - DbgPrint("Entered debugger on unexpected debug trap!\n"); + KdbpPrint("Entered debugger on unexpected debug trap!\n"); } } else if (ExceptionCode == STATUS_BREAKPOINT) @@ -1496,7 +1498,7 @@ return kdHandleException; } - DbgPrint("Entered debugger on embedded INT3 at 0x%04x:0x%08x.\n", + KdbpPrint("Entered debugger on embedded INT3 at 0x%04x:0x%08x.\n", TrapFrame->SegCs & 0xffff, TrapFrame->Eip - 1); } else @@ -1510,7 +1512,7 @@ return ContinueType; } - DbgPrint("Entered debugger on %s-chance exception (Exception Code: 0x%x) (%s)\n", + KdbpPrint("Entered debugger on %s-chance exception (Exception Code: 0x%x) (%s)\n", FirstChance ? "first" : "last", ExceptionCode, ExceptionString); if (ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionRecord != NULL && ExceptionRecord->NumberParameters != 0) @@ -1528,15 +1530,15 @@ #endif Err = TrapFrame->ErrCode; - DbgPrint("Memory at 0x%p could not be %s: ", TrapCr2, (Err & (1 << 1)) ? "written" : "read"); + KdbpPrint("Memory at 0x%p could not be %s: ", TrapCr2, (Err & (1 << 1)) ? "written" : "read"); if ((Err & (1 << 0)) == 0) - DbgPrint("Page not present.\n"); + KdbpPrint("Page not present.\n"); else { if ((Err & (1 << 3)) != 0) - DbgPrint("Reserved bits in page directory set.\n"); + KdbpPrint("Reserved bits in page directory set.\n"); else - DbgPrint("Page protection violation.\n"); + KdbpPrint("Page protection violation.\n"); } } } @@ -1577,7 +1579,7 @@ } else { - KdbCurrentTrapFrame->Tf.EFlags |= X86_EFLAGS_TF; + Context->EFlags |= X86_EFLAGS_TF; } } @@ -1601,7 +1603,7 @@ continue_execution: /* Clear debug status */ - if (ExceptionCode == STATUS_SINGLE_STEP || ExceptionCode == STATUS_BREAKPOINT) /* FIXME: Why clear DR6 on INT3? */ + if (ExceptionCode == STATUS_BREAKPOINT) /* FIXME: Why clear DR6 on INT3? */ { /* Set the RF flag so we don't trigger the same breakpoint again. */ if (Resume) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Aug 2 17:01:46 2008 @@ -1395,8 +1395,10 @@ { if (!KdbpSymFindModuleByIndex(0, &Info)) { - KdbpPrint("No modules.\n"); - return TRUE; + ULONG_PTR ntoskrnlBase = ((ULONG_PTR)KdbpCmdMod) & 0xfff00000; + KdbpPrint(" Base Size Name\n"); + KdbpPrint(" %08x %08x %s\n", ntoskrnlBase, 0, "ntoskrnl.exe"); + return TRUE; } i = 1; } @@ -1915,6 +1917,8 @@ TerminalInitialized = TRUE; Length = 0; + KeStallExecutionProcessor(100000); + for (;;) { c = KdbpTryGetCharSerial(5000); @@ -1937,6 +1941,7 @@ { /* Try to query number of rows from terminal. A reply looks like "\x1b[8;24;80t" */ TerminalReportsSize = FALSE; + KeStallExecutionProcessor(100000); DbgPrint("\x1b[18t"); c = KdbpTryGetCharSerial(5000); if (c == KEY_ESC) @@ -1968,6 +1973,8 @@ } } } + /* Clear further characters */ + while ((c = KdbpTryGetCharSerial(5000)) != -1); } } @@ -2066,7 +2073,7 @@ } } - DbgPrint("%s", p); + DbgPrint("%s", p); if (c != '\0') p[i + 1] = c; @@ -2229,13 +2236,14 @@ /* Read the next char - this is to throw away a \n which most clients should * send after \r. */ + KeStallExecutionProcessor(100000); if (KdbDebugState & KD_DEBUG_KDSERIAL) NextKey = KdbpTryGetCharSerial(5); else NextKey = KdbpTryGetCharKeyboard(&ScanCode, 5); if (NextKey == '\n' || NextKey == -1) /* \n or no response at all */ NextKey = '\0'; - DbgPrint("\n"); + KdbpPrint("\n"); /* * Repeat the last command if the user presses enter. Reduces the * risk of RSI when single-stepping. @@ -2260,9 +2268,9 @@ Buffer--; *Buffer = 0; if (EchoOn) - DbgPrint("%c %c", KEY_BS, KEY_BS); + KdbpPrint("%c %c", KEY_BS, KEY_BS); else - DbgPrint(" %c", KEY_BS); + KdbpPrint(" %c", KEY_BS); } } else if (ScanCode == KEY_SCAN_UP) @@ -2287,15 +2295,15 @@ Buffer--; *Buffer = 0; if (EchoOn) - DbgPrint("%c %c", KEY_BS, KEY_BS); + KdbpPrint("%c %c", KEY_BS, KEY_BS); else - DbgPrint(" %c", KEY_BS); + KdbpPrint(" %c", KEY_BS); } i = min(strlen(KdbCommandHistory[CmdHistIndex]), Size - 1); memcpy(Orig, KdbCommandHistory[CmdHistIndex], i); Orig[i] = '\0'; Buffer = Orig + i; - DbgPrint("%s", Orig); + KdbpPrint("%s", Orig); } } else if (ScanCode == KEY_SCAN_DOWN) @@ -2313,22 +2321,22 @@ Buffer--; *Buffer = 0; if (EchoOn) - DbgPrint("%c %c", KEY_BS, KEY_BS); + KdbpPrint("%c %c", KEY_BS, KEY_BS); else - DbgPrint(" %c", KEY_BS); + KdbpPrint(" %c", KEY_BS); } i = min(strlen(KdbCommandHistory[CmdHistIndex]), Size - 1); memcpy(Orig, KdbCommandHistory[CmdHistIndex], i); Orig[i] = '\0'; Buffer = Orig + i; - DbgPrint("%s", Orig); + KdbpPrint("%s", Orig); } } } else { if (EchoOn) - DbgPrint("%c", Key); + KdbpPrint("%c", Key); *Buffer = Key; Buffer++; @@ -2406,14 +2414,14 @@ { if (!KdbSymPrintAddress((PVOID)KdbCurrentTrapFrame->Tf.Eip)) { - DbgPrint("<%x>", KdbCurrentTrapFrame->Tf.Eip); - } - DbgPrint(": "); + KdbpPrint("<%x>", KdbCurrentTrapFrame->Tf.Eip); + } + KdbpPrint(": "); if (KdbpDisassemble(KdbCurrentTrapFrame->Tf.Eip, KdbUseIntelSyntax) < 0) { - DbgPrint("<INVALID>"); - } - DbgPrint("\n"); + KdbpPrint("<INVALID>"); + } + KdbpPrint("\n"); } /* Flush the input buffer */ @@ -2431,7 +2439,7 @@ do { /* Print the prompt */ - DbgPrint("kdb:> "); + KdbpPrint("kdb:> "); /* Read a command and remember it */ KdbpReadCommand(Command, sizeof (Command)); @@ -2456,7 +2464,7 @@ if (!KdbBreakOnModuleLoad) return; - DbgPrint("Module %wZ loaded.\n", Name); + KdbpPrint("Module %wZ loaded.\n", Name); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); } Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sat Aug 2 17:01:46 2008 @@ -26,7 +26,7 @@ static BOOLEAN LoadSymbols; static LIST_ENTRY SymbolFileListHead; static KSPIN_LOCK SymbolFileListLock; - +BOOLEAN KdbpSymbolsInitialized = FALSE; /* FUNCTIONS ****************************************************************/ @@ -56,6 +56,9 @@ PPEB Peb = NULL; INT Count = 0; INT Length; + + if (!KdbpSymbolsInitialized) + return FALSE; CurrentProcess = PsGetCurrentProcess(); if (CurrentProcess != NULL) @@ -110,6 +113,9 @@ INT Count = 0; INT Length; + if (!KdbpSymbolsInitialized) + return FALSE; + current_entry = PsLoadedModuleList.Flink; while (current_entry != &PsLoadedModuleList) @@ -213,7 +219,7 @@ CHAR FileName[256]; CHAR FunctionName[256]; - if (!KdbpSymFindModuleByAddress(Address, &Info)) + if (!KdbpSymbolsInitialized || !KdbpSymFindModuleByAddress(Address, &Info)) return FALSE; RelativeAddress = (ULONG_PTR) Address - Info.Base; @@ -259,6 +265,11 @@ OUT PCH FileName OPTIONAL, OUT PCH FunctionName OPTIONAL) { + if (!KdbpSymbolsInitialized) + { + return STATUS_UNSUCCESSFUL; + } + if (NULL == RosSymInfo) { return STATUS_UNSUCCESSFUL; @@ -772,6 +783,7 @@ SymbolsInfo.SizeOfImage = DataTableEntry->SizeOfImage; KdbSymProcessSymbols(NULL, &SymbolsInfo); + KdbpSymbolsInitialized = TRUE; } }

16 years, 4 months

[mkupfer] 35047: Reorganize shdocvw: - Moved and renamed language resource files into created 'lang' directory. - Outdated shdocvw_ros.diff removed.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Aug 2 16:57:53 2008 New Revision: 35047 URL: http://svn.reactos.org/svn/reactos?rev=35047&view=rev Log: Reorganize shdocvw: - Moved and renamed language resource files into created 'lang' directory. - Outdated shdocvw_ros.diff removed. Added: trunk/reactos/dll/win32/shdocvw/lang/ trunk/reactos/dll/win32/shdocvw/lang/bg-BG.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/shdocvw/lang/cz-CZ.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Cs.rc trunk/reactos/dll/win32/shdocvw/lang/de-DE.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/lang/en-US.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/lang/es-ES.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/lang/fi-FI.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Fi.rc trunk/reactos/dll/win32/shdocvw/lang/fr-FR.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/lang/hu-HU.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Hu.rc trunk/reactos/dll/win32/shdocvw/lang/ja-JP.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Ja.rc trunk/reactos/dll/win32/shdocvw/lang/ko-KO.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/lang/nl-NL.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/lang/no-NO.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/No.rc trunk/reactos/dll/win32/shdocvw/lang/pl-PL.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/shdocvw/lang/pt-PT.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/lang/ru-RU.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Ru.rc trunk/reactos/dll/win32/shdocvw/lang/sk-SK.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Sk.rc trunk/reactos/dll/win32/shdocvw/lang/sv-SE.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/lang/uk-UA.rc - copied unchanged from r35032, trunk/reactos/dll/win32/shdocvw/Uk.rc Removed: trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/shdocvw/Cs.rc trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/Fi.rc trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/Hu.rc trunk/reactos/dll/win32/shdocvw/Ja.rc trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/No.rc trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/Ru.rc trunk/reactos/dll/win32/shdocvw/Sk.rc trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/Uk.rc trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc Removed: trunk/reactos/dll/win32/shdocvw/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Bg.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Bg.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2004 Mike McCormack for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ñâàëÿíå íà ActiveX äæàäæàòà çà Mozilla" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Îòêàç", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ïðèëîæåíèåòî èçèñêâà ActiveX îáåêò íà îáçîðíèêà\n" \ - "íî äæàäæàòà Mozilla Active X íå å ñëîæåíà.\n" \ - "Èñêàòå ëè äà ÿ ñâàëèòå è äà ÿ ñëîæèòå?" -END Removed: trunk/reactos/dll/win32/shdocvw/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Cs.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Cs.rc (removed) @@ -1,23 +1,0 @@ -/* FILE: dll/win32/shdocvw/Cs.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-06-27 - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Stahuji objekt Mozilla ActiveX" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Storno", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Tato aplikace poaduje objekt prohlíeèe ActiveX,\n" \ - "ale objekt Mozilla ActiveX momentálnì není nainstalovaný.\n" \ - "Stáhnout a nainstalovat jej?" -END Removed: trunk/reactos/dll/win32/shdocvw/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/De.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/De.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Henning Gerhardt - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Lade die Mozilla Active X Steuerung" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Abbrechen", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Diese Anwendung fordert ein ActiveX Browser Objekt an,\n" \ - "aber die Mozilla Active X Steuerung ist nicht installiert.\n" \ - "Möchten Sie, dass es aus dem Internet geladen und installiert wird ?" -END Removed: trunk/reactos/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/En.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/En.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2004 Mike McCormack for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Downloading the Mozilla Active X control" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "This application is requesting an ActiveX browser object\n" \ - "but the Mozilla Active X control is currently not installed.\n" \ - "Do you wish to download and install it?" -END Removed: trunk/reactos/dll/win32/shdocvw/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Es.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Es.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 José Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Descargando el control Active X de Mozilla" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancelar", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Esta aplicación está solicitando un objeto Active X de navegador\n" \ - "pero el control Active X de Mozilla no está instalado actualmente.\n" \ - "¿Desea descargarlo e instalarlo?" -END Removed: trunk/reactos/dll/win32/shdocvw/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fi.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Fi.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Kimmo Myllyvirta - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ladataan Mozilla Active X -komponenttia" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Peruuta", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Tämä sovellus vaatii ActiveX selainkomponentin,\n" \ - "mutta Mozilla Active X -komponenttia ei ole vielä asennettu.\n" \ - "Haluatko ladata ja asentaa sen?" -END Removed: trunk/reactos/dll/win32/shdocvw/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fr.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Fr.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2004 Jonathan Ernst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Téléchargement du contrôle ActiveX de Mozilla" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Annuler", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Cette application requiert un object navigateur ActiveX\n" \ - "mais le contrôle Active X de Mozilla n'est pas installé.\n" \ - "Souhaitez-vous le télécharger et l'installer ?" -END Removed: trunk/reactos/dll/win32/shdocvw/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Hu.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Hu.rc (removed) @@ -1,37 +1,0 @@ -/* - * Copyright 2004 Mike McCormack for CodeWeavers - * Copyright 2005 Risko Gergely - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "A Mozilla Active X vezérlõ letöltése" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Mégse", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ez az alkalmazás ActiveX támogatást igényel, de nincs \n" \ - "feltelepítve a Mozilla Active X vezérlõ.\n" \ - "Szeretnéd letölteni és telepíteni?" -END Removed: trunk/reactos/dll/win32/shdocvw/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ja.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Ja.rc (removed) @@ -1,18 +1,0 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Mozilla ActiveX Control Ì_E[h" -FONT 9, "MS UI Gothic" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "LZ", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "±ÌAvP[VÍ ActiveX browser object ðvµÄ¢Ü·\n" \ - "ªAMozilla ActiveX control Í»ÝCXg[³êÄ¢Ü¹ñB\n" \ - "Mozilla ActiveX Control ð_E[hµACXg[µÜ·©H" -END Removed: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Ko.rc (removed) @@ -1,22 +1,0 @@ -/* - *Korean Translation by manatails007(www.manatails007.org) Seungju Kim - */ - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Mozilla ActiveX ÄÁÆ®·Ñ ´Ù¿î·Îµå Áß" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "ÀÌ ÇÁ·Î±×·¥Àº Mozilla ActiveX ºê¶ó¿ìÀú °´Ã¼¸¦ ¿ä±¸ÇÕ´Ï´Ù.\n" \ - "±×·¯³ª Mozilla ActiveX ÄÁÆ®·ÑÀÌ ÇöÀç ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù.\n" \ - "´Ù¿î·ÎµåÇØ¼ ¼³Ä¡ÇÏ½Ã°Ú½À´Ï±î?" -END Removed: trunk/reactos/dll/win32/shdocvw/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Nl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Nl.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "De Mozilla ActiveX control wordt gedownload" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Annuleren", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Deze applicatie heeft een ActiveX browserobject nodig\n" \ - "maar de Mozilla ActiveX control is niet geïnstalleerd.\n" \ - "Wilt u deze downloaden en installeren?" -END Removed: trunk/reactos/dll/win32/shdocvw/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/No.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/No.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Last ned Mozilla Active X-kontrolleren" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Avbryt", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Dette programmet ber om et Active X-nettleserobjekt,\n" \ - "men Mozilla Active X-kontrolleren er ikke installert.\n" \ - "Vil du laste den ned og installere den?" -END Removed: trunk/reactos/dll/win32/shdocvw/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Pl.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Sebastian Gasiorek - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Pobierz kontrolkê ActiveX Mozilli" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Anuluj", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ta aplikacja wywo³uje obiekt ActiveX przegl¹darki,\n" \ - "ale kontrolka Mozilla Active X nie jest zainstalowana.\n" \ - "Czy chcesz j¹ pobraæ i zainstalowaæ?" -END Removed: trunk/reactos/dll/win32/shdocvw/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pt.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Pt.rc (removed) @@ -1,36 +1,0 @@ -/* - * Copyright 2005 Marcelo Duarte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Baixando o controle Mozilla ActiveX" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancelar", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Esta aplicação requer um objecto ActiveX do navegador\n" \ - "mas o controle Mozilla ActiveX atualmente não está instalado.\n" \ - "Você deseja baixá-lo e instalá-lo?" -END Removed: trunk/reactos/dll/win32/shdocvw/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ru.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Ru.rc (removed) @@ -1,38 +1,0 @@ -/* - * Copyright 2005 Mikhail Y. Zvyozdochkin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Çàãðóçêà ýëåìåíòà óïðàâëåíèÿ Mozilla Active X" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Îòìåíà", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Ïðèëîæåíèå çàïðàøèâàåò ActiveX-îáúåêò îáîçðåâàòåëÿ,\n" \ - "îäíàêî ýëåìåíò óïðàâëåíèÿ Mozilla ActiveX íåóñòàíîâëåí.\n" \ - "Õîòèòå çàãðóçèòü è óñòàíîâèòü åãî?" -END - - Removed: trunk/reactos/dll/win32/shdocvw/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sk.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Sk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Sk.rc (removed) @@ -1,22 +1,0 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 15-02-2008 - */ - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sahujem ovládanie Mozilla Active X" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Zrui", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Táto aplikácia sa doaduje prehliadania objektu ActiveX\n" \ - "ale ovládanie Mozilla Active X nie je v súèasnosti naintalované.\n" \ - "eláte si ho stiahnu a naintalova?" -END Removed: trunk/reactos/dll/win32/shdocvw/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sv.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Sv.rc (removed) @@ -1,34 +1,0 @@ -/* - * Copyright 2005 Anders Bergh - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Laddar ner Mozilla ActiveX-komponent" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Avbryt", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Programmet kräver en ActiveX-komponent som inte är tillgänglig.\nVill du ladda ner och installera Mozillas ActiveX-komponent?" -END Removed: trunk/reactos/dll/win32/shdocvw/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Uk.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/Uk.rc (removed) @@ -1,26 +1,0 @@ -/* - * PROJECT: Shell Doc Object and Control Library - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shdocvw/Uk.rc - * PURPOSE: Ukraianian Language File for shdocvw - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Çàâàíòàæåííÿ åëåìåíòó óïðàâë³ííÿ Mozilla Active X" -FONT 8, "MS Shell Dlg" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "Öåé äîäàòîê ïîòðåáóº îá'ºêò ActiveX îãëÿäà÷à,\n" \ - "àëå åëåìåíò óïðàâë³ííÿ Mozilla Active X íå âñòàíîâëåíèé.\n" \ - "Âè áàæàºòå çàâàíòàæèòè ³ âñòàíîâèòè éîãî??" -END Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] Sat Aug 2 16:57:53 2008 @@ -23,21 +23,21 @@ #include "version.rc" -#include "Bg.rc" -#include "Cs.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Sk.rc" -#include "Sv.rc" -#include "Uk.rc" +#include "lang/bg-BG.rc" +#include "lang/cz-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fi-FI.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/ja-JP.rc" +#include "lang/ko-KO.rc" +#include "lang/nl-NL.rc" +#include "lang/no-NO.rc" +#include "lang/pl-PL.rc" +#include "lang/pt-PT.rc" +#include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Removed: trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_ros.diff (removed) @@ -1,46 +1,0 @@ -Index: shdocvw.rc -=================================================================== ---- shdocvw.rc (revision 25694) -+++ shdocvw.rc (revision 25695) -@@ -38,3 +38,4 @@ - #include "Pt.rc" - #include "Ru.rc" - #include "Sv.rc" -+#include "Uk.rc" -Index: Uk.rc -=================================================================== ---- Uk.rc (revision 25695) -+++ Uk.rc (working copy) -@@ -0,0 +1,26 @@ -+/* -+ * PROJECT: Shell Doc Object and Control Library -+ * LICENSE: GPL - See COPYING in the top level directory -+ * FILE: dll/win32/shdocvw/Uk.rc -+ * PURPOSE: Ukraianian Language File for shdocvw -+ * TRANSLATOR: Artem Reznikov -+ */ -+ -+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -+ -+100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -+CAPTION "Çàâàíòàæåííÿ åëåìåíòó óïðàâë³ííÿ Mozilla Active X" -+FONT 8, "MS Shell Dlg" -+{ -+ CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 -+ LTEXT "", 104, 10, 30, 200, 10, SS_CENTER -+ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -+} -+ -+STRINGTABLE -+BEGIN -+ 1001 "Öåé äîäàòîê ïîòðåáóº îá'ºêò ActiveX îãëÿäà÷à,\n" \ -+ "àëå åëåìåíò óïðàâë³ííÿ Mozilla Active X íå âñòàíîâëåíèé." \ -+ "Âè áàæàºòå çàâàíòàæèòè ³ âñòàíîâèòè éîãî??" -+END - -Property changes on: Uk.rc -___________________________________________________________________ -Name: svn:eol-style - + native -

16 years, 4 months

[cgutman] 35046: - Set Irp->IoStatus.Information to 0 - Set Irp->IoStatus.Status before returning

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Aug 2 15:53:32 2008 New Revision: 35046 URL: http://svn.reactos.org/svn/reactos?rev=35046&view=rev Log: - Set Irp->IoStatus.Information to 0 - Set Irp->IoStatus.Status before returning Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 2 15:53:32 2008 @@ -313,6 +313,8 @@ ASSERT(FileObject == IrpSp->FileObject); } + Irp->IoStatus.Information = 0; + switch(IrpSp->MajorFunction) { /* opening and closing handles to the device */ @@ -457,7 +459,6 @@ default: Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; AFD_DbgPrint(MIN_TRACE, ("Unknown IOCTL (0x%x)\n", IrpSp->Parameters.DeviceIoControl. IoControlCode)); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Sat Aug 2 15:53:32 2008 @@ -262,6 +262,8 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + Irp->IoStatus.Status = Status; + return Status; }

16 years, 4 months

[jmorlan] 35045: NtGdiGetRegionData: Use correct address of region header (&obj->rdh, not obj). Also, for the contents, just use 'rgndata->Buffer' as the destination address instead of doing funky pointer arithmetic.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sat Aug 2 15:07:59 2008 New Revision: 35045 URL: http://svn.reactos.org/svn/reactos?rev=35045&view=rev Log: NtGdiGetRegionData: Use correct address of region header (&obj->rdh, not obj). Also, for the contents, just use 'rgndata->Buffer' as the destination address instead of doing funky pointer arithmetic. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sat Aug 2 15:07:59 2008 @@ -3174,12 +3174,8 @@ _SEH_TRY { ProbeForWrite(rgndata, count, 1); - RtlCopyMemory(rgndata, - obj, - sizeof(RGNDATAHEADER)); - RtlCopyMemory((PVOID)((ULONG_PTR)rgndata + (ULONG_PTR)sizeof(RGNDATAHEADER)), - obj->Buffer, - size); + RtlCopyMemory(rgndata, &obj->rdh, sizeof(RGNDATAHEADER)); + RtlCopyMemory(rgndata->Buffer, obj->Buffer, size); } _SEH_HANDLE {

16 years, 4 months

[pschweitzer] 35044: Revert r35043 on shell32/fprop.c

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Aug 2 13:35:08 2008 New Revision: 35044 URL: http://svn.reactos.org/svn/reactos?rev=35044&view=rev Log: Revert r35043 on shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat Aug 2 13:35:08 2008 @@ -349,10 +349,10 @@ return FALSE; } CloseHandle(hFile); - if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr)/sizeof(resultstr[0]))); + if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr) / sizeof(WCHAR))) return FALSE; hDlgCtrl = GetDlgItem(hwndDlg, 14011); - ERR("result size %u resultstr %s %s\n", file_size.QuadPart, debugstr_w(resultstr), resultstr); + TRACE("result size %u resultstr %s\n", file_size.QuadPart, debugstr_w(resultstr)); SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); if (lpfilesize)

16 years, 4 months

[pschweitzer] 35043: Synced dbghelp.dll with Wine HEAD.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Aug 2 13:30:38 2008 New Revision: 35043 URL: http://svn.reactos.org/svn/reactos?rev=35043&view=rev Log: Synced dbghelp.dll with Wine HEAD. Removed: trunk/reactos/dll/win32/dbghelp/Makefile.in trunk/reactos/dll/win32/dbghelp/dbghelp.def trunk/reactos/dll/win32/dbghelp/dbghelp.rc trunk/reactos/dll/win32/dbghelp/stackframe.h trunk/reactos/dll/win32/dbghelp/stubs.c trunk/reactos/dll/win32/dbghelp/thread.h Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/dwarf.h trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/include/psdk/dbghelp.h trunk/reactos/include/reactos/wine/mscvpdb.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/dbghelp/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/Makefile… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Removed: trunk/reactos/dll/win32/dbghelp/dbghelp.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Removed: trunk/reactos/dll/win32/dbghelp/dbghelp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.h?… Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… Removed: trunk/reactos/dll/win32/dbghelp/stackframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stackfra… Removed: trunk/reactos/dll/win32/dbghelp/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stubs.c?… Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… Removed: trunk/reactos/dll/win32/dbghelp/thread.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/thread.h… Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… Modified: trunk/reactos/include/reactos/wine/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mscvp… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

16 years, 4 months

← Newer
1
...
77
78
79
80
81
82
83
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008