Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 22548: Andrey Korotaev: Fix errors and typos in Russian translation, change Wine-specific parts to ReactOS.
by fireball＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: fireball Date: Sat Jun 24 01:12:32 2006 New Revision: 22548 URL: http://svn.reactos.org/svn/reactos?rev=22548&view=rev Log: Andrey Korotaev: Fix errors and typos in Russian translation, change Wine-specific parts to ReactOS. Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ru.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ru.rc Sat Jun 24 01:12:32 2006 @@ -21,8 +21,8 @@ MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Áîëüøèå Èêîíêè", FCIDM_SHVIEW_BIGICON - MENUITEM "&Ìåëêèå Èêîíêè", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Áîëüøèå çíà÷êè", FCIDM_SHVIEW_BIGICON + MENUITEM "&Ìåëêèå çíà÷êè", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ñïèñîê", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ïîäðîáíî", FCIDM_SHVIEW_REPORTVIEW END @@ -36,13 +36,13 @@ BEGIN POPUP "&Ïðîñìîòð" BEGIN - MENUITEM "&Áîëüøèå Èêîíêè", FCIDM_SHVIEW_BIGICON - MENUITEM "&Ìåëêèå Èêîíêè", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Áîëüøèå çíà÷êè", FCIDM_SHVIEW_BIGICON + MENUITEM "&Ìåëêèå çíà÷êè", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ñïèñîê", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ïîäðîáíî", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrange &Icons" + POPUP "Âûñòðîèòü &çíà÷êè" BEGIN MENUITEM "Ïî &Èìåíè", 0x30 /* column 0 */ MENUITEM "Ïî &Òèïó", 0x32 /* column 2 */ @@ -51,12 +51,12 @@ MENUITEM SEPARATOR MENUITEM "&Àâòîìàòè÷åñêè", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Â&ûðîâíÿòü èêîíêè", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Â&ûðîâíÿòü çíà÷êè", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Î&áíîâèòü", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "&Âñòàâèòü", FCIDM_SHVIEW_INSERT - MENUITEM "Âñòàâèòü &ÿðêëûê", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Âñòàâèòü &ÿðëûê", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Ñîçäàòü" BEGIN @@ -82,8 +82,8 @@ MENUITEM "&Âûðåçàòü", FCIDM_SHVIEW_CUT MENUITEM "&Êîïèðîâàòü", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Ñîçäàòü &ßîëûê", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Óäàëìòü", FCIDM_SHVIEW_DELETE + MENUITEM "Ñîçäàòü &ÿðëûê", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Óäàëèòü", FCIDM_SHVIEW_DELETE MENUITEM "Ïåðåè&ìåíîâàòü", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "Ñâî&éñòâà", FCIDM_SHVIEW_PROPERTIES @@ -152,27 +152,27 @@ IDS_MYCOMPUTER "Ìîé êîìïüþòåð" /* context menus */ - IDS_VIEW_LARGE "&Áîëüøèå Èêîíêè" - IDS_VIEW_SMALL "&Ìåëêèå Èêîíêè" + IDS_VIEW_LARGE "&Áîëüøèå çíà÷êè" + IDS_VIEW_SMALL "&Ìåëêèå çíà÷êè" IDS_VIEW_LIST "&Ñïèñîê" IDS_VIEW_DETAILS "&Ïîäðîáíî" IDS_SELECT "&Âûáðàòü" IDS_OPEN "&Îòêðûòü" - IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." + IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - îòêàçàíî â äîñòóïå" IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè" IDS_DELETEITEM_CAPTION "Ïîäòâåðæäåíèå óäàëåíèÿ ôàéëà" IDS_DELETEFOLDER_CAPTION "Ïîäòâåðæäåíèå óäàëåíèÿ ïàïêè" IDS_DELETEITEM_TEXT "Óäàëèòü '%1'?" - IDS_DELETEMULTIPLE_TEXT "Óäàëèòü ýòè îáüåêòû (%1?" + IDS_DELETEMULTIPLE_TEXT "Óäàëèòü ýòè îáüåêòû %1?" IDS_OVERWRITEFILE_TEXT "Çàìåíèòü ôàéë(û) %1?" IDS_OVERWRITEFILE_CAPTION "Ïîäòâåðæäåíèå çàìåíû ôàéëà" /* message box strings */ IDS_RESTART_TITLE "Ïåðåçàãðóçèòü" - IDS_RESTART_PROMPT "Âû õîòèòå ñèìóëèðîâàòü ïåðåçàïóñê Windows?" + IDS_RESTART_PROMPT "Âû äåéñòâèòåëüíî õîòèòå ïåðåçàãðóçèòü ReactOS?" IDS_SHUTDOWN_TITLE "Âûêëþ÷èòü ïèòàíèå" - IDS_SHUTDOWN_PROMPT "Âû õîòèòå çàêèí÷èòü ðàáîòó ñ Wine?" + IDS_SHUTDOWN_PROMPT "Âû äåéñòâèòåëüíî õîòèòå çàêîí÷èòü ðàáîòó ñ ReactOS?" /* shell folder path default values */ IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû" @@ -180,7 +180,7 @@ IDS_FAVORITES "Èçáðàííîå" IDS_STARTUP "Ãëàâíîå ìåíþ\\Ïðîãðàììû\\Àâòîçàãðóçêà" IDS_RECENT "Recent" - IDS_SENDTO "Îòïðââèòü" + IDS_SENDTO "Îòïðàâèòü" IDS_STARTMENU "Ãëàâíîå ìåíþ" IDS_MYMUSIC "Ìîè äîêóìåíòû\\Ìîÿ ìóçûêà" IDS_MYVIDEO "Ìîè äîêóìåíòû\\Ìîè ôèëüìû"

1 0

[cwittich] 22547: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Sat Jun 24 00:49:21 2006 New Revision: 22547 URL: http://svn.reactos.org/svn/reactos?rev=22547&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c trunk/reactos/base/applications/msconfig/generalpage.c trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c trunk/reactos/base/applications/msconfig/systempage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.c (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c Sat Jun 24 00:49:21 2006 @@ -15,6 +15,9 @@ INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + switch (message) { case WM_INITDIALOG: hFreeLdrDialog = hDlg; Modified: trunk/reactos/base/applications/msconfig/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/generalpage.c (original) +++ trunk/reactos/base/applications/msconfig/generalpage.c Sat Jun 24 00:49:21 2006 @@ -15,6 +15,9 @@ INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + switch (message) { case WM_INITDIALOG: hGeneralDialog = hDlg; Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Sat Jun 24 00:49:21 2006 @@ -21,12 +21,12 @@ TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, (DLGPROC) ServicesPageWndProc); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC) StartupPageWndProc); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC) ToolsPageWndProc); LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp); @@ -192,13 +192,17 @@ INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(hPrevInstance) + UNREFERENCED_PARAMETER(lpCmdLine) + UNREFERENCED_PARAMETER(nCmdShow) + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; InitCommonControlsEx(&InitControls); hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc); return 0; } Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c Sat Jun 24 00:49:21 2006 @@ -21,6 +21,9 @@ LV_COLUMN column; TCHAR szTemp[256]; DWORD dwStyle; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c Sat Jun 24 00:49:21 2006 @@ -21,6 +21,9 @@ LV_COLUMN column; TCHAR szTemp[256]; DWORD dwStyle; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/systempage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/systempage.c (original) +++ trunk/reactos/base/applications/msconfig/systempage.c Sat Jun 24 00:49:21 2006 @@ -14,6 +14,8 @@ INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch (message) { case WM_INITDIALOG: hSystemDialog = hDlg;

1 0

[cwittich] 22546: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Sat Jun 24 00:08:52 2006 New Revision: 22546 URL: http://svn.reactos.org/svn/reactos?rev=22546&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Sat Jun 24 00:08:52 2006 @@ -52,6 +52,7 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -99,11 +100,11 @@ psh.ppsp = psp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, KeyboardPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, SoundPageProc); - InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, DisplayPageProc); - InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, MousePageProc); - InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, GeneralPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC) KeyboardPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC) SoundPageProc); + InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC) DisplayPageProc); + InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC) MousePageProc); + InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -117,7 +118,8 @@ LPARAM lParam2) { int i = (int)lParam1; - + UNREFERENCED_PARAMETER(hwndCPl) + switch(uMsg) { case CPL_INIT: @@ -153,6 +155,7 @@ DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Sat Jun 24 00:08:52 2006 @@ -195,6 +195,7 @@ static INT_PTR CALLBACK InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: @@ -234,6 +235,9 @@ static INT_PTR CALLBACK RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: @@ -279,8 +283,8 @@ psh.ppsp = psp; psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, InstallPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, RosPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, (DLGPROC) InstallPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, (DLGPROC) RosPageProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -292,6 +296,8 @@ { CPLINFO *CPlInfo; DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl) i = (DWORD)lParam1; switch(uMsg) @@ -322,6 +328,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Sat Jun 24 00:08:52 2006 @@ -52,6 +52,10 @@ DWORD Reboot; BOOL ret; LONG rc; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(uMsg) hNewDev = LoadLibrary(_T("newdev.dll")); if (!hNewDev) @@ -136,6 +140,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH:

1 0

[cwittich] 22545: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Sat Jun 24 00:01:20 2006 New Revision: 22545 URL: http://svn.reactos.org/svn/reactos?rev=22545&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c (original) +++ trunk/reactos/dll/cpl/desk/appearance.c Sat Jun 24 00:01:20 2006 @@ -15,6 +15,10 @@ WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(hwndDlg) + switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sat Jun 24 00:01:20 2006 @@ -302,6 +302,8 @@ BOOL CheckListBoxFilename(HWND list, TCHAR *filename) { + UNREFERENCED_PARAMETER(filename) + UNREFERENCED_PARAMETER(list) return FALSE; } @@ -571,7 +573,7 @@ { if(command == CBN_SELCHANGE) { - g_placementSelection = SendMessage(g_hPlacementCombo, CB_GETCURSEL, 0, 0); + g_placementSelection = (int)SendMessage(g_hPlacementCombo, CB_GETCURSEL, 0, 0); InvalidateRect(g_hBackgroundPreview, NULL, TRUE); Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Sat Jun 24 00:01:20 2006 @@ -49,6 +49,11 @@ PROPSHEETHEADER psh; TCHAR Caption[1024]; + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(hwnd) + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); @@ -62,10 +67,10 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_BACKGROUND, BackgroundPageProc); - InitPropSheetPage(&psp[1], IDD_SCREENSAVER, ScreenSaverPageProc); - InitPropSheetPage(&psp[2], IDD_APPEARANCE, AppearancePageProc); - InitPropSheetPage(&psp[3], IDD_SETTINGS, SettingsPageProc); + InitPropSheetPage(&psp[0], IDD_BACKGROUND, (DLGPROC) BackgroundPageProc); + InitPropSheetPage(&psp[1], IDD_SCREENSAVER, (DLGPROC) ScreenSaverPageProc); + InitPropSheetPage(&psp[2], IDD_APPEARANCE, (DLGPROC) AppearancePageProc); + InitPropSheetPage(&psp[3], IDD_SETTINGS, (DLGPROC) SettingsPageProc); return (LONG)(PropertySheet(&psh) != -1); } 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 (original) +++ trunk/reactos/dll/cpl/desk/settings.c Sat Jun 24 00:01:20 2006 @@ -69,7 +69,7 @@ } } if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); } static PSETTINGS_ENTRY

1 0

[greatlrd] 22544: norwigen translation from lars_martin4 at hotmail.com, please use LANG_NORWEGIAN, SUBLANG_NEUTRAL when u doing a translation. bug 1607
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 23:55:19 2006 New Revision: 22544 URL: http://svn.reactos.org/svn/reactos?rev=22544&view=rev Log: norwigen translation from lars_martin4 at hotmail.com, please use LANG_NORWEGIAN, SUBLANG_NEUTRAL when u doing a translation. bug 1607 Added: trunk/reactos/base/applications/msconfig/No.rc (with props) Modified: trunk/reactos/base/applications/msconfig/msconfig.rc Added: trunk/reactos/base/applications/msconfig/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/No.rc (added) +++ trunk/reactos/base/applications/msconfig/No.rc Fri Jun 23 23:55:19 2006 @@ -1,0 +1,156 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "System configuration program" +FONT 8, "Tahoma" +BEGIN + CONTROL "kategori1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Hjelp", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Bruk", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "liste3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Aktivere alt",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Deaktivere alt",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "Liste2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Kjør", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "Liste1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Aktivere alt",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Deaktivere alt",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + GROUPBOX "Oppstarts utvalg", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "&Normal oppstart - laste inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "&Last inn System tjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "", IDC_LIST_BOX, "Listeboks", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Sjekk alle oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Sett som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "Flytt &Opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Flytt &Ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/&SIKKEROPPSTART", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/&OPPSTARTLOGG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Tidsavbrudd:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "sek.", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFIL", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Avbryt", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "System konfigurasjon program" + IDS_TAB_GENERAL "Generelt" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Tjenester" + IDS_TAB_STARTUP "Oppstart" + IDS_TAB_TOOLS "Verktøy" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Tjeneste" + IDS_SERVICES_COLUMN_REQ "Viktig" + IDS_SERVICES_COLUMN_VENDOR "Produsent" + IDS_SERVICES_COLUMN_STATUS "Status" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Navn" + IDS_TOOLS_COLUMN_DESCR "Beskrivelse" + + IDS_TOOLS_CMD_NAME "ledertekst" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Versjon" + IDS_TOOLS_INFO_DESCR "Vis versjon informasjon." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Register-Editor" + IDS_TOOLS_REGEDIT_DESCR "Åpne Register-Editor." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "System egenskaper" + IDS_TOOLS_SYSDM_DESCR "Vis informasjon om denne datamaskinen." + IDS_TOOLS_SYSDM_CMD "kontroll" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" + IDS_STARTUP_COLUMN_CMD "kommando" + IDS_STARTUP_COLUMN_PATH "Plassering" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Kjører" + IDS_SERVICES_STATUS_STOPPED "Stoppet" + IDS_SERVICES_YES "Ja" + IDS_SERVICES_UNKNOWN "Ukjent" +END + Propchange: trunk/reactos/base/applications/msconfig/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc Fri Jun 23 23:55:19 2006 @@ -18,4 +18,5 @@ #include "Fr.rc" #include "Hu.rc" #include "Nl.rc" +#include "No.rc"

1 0

[janderwald] 22543: restore old targets
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 23:36:23 2006 New Revision: 22543 URL: http://svn.reactos.org/svn/reactos?rev=22543&view=rev Log: restore old targets Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=22543&r1=2254… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Jun 23 23:36:23 2006 @@ -414,27 +414,101 @@ .PHONY: msvc6 msvc6: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc .PHONY: msvc7 msvc7: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc .PHONY: msvc71 msvc71: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc .PHONY: msvc8 msvc8: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc + +.PHONY: msvc6_clean +msvc6_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc + +.PHONY: msvc7_clean +msvc7_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc + +.PHONY: msvc71_clean +msvc71_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc + +.PHONY: msvc8_clean +msvc8_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc .PHONY: msvc_clean msvc_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c msvc + +.PHONY: msvc_clean_all +msvc_clean_all: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc + +.PHONY: msvc7_install_debug +msvc7_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc + +.PHONY: msvc7_install_release +msvc7_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc + +.PHONY: msvc7_install_speed +msvc7_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc + +.PHONY: msvc71_install_debug +msvc71_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc + +.PHONY: msvc71_install_release +msvc71_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc + + +.PHONY: msvc71_install_speed +msvc71_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc + +.PHONY: msvc8_install_debug +msvc8_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc + +.PHONY: msvc8_install_release +msvc8_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc + +.PHONY: msvc8_install_speed +msvc8_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc .PHONY: makefile_auto_clean makefile_auto_clean:

1 0

[janderwald] 22542: parse -vo option
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 23:36:01 2006 New Revision: 22542 URL: http://svn.reactos.org/svn/reactos?rev=22542&view=rev Log: parse -vo option Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp Fri Jun 23 23:36:01 2006 @@ -175,7 +175,7 @@ switch ( switchChar ) { case 'v': - if (switchChar2 == 's' || switchChar2 == 'c' ) + if (switchChar2 == 's' || switchChar2 == 'c' || switchChar2 == 'o') { return ParseVCProjectSwitch ( switchChar2,

1 0

[greatlrd] 22541: rewrite janderwald patch for NULL, I see it as pointless using static const WCHAR szNullString[] = { '\0' }; to return a null termentate string when u can simple replace it with L'\0'
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 22:54:53 2006 New Revision: 22541 URL: http://svn.reactos.org/svn/reactos?rev=22541&view=rev Log: rewrite janderwald patch for NULL, I see it as pointless using static const WCHAR szNullString[] = { '\0' }; to return a null termentate string when u can simple replace it with L'\0' Modified: trunk/reactos/dll/win32/crypt32/protectdata.c Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c Fri Jun 23 22:54:53 2006 @@ -56,9 +56,6 @@ 'I','\'','m',' ','h','u','n','t','i','n','g',' ', 'w','a','b','b','i','t','s',0 }; - -static const WCHAR szNullString[] = -{ '\0' }; /* * The data format returned by the real Windows CryptProtectData seems @@ -866,7 +863,7 @@ /* Windows appears to create an empty szDataDescr instead of maintaining * a NULL */ if (!szDataDescr) - szDataDescr = szNullString; + szDataDescr = L'\0'; /* get crypt context */ if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))

1 0

[janderwald] 22540: oops thnx Greatlord
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:48:57 2006 New Revision: 22540 URL: http://svn.reactos.org/svn/reactos?rev=22540&view=rev Log: oops thnx Greatlord Modified: trunk/reactos/include/winternl.h Modified: trunk/reactos/include/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/winternl.h?rev=225… ============================================================================== --- trunk/reactos/include/winternl.h (original) +++ trunk/reactos/include/winternl.h Fri Jun 23 22:48:57 2006 @@ -1985,7 +1985,7 @@ BOOL WINAPI RtlEqualSid(PSID,PSID); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); -//void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; +void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT);

1 0

[cwittich] 22539: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Fri Jun 23 22:44:57 2006 New Revision: 22539 URL: http://svn.reactos.org/svn/reactos?rev=22539&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c Fri Jun 23 22:44:57 2006 @@ -96,7 +96,7 @@ { int Index; - for (Index = 0; Index < dwActionSize; Index++) + for (Index = 0; Index < (int) dwActionSize; Index++) { if (lpAction[Index] == poAction) return Index; Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c Fri Jun 23 22:44:57 2006 @@ -31,6 +31,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Fri Jun 23 22:44:57 2006 @@ -55,6 +55,7 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -88,7 +89,12 @@ TCHAR Caption[1024]; SYSTEM_POWER_CAPABILITIES spc; INT i=0; - + + UNREFERENCED_PARAMETER(hwnd) + UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + memset(Caption, 0x0, sizeof(Caption)); LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -104,17 +110,17 @@ psh.ppsp = psp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[i++], IDD_PROPPAGEPOWERSHEMES, powershemesProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEPOWERSHEMES, (DLGPROC) powershemesProc); if (GetPwrCapabilities(&spc)) { if (spc.SystemBatteriesPresent) { - InitPropSheetPage(&psp[i++], IDD_PROPPAGEALARMS, alarmsProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEALARMS, (DLGPROC) alarmsProc); psh.nPages += 1; } } - InitPropSheetPage(&psp[i++], IDD_PROPPAGEADVANCED, advancedProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGEHIBERNATE, hibernateProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEADVANCED, (DLGPROC) advancedProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEHIBERNATE, (DLGPROC) hibernateProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -165,6 +171,7 @@ DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c Fri Jun 23 22:44:57 2006 @@ -224,6 +224,12 @@ LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) { int index; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(sDesc) + UNREFERENCED_PARAMETER(dwDesc) + UNREFERENCED_PARAMETER(dwName) + if (ValidatePowerPolicies(0,pp)) { if (guiIndex >= MAX_POWER_POLICY) @@ -237,7 +243,7 @@ memcpy(&gPP[guiIndex], pp, sizeof(POWER_POLICY)); guiIndex++; - index = SendMessage(hList, + index = (int) SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)sName); @@ -393,7 +399,7 @@ TCHAR szConfig[MAX_PATH]; POWER_POLICY pp; - iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); @@ -402,7 +408,7 @@ memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); - uiIndex = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); + uiIndex = (UINT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); if(uiIndex != CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); @@ -479,14 +485,14 @@ { INT iCurSel=0,tmp=0; - iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); if (iCurSel == CB_ERR) return; - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -494,7 +500,7 @@ { gPP[iCurSel].user.VideoTimeoutAc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -502,7 +508,7 @@ { gPP[iCurSel].user.VideoTimeoutDc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_DISKACLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_DISKACLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -510,7 +516,7 @@ { gPP[iCurSel].user.SpindownTimeoutAc = Sec[tmp+2]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_DISKDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_DISKDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -518,7 +524,7 @@ { gPP[iCurSel].user.SpindownTimeoutDc = Sec[tmp+2]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -526,7 +532,7 @@ { gPP[iCurSel].user.IdleTimeoutAc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -534,7 +540,7 @@ { gPP[iCurSel].user.IdleTimeoutDc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -542,7 +548,7 @@ { gPP[iCurSel].mach.DozeS4TimeoutAc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), CB_GETCURSEL, 0, (LPARAM)0);

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