Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 35037: - Add dosfsck to the build.
by fireball＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: fireball Date: Sat Aug 2 09:45:18 2008 New Revision: 35037 URL: http://svn.reactos.org/svn/reactos?rev=35037&view=rev Log: - Add dosfsck to the build. Added: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rbuild (with props) trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rc (with props) Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild Added: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rbuild (added) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rbuild [iso-8859-1] Sat Aug 2 09:45:18 2008 @@ -1,0 +1,15 @@ +<module name="dosfsck" type="win32cui" installbase="system32" installname="dosfsck.exe" unicode="no" allowwarnings="true"> + <library>kernel32</library> + <library>user32</library> + + <file>boot.c</file> + <file>check.c</file> + <file>common.c</file> + <file>dosfsck.c</file> + <file>fat.c</file> + <file>file.c</file> + <file>io.c</file> + <file>lfn.c</file> + + <file>dosfsck.rc</file> +</module> Propchange: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rc (added) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rc [iso-8859-1] Sat Aug 2 09:45:18 2008 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS FAT checker\0" +#define REACTOS_STR_INTERNAL_NAME "dosfsck\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dosfsck.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright ReactOS Development team\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Sat Aug 2 09:45:18 2008 @@ -10,6 +10,10 @@ <directory name="chklib"> <xi:include href="chklib/chklib.rbuild" /> + </directory> + + <directory name="dosfsck"> + <xi:include href="dosfsck/dosfsck.rbuild" /> </directory> <directory name="gettype">

1 0

[hpoussin] 35036: Support GetObjectW() failure Reformat code
by hpoussin＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: hpoussin Date: Sat Aug 2 09:11:48 2008 New Revision: 35036 URL: http://svn.reactos.org/svn/reactos?rev=35036&view=rev Log: Support GetObjectW() failure Reformat code Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sat Aug 2 09:11:48 2008 @@ -57,8 +57,7 @@ HDC hDC; PSETTINGS_ENTRY Current; DWORD bpp, xres, yres, checkbpp; - DWORD curDispFreq; - + DWORD curDispFreq; /* Get current settings */ *CurrentSettings = NULL; @@ -80,12 +79,12 @@ while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { - if ((devmode.dmBitsPerPel==4 || - devmode.dmBitsPerPel==8 || - devmode.dmBitsPerPel==16 || - devmode.dmBitsPerPel==24 || - devmode.dmBitsPerPel==32) && - devmode.dmDisplayFrequency==curDispFreq) + if ((devmode.dmBitsPerPel == 4 || + devmode.dmBitsPerPel == 8 || + devmode.dmBitsPerPel == 16 || + devmode.dmBitsPerPel == 24 || + devmode.dmBitsPerPel == 32) && + devmode.dmDisplayFrequency == curDispFreq) { checkbpp=1; } @@ -286,7 +285,7 @@ BITMAP bitmap; DWORD Result = 0; DWORD iDevNum = 0; - INT i; + INT i; DISPLAY_DEVICE displayDevice; PGLOBAL_DATA pGlobalData; @@ -365,44 +364,52 @@ } /* Initialize the color spectrum bitmaps */ - for(i = 0; i < NUM_SPECTRUM_BITMAPS; i++) - { - pGlobalData->hSpectrumBitmaps[i] = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM_4 + i), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - - if (pGlobalData->hSpectrumBitmaps[i] != NULL) - { - GetObjectW(pGlobalData->hSpectrumBitmaps[i], sizeof(BITMAP), &bitmap); - - pGlobalData->cxSource[i] = bitmap.bmWidth; - pGlobalData->cySource[i] = bitmap.bmHeight; - } - } + for(i = 0; i < NUM_SPECTRUM_BITMAPS; i++) + { + pGlobalData->hSpectrumBitmaps[i] = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM_4 + i), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + + if (pGlobalData->hSpectrumBitmaps[i] != NULL) + { + if (GetObjectW(pGlobalData->hSpectrumBitmaps[i], sizeof(BITMAP), &bitmap) != 0) + { + pGlobalData->cxSource[i] = bitmap.bmWidth; + pGlobalData->cySource[i] = bitmap.bmHeight; + } + else + { + pGlobalData->cxSource[i] = 0; + pGlobalData->cySource[i] = 0; + } + } + } } /* Get the ID for GLOBAL_DATA::hSpectrumBitmaps */ static VOID ShowColorSpectrum(IN HDC hDC, IN LPRECT client, IN DWORD BitsPerPel, IN PGLOBAL_DATA pGlobalData) { - HDC hdcMem; - hdcMem = CreateCompatibleDC(hDC); - - if (hdcMem) - { - INT iBitmap; - - switch(BitsPerPel) - { - case 4: iBitmap = 0; break; - case 8: iBitmap = 1; break; - default: iBitmap = 2; - } - - SelectObject(hdcMem, pGlobalData->hSpectrumBitmaps[iBitmap]); - StretchBlt(hDC, client->left, client->top, client->right - client->left, - client->bottom - client->top, hdcMem, 0, 0, - pGlobalData->cxSource[iBitmap], pGlobalData->cySource[iBitmap], SRCCOPY); - DeleteDC(hdcMem); - } + HDC hdcMem; + INT iBitmap; + + hdcMem = CreateCompatibleDC(hDC); + + if (!hdcMem) + return; + + switch(BitsPerPel) + { + case 4: iBitmap = 0; break; + case 8: iBitmap = 1; break; + default: iBitmap = 2; + } + + SelectObject(hdcMem, pGlobalData->hSpectrumBitmaps[iBitmap]); + StretchBlt(hDC, + client->left, client->top, client->right - client->left, client->bottom - client->top, + hdcMem, 0, 0, + pGlobalData->cxSource[iBitmap], + pGlobalData->cySource[iBitmap], SRCCOPY); + DeleteDC(hdcMem); } static VOID @@ -415,18 +422,18 @@ PSETTINGS_ENTRY Current; DWORD dmNewBitsPerPel; DWORD index; - HDC hSpectrumDC; - HWND hSpectrumControl; - RECT client; + HDC hSpectrumDC; + HWND hSpectrumControl; + RECT client; index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETCURSEL, 0, 0); dmNewBitsPerPel = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); - /* Show a new spectrum bitmap */ - hSpectrumControl = GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM); - hSpectrumDC = GetDC(hSpectrumControl); - GetClientRect(hSpectrumControl, &client); - ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pGlobalData); + /* Show a new spectrum bitmap */ + hSpectrumControl = GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM); + hSpectrumDC = GetDC(hSpectrumControl); + GetClientRect(hSpectrumControl, &client); + ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pGlobalData); /* find if new parameters are valid */ Current = pGlobalData->CurrentDisplayDevice->CurrentSettings; @@ -588,20 +595,20 @@ UINT CALLBACK SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp) { - UINT Ret = 0; - - switch (uMsg) - { - case PSPCB_CREATE: - Ret = RegisterMonitorSelectionControl(hApplet); - break; - - case PSPCB_RELEASE: - UnregisterMonitorSelectionControl(hApplet); - break; - } - - return Ret; + UINT Ret = 0; + + switch (uMsg) + { + case PSPCB_CREATE: + Ret = RegisterMonitorSelectionControl(hApplet); + break; + + case PSPCB_RELEASE: + UnregisterMonitorSelectionControl(hApplet); + break; + } + + return Ret; } /* Property page dialog callback */ @@ -612,7 +619,6 @@ pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - switch(uMsg) { case WM_INITDIALOG: @@ -625,8 +631,8 @@ LPDRAWITEMSTRUCT lpDrawItem; lpDrawItem = (LPDRAWITEMSTRUCT) lParam; - if(lpDrawItem->CtlID == IDC_SETTINGS_SPECTRUM) - ShowColorSpectrum(lpDrawItem->hDC, &lpDrawItem->rcItem, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel, pGlobalData); + if (lpDrawItem->CtlID == IDC_SETTINGS_SPECTRUM) + ShowColorSpectrum(lpDrawItem->hDC, &lpDrawItem->rcItem, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel, pGlobalData); break; } @@ -711,111 +717,111 @@ break; } - case WM_CONTEXTMENU: - { - HWND hwndMonSel; - HMENU hPopup; - UINT uiCmd; - POINT pt, ptClient; - INT Index; - - pt.x = (SHORT)LOWORD(lParam); - pt.y = (SHORT)HIWORD(lParam); - - hwndMonSel = GetDlgItem(hwndDlg, - IDC_SETTINGS_MONSEL); - if ((HWND)wParam == hwndMonSel) - { - if (pt.x == -1 && pt.y == -1) - { - RECT rcMon; - - Index = (INT)SendMessage(hwndMonSel, - MSLM_GETCURSEL, - 0, - 0); - - if (Index >= 0 && - (INT)SendMessage(hwndMonSel, - MSLM_GETMONITORRECT, - Index, - (LPARAM)&rcMon) > 0) - { - pt.x = rcMon.left + ((rcMon.right - rcMon.left) / 2); - pt.y = rcMon.top + ((rcMon.bottom - rcMon.top) / 2); - } - else - pt.x = pt.y = 0; - - MapWindowPoints(hwndMonSel, - NULL, - &pt, - 1); - } - else - { - ptClient = pt; - MapWindowPoints(NULL, - hwndMonSel, - &ptClient, - 1); - - Index = (INT)SendMessage(hwndMonSel, - MSLM_HITTEST, - (WPARAM)&ptClient, - 0); - } - - if (Index >= 0) - { - hPopup = LoadPopupMenu(hApplet, - MAKEINTRESOURCE(IDM_MONITOR_MENU)); - if (hPopup != NULL) - { - /* FIXME: Enable/Disable menu items */ - EnableMenuItem(hPopup, - ID_MENU_ATTACHED, - MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); - EnableMenuItem(hPopup, - ID_MENU_PRIMARY, - MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); - EnableMenuItem(hPopup, - ID_MENU_IDENTIFY, - MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); - EnableMenuItem(hPopup, - ID_MENU_PROPERTIES, - MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); - - uiCmd = (UINT)TrackPopupMenu(hPopup, - TPM_RETURNCMD | TPM_RIGHTBUTTON, - pt.x, - pt.y, - 0, - hwndDlg, - NULL); - - switch (uiCmd) - { - case ID_MENU_ATTACHED: - case ID_MENU_PRIMARY: - case ID_MENU_IDENTIFY: - case ID_MENU_PROPERTIES: - /* FIXME: Implement */ - break; - } - - DestroyMenu(hPopup); - } - } - } - break; - } + case WM_CONTEXTMENU: + { + HWND hwndMonSel; + HMENU hPopup; + UINT uiCmd; + POINT pt, ptClient; + INT Index; + + pt.x = (SHORT)LOWORD(lParam); + pt.y = (SHORT)HIWORD(lParam); + + hwndMonSel = GetDlgItem(hwndDlg, + IDC_SETTINGS_MONSEL); + if ((HWND)wParam == hwndMonSel) + { + if (pt.x == -1 && pt.y == -1) + { + RECT rcMon; + + Index = (INT)SendMessage(hwndMonSel, + MSLM_GETCURSEL, + 0, + 0); + + if (Index >= 0 && + (INT)SendMessage(hwndMonSel, + MSLM_GETMONITORRECT, + Index, + (LPARAM)&rcMon) > 0) + { + pt.x = rcMon.left + ((rcMon.right - rcMon.left) / 2); + pt.y = rcMon.top + ((rcMon.bottom - rcMon.top) / 2); + } + else + pt.x = pt.y = 0; + + MapWindowPoints(hwndMonSel, + NULL, + &pt, + 1); + } + else + { + ptClient = pt; + MapWindowPoints(NULL, + hwndMonSel, + &ptClient, + 1); + + Index = (INT)SendMessage(hwndMonSel, + MSLM_HITTEST, + (WPARAM)&ptClient, + 0); + } + + if (Index >= 0) + { + hPopup = LoadPopupMenu(hApplet, + MAKEINTRESOURCE(IDM_MONITOR_MENU)); + if (hPopup != NULL) + { + /* FIXME: Enable/Disable menu items */ + EnableMenuItem(hPopup, + ID_MENU_ATTACHED, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + EnableMenuItem(hPopup, + ID_MENU_PRIMARY, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + EnableMenuItem(hPopup, + ID_MENU_IDENTIFY, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + EnableMenuItem(hPopup, + ID_MENU_PROPERTIES, + MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + + uiCmd = (UINT)TrackPopupMenu(hPopup, + TPM_RETURNCMD | TPM_RIGHTBUTTON, + pt.x, + pt.y, + 0, + hwndDlg, + NULL); + + switch (uiCmd) + { + case ID_MENU_ATTACHED: + case ID_MENU_PRIMARY: + case ID_MENU_IDENTIFY: + case ID_MENU_PROPERTIES: + /* FIXME: Implement */ + break; + } + + DestroyMenu(hPopup); + } + } + } + break; + } case WM_DESTROY: { - INT i; - + INT i; PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList; + while (Current != NULL) { PDISPLAY_DEVICE_ENTRY Next = Current->Flink; @@ -832,11 +838,11 @@ HeapFree(GetProcessHeap(), 0, pGlobalData); - for(i = 0; i < NUM_SPECTRUM_BITMAPS; i++) - { - if(pGlobalData->hSpectrumBitmaps[i]) - DeleteObject(pGlobalData->hSpectrumBitmaps[i]); - } + for (i = 0; i < NUM_SPECTRUM_BITMAPS; i++) + { + if (pGlobalData->hSpectrumBitmaps[i]) + DeleteObject(pGlobalData->hSpectrumBitmaps[i]); + } } } return FALSE;

1 0

[cfinck] 35035: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop - Change the version number in the Explorer start menu bitmap
by cfinck＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cfinck Date: Sat Aug 2 08:10:59 2008 New Revision: 35035 URL: http://svn.reactos.org/svn/reactos?rev=35035&view=rev Log: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop - Change the version number in the Explorer start menu bitmap Modified: branches/ros-branch-0_3_6/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_6/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_6/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_6/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_6/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_6/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_6/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sat Aug 2 08:10:59 2008 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\lake.bmp" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" Modified: branches/ros-branch-0_3_6/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_6/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_6/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Aug 2 08:10:59 2008 @@ -756,6 +756,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE);

1 0

[cfinck] 35034: Hack: Copy the toolbar image on our own instead of using CopyImage to hackfix the messed up toolbar graphics as it was done for previous releases.
by cfinck＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cfinck Date: Sat Aug 2 08:02:42 2008 New Revision: 35034 URL: http://svn.reactos.org/svn/reactos?rev=35034&view=rev Log: Hack: Copy the toolbar image on our own instead of using CopyImage to hackfix the messed up toolbar graphics as it was done for previous releases. Modified: branches/ros-branch-0_3_6/reactos/dll/win32/comctl32/toolbar.c Modified: branches/ros-branch-0_3_6/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_6/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_6/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Aug 2 08:02:42 2008 @@ -2665,7 +2665,33 @@ TRACE("adding hInst=%p nID=%d nButtons=%d\n", bitmap->hInst, bitmap->nID, bitmap->nButtons); /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ - hbmLoad = (HBITMAP)CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); + { + BITMAP bmp; + HBITMAP hOldBitmapBitmap, hOldBitmapLoad; + HDC hdcImage, hdcBitmap; + + /* copy the bitmap before adding it so that the user's bitmap + * doesn't get modified. + */ + GetObjectW ((HBITMAP)bitmap->nID, sizeof(BITMAP), (LPVOID)&bmp); + + hdcImage = CreateCompatibleDC(0); + hdcBitmap = CreateCompatibleDC(0); + + /* create new bitmap */ + hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); + hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)bitmap->nID); + hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + + /* Copy the user's image */ + BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, + hdcBitmap, 0, 0, SRCCOPY); + + SelectObject (hdcImage, hOldBitmapLoad); + SelectObject (hdcBitmap, hOldBitmapBitmap); + DeleteDC (hdcImage); + DeleteDC (hdcBitmap); + } else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0

[cfinck] 35033: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases
by cfinck＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cfinck Date: Sat Aug 2 08:01:08 2008 New Revision: 35033 URL: http://svn.reactos.org/svn/reactos?rev=35033&view=rev Log: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases Modified: branches/ros-branch-0_3_6/reactos/base/applications/mstsc/connectdialog.c Modified: branches/ros-branch-0_3_6/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_6/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_6/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sat Aug 2 08:01:08 2008 @@ -197,19 +197,12 @@ static VOID -GeneralOnInit(HWND hwnd, - PINFO pInfo) -{ - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hGeneralPage = hwnd; - +GeneralOnInit(PINFO pInfo) +{ SetWindowPos(pInfo->hGeneralPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -255,13 +248,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - GeneralOnInit(hDlg, (PINFO)lParam); + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); return TRUE; case WM_COMMAND: @@ -745,23 +739,16 @@ static VOID -DisplayOnInit(HWND hwnd, - PINFO pInfo) +DisplayOnInit(PINFO pInfo) { DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hDisplayPage = hwnd; - SetWindowPos(pInfo->hDisplayPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -835,13 +822,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - DisplayOnInit(hDlg, (PINFO)lParam); + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; case WM_DRAWITEM: @@ -983,11 +971,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_GENERAL), - pInfo->hTab, - (DLGPROC)GeneralDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -998,11 +985,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_DISPLAY), - pInfo->hTab, - (DLGPROC)DisplayDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM));

1 0

[sginsberg] 35032: - Clean up ntdll a bit
by sginsberg＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: sginsberg Date: Sat Aug 2 07:46:02 2008 New Revision: 35032 URL: http://svn.reactos.org/svn/reactos?rev=35032&view=rev Log: - Clean up ntdll a bit Added: trunk/reactos/dll/ntdll/dispatch/ (props changed) - copied from r35027, trunk/reactos/dll/ntdll/main/ trunk/reactos/dll/ntdll/include/ (props changed) - copied from r35027, trunk/reactos/dll/ntdll/inc/ Removed: trunk/reactos/dll/ntdll/inc/ trunk/reactos/dll/ntdll/main/ Modified: trunk/reactos/dll/ntdll/csr/capture.c trunk/reactos/dll/ntdll/dispatch/dispatch.c trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/dll/ntdll/include/ntdll.h trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/elf.c trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/ntdll/rtl/version.c Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/capture.c - * PURPOSE: routines for probing and capturing CSR API Messages + * PURPOSE: Routines for probing and capturing CSR API Messages * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Propchange: trunk/reactos/dll/ntdll/dispatch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 2 07:46:02 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/ntdll/dispatch/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatc… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,6 +1,7 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS NT Library - * FILE: lib/ntdll/main/dispatch.c + * FILE: dll/ntdll/dispatch/dispatch.c * PURPOSE: User-Mode NT Dispatchers * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch <welch(a)cwcom.net> Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS NT Library - * FILE: lib/ntdll/main/i386/dispatch.S + * FILE: dl/ntdll/dispatch/i386/dispatch.S * PURPOSE: User-Mode NT Dispatchers * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ Propchange: trunk/reactos/dll/ntdll/include/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 2 07:46:02 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/ntdll/include/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS System Libraries - * FILE: lib/ntdll/inc/ntdll.h + * FILE: dll/ntdll/include/ntdll.h * PURPOSE: Native Libary Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS System Libraries - * FILE: lib/ntdll/inc/ntdllp.h + * FILE: dll/ntdll/include/ntdllp.h * PURPOSE: Native Libary Internal Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/ntdll/ldr/elf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/elf.c?rev=35… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/elf.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/elf.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,6 +1,3 @@ -/* $Id$ -*/ - /* * REACTOS ELF LOADER * @@ -35,6 +32,7 @@ * * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.101 2004/11/02 09:42:21 ssouhlal Exp $ */ + /* * Dynamic linker for ELF. Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -4,8 +4,8 @@ <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll_$(ARCH).def" /> - <include base="ntdll">inc</include> - <include base="ntdll" root="intermediate">def</include> + <include base="ntdll">include</include> + <include base="ntdll" root="intermediate"></include> <include base="ReactOS">include/reactos/subsys</include> <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> @@ -25,11 +25,7 @@ <directory name="dbg"> <file>dbgui.c</file> </directory> - <directory name="ldr"> - <file>startup.c</file> - <file>utils.c</file> - </directory> - <directory name="main"> + <directory name="dispatch"> <if property="ARCH" value="i386"> <directory name="i386"> <file>dispatch.S</file> @@ -44,6 +40,13 @@ <file>dispatch.c</file> </ifnot> </directory> + <directory name="include"> + <pch>ntdll.h</pch> + </directory> + <directory name="ldr"> + <file>startup.c</file> + <file>utils.c</file> + </directory> <directory name="rtl"> <file>libsupp.c</file> <file>version.c</file> @@ -51,8 +54,5 @@ <directory name="def"> <file>ntdll.rc</file> </directory> - <directory name="inc"> - <pch>ntdll.h</pch> - </directory> </module> </group> Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/ntdll/rtl/process.c

1 0

[fireball] 35031: - Update with 3 more additional (only available in a checked build) syscalls.
by fireball＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: fireball Date: Sat Aug 2 06:53:54 2008 New Revision: 35031 URL: http://svn.reactos.org/svn/reactos?rev=35031&view=rev Log: - Update with 3 more additional (only available in a checked build) syscalls. Modified: branches/nwin32/subsystems/win32/win32k/w32ksvc.db Modified: branches/nwin32/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Aug 2 06:53:54 2008 @@ -661,5 +661,8 @@ NtGdiBRUSHOBJ_DeleteRbrush 2 NtGdiUMPDEngFreeUserMem 1 NtGdiDrawStream 3 +#NtUserDbgWin32HeapFail 2 # checked build only +#NtUserDbgWin32HeapStat 2 # checked build only +#NtUserSetRipFlags 1 # checked build only NtGdiMakeObjectXferable 2 NtGdiMakeObjectUnXferable 1

1 0

[fireball] 35030: - Remove unneeded code, which would have its 10 years anniversary in ~20 days (committed originally by Rex back in August, 1998, revision number 8(!), and coded by David Welch, never touched since then).
by fireball＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: fireball Date: Sat Aug 2 05:55:56 2008 New Revision: 35030 URL: http://svn.reactos.org/svn/reactos?rev=35030&view=rev Log: - Remove unneeded code, which would have its 10 years anniversary in ~20 days (committed originally by Rex back in August, 1998, revision number 8(!), and coded by David Welch, never touched since then). Removed: trunk/reactos/ntoskrnl/rtl/strtok.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Aug 2 05:55:56 2008 @@ -443,7 +443,6 @@ </if> <file>libsupp.c</file> <file>misc.c</file> - <file>strtok.c</file> </directory> <directory name="se"> <file>access.c</file> Removed: trunk/reactos/ntoskrnl/rtl/strtok.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/strtok.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/strtok.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/strtok.c (removed) @@ -1,109 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/rtl/strtok.c - * PURPOSE: Unicode and thread safe implementation of strtok - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - - -/* FUNCTIONS *****************************************************************/ - -char* __cdecl strtok(char *s, const char *delim) -{ - const char *spanp; - int c, sc; - char *tok; - static char *last; - - if (s == NULL && (s = last) == NULL) - return (NULL); - - /* - * Skip (span) leading delimiters (s += strspn(s, delim), sort of). - */ - cont: - c = *s++; - for (spanp = delim; (sc = *spanp++) != 0;) { - if (c == sc) - goto cont; - } - - if (c == 0) { /* no non-delimiter characters */ - last = NULL; - return (NULL); - } - tok = s - 1; - - /* - * Scan token (scan for delimiters: s += strcspn(s, delim), sort of). - * Note that delim must have one NUL; we stop if we see that, too. - */ - for (;;) { - c = *s++; - spanp = delim; - do { - if ((sc = *spanp++) == c) { - if (c == 0) - s = NULL; - else - s[-1] = 0; - last = s; - return (tok); - } - } while (sc != 0); - } - /* NOTREACHED */ -} - -PWSTR RtlStrtok(PUNICODE_STRING _string, PWSTR _sep, - PWSTR* temp) -/* - * FUNCTION: Splits a string into tokens - * ARGUMENTS: - * string = string to operate on - * if NULL then continue with previous string - * sep = Token deliminators - * temp = Tempory storage provided by the caller - * ARGUMENTS: Returns the beginning of the next token - */ -{ - PWSTR string; - PWSTR sep; - PWSTR start; - - if (_string!=NULL) - { - string = _string->Buffer; - } - else - { - string = *temp; - } - - start = string; - - while ((*string)!=0) - { - sep = _sep; - while ((*sep)!=0) - { - if ((*string)==(*sep)) - { - *string=0; - *temp=string+1; - return(start); - } - sep++; - } - string++; - } - *temp=NULL; - return(start); -}

1 0

[cfinck] 35029: Change the version to 0.3.6
by cfinck＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cfinck Date: Sat Aug 2 05:19:56 2008 New Revision: 35029 URL: http://svn.reactos.org/svn/reactos?rev=35029&view=rev Log: Change the version to 0.3.6 Modified: branches/ros-branch-0_3_6/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_6/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_6/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_6/reactos/include/reactos/version.h [iso-8859-1] Sat Aug 2 05:19:56 2008 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 6 #define COPYRIGHT_YEAR "2008" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

1 0

[arty] 35028: Automatic modules. This will be safe at early breakin after the int1 fix that's forthcoming.
by arty＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: arty Date: Sat Aug 2 04:48:48 2008 New Revision: 35028 URL: http://svn.reactos.org/svn/reactos?rev=35028&view=rev Log: Automatic modules. This will be safe at early breakin after the int1 fix that's forthcoming. Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/Modules.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Sat Aug 2 04:48:48 2008 @@ -39,6 +39,7 @@ static Regex mRegLineEFLAGS = new Regex("EFLAGS 0x(?<eflags>[0-9a-fA-F]+).*"); static Regex mSregLine = new Regex("[CDEFGS]S 0x(?<seg>[0-9a-fA-F]+).*"); + bool mFirstModuleUpdate = false; StringBuilder mInputBuffer = new StringBuilder(); int usedInput; @@ -83,8 +84,13 @@ if (cleanedLine.StartsWith("Entered debugger on ")) { GetRegisterUpdate(); + continue; + } + + if (!mFirstModuleUpdate) + { GetModuleUpdate(); - continue; + mFirstModuleUpdate = true; } Match memoryMatch = mMemoryRowUpdate.Match(cleanedLine); @@ -289,23 +295,27 @@ { QueueCommand("step"); GetRegisterUpdate(); + GetModuleUpdate(); } public void Next() { QueueCommand("next"); GetRegisterUpdate(); + GetModuleUpdate(); } public void Break() { mConnection.Write("\r"); GetRegisterUpdate(); + GetModuleUpdate(); } public void Go(ulong address) { mRunning = true; + mFirstModuleUpdate = false; QueueCommand("cont"); } Modified: trunk/tools/reactosdbg/RosDBG/Modules.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Modules.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Modules.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Modules.cs [iso-8859-1] Sat Aug 2 04:48:48 2008 @@ -10,7 +10,7 @@ namespace RosDBG { - [DebugControl] + [DebugControl,BuildAtStartup] public partial class Modules : UserControl, IUseDebugConnection { public SortedList<uint, string> mModules = new SortedList<uint, string>();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs