Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[jimtabor] 22443: Sync to wine, User32. Tested with winefile, explorer with out any problems and no real improvements.
by jimtabor＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: jimtabor Date: Wed Jun 21 06:14:09 2006 New Revision: 22443 URL: http://svn.reactos.ru/svn/reactos?rev=22443&view=rev Log: Sync to wine, User32. Tested with winefile, explorer with out any problems and no real improvements. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/de… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Wed Jun 21 06:14:09 2006 @@ -37,8 +37,12 @@ HBRUSH SysBrushes[NUM_SYSCOLORS] = {0}; /* Bits in the dwKeyData */ -#define KEYDATA_ALT 0x2000 - +#define KEYDATA_ALT 0x2000 +#define KEYDATA_PREVSTATE 0x4000 + +static short iF10Key = 0; +static short iMenuSysKey = 0; + /* FUNCTIONS *****************************************************************/ void @@ -922,6 +926,39 @@ return GetSysColorBrush(COLOR_WINDOW); } +static void DefWndPrint( HWND hwnd, HDC hdc, ULONG uFlags) +{ + /* + * Visibility flag. + */ + if ( (uFlags & PRF_CHECKVISIBLE) && + !IsWindowVisible(hwnd) ) + return; + + /* + * Unimplemented flags. + */ + if ( (uFlags & PRF_CHILDREN) || + (uFlags & PRF_OWNED) || + (uFlags & PRF_NONCLIENT) ) + { + DPRINT1("WM_PRINT message with unsupported flags\n"); + } + + /* + * Background + */ + if ( uFlags & PRF_ERASEBKGND) + SendMessageW(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + + /* + * Client area + */ + if ( uFlags & PRF_CLIENT) + SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); +} + + VOID FASTCALL DefWndScreenshot(HWND hWnd) { @@ -960,11 +997,18 @@ return (DefWndNCHitTest(hWnd, Point)); } + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + iF10Key = iMenuSysKey = 0; + break; + case WM_NCLBUTTONDOWN: { return (DefWndNCLButtonDown(hWnd, wParam, lParam)); } + case WM_LBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK: { return (DefWndNCLButtonDblClk(hWnd, wParam, lParam)); @@ -978,6 +1022,16 @@ case WM_WINDOWPOSCHANGED: { return (DefWndHandleWindowPosChanged(hWnd, (WINDOWPOS*)lParam)); + } + + case WM_NCRBUTTONDOWN: + { + /* in Windows, capture is taken when right-clicking on the caption bar */ + if (wParam == HTCAPTION) + { + SetCapture(hWnd); + } + break; } case WM_RBUTTONUP: @@ -1001,6 +1055,15 @@ } break; } + + case WM_NCRBUTTONUP: + /* + * FIXME : we must NOT send WM_CONTEXTMENU on a WM_NCRBUTTONUP (checked + * in Windows), but what _should_ we do? According to MSDN : + * "If it is appropriate to do so, the system sends the WM_SYSCOMMAND + * message to the window". When is it appropriate? + */ + break; case WM_CONTEXTMENU: { @@ -1057,7 +1120,7 @@ case WM_PRINT: { - /* FIXME: Implement. */ + DefWndPrint(hWnd, (HDC)wParam, lParam); return (0); } @@ -1196,6 +1259,9 @@ case WM_CTLCOLORSTATIC: case WM_CTLCOLORSCROLLBAR: return (LRESULT) DefWndControlColor((HDC)wParam, Msg - WM_CTLCOLORMSGBOX); + + case WM_CTLCOLOR: + return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); case WM_SETCURSOR: { @@ -1233,19 +1299,25 @@ return (DefWndHandleSysCommand(hWnd, wParam, Pt)); } - /* FIXME: Handle key messages. */ -/* + case WM_KEYDOWN: - case WM_KEYUP: - case WM_SYSKEYUP: - case WM_SYSCHAR: -*/ + if(wParam == VK_F10) iF10Key = VK_F10; + break; /* FIXME: This is also incomplete. */ case WM_SYSKEYDOWN: { if (HIWORD(lParam) & KEYDATA_ALT) { + /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */ + if ( (wParam == VK_MENU || wParam == VK_LMENU + || wParam == VK_RMENU) && !iMenuSysKey ) + iMenuSysKey = 1; + else + iMenuSysKey = 0; + + iF10Key = 0; + if (wParam == VK_F4) /* Try to close the window */ { HWND top = GetAncestor(hWnd, GA_ROOT); @@ -1262,6 +1334,42 @@ DefWndScreenshot(hWnd); } } + else if( wParam == VK_F10 ) + iF10Key = 1; + else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) + SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); + break; + } + + case WM_KEYUP: + case WM_SYSKEYUP: + { + /* Press and release F10 or ALT */ + if (((wParam == VK_MENU || wParam == VK_LMENU || wParam == VK_RMENU) + && iMenuSysKey) || ((wParam == VK_F10) && iF10Key)) + SendMessageW( GetAncestor( hWnd, GA_ROOT ), WM_SYSCOMMAND, SC_KEYMENU, 0L ); + iMenuSysKey = iF10Key = 0; + break; + } + + case WM_SYSCHAR: + { + iMenuSysKey = 0; + if (wParam == '\r' && IsIconic(hWnd)) + { + PostMessageW( hWnd, WM_SYSCOMMAND, SC_RESTORE, 0L ); + break; + } + if ((HIWORD(lParam) & KEYDATA_ALT) && wParam) + { + if (wParam == '\t' || wParam == '\x1b') break; + if (wParam == ' ' && (GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD)) + SendMessageW( GetParent(hWnd), Msg, wParam, lParam ); + else + SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, wParam ); + } + else /* check for Ctrl-Esc */ + if (wParam != '\x1b') MessageBeep(0); break; } @@ -1270,17 +1378,11 @@ LONG Style; INT Ret = 0; - if (!lParam) - return 0; + if (!lParam) return 0; Style = GetWindowLongW(hWnd, GWL_STYLE); -// if (!(Style & WS_POPUP)) -// return 0; - if ((Style & WS_VISIBLE) && wParam) - return 0; - if (!(Style & WS_VISIBLE) && !wParam) - return 0; - if (!GetWindow(hWnd, GW_OWNER)) - return 0; + if ((Style & WS_VISIBLE) && wParam) return 0; + if (!(Style & WS_VISIBLE) && !wParam) return 0; + if (!GetWindow(hWnd, GW_OWNER)) return 0; Ret = NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam, TWOPARAM_ROUTINE_ROS_SHOWWINDOW); if(Ret) { @@ -1293,7 +1395,9 @@ case WM_CANCELMODE: { + iMenuSysKey = 0; /* FIXME: Check for a desktop. */ + if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD)) EndMenu(); if (GetCapture() == hWnd) { ReleaseCapture(); @@ -1306,8 +1410,7 @@ return (-1); /* case WM_DROPOBJECT: - - break; + return DRAG_FILE; */ case WM_QUERYDROPOBJECT: { @@ -1403,6 +1506,11 @@ { return (1); } + + case WM_ENDSESSION: + if (wParam) PostQuitMessage(0); + return 0; + } return 0; }

1 0

[cwittich] 22442: -started to refactor the code -started to improve the design -use XmlSerialization to store the settings instead of parsing the QEmu commandline each time -this version does not work yet - all other settings have to be moved to QEmu.cs first
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 04:13:55 2006 New Revision: 22442 URL: http://svn.reactos.ru/svn/reactos?rev=22442&view=rev Log: -started to refactor the code -started to improve the design -use XmlSerialization to store the settings instead of parsing the QEmu commandline each time -this version does not work yet - all other settings have to be moved to QEmu.cs first Added: trunk/tools/Qemu GUI/QEmu.cs Modified: trunk/tools/Qemu GUI/Form1.cs trunk/tools/Qemu GUI/Form1.resx [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/Qemu GUI/Form1.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Form1.cs?rev=22442… Modified: trunk/tools/Qemu GUI/Form1.resx URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Form1.resx?rev=224… Added: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22442&…

1 0

[greatlrd] 22441: move back packmgr did move it by mistake
by greatlrd＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: greatlrd Date: Wed Jun 21 01:12:15 2006 New Revision: 22441 URL: http://svn.reactos.ru/svn/reactos?rev=22441&view=rev Log: move back packmgr did move it by mistake Added: trunk/rosapps/packmgr/ - copied from r22440, trunk/tools/packmgr/ Removed: trunk/tools/packmgr/

1 0

[greatlrd] 22440: move qemu gui to tools
by greatlrd＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: greatlrd Date: Wed Jun 21 01:11:39 2006 New Revision: 22440 URL: http://svn.reactos.ru/svn/reactos?rev=22440&view=rev Log: move qemu gui to tools Added: trunk/tools/Qemu GUI/ - copied from r22439, trunk/rosapps/Qemu GUI/ Removed: trunk/rosapps/Qemu GUI/

1 0

[greatlrd] 22439: Moved remotely
by greatlrd＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: greatlrd Date: Wed Jun 21 01:11:04 2006 New Revision: 22439 URL: http://svn.reactos.ru/svn/reactos?rev=22439&view=rev Log: Moved remotely Added: trunk/tools/packmgr/ - copied from r22438, trunk/rosapps/packmgr/ Removed: trunk/rosapps/packmgr/

1 0

[greatlrd] 22438: Qemu GUI written in C# visual studio 2003. This is the source code of preview 6 I have done. The code have not been cleanup I commit a binary version of it as well. for not every one can compile it, and we should only include it with qemu when we are doing a release. so people with very lite knowlegws can config qemu as they like. I did speak with fireball he did think it was good idea to commit it to rosapps. See the todo.txt what left be done.
by greatlrd＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: greatlrd Date: Wed Jun 21 01:05:59 2006 New Revision: 22438 URL: http://svn.reactos.ru/svn/reactos?rev=22438&view=rev Log: Qemu GUI written in C# visual studio 2003. This is the source code of preview 6 I have done. The code have not been cleanup I commit a binary version of it as well. for not every one can compile it, and we should only include it with qemu when we are doing a release. so people with very lite knowlegws can config qemu as they like. I did speak with fireball he did think it was good idea to commit it to rosapps. See the todo.txt what left be done. Added: trunk/rosapps/Qemu GUI/ trunk/rosapps/Qemu GUI/App.ico (with props) trunk/rosapps/Qemu GUI/AssemblyInfo.cs (with props) trunk/rosapps/Qemu GUI/Form1.cs (with props) trunk/rosapps/Qemu GUI/Form1.resx (with props) trunk/rosapps/Qemu GUI/Icon1.ico (with props) trunk/rosapps/Qemu GUI/Qemu GUI.csproj (with props) trunk/rosapps/Qemu GUI/Qemu GUI.csproj.user (with props) trunk/rosapps/Qemu GUI/Qemu GUI.sln (with props) trunk/rosapps/Qemu GUI/Qemu GUI.suo (with props) trunk/rosapps/Qemu GUI/ToDO.txt (with props) trunk/rosapps/Qemu GUI/bin/ trunk/rosapps/Qemu GUI/bin/Debug/ trunk/rosapps/Qemu GUI/bin/Release/ trunk/rosapps/Qemu GUI/bin/Release/Qemu GUI.exe (with props) trunk/rosapps/Qemu GUI/obj/ trunk/rosapps/Qemu GUI/obj/Debug/ trunk/rosapps/Qemu GUI/obj/Release/ [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rosapps/Qemu GUI/App.ico URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/App.ico?rev=2243… Added: trunk/rosapps/Qemu GUI/AssemblyInfo.cs URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/AssemblyInfo.cs?… Added: trunk/rosapps/Qemu GUI/Form1.cs URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/Form1.cs?rev=224… Added: trunk/rosapps/Qemu GUI/Form1.resx URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/Form1.resx?rev=2… Added: trunk/rosapps/Qemu GUI/Icon1.ico URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/Icon1.ico?rev=22… Added: trunk/rosapps/Qemu GUI/Qemu GUI.csproj URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/Qemu%20GUI.cspro… Added: trunk/rosapps/Qemu GUI/Qemu GUI.csproj.user URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/Qemu%20GUI.cspro… Added: trunk/rosapps/Qemu GUI/Qemu GUI.sln URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/Qemu%20GUI.sln?r… Added: trunk/rosapps/Qemu GUI/Qemu GUI.suo URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/Qemu%20GUI.suo?r… Added: trunk/rosapps/Qemu GUI/ToDO.txt URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/ToDO.txt?rev=224… Added: trunk/rosapps/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/rosapps/Qemu%20GUI/bin/Release/Qemu…

1 0

[hpoussin] 22437: Fix a cast
by hpoussin＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: hpoussin Date: Tue Jun 20 22:56:41 2006 New Revision: 22437 URL: http://svn.reactos.ru/svn/reactos?rev=22437&view=rev Log: Fix a cast Modified: trunk/reactos/include/winnt.h Modified: trunk/reactos/include/winnt.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winnt.h?rev=22437&r… ============================================================================== --- trunk/reactos/include/winnt.h (original) +++ trunk/reactos/include/winnt.h Tue Jun 20 22:56:41 2006 @@ -3742,7 +3742,7 @@ #pragma intrinsic(__readfsdword) __inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } -__inline struct _TEB * NtCurrentTeb(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x18); } +__inline struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)__readfsdword(0x18); } #else

1 0

[jimtabor] 22436: Remove unimplemented debug print from CheckMenuRadioItem.
by jimtabor＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: jimtabor Date: Tue Jun 20 05:42:02 2006 New Revision: 22436 URL: http://svn.reactos.ru/svn/reactos?rev=22436&view=rev Log: Remove unimplemented debug print from CheckMenuRadioItem. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/me… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Tue Jun 20 05:42:02 2006 @@ -3570,7 +3570,7 @@ mi.cbSize = sizeof(MENUINFO); - UNIMPLEMENTED; + DPRINT("CheckMenuRadioItem\n"); if(idFirst > idLast) return ret;

1 0

[mwirth] 22435: Changed file to Norwegian language. Solves bug 1534. Thanks to Lars Martin.
by mwirth＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: mwirth Date: Tue Jun 20 01:31:24 2006 New Revision: 22435 URL: http://svn.reactos.ru/svn/reactos?rev=22435&view=rev Log: Changed file to Norwegian language. Solves bug 1534. Thanks to Lars Martin. Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/no.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/no.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/l… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/lang/no.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/no.php Tue Jun 20 01:31:24 2006 @@ -27,160 +27,160 @@ // Language settings $roscms_langres['charset'] = 'utf-8'; //$roscms_langres['charset'] = 'iso-8859-1'; -$roscms_langres['lang_code'] = 'EN'; +$roscms_langres['lang_code'] = 'NO'; // main menu -$roscms_langres['Navigation'] = 'Navigation'; -$roscms_langres['Home'] = 'Home'; -$roscms_langres['Dev'] = 'Development'; -$roscms_langres['Community'] = 'Community'; -$roscms_langres['Support'] = 'Support'; -$roscms_langres['myReactOS'] = 'myReactOS'; +$roscms_langres['Navigation'] = 'Navigasjon'; +$roscms_langres['Home'] = 'Hjem'; +$roscms_langres['Dev'] = 'Utvikling'; +$roscms_langres['Community'] = 'Fellesskap'; +$roscms_langres['Support'] = 'Kompatibilitet'; +$roscms_langres['myReactOS'] = 'Min ReactOS'; // Login bar: -$roscms_langres['Account'] = 'Account'; -$roscms_langres['Login'] = 'Login'; -$roscms_langres['Logout'] = 'Logout'; -$roscms_langres['Global_Login_System'] = 'Global Login System'; -$roscms_langres['Register_Account'] = 'Register Account'; -$roscms_langres['Login_Nick'] = ' Nick: '; -$roscms_langres['LoginPwd'] = ' Pwd: '; +$roscms_langres['Account'] = 'Konto'; +$roscms_langres['Login'] = 'Logg inn'; +$roscms_langres['Logout'] = 'Logg ut'; +$roscms_langres['Global_Login_System'] = 'Nettverk Logg inn System'; +$roscms_langres['Register_Account'] = 'Register en Konto'; +$roscms_langres['Login_Nick'] = ' Brukernavn: '; +$roscms_langres['LoginPwd'] = ' Passord: '; // myReactOS menu -$roscms_langres['User_Profil_Overview'] = 'User Profile Overview'; -$roscms_langres['User_Profil'] = 'User Profile'; -$roscms_langres['Overview'] = 'Overview'; -$roscms_langres['Login_System'] = 'Login System'; -$roscms_langres['Messages'] = 'Messages'; -$roscms_langres['Contacts'] = 'Contacts'; -$roscms_langres['Favorites'] = 'Favorites'; -$roscms_langres['Documentation'] = 'Documentation'; -$roscms_langres['Account_Edit'] = 'Settings'; -$roscms_langres['Accountlist'] = 'User List'; +$roscms_langres['User_Profil_Overview'] = 'Bruker Profil Oversikt'; +$roscms_langres['User_Profil'] = 'Bruker Profil'; +$roscms_langres['Overview'] = 'Oversikt'; +$roscms_langres['Login_System'] = 'Logg inn System'; +$roscms_langres['Messages'] = 'Meldinger'; +$roscms_langres['Contacts'] = 'Kontakter'; +$roscms_langres['Favorites'] = 'Favoritter'; +$roscms_langres['Documentation'] = 'Dokumentasjon'; +$roscms_langres['Account_Edit'] = 'Innstillinger'; +$roscms_langres['Accountlist'] = 'Bruker liste'; // myReactOS Content -$roscms_langres['myReactOS_description'] = 'A powerful and easy to use interface to manage your ReactOS homepage account.'; -$roscms_langres['Account_Information'] = 'Account Information'; -$roscms_langres['Account_Information_description'] = 'A sum up of the account data ... <placeholder>'; +$roscms_langres['myReactOS_description'] = 'Et fullkraftig og lett bruker grensesnitt for å bestemme over din ReactOS hjemmeside konto.'; +$roscms_langres['Account_Information'] = 'Konto Informasjon'; +$roscms_langres['Account_Information_description'] = 'sumerer opp av konto dataene ... <plass holder>'; // Right side bar: -$roscms_langres['Latest_Release'] = 'Latest Release'; -$roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; +$roscms_langres['Latest_Release'] = 'Sist oppdatert'; +$roscms_langres['myReactOS_Developer_Quotes'] = 'Utvikling sitat'; // Error 404 -$roscms_langres['Page_not_found'] = 'Page not found'; +$roscms_langres['Page_not_found'] = 'Siden ble ikke funnet'; // Admin/Dev/Translator Interface -$roscms_langres['Dev_Interface'] = 'Dev Interface'; -$roscms_langres['Dev_Overview'] = 'Overview'; -$roscms_langres['Dev_Pages'] = 'Pages'; -$roscms_langres['Dev_Contents'] = 'Contents'; -$roscms_langres['Dev_Help'] = 'Help'; +$roscms_langres['Dev_Interface'] = 'Dev grensesnitt'; +$roscms_langres['Dev_Overview'] = 'Oversikt'; +$roscms_langres['Dev_Pages'] = 'Sider'; +$roscms_langres['Dev_Contents'] = 'Innholdet'; +$roscms_langres['Dev_Help'] = 'Hjelp'; -$roscms_langres['Dev_DeveloperInterfaceOverview'] = 'Developer Interface - Overview'; +$roscms_langres['Dev_DeveloperInterfaceOverview'] = 'Fremkalle grensesnitt - Oversikt'; -$roscms_langres['ContTrans_Interface_Content'] = 'Dev Interface - Content'; +$roscms_langres['ContTrans_Interface_Content'] = 'Fremkaller grensesnitt - Innhold'; $roscms_langres['ContTrans_Contents'] = 'Content'; -$roscms_langres['ContTrans_Interface_Pages'] = 'Dev Interface - Pages'; -$roscms_langres['ContTrans_Pages'] = 'Pages'; +$roscms_langres['ContTrans_Interface_Pages'] = 'Fremkaller grensesnitt - Sider'; +$roscms_langres['ContTrans_Pages'] = 'Sider'; -$roscms_langres['ContTrans_Profile'] = 'Profile'; +$roscms_langres['ContTrans_Profile'] = 'Profil'; -$roscms_langres['ContTrans_Action'] = 'Action'; -$roscms_langres['ContTrans_NewContent'] = 'New Content'; -$roscms_langres['ContTrans_NewPage'] = 'New Page'; +$roscms_langres['ContTrans_Action'] = 'Handling'; +$roscms_langres['ContTrans_NewContent'] = 'Ny Innhold'; +$roscms_langres['ContTrans_NewPage'] = 'Ny side'; -$roscms_langres['ContTrans_resetfilters'] = 'reset filters & sort'; -$roscms_langres['ContTrans_Info'] = 'Info'; -$roscms_langres['ContTrans_ContentID'] = 'Content ID'; -$roscms_langres['ContTrans_PageID'] = 'Page ID'; -$roscms_langres['ContTrans_Content'] = 'Content'; +$roscms_langres['ContTrans_resetfilters'] = 'restart filter & sorter'; +$roscms_langres['ContTrans_Info'] = 'Infomasjon'; +$roscms_langres['ContTrans_ContentID'] = 'Innhold ID'; +$roscms_langres['ContTrans_PageID'] = 'Side ID'; +$roscms_langres['ContTrans_Content'] = 'Innhold'; $roscms_langres['ContTrans_Rev'] = 'Rev.'; -$roscms_langres['ContTrans_Date'] = 'Date'; -$roscms_langres['ContTrans_Time'] = 'Time'; -$roscms_langres['ContTrans_User'] = 'User'; -$roscms_langres['ContTrans_Language'] = 'Language'; -$roscms_langres['ContTrans_International'] = 'Original (English)'; -$roscms_langres['ContTrans_All'] = 'All'; +$roscms_langres['ContTrans_Date'] = 'Dato'; +$roscms_langres['ContTrans_Time'] = 'Klokkeslett'; +$roscms_langres['ContTrans_User'] = 'Bruker'; +$roscms_langres['ContTrans_Language'] = 'Språk'; +$roscms_langres['ContTrans_International'] = 'Original (Engelsk)'; +$roscms_langres['ContTrans_All'] = 'Alt'; $roscms_langres['ContTrans_Filter'] = 'Filter'; -$roscms_langres['ContTrans_activecontent'] = 'active content'; -$roscms_langres['ContTrans_activepages'] = 'active pages'; -$roscms_langres['ContTrans_allcontent'] = 'all content'; -$roscms_langres['ContTrans_allpages'] = 'all pages'; -$roscms_langres['ContTrans_activeandvisiblecontent'] = 'active and visible content'; -$roscms_langres['ContTrans_currentuser'] = 'current user'; +$roscms_langres['ContTrans_activecontent'] = 'aktive innhold'; +$roscms_langres['ContTrans_activepages'] = 'aktive sider'; +$roscms_langres['ContTrans_allcontent'] = 'alt innhold'; +$roscms_langres['ContTrans_allpages'] = 'alle sider'; +$roscms_langres['ContTrans_activeandvisiblecontent'] = 'aktive og synlig innhold'; +$roscms_langres['ContTrans_currentuser'] = 'nåværende bruker'; -$roscms_langres['ContTrans_normalpages'] = 'normal pages'; -$roscms_langres['ContTrans_dynamicpages'] = 'dynamic pages'; +$roscms_langres['ContTrans_normalpages'] = 'normal sider'; +$roscms_langres['ContTrans_dynamicpages'] = 'dynamisk sider'; -$roscms_langres['ContTrans_history'] = 'history'; -$roscms_langres['ContTrans_Sortedby'] = 'Sorted by'; -$roscms_langres['ContTrans_contentid'] = 'content id'; -$roscms_langres['ContTrans_pageid'] = 'page id'; -$roscms_langres['ContTrans_date'] = 'date'; -$roscms_langres['ContTrans_user'] = 'user'; -$roscms_langres['ContTrans_active'] = 'active'; -$roscms_langres['ContTrans_Active'] = 'Active'; -$roscms_langres['ContTrans_visible'] = 'visible'; -$roscms_langres['ContTrans_Visible'] = 'Visible'; -$roscms_langres['ContTrans_version'] = 'version'; -$roscms_langres['ContTrans_extra'] = 'extra'; -$roscms_langres['ContTrans_Extra'] = 'Extra'; -$roscms_langres['ContTrans_language'] = 'language'; +$roscms_langres['ContTrans_history'] = 'historie'; +$roscms_langres['ContTrans_Sortedby'] = 'Sorteres etter'; +$roscms_langres['ContTrans_contentid'] = 'innhold id'; +$roscms_langres['ContTrans_pageid'] = 'side id'; +$roscms_langres['ContTrans_date'] = 'dato'; +$roscms_langres['ContTrans_user'] = 'bruker'; +$roscms_langres['ContTrans_active'] = 'aktiv'; +$roscms_langres['ContTrans_Active'] = 'Aktiv'; +$roscms_langres['ContTrans_visible'] = 'ikke aktiv'; +$roscms_langres['ContTrans_Visible'] = 'ikke aktiv'; +$roscms_langres['ContTrans_version'] = 'versjon'; +$roscms_langres['ContTrans_extra'] = 'ekstra'; +$roscms_langres['ContTrans_Extra'] = 'Ekstra'; +$roscms_langres['ContTrans_language'] = 'språk'; $roscms_langres['ContTrans_editor'] = 'editor'; $roscms_langres['ContTrans_Editor'] = 'Editor'; -$roscms_langres['ContTrans_Translate'] = 'Translate'; -$roscms_langres['ContTrans_Edit'] = 'View / Edit'; -$roscms_langres['ContTrans_Delete'] = 'Delete'; -$roscms_langres['ContTrans_filter_history'] = 'Filter: history'; +$roscms_langres['ContTrans_Translate'] = 'Oversette'; +$roscms_langres['ContTrans_Edit'] = 'Vis / Rediger'; +$roscms_langres['ContTrans_Delete'] = 'Slett'; +$roscms_langres['ContTrans_filter_history'] = 'Filter: historie'; -$roscms_langres['ContTrans_ViewEditContent'] = 'View / Edit content'; -$roscms_langres['ContTrans_ViewEditpage'] = 'View / Edit page'; -$roscms_langres['ContTrans_SaveContent'] = 'Save content'; +$roscms_langres['ContTrans_ViewEditContent'] = 'Vis / rediger innhold'; +$roscms_langres['ContTrans_ViewEditpage'] = 'Vis / rediger side'; +$roscms_langres['ContTrans_SaveContent'] = 'Lagre innhold'; $roscms_langres['ContTrans_Type'] = 'Type'; -$roscms_langres['ContTrans_Description'] = 'Description'; -$roscms_langres['ContTrans_Username'] = 'Username'; -$roscms_langres['ContTrans_egAbout'] = 'e.g. "about"'; -$roscms_langres['ContTrans_checklang'] = 'Please check, if you have selected the right language, before you click "submit"!'; -$roscms_langres['ContTrans_SAVE'] = 'Save (new version and new db entry)'; -$roscms_langres['ContTrans_UPDATE'] = 'Update (overwrite the current entry)'; -$roscms_langres['ContTrans_Save1'] = 'A new version of content'; -$roscms_langres['ContTrans_Save2'] = 'has been saved!'; -$roscms_langres['ContTrans_Save3'] = 'Go to the \'content edit\' page'; -$roscms_langres['ContTrans_Save4'] = 'Back to the \'content edit\' page'; -$roscms_langres['ContTrans_Save5'] = 'The page'; -$roscms_langres['ContTrans_Save6'] = 'View the page (dynamic version; new window)'; -$roscms_langres['ContTrans_Save7'] = 'Back to the \'page edit\' page'; +$roscms_langres['ContTrans_Description'] = 'Beskrivelse'; +$roscms_langres['ContTrans_Username'] = 'Brukernavn'; +$roscms_langres['ContTrans_egAbout'] = 'e.g. "om"'; +$roscms_langres['ContTrans_checklang'] = 'Vennligst sjekk, om du har valgt riktig språk, før du trykker "submit"!'; +$roscms_langres['ContTrans_SAVE'] = 'Lagre (ny versjon og ny db fil)'; +$roscms_langres['ContTrans_UPDATE'] = 'Oppdater (overskriver nåværende fil)'; +$roscms_langres['ContTrans_Save1'] = 'En ny versjon av innholdet'; +$roscms_langres['ContTrans_Save2'] = ' har blitt lagret!'; +$roscms_langres['ContTrans_Save3'] = 'Gå til \'innhold rediger\' side'; +$roscms_langres['ContTrans_Save4'] = 'Tilbake til \'innhold rediger\' side'; +$roscms_langres['ContTrans_Save5'] = 'Siden'; +$roscms_langres['ContTrans_Save6'] = 'Vis siden (dynamisk versjon; ny vindu)'; +$roscms_langres['ContTrans_Save7'] = 'Tilbake til \'innhold rediger\' side'; -$roscms_langres['ContTrans_Preview'] = 'Preview'; -$roscms_langres['ContTrans_PageTitle'] = 'Page Title'; -$roscms_langres['ContTrans_Extention'] = 'Extention'; +$roscms_langres['ContTrans_Preview'] = 'Forhåndsvisning'; +$roscms_langres['ContTrans_PageTitle'] = 'Side Tittel'; +$roscms_langres['ContTrans_Extention'] = 'Utvidelse'; -$roscms_langres['ContTrans_DevPageGenerator'] = 'Developer Interface - Page Generator'; -$roscms_langres['Dev_PageGenerator'] = 'Page Generator'; -$roscms_langres['Dev_PageGeneratorOverview'] = 'Page Generator Overview'; -$roscms_langres['ContTrans_Change'] = 'Change'; -$roscms_langres['ContTrans_LatestGen'] = 'Latest Gen.'; -$roscms_langres['ContTrans_UserGen'] = 'User (Generator)'; +$roscms_langres['ContTrans_DevPageGenerator'] = 'Utvike Grensesnitt - Side Generator'; +$roscms_langres['Dev_PageGenerator'] = 'Side Generator'; +$roscms_langres['Dev_PageGeneratorOverview'] = 'Side Generator Oversikt'; +$roscms_langres['ContTrans_Change'] = 'Endre'; +$roscms_langres['ContTrans_LatestGen'] = 'Nyeste Gen.'; +$roscms_langres['ContTrans_UserGen'] = 'Bruker (Generator)'; -$roscms_langres['ContTrans_Gen_desc'] = 'The static page generator can output the pages to files or to the browser.'; -$roscms_langres['ContTrans_Gen_menu1'] = 'Generate all UPDATED static pages'; -$roscms_langres['ContTrans_Gen_menu2'] = 'Generate all static pages'; -$roscms_langres['ContTrans_Gen_menu3'] = 'Generate/view a specific static page'; -$roscms_langres['ContTrans_Gen_menu4'] = 'View page (dynamic from database)'; -$roscms_langres['ContTrans_Gen_menu3_desc'] = 'Generate one static page; e.g. if you want to update one specific page'; -$roscms_langres['ContTrans_allactivepages'] = 'all (active) pages'; +$roscms_langres['ContTrans_Gen_desc'] = ' statisk side generator utgang sidene til filer eller til nettleseren.'; +$roscms_langres['ContTrans_Gen_menu1'] = 'Generate alt OPPDATERT statisk sider'; +$roscms_langres['ContTrans_Gen_menu2'] = 'Generate alle statisk sider'; +$roscms_langres['ContTrans_Gen_menu3'] = 'Generate/vis en spesifisk statisk side'; +$roscms_langres['ContTrans_Gen_menu4'] = 'Vis side (dynamisk fra database)'; +$roscms_langres['ContTrans_Gen_menu3_desc'] = 'Generate en statisk side; f.eks. hvis du ønsker å oppdatere en spesifikt side'; +$roscms_langres['ContTrans_allactivepages'] = 'alle (aktive) sider'; -$roscms_langres['ContTrans_yes'] = 'yes'; -$roscms_langres['ContTrans_no'] = 'no'; +$roscms_langres['ContTrans_yes'] = 'ja'; +$roscms_langres['ContTrans_no'] = 'nei'; ?>

1 0

[fireball] 22434: GCC 4 fixes, thanks to w3seek
by fireball＠svn.reactos.org 19 Jun '06

19 Jun '06

Author: fireball Date: Tue Jun 20 01:05:33 2006 New Revision: 22434 URL: http://svn.reactos.ru/svn/reactos?rev=22434&view=rev Log: GCC 4 fixes, thanks to w3seek Modified: trunk/reactos/drivers/test/kmtest/kmtest.c trunk/reactos/drivers/test/kmtest/kmtest.h Modified: trunk/reactos/drivers/test/kmtest/kmtest.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.c (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.c Tue Jun 20 01:05:33 2006 @@ -25,8 +25,8 @@ #include <ddk/ntddk.h> #include "kmtest.h" -ULONG successes; -ULONG failures; +LONG successes; +LONG failures; tls_data glob_data; /* PRIVATE FUNCTIONS ***********************************************************/ Modified: trunk/reactos/drivers/test/kmtest/kmtest.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.… ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.h (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.h Tue Jun 20 01:05:33 2006 @@ -11,8 +11,8 @@ Everything else is done by Aleksey Bragin based on PnPTest by Filip Navara */ -extern ULONG successes; /* number of successful tests */ -extern ULONG failures; /* number of failures */ +extern LONG successes; /* number of successful tests */ +extern LONG failures; /* number of failures */ //static ULONG todo_successes; /* number of successful tests inside todo block */ //static ULONG todo_failures; /* number of failures inside todo block */

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
60
Older →

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 June 2006