Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 47862: The Win32ClientInfo TEB field can be bigger than the CLIENTINFO structure.
by tkreuzer＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: tkreuzer Date: Sun Jun 27 15:20:34 2010 New Revision: 47862 URL: http://svn.reactos.org/svn/reactos?rev=47862&view=rev Log: The Win32ClientInfo TEB field can be bigger than the CLIENTINFO structure. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jun 27 15:20:34 2010 @@ -216,8 +216,8 @@ PPROCESSINFO ppi; } CLIENTINFO, *PCLIENTINFO; -/* Make sure it fits exactly into the TEB */ -C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET(TEB, Win32ClientInfo)); +/* Make sure it fits into the TEB */ +C_ASSERT(sizeof(CLIENTINFO) <= sizeof(((PTEB)0)->Win32ClientInfo)); #define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo))

1 0

[fireball] 47861: [VENDOR/WINE] - Import Wine-1.2-rc5 gdi32, user32, winex11.drv.
by fireball＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: fireball Date: Sun Jun 27 13:36:43 2010 New Revision: 47861 URL: http://svn.reactos.org/svn/reactos?rev=47861&view=rev Log: [VENDOR/WINE] - Import Wine-1.2-rc5 gdi32, user32, winex11.drv. Modified: vendor/wine/dlls/gdi32/current/dc.c vendor/wine/dlls/gdi32/current/font.c vendor/wine/dlls/gdi32/current/gdi32.spec vendor/wine/dlls/gdi32/current/tests/dc.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/user32/current/cursoricon.c vendor/wine/dlls/user32/current/dde_server.c vendor/wine/dlls/user32/current/msgbox.c vendor/wine/dlls/user32/current/resources/oic_bang.svg vendor/wine/dlls/user32/current/resources/oic_hand.svg vendor/wine/dlls/user32/current/resources/oic_note.svg vendor/wine/dlls/user32/current/resources/oic_ques.svg vendor/wine/dlls/user32/current/resources/oic_sample.svg vendor/wine/dlls/user32/current/resources/user32_Ru.rc vendor/wine/dlls/user32/current/sysparams.c vendor/wine/dlls/user32/current/tests/class.c vendor/wine/dlls/user32/current/tests/dce.c vendor/wine/dlls/user32/current/tests/dde.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/init.c vendor/wine/dlls/winex11.drv/current/xim.c vendor/wine/dlls/winex11.drv/current/xrender.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dc.c?rev=… Modified: vendor/wine/dlls/gdi32/current/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/font.c?re… Modified: vendor/wine/dlls/gdi32/current/gdi32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi32.spe… Modified: vendor/wine/dlls/gdi32/current/tests/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/dc.… Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… Modified: vendor/wine/dlls/user32/current/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/cursoric… Modified: vendor/wine/dlls/user32/current/dde_server.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/dde_serv… Modified: vendor/wine/dlls/user32/current/msgbox.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/msgbox.c… Modified: vendor/wine/dlls/user32/current/resources/oic_bang.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_hand.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_note.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_ques.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_sample.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/user32_Ru.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/sysparams.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/sysparam… Modified: vendor/wine/dlls/user32/current/tests/class.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cl… Modified: vendor/wine/dlls/user32/current/tests/dce.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/dc… Modified: vendor/wine/dlls/user32/current/tests/dde.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/dd… Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… Modified: vendor/wine/dlls/user32/current/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.c?re… Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… Modified: vendor/wine/dlls/winex11.drv/current/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/ini… Modified: vendor/wine/dlls/winex11.drv/current/xim.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xim… Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre…

1 0

[spetreolle] 47860: update olepro32 base address.
by spetreolle＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: spetreolle Date: Sun Jun 27 13:26:22 2010 New Revision: 47860 URL: http://svn.reactos.org/svn/reactos?rev=47860&view=rev Log: update olepro32 base address. Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=478… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun Jun 27 13:26:22 2010 @@ -242,7 +242,7 @@ <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_VERSION" value="0x77a40000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" /> + <property name="BASEADDRESS_OLEPRO32" value="0x77b20000" /> <property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e50000" />

1 0

[mjmartin] 47859: [win32k] - Add Check for spwndNext being null before accessing any of the members. Fixes bugcheck when using cubicexplorer.
by mjmartin＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: mjmartin Date: Sun Jun 27 12:36:23 2010 New Revision: 47859 URL: http://svn.reactos.org/svn/reactos?rev=47859&view=rev Log: [win32k] - Add Check for spwndNext being null before accessing any of the members. Fixes bugcheck when using cubicexplorer. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sun Jun 27 12:36:23 2010 @@ -961,7 +961,7 @@ * itself. */ if ((WinPos->hwnd == WinPos->hwndInsertAfter) || - (WinPos->hwnd == InsAfterWnd->spwndNext->hSelf)) + ((InsAfterWnd->spwndNext) && (WinPos->hwnd == InsAfterWnd->spwndNext->hSelf))) { WinPos->flags |= SWP_NOZORDER; } @@ -1006,10 +1006,10 @@ if (!Window->Wnd) return FALSE; /* FIXME: Get current active window from active queue. */ - /* * Only allow CSRSS to mess with the desktop window */ + if ( Window->hSelf == IntGetDesktopWindow() && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) {

1 0

[ilardig] 47858: [EVENTVWR] - Update Italian and Spanish translations
by ilardig＠svn.reactos.org 26 Jun '10

26 Jun '10

Author: ilardig Date: Sat Jun 26 22:14:07 2010 New Revision: 47858 URL: http://svn.reactos.org/svn/reactos?rev=47858&view=rev Log: [EVENTVWR] - Update Italian and Spanish translations Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sat Jun 26 22:14:07 2010 @@ -105,13 +105,13 @@ STRINGTABLE BEGIN - IDS_COLUMNTYPE "Type" - IDS_COLUMNDATE "Date" - IDS_COLUMNTIME "Time" - IDS_COLUMNSOURCE "Source" - IDS_COLUMNCATEGORY "Category" - IDS_COLUMNEVENT "Event" - IDS_COLUMNUSER "User" - IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" + IDS_COLUMNTYPE "Tipo" + IDS_COLUMNDATE "Fecha" + IDS_COLUMNTIME "Hora" + IDS_COLUMNSOURCE "Origen" + IDS_COLUMNCATEGORY "Categoría" + IDS_COLUMNEVENT "Evento" + IDS_COLUMNUSER "Usuario" + IDS_COLUMNCOMPUTER "Computadora" + IDS_COLUMNEVENTDATA "Datos del evento" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sat Jun 26 22:14:07 2010 @@ -105,13 +105,13 @@ STRINGTABLE BEGIN - IDS_COLUMNTYPE "Type" - IDS_COLUMNDATE "Date" - IDS_COLUMNTIME "Time" - IDS_COLUMNSOURCE "Source" - IDS_COLUMNCATEGORY "Category" - IDS_COLUMNEVENT "Event" - IDS_COLUMNUSER "User" + IDS_COLUMNTYPE "Tipo" + IDS_COLUMNDATE "Data" + IDS_COLUMNTIME "Ora" + IDS_COLUMNSOURCE "Origine" + IDS_COLUMNCATEGORY "Categoria" + IDS_COLUMNEVENT "Evento" + IDS_COLUMNUSER "Utente" IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" + IDS_COLUMNEVENTDATA "Dati Evento" END

1 0

[spetreolle] 47857: french translation for eventvwr
by spetreolle＠svn.reactos.org 26 Jun '10

26 Jun '10

Author: spetreolle Date: Sat Jun 26 21:51:29 2010 New Revision: 47857 URL: http://svn.reactos.org/svn/reactos?rev=47857&view=rev Log: french translation for eventvwr Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sat Jun 26 21:51:29 2010 @@ -107,11 +107,11 @@ BEGIN IDS_COLUMNTYPE "Type" IDS_COLUMNDATE "Date" - IDS_COLUMNTIME "Time" + IDS_COLUMNTIME "Heure" IDS_COLUMNSOURCE "Source" - IDS_COLUMNCATEGORY "Category" - IDS_COLUMNEVENT "Event" - IDS_COLUMNUSER "User" - IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" + IDS_COLUMNCATEGORY "Catégorie" + IDS_COLUMNEVENT "Événement" + IDS_COLUMNUSER "Utilisateur" + IDS_COLUMNCOMPUTER "Ordinateur" + IDS_COLUMNEVENTDATA "Données" END

1 0

[ekohl] 47856: [EVENTVWR] - Replace hard-coded column names by string resources.
by ekohl＠svn.reactos.org 26 Jun '10

26 Jun '10

Author: ekohl Date: Sat Jun 26 19:55:05 2010 New Revision: 47856 URL: http://svn.reactos.org/svn/reactos?rev=47856&view=rev Log: [EVENTVWR] - Replace hard-coded column names by string resources. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -757,6 +757,7 @@ { HIMAGELIST hSmall; LVCOLUMNW lvc = {0}; + WCHAR szTemp[256]; hInst = hInstance; // Store instance handle in our global variable @@ -820,39 +821,75 @@ // Now set up the listview with its columns. lvc.mask = LVCF_TEXT | LVCF_WIDTH; lvc.cx = 90; - lvc.pszText = L"Type"; + LoadStringW(hInstance, + IDS_COLUMNTYPE, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 0, &lvc); lvc.cx = 70; - lvc.pszText = L"Date"; + LoadStringW(hInstance, + IDS_COLUMNDATE, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 1, &lvc); lvc.cx = 70; - lvc.pszText = L"Time"; + LoadStringW(hInstance, + IDS_COLUMNTIME, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 2, &lvc); lvc.cx = 150; - lvc.pszText = L"Source"; + LoadStringW(hInstance, + IDS_COLUMNSOURCE, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 3, &lvc); lvc.cx = 100; - lvc.pszText = L"Category"; + LoadStringW(hInstance, + IDS_COLUMNCATEGORY, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 4, &lvc); lvc.cx = 60; - lvc.pszText = L"Event"; + LoadStringW(hInstance, + IDS_COLUMNEVENT, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 5, &lvc); lvc.cx = 120; - lvc.pszText = L"User"; + LoadStringW(hInstance, + IDS_COLUMNUSER, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 6, &lvc); lvc.cx = 100; - lvc.pszText = L"Computer"; + LoadStringW(hInstance, + IDS_COLUMNCOMPUTER, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 7, &lvc); lvc.cx = 0; - lvc.pszText = L"Event Data"; + LoadStringW(hInstance, + IDS_COLUMNEVENTDATA, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 8, &lvc); ShowWindow(hwndMainWindow, nCmdShow); Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -83,8 +83,21 @@ CONTROL "&Äóìè",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,85,194,33,10 END -STRINGTABLE +STRINGTABLE BEGIN IDS_APP_TITLE "Ïðåãëåä íà ñúáèòèÿ" IDC_EVENTSTRINGIDNOTFOUND "Íå å íàìåðåíî îïèñàíèåòî íà ñúáèòèå ( %lu ) â èçòî÷íèê ( %s ). Âúçìîæíî å ìåñòèÿò êîìïþòúð äà íÿìà íóæíèòå ñâåäåíèÿ â ðåãèñòúðà èëè DLL ôàéëîâåò, íóæíè çà ïîêàçâàíå íà ñúîáùåíèÿ îò îòäàëå÷åí êîìïþòúð." END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Erfolgreich" IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Typ" + IDS_COLUMNDATE "Datum" + IDS_COLUMNTIME "Zeit" + IDS_COLUMNSOURCE "Quelle" + IDS_COLUMNCATEGORY "Kategorie" + IDS_COLUMNEVENT "Ereignis" + IDS_COLUMNUSER "Benutzer" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Ereignisdaten" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Åðéôõ÷ßá" IDC_EVENTLOG_UNKNOWN_TYPE "¢ãíùóôï óõìâÜí" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Success" IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Acierto" IDC_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Succès" IDC_EVENTLOG_UNKNOWN_TYPE "Événement Inconnu" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Successo" IDC_EVENTLOG_UNKNOWN_TYPE "Evento sconosciuto" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "¬÷" IDC_EVENTLOG_UNKNOWN_TYPE "s¾ÈCxg" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -98,3 +98,16 @@ IDC_EVENTLOG_SUCCESS "¼º°ø" IDC_EVENTLOG_UNKNOWN_TYPE "¾Ë·ÁÁöÁö ¾ÊÀº ÀÌº¥Æ®" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Suksess" IDC_EVENTLOG_UNKNOWN_TYPE "Ukjent hendelse" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -106,3 +106,16 @@ IDC_EVENTLOG_SUCCESS "Sukces" IDC_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Succes" IDC_EVENTLOG_UNKNOWN_TYPE "Eveniment necunoscut" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Óñïåõ" IDC_EVENTLOG_UNKNOWN_TYPE "Íåèçâåñòíîå ñîáûòèå" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -99,3 +99,16 @@ IDC_EVENTLOG_SUCCESS "Úspech" //Success IDC_EVENTLOG_UNKNOWN_TYPE "Neznáma udalos" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -102,3 +102,16 @@ IDC_EVENTLOG_SUCCESS "Óñï³õ" IDC_EVENTLOG_UNKNOWN_TYPE "Íåâ³äîìà ïîä³ÿ" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sat Jun 26 19:55:05 2010 @@ -1,7 +1,3 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by eventvwr.rc -// #define IDC_MYICON 2 #define IDNEXT 3 #define IDD_EVENTVWR_DIALOG 102 @@ -54,14 +50,13 @@ #define IDM_REFRESH 32782 #define IDC_STATIC -1 -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 133 -#define _APS_NEXT_COMMAND_VALUE 32783 -#define _APS_NEXT_CONTROL_VALUE 1012 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif + +#define IDS_COLUMNTYPE 300 +#define IDS_COLUMNDATE 301 +#define IDS_COLUMNTIME 302 +#define IDS_COLUMNSOURCE 303 +#define IDS_COLUMNCATEGORY 304 +#define IDS_COLUMNEVENT 305 +#define IDS_COLUMNUSER 306 +#define IDS_COLUMNCOMPUTER 307 +#define IDS_COLUMNEVENTDATA 308

1 0

[dreimer] 47855: Update WineFile to Wine 1.2rc5
by dreimer＠svn.reactos.org 26 Jun '10

26 Jun '10

Author: dreimer Date: Sat Jun 26 14:07:37 2010 New Revision: 47855 URL: http://svn.reactos.org/svn/reactos?rev=47855&view=rev Log: Update WineFile to Wine 1.2rc5 Modified: trunk/rosapps/applications/winfile/Pt.rc trunk/rosapps/applications/winfile/Ru.rc Modified: trunk/rosapps/applications/winfile/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] Sat Jun 26 14:07:37 2010 @@ -4,6 +4,7 @@ * * Copyright 2003 Marcelo Duarte * Copyright 2004,2007 AmÃ©rico JosÃ© Melo + * Copyright 2010 Gustavo Henrique MilarÃ© * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,20 +35,20 @@ MENUITEM "A&brir\tEnter", ID_ACTIVATE MENUITEM "&Mover...\tF7", ID_FILE_MOVE MENUITEM "&Copiar...\tF8", ID_FILE_COPY - MENUITEM "&In Clipboard...\tF9", 118 + MENUITEM "Na Ã¡rea de &transferÃªncia...\tF9", 118 MENUITEM "E&xcluir\tDel", ID_FILE_DELETE MENUITEM "Re&nomear...", 109 - MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM "Propri&edades...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "C&omprimir...", 119 - MENUITEM "Descomprimir...", 120 - MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_RUN + MENUITEM "&Descomprimir...", 120 + MENUITEM SEPARATOR + MENUITEM "Exec&utar...", ID_RUN MENUITEM "&Imprimir...", 102 MENUITEM "A&ssociar...", 103 MENUITEM SEPARATOR - MENUITEM "Cri&ar pasta...", 111 - MENUITEM "P&esquisar...", 104 + MENUITEM "Criar &pasta...", 111 + MENUITEM "Pes&quisar...", 104 MENUITEM "Selecionar arqui&vos...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS @@ -66,8 +67,8 @@ MENUITEM "&Gerar disco de sistema...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Conecta&r unidade de rede", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Desconectar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "Con&ectar unidade de rede", ID_CONNECT_NETWORK_DRIVE + MENUITEM "De&sconectar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "C&ompartilhar como...", 254 MENUITEM "&Remover compartilhamento...",255 @@ -77,30 +78,30 @@ POPUP "Ã&rvore" { MENUITEM "&PrÃ³ximo nÃvel\t+", 301 - MENUITEM "Expandi&r pasta\t*", 302 + MENUITEM "E&xpandir pasta\t*", 302 MENUITEM "Expandir &tudo\tStrg+*", 303 MENUITEM "Recolher p&asta\t-", 304 MENUITEM SEPARATOR MENUITEM "&Indicar subnÃveis", 505 } - POPUP "&Exibir" { + POPUP "E&xibir" { MENUITEM "Ã&rvore e pasta", 413 - MENUITEM "S&omente Ã¡rvore", 411 - MENUITEM "So&mente pasta", 412 + MENUITEM "Apenas Ã¡r&vore", 411 + MENUITEM "Apenas &pasta", 412 MENUITEM SEPARATOR MENUITEM "&Dividir", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome", ID_VIEW_NAME - MENUITEM "&Todos os delalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Todos os detalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "D&etalhes parciais...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR MENUITEM "&Classificar por nome", ID_VIEW_SORT_NAME - MENUITEM "C&lassificar por tipo", ID_VIEW_SORT_TYPE - MENUITEM "Cl&assificar por tamanho", ID_VIEW_SORT_SIZE - MENUITEM "Cla&ssificar por &data", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Classificar &por...", ID_VIEW_FILTER + MENUITEM "Cla&ssificar por tipo", ID_VIEW_SORT_TYPE + MENUITEM "Classificar por ta&manho", ID_VIEW_SORT_SIZE + MENUITEM "Classi&ficar por data", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Classificar p&or...", ID_VIEW_FILTER } POPUP "&OpÃ§Ãµes" { @@ -109,10 +110,10 @@ MENUITEM "&Personalizar barra de ferramentas...", 512 MENUITEM SEPARATOR MENUITEM "Barra d&e ferramentas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "B&arra de &status", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "Tela Cheia\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "Barra de &unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra de s&tatus", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "Tela cheia\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Minimizar durante o uso", 504 @@ -122,8 +123,8 @@ POPUP "&SeguranÃ§a" { MENUITEM "&Acesso...", 605 - MENUITEM "&Logging...", 606 - MENUITEM "&Owner...", 607 + MENUITEM "Au&tenticaÃ§Ã£o...", 606 + MENUITEM "&ProprietÃ¡rio...", 607 } POPUP "&Janela" { @@ -140,8 +141,8 @@ POPUP "Aj&uda" { MENUITEM "&TÃ³picos da ajuda\tF1", ID_HELP - MENUITEM "Pesquisar...", ID_HELP - MENUITEM "&Usando a ajuda", ID_HELP_USING + MENUITEM "&Pesquisar...", ID_HELP + MENUITEM "Usando a &ajuda", ID_HELP_USING MENUITEM SEPARATOR MENUITEM "&Sobre o Winefile...", ID_ABOUT } @@ -155,21 +156,21 @@ MENUITEM "A&brir\tEnter", ID_ACTIVATE MENUITEM "&Mover...\tF7", ID_FILE_MOVE MENUITEM "&Copiar...\tF8", ID_FILE_COPY - MENUITEM "&Na Area de TransferÃªncia...\tF9", 118 + MENUITEM "Na Area de &TransferÃªncia...\tF9", 118 MENUITEM "E&xcluir\tDel", ID_FILE_DELETE MENUITEM "Re&nomear...", 109 - MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM "Propri&edades...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "C&omprimir...", 119 MENUITEM "&Descomprimir...", 120 MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_RUN + MENUITEM "Exec&utar...", ID_RUN MENUITEM "&Imprimir...", 102 MENUITEM "A&ssociar...", 103 MENUITEM SEPARATOR - MENUITEM "Cri&ar pasta...", 111 - MENUITEM "P&esquisar...", 104 - MENUITEM "Seleccionar fichei&ros...", 116 + MENUITEM "Criar &pasta...", 111 + MENUITEM "Pes&quisar...", 104 + MENUITEM "Seleccion&ar ficheiros...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "Sai&r\tAlt+X", ID_FILE_EXIT @@ -187,8 +188,8 @@ MENUITEM "&Gerar disco de sistema...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Liga&r unidade de rede", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Desligar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "L&igar unidade de rede", ID_CONNECT_NETWORK_DRIVE + MENUITEM "D&esligar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "&Partilhar como...", 254 MENUITEM "&Remover partilha...", 255 @@ -198,42 +199,42 @@ POPUP "Ã&rvore" { MENUITEM "&PrÃ³ximo nÃvel\t+", 301 - MENUITEM "Expandi&r pasta\t*", 302 + MENUITEM "E&xpandir pasta\t*", 302 MENUITEM "Expandir &tudo\tStrg+*", 303 MENUITEM "Recolher p&asta\t-", 304 MENUITEM SEPARATOR MENUITEM "&Indicar subnÃveis", 505 } - POPUP "&Exibir" { + POPUP "E&xibir" { MENUITEM "Ã&rvore e pasta", 413 - MENUITEM "A&penas Ã¡rvore", 411 - MENUITEM "Ap&enas pasta", 412 + MENUITEM "Apenas Ã¡r&vore", 411 + MENUITEM "Apenas &pasta", 412 MENUITEM SEPARATOR MENUITEM "&Dividir", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome", ID_VIEW_NAME - MENUITEM "&Todos os delalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Todos os detalhes", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "D&etalhes parciais...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR MENUITEM "&Classificar por nome", ID_VIEW_SORT_NAME - MENUITEM "C&lassificar por tipo", ID_VIEW_SORT_TYPE - MENUITEM "Cl&assificar por tamanho", ID_VIEW_SORT_SIZE - MENUITEM "Cla&ssificar por &data", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Classificar &por...", ID_VIEW_FILTER + MENUITEM "Cla&ssificar por tipo", ID_VIEW_SORT_TYPE + MENUITEM "Classificar por ta&manho", ID_VIEW_SORT_SIZE + MENUITEM "Classi&ficar por data", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Classificar p&or...", ID_VIEW_FILTER } POPUP "&OpÃ§Ãµes" { MENUITEM "&ConfirmaÃ§Ã£o...", 501 - MENUITEM "&Tipo de Letra...", ID_SELECT_FONT + MENUITEM "&Tipo de letra...", ID_SELECT_FONT MENUITEM "&Personalizar barra de ferramentas...", 512 MENUITEM SEPARATOR - MENUITEM "Barra d&e ferramentas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "B&arra de e&stado", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "EcrÃ£ Completo\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "Barra de &ferramentas", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Barra de &unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra de &estado", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "EcrÃ£ completo\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Minimizar durante o uso", 504 @@ -243,7 +244,7 @@ POPUP "&SeguranÃ§a" { MENUITEM "&Acesso...", 605 - MENUITEM "&AutenticaÃ§Ã£o...", 606 + MENUITEM "Au&tenticaÃ§Ã£o...", 606 MENUITEM "&Dono...", 607 } @@ -261,8 +262,8 @@ POPUP "Aj&uda" { MENUITEM "&TÃ³picos da ajuda\tF1", ID_HELP - MENUITEM "Pesquisar...", ID_HELP - MENUITEM "&Usar a ajuda", ID_HELP_USING + MENUITEM "&Pesquisar...", ID_HELP + MENUITEM "Usar a &ajuda", ID_HELP_USING MENUITEM SEPARATOR MENUITEM "&Sobre o Winefile...", ID_ABOUT } @@ -297,6 +298,34 @@ PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 } + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Por tipo de arquivo" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nome:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Tipo de arquivo",-1,7,23,87,56 + CONTROL "&DiretÃ³rios",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programas",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Do&cumentos",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Outros arquivos",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "&Mostrar arquivos ocultos/sistema",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,104,24,50,14 +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -310,7 +339,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 CONTROL "&Programas",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 - CONTROL "Docu&mentos",IDC_VIEW_TYPE_DOCUMENTS,"Button", + CONTROL "Do&cumentos",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 CONTROL "&Outros ficheiros",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 @@ -319,6 +348,41 @@ DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,104,24,50,14 END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Propriedades de %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,191,29,50,14 + LTEXT "&Nome do arquivo:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&LocalizaÃ§Ã£o Completa:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Ãltima alteraÃ§Ã£o:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "VersÃ£o:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Direitos de autor:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Tamanho:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Atributos",-1,7,79,158,46 + CONTROL "&Apenas leitura",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Oculto",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "Ar&quivo",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Comprimido",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&InformaÃ§Ã£o de versÃ£o",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -341,10 +405,10 @@ EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Atributos",-1,7,79,158,46 CONTROL "&Apenas de leitura",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "&Ocultos",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 - CONTROL "&Arquivos",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Oculto",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "Ar&quivo",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&Sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "&Comprimidos",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + CONTROL "&Comprimido",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 GROUPBOX "&InformaÃ§Ã£o de versÃ£o",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -355,7 +419,7 @@ STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Aplicando configuraÃ§Ãµes de fonte" - IDS_FONT_SEL_ERROR "Erro enquanto seleciona nova fonte." + IDS_FONT_SEL_ERROR "Erro al selecionar nova fonte." } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -367,7 +431,37 @@ } -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_WINEFILE "Gerenciador de Arquivos do Wine" + IDS_ERROR "Erro" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Ãrea de trabalho" + IDS_SHELL "Linha de comandos" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ainda nÃ£o implementado" + IDS_WINE_FILE "Arquivo Wine" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nome" + IDS_COL_SIZE "Tamanho" + IDS_COL_CDATE "CData" + IDS_COL_ADATE "AData" + IDS_COL_MDATE "MData" + IDS_COL_IDX "Ãndice/Inode" + IDS_COL_LINKS "Links" + IDS_COL_ATTR "Atributos" + IDS_COL_SEC "SeguranÃ§a" + + IDS_FREE_SPACE_FMT "%s de %s livre" +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { Modified: trunk/rosapps/applications/winfile/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ru.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] Sat Jun 26 14:07:37 2010 @@ -63,7 +63,7 @@ MENUITEM SEPARATOR MENUITEM "&Ð¤Ð¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐ¹ Ð´Ð¸ÑÐº...", -1 /*TODO*/ + MENUITEM "&Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐ¹ Ð´Ð¸ÑÐº...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "ÐÐ¾Ð´ÐºÐ»Ñ&ÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº", ID_CONNECT_NETWORK_DRIVE @@ -78,7 +78,7 @@ POPUP "&ÐÐ°Ð¿ÐºÐ¸" { MENUITEM "Ð¡&Ð»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÑÐ¾Ð²ÐµÐ½Ñ\t+", 301 MENUITEM "&Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð´ÐµÑÐµÐ²Ð¾\t*", 302 - MENUITEM "Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð²&ÑÐµ\tStrg+*", 303 + MENUITEM "Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð²&ÑÑ\tStrg+*", 303 MENUITEM "&Ð¡Ð²ÐµÑÐ½ÑÑÑ Ð´ÐµÑÐµÐ²Ð¾\t-", 304 MENUITEM SEPARATOR MENUITEM "&ÐÑÐ¼ÐµÑÐ¸ÑÑ Ð²ÐµÑÐ²Ð¸", 505 @@ -204,7 +204,7 @@ GROUPBOX "ÐÑÑÐ¸Ð±ÑÑÑ",-1,7,79,158,46 CONTROL "&Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 CONTROL "Ð¡&ÐºÑÑÑÑÐ¹",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 - CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&ÐÑÑÐ¸Ð²Ð½ÑÐ¹",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐ¹",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 CONTROL "Ð¡&Ð¶Ð°ÑÑÐ¹",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 GROUPBOX "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð²ÐµÑÑÐ¸Ð¸",-1,7,129,234,79

1 0

[dreimer] 47854: Update reg, xcopy, winhlp32, wordpad to Wine 1.2rc5
by dreimer＠svn.reactos.org 26 Jun '10

26 Jun '10

Author: dreimer Date: Sat Jun 26 13:56:41 2010 New Revision: 47854 URL: http://svn.reactos.org/svn/reactos?rev=47854&view=rev Log: Update reg, xcopy, winhlp32, wordpad to Wine 1.2rc5 Added: trunk/reactos/base/applications/cmdutils/reg/Ro.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/reg/rsrc.rc trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/winhlp32/Es.rc trunk/reactos/base/applications/winhlp32/Nl.rc trunk/reactos/base/applications/winhlp32/Pl.rc trunk/reactos/base/applications/winhlp32/Ru.rc trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h Added: trunk/reactos/base/applications/cmdutils/reg/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Ro.rc (added) +++ trunk/reactos/base/applications/cmdutils/reg/Ro.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -1,0 +1,40 @@ +/* + * REG.EXE - Wine-compatible reg program. + * + * Copyright 2008 Andrew Riedi + * Copyright 2010 Claudia CotunÄ + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "reg.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY ]\nREG comandÄ /?\n" + STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n" + STRING_SUCCESS, "OperaÈiunea a fost finalizatÄ cu succes\n" + STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n" + STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandÄ\n" + STRING_NO_REMOTE, "Eroare: Nu se pot adÄuga chei pe calculatorul de la distanÈÄ\n" + STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut gÄsi cheia sau valoarea de registru specificatÄ\n" +} Propchange: trunk/reactos/base/applications/cmdutils/reg/Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/reg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -13,6 +13,7 @@ #include "Lt.rc" #include "No.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Uk.rc" Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -53,8 +53,8 @@ \n\ Where:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or\n\ -\tmore files\n\ +[/I] Assume directory if destination does not exist and copying two or\n\ +\ more files\n\ [/S] Copy directories and subdirectories\n\ [/E] Copy directories and subdirectories, including any empty ones\n\ [/Q] Do not list names during copy, ie quiet.\n\ @@ -72,7 +72,7 @@ [/C] Continue even if an error occurs during the copy\n\ [/A] Only copy files with archive attribute set\n\ [/M] Only copy files with archive attribute set, removes\n\ -\tarchive attribute\n\ +\ archive attribute\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source\n\n" Added: trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -1,0 +1,80 @@ +/* + * XCOPY - Wine-compatible xcopy program + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2010 Claudia CotunÄ + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + STRING_INVPARMS, "NumÄr de parametri nevalid - UtilizaÈi xcopy /? pentru ajutor\n" + STRING_INVPARM, "Parametru nevalid â%sâ - UtilizaÈi xcopy /? pentru ajutor\n" + STRING_PAUSE, "ApÄsaÈi pe <enter> pentru a Ã®ncepe copierea\n" + STRING_SIMCOPY, "%d fiÈier(e) ar fi copiat(e)\n" + STRING_COPY, "%d fiÈier(e) copiat(e)\n" + STRING_QISDIR, "â%sâ este un nume de fiÈier sau un director\ndin destinaÈie?\n(F - FiÈier, D - Director)\n" + STRING_SRCPROMPT,"%s? (Da|Nu)\n" + STRING_OVERWRITE,"Se suprascrie %s? (Da|Nu|Toate)\n" + STRING_COPYFAIL, "Copierea â%sâ Ã®n â%sâ a eÈuat cu cod de retur %d\n" + STRING_OPENFAIL, "Deschiderea â%sâ a eÈuat\n" + STRING_READFAIL, "Citirea â%sâ a eÈuat\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - CopiazÄ fiÈiere sau arbori de directoare sursÄ Ã®ntr-o destinaÈie\n\ +\n\ +SintaxÄ:\n\ +XCOPY sursÄ [destinaÈie] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\ [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\nCu:\n\ +\n\ +[/I] CreeazÄ director dacÄ destinaÈia nu existÄ Èi se copiazÄ douÄ sau\n\ +\ mai multe fiÈiere\n\ +[/S] CopiazÄ directoarele Èi subdirectoarele\n\ +[/E] CopiazÄ directoarele Èi subdirectoarele, inclusiv pe cele goale\n\ +[/Q] Nu afiÈa numele Ã®n timpul copierii.\n\ +[/F] AratÄ numele Ã®ntreg pentru sursÄ Èi destinaÈie Ã®n timpul copierii\n\ +[/L] SimuleazÄ operaÈiunea, afiÈÃ¢nd numele care ar fi copiate\n\ +[/W] SolicitÄ confirmarea Ã®nainte de a Ã®ncepe copierea\n\ +[/T] CreeazÄ o structurÄ de directoare goale, dar nu copiazÄ fiÈiere\n\ +[/Y] Nu solicita confirmarea la suprascrierea fiÈierelor\n\ +[/-Y] SolicitÄ confirmarea la suprascrierea fiÈierelor\n\ +[/P] SolicitÄ confirmarea Ã®nainte de copierea fiecÄrui fiÈier sursÄ\n\ +[/N] CopiazÄ utilizÃ¢nd prescurtÄri de nume\n\ +[/U] CopiazÄ numai fiÈierele care existÄ deja Ã®n destinaÈie\n\ +[/R] Suprascrie orice fiÈiere cu protecÈie la modificÄri\n\ +[/H] Include Ã®n copie fiÈierele ascunse Èi de sistem\n\ +[/C] ContinuÄ chiar dacÄ apare o eroare Ã®n timpul copierii\n\ +[/A] CopiazÄ numai fiÈierele cu atributul de arhivÄ activat\n\ +[/M] CopiazÄ numai fiÈierele cu atributul de arhivÄ activat, dezactiveazÄ\n\ +\ apoi atributul\n\ +[/D | /D:m-d-y] CopiazÄ fiÈierele noi sau pe cele modificate dupÄ data\n\ +\t\tspecificatÄ. DacÄ nu este specificatÄ nici o datÄ, copiazÄ\n\ +\t\tnumai dacÄ fiÈierul destinaÈie este mai vechi decÃ¢t fiÈierul\n\ +\t\tsursÄ\n\n" +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -35,7 +35,7 @@ STRING_INVPARM, "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%s' - Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ 'xcopy /?' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð³Ð¾\n\ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n" - STRING_PAUSE, "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ <enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" + STRING_PAUSE, "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÑ <Enter>, ÑÑÐ¾Ð±Ñ Ð½Ð°ÑÐ°ÑÑ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ.\n" STRING_SIMCOPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð±ÑÐ»Ð¾ Ð±Ñ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" STRING_COPY, "%d ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾.\n" STRING_QISDIR, "'%s' ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¾Ð¹?\n" \ Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -40,6 +40,7 @@ #include "Ja.rc" #include "Lt.rc" #include "Nl.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Uk.rc" Modified: trunk/reactos/base/applications/winhlp32/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Es.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -42,21 +42,21 @@ POPUP "&Marcador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opciones" { + POPUP "Ayuda siempre visible" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Por defecto", MNID_OPTS_HELP_DEFAULT MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "No visible", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historial", MNID_OPTS_HISTORY + POPUP "Fuentes" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Pequeña", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usar colores del sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "A&yuda" { MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON @@ -69,6 +69,22 @@ } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Índice" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Buscar" +{ + LTEXT "Aún no implementado", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL { @@ -79,11 +95,11 @@ STID_NOT_IMPLEMENTED, "Aún no implementado" STID_HLPFILE_ERROR_s, "Error al leer el archivo de ayuda `%s'" STID_INDEX, "&Índice" -STID_CONTENTS, "Summary" +STID_CONTENTS, "Resumen" STID_BACK, "&Anterior" STID_ALL_FILES, "Todos los archivos (*.*)" STID_HELP_FILES_HLP, "Archivos de ayuda (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "No se pudo encontrar '%s'. ¿Desea buscar este archivo usted mismo?" +STID_NO_RICHEDIT "No se pudo encontrar una implementación de richedit... Abortando" +STID_PSH_INDEX, "Temas de ayuda: " } Modified: trunk/reactos/base/applications/winhlp32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Nl.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -113,7 +113,7 @@ BEGIN MENUITEM "Annotering...", MNID_CTXT_ANNOTATE MENUITEM "KopiÃ«ren", MNID_CTXT_COPY - MENUITEM "Afdrukken ...", MNID_CTXT_PRINT + MENUITEM "Afdrukken...", MNID_CTXT_PRINT POPUP "Lettertype" BEGIN MENUITEM "Klein", MNID_CTXT_FONTS_SMALL Modified: trunk/reactos/base/applications/winhlp32/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Pl.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -4,6 +4,7 @@ * Copyright 1996 Ulrich Schmid * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2004 Piotr Caban + * Copyright 2010 £ukasz Wojni³owicz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,9 +23,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Plik" { MENUITEM "&Otwórz", MNID_FILE_OPEN @@ -43,20 +46,20 @@ MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE } POPUP "&Options" { - POPUP "Help always visible" + POPUP "Pomoc zawsze widoczna" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Domylnie", MNID_OPTS_HELP_DEFAULT + MENUITEM "Widoczna", MNID_OPTS_HELP_VISIBLE + MENUITEM "Niewidoczna", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historia", MNID_OPTS_HISTORY + POPUP "Czcionki" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Ma³e", MNID_OPTS_FONTS_SMALL + MENUITEM "Normalne", MNID_OPTS_FONTS_NORMAL + MENUITEM "Du¿e", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "U¿yj kolorów systemowych", MNID_OPTS_SYSTEM_COLORS } POPUP "Pomo&c" { MENUITEM "&Pomoc", MNID_HELP_HELPON @@ -69,7 +72,7 @@ } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Indeks" @@ -77,8 +80,16 @@ LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Szukaj" +{ + LTEXT "Nie zaimplementowane", -1, 10, 10, 180, 150 +} + /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE - Pomoc" STID_WHERROR, "B£¥D" @@ -92,12 +103,12 @@ STID_ALL_FILES, "Wszystkie pliki (*.*)" STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)" STID_FILE_NOT_FOUND_s "Nie znaleziono pliku '%s'. Czy chcesz poszukaæ tego pliku samodzielnie?" -STID_NO_RICHEDIT "Nie uda³o siê znaleæ modu³u richedit... Wywietlenie pomocy nie jest mo¿liwe" -STID_PSH_INDEX, "Help topics: " +STID_NO_RICHEDIT "Nie znaleziono implementacji richedit... Wywietlenie pomocy nie jest mo¿liwe" +STID_PSH_INDEX, "Tematy pomocy: " } -CONTEXT_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN Modified: trunk/reactos/base/applications/winhlp32/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ru.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -80,6 +80,14 @@ LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ÐÐ¾Ð¸ÑÐº" +{ + LTEXT "ÐÐµ ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE { @@ -87,7 +95,7 @@ STID_WHERROR, "ÐÐ¨ÐÐÐÐ" STID_WARNING, "ÐÐÐÐÐÐÐÐ" STID_INFO, "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" -STID_NOT_IMPLEMENTED, "ÐÐµ ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ð¾" +STID_NOT_IMPLEMENTED, "ÐÐµ ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾" STID_HLPFILE_ERROR_s, "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ ÑÑÐµÐ½Ð¸Ð¸ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð¼Ð¾ÑÐ¸ `%s'" STID_INDEX, "&Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ" STID_CONTENTS, "ÐÐ°ÑÐ°Ð»Ð¾" Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -281,24 +281,32 @@ static void CALLBACK MACRO_CloseSecondarys(void) { WINHELP_WINDOW *win; - - WINE_TRACE("()\n"); - for (win = Globals.win_list; win; win = win->next) + WINHELP_WINDOW *next; + + WINE_TRACE("()\n"); + for (win = Globals.win_list; win; win = next) + { + next = win->next; if (lstrcmpi(win->info->name, "main")) WINHELP_ReleaseWindow(win); + } } static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) { WINHELP_WINDOW *win; + WINHELP_WINDOW *next; WINE_TRACE("(\"%s\")\n", lpszWindow); if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main"; - for (win = Globals.win_list; win; win = win->next) + for (win = Globals.win_list; win; win = next) + { + next = win->next; if (!lstrcmpi(win->info->name, lpszWindow)) WINHELP_ReleaseWindow(win); + } } static void CALLBACK MACRO_Compare(LPCSTR str) @@ -575,13 +583,17 @@ if ((ptr = strchr(lpszPathWindow, '>')) != NULL) { LPSTR tmp; - size_t sz = ptr - lpszPathWindow; - - tmp = HeapAlloc(GetProcessHeap(), 0, sz + 1); + size_t sz; + + tmp = HeapAlloc(GetProcessHeap(), 0, strlen(lpszPathWindow) + 1); if (tmp) { - memcpy(tmp, lpszPathWindow, sz); - tmp[sz] = '\0'; + strcpy(tmp, lpszPathWindow); + tmp[ptr - lpszPathWindow] = '\0'; + ptr += tmp - lpszPathWindow; /* ptr now points to '>' in tmp buffer */ + /* in some cases, we have a trailing space that we need to get rid of */ + /* FIXME: check if it has to be done in lexer rather than here */ + for (sz = strlen(ptr + 1); sz >= 1 && ptr[sz] == ' '; sz--) ptr[sz] = '\0'; MACRO_JumpHash(tmp, ptr + 1, HLPFILE_Hash(topic_id)); HeapFree(GetProcessHeap(), 0, tmp); } Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -912,7 +912,10 @@ if ((hlpfile = WINHELP_LookupHelpFile(link->string))) { if (link->window == -1) + { wi = win->info; + if (wi->win_style & WS_POPUP) wi = Globals.active_win->info; + } else if (link->window < hlpfile->numWindows) wi = &hlpfile->windows[link->window]; else @@ -971,9 +974,10 @@ (HWND)lParam == Globals.active_popup->hMainWnd || GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd) break; + /* fall through */ case WM_LBUTTONDOWN: - if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam)) - return FALSE; + if (msg == WM_LBUTTONDOWN) + WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam); /* fall through */ case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -105,151 +105,3 @@ MENUITEM "&Paragraph..." ID_PARAFORMAT END END - -IDM_COLOR_POPUP MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Black", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC - END -END - -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Available formats",-1,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY - PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 -END - -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "New" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "New document type",-1,3,2,100,15 - LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 -END - -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Paragraph format" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Indentation", -1, 10, 10, 120, 68 - LTEXT "Left", -1, 15, 22, 40, 13 - EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", -1, 15, 40, 40, 13 - EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", -1, 15, 58, 40, 13 - EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", -1, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 -END - -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabs" -FONT 8, "MS SHell DLg" -BEGIN - GROUPBOX "Tab stops", -1, 10, 10, 120, 90 - COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE - DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 -END - -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 -STYLE DS_SYSMODAL -Caption "" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", -1, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 - LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" - STRING_TEXT_FILES_TXT, "Text documents (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" - STRING_ALL_FILES, "All documents (*.*)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "Left" - STRING_ALIGN_RIGHT, "Right" - STRING_ALIGN_CENTER, "Center" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Text document" - STRING_NEWFILE_TXT_UNICODE, "Unicode text document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Options" - STRING_VIEWPROPS_TEXT, "Text" - STRING_VIEWPROPS_RICHTEXT, "Rich text" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Print" - STRING_PREVIEW_NEXTPAGE, "Next page" - STRING_PREVIEW_PREVPAGE, "Previous page" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" - STRING_PREVIEW_CLOSE, "Close" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" -END Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -247,13 +247,6 @@ STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Lukk" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -2,6 +2,7 @@ * Portuguese Language File * * Copyright 2008 Ricardo Filipe + * Copyright 2010 Gustavo Henrique MilarÃ© * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,81 @@ #pragma code_page(65001) +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Arquivo" + BEGIN + MENUITEM "&Novo...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Abrir...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Salvar\tCtrl+S", ID_FILE_SAVE + MENUITEM "Salvar &como...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Imprimir...\tCtrl+P", ID_PRINT + MENUITEM "&PrÃ© visualizar...", ID_PREVIEW + MENUITEM "C&onfigurar pÃ¡gina...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Sair", ID_FILE_EXIT + END + POPUP "&Editar" + BEGIN + MENUITEM "&Desfazer\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Refazer\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "Cor&tar\tCtrl+X", ID_EDIT_CUT + MENUITEM "C&opiar\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Colar\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Limpar\tDEL", ID_EDIT_CLEAR + MENUITEM "&Selecionar tudo\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "Locali&zar...\tCtrl+F", ID_FIND + MENUITEM "&Localizar prÃ³xima\tF3", ID_FIND_NEXT + MENUITEM "Substitui&r...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Some&nte leitura", ID_EDIT_READONLY + MENUITEM "&Modificado", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtras" + BEGIN + MENUITEM "&InformaÃ§Ã£o da selecÃ§Ã£o", ID_EDIT_SELECTIONINFO + MENUITEM "&Formato dos caracteres", ID_EDIT_CHARFORMAT + MENUITEM "&Definir formato dos caracteres", ID_EDIT_DEFCHARFORMAT + MENUITEM "F&ormato dos parÃ¡grafos", ID_EDIT_PARAFORMAT + MENUITEM "&Buscar texto", ID_EDIT_GETTEXT + END + END + POPUP "E&xibir" + BEGIN + MENUITEM "&Barra de Ferramentas", ID_TOGGLE_TOOLBAR + MENUITEM "Barra de &FormataÃ§Ã£o", ID_TOGGLE_FORMATBAR + MENUITEM "&RÃ©gua", ID_TOGGLE_RULER + MENUITEM "Barra de &Estado", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&OpÃ§Ãµes...", ID_VIEWPROPERTIES + END + POPUP "&Inserir" + BEGIN + MENUITEM "&Data e hora...", ID_DATETIME + END + POPUP "F&ormatar" + BEGIN + MENUITEM "&Fonte...", ID_FONTSETTINGS + MENUITEM "&Marcadores" ID_BULLET + MENUITEM "&ParÃ¡grafo..." ID_PARAFORMAT + MENUITEM "T&abulaÃ§Ã£o..." ID_TABSTOPS + POPUP "&Fundo" + BEGIN + MENUITEM "&Sistema\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat amarelo\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Ajuda" + BEGIN + MENUITEM "&Sobre Wine Wordpad" ID_ABOUT + END +END + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDM_MAINMENU MENU DISCARDABLE @@ -97,6 +173,24 @@ END END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Cortar", ID_EDIT_CUT + MENUITEM "C&opiar", ID_EDIT_COPY + MENUITEM "Co&lar", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Marcadores" ID_BULLET + MENUITEM "&ParÃ¡grafo..." ID_PARAFORMAT + END +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + IDM_POPUP MENU DISCARDABLE BEGIN POPUP "" @@ -109,6 +203,9 @@ MENUITEM "&ParÃ¡grafo..." ID_PARAFORMAT END END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDM_COLOR_POPUP MENU DISCARDABLE BEGIN @@ -130,7 +227,7 @@ MENUITEM "FÃºcsia" ID_COLOR_FUCHSIA MENUITEM "Azul-piscina" ID_COLOR_AQUA MENUITEM "Branco" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "AutomÃ¡tico" ID_COLOR_AUTOMATIC END END @@ -156,22 +253,22 @@ PUSHBUTTON "&Cancelar",IDCANCEL,97,26,40,12 END -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 220, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "ParÃ¡grafo" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IdentaÃ§Ã£o", -1, 10, 10, 120, 68 - LTEXT "Esquerda", -1, 15, 22, 40, 13 - EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Direita", -1, 15, 40, 40, 13 - EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "Primeira Linha", -1, 15, 58, 40, 13 - EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alinhamento", -1, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancelar", IDCANCEL, 137, 33, 50, 15 + GROUPBOX "IdentaÃ§Ã£o", -1, 10, 10, 140, 68 + LTEXT "Esquerda", -1, 15, 22, 60, 13 + EDITTEXT IDC_PARA_LEFT, 75, 20, 60, 13 + LTEXT "Direita", -1, 15, 40, 60, 13 + EDITTEXT IDC_PARA_RIGHT, 75, 38, 60, 13 + LTEXT "Primeira Linha", -1, 15, 58, 60, 13 + EDITTEXT IDC_PARA_FIRST, 75, 56, 60, 13 + LTEXT "Alinhamento", -1, 15, 87, 50, 13 + COMBOBOX IDC_PARA_ALIGN, 65, 85, 70, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 157, 15, 50, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 157, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 @@ -207,29 +304,49 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" STRING_ALL_FILES, "Todos os documentos (*.*)" END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALL_FILES, "Todos os documentos (*.*)" + STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Documento rich text" + STRING_NEWFILE_TXT, "Documento de texto" + STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" + STRING_PRINTER_FILES_PRN, "Arquivos de impressora (*.PRN)" +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALL_FILES, "Todos os documentos (*.*)" + STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Formato rich text (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Documento rich text" + STRING_NEWFILE_TXT, "Documento de texto" + STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" + STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + STRINGTABLE DISCARDABLE BEGIN STRING_ALIGN_LEFT, "Esquerda" STRING_ALIGN_RIGHT, "Direita" STRING_ALIGN_CENTER, "Centro" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Documento de texto" - STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" END STRINGTABLE DISCARDABLE @@ -249,14 +366,37 @@ STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Fechar" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" -END + STRING_PREVIEW_PAGE, "PÃ¡gina" + STRING_PREVIEW_PAGES, "PÃ¡ginas" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "pt" +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Documento" + STRING_PROMPT_SAVE_CHANGES, "Salvar as alteraÃ§Ãµes de '%s'?" + STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." + STRING_LOAD_RICHED_FAILED, "Falha ao carregar a biblioteca RichEdit." + STRING_SAVE_LOSEFORMATTING, "Foi escolhido salvar em formato de texto simples, " \ + "o que vai anular todas as formataÃ§Ãµes. " \ + "Tem a certeza que deseja fazer isto?" + STRING_INVALID_NUMBER, "Formato de nÃºmero invÃ¡lido" + STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE nÃ£o sÃ£o suportados" + STRING_WRITE_FAILED, "NÃ£o foi possÃvel salvar o arquivo." + STRING_WRITE_ACCESS_DENIED, "NÃ£o tem permissÃµes para salvar o arquivo." + STRING_OPEN_FAILED, "NÃ£o foi possÃvel abrir o arquivo." + STRING_OPEN_ACCESS_DENIED, "NÃ£o tem permissÃµes para abrir o arquivo." + STRING_PRINTING_NOT_IMPLEMENTED, "ImpressÃ£o nÃ£o implementada" + STRING_MAX_TAB_STOPS, "NÃ£o Ã© possÃvel adicionar mais de 32 tabulaÃ§Ãµes." +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -47,14 +47,14 @@ MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCtrl+C", ID_EDIT_COPY MENUITEM "&ÐÑÑÐ°Ð²Ð¸ÑÑ\tCtrl+V", ID_EDIT_PASTE MENUITEM "&Ð£Ð´Ð°Ð»Ð¸ÑÑ\tDEL", ID_EDIT_CLEAR - MENUITEM "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²&ÑÐµ\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²&ÑÑ\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "&ÐÐ°Ð¹ÑÐ¸...\tCtrl+F", ID_FIND MENUITEM "ÐÐ°&Ð¹ÑÐ¸ Ð´Ð°Ð»ÐµÐµ\tF3", ID_FIND_NEXT MENUITEM "&ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "&Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ", ID_EDIT_READONLY - MENUITEM "&ÐÐ·Ð¼ÐµÐ½ÐµÐ½", ID_EDIT_MODIFIED + MENUITEM "&ÐÐ·Ð¼ÐµÐ½ÑÐ½", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾" BEGIN @@ -129,7 +129,7 @@ MENUITEM "Ð¯ÑÐºÐ¾-ÑÐ¾Ð·Ð¾Ð²ÑÐ¹" ID_COLOR_FUCHSIA MENUITEM "ÐÐ¾Ð»ÑÐ±Ð¾Ð¹" ID_COLOR_AQUA MENUITEM "ÐÐµÐ»ÑÐ¹" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸" ID_COLOR_AUTOMATIC END END @@ -193,7 +193,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ÐÐµÑÐµÐ½Ð¾Ñ Ð¿Ð¾ ÑÐ»Ð¾Ð²Ð°Ð¼", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "ÐÐµ Ð¿ÐµÑÐµÐ½Ð¾ÑÐ¸ÑÑ", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Ð Ð³ÑÐ°Ð½Ð¸ÑÐ°Ñ &Ð¾ÐºÐ½Ð°", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Ð Ð³ÑÐ°Ð½Ð¸ÑÐ°Ñ &Ð¿Ð¾Ð»ÐµÐ¹", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "ÐÐ°Ð½ÐµÐ»Ð¸", -1, 150, 10, 120, 85 @@ -241,15 +241,15 @@ STRINGTABLE DISCARDABLE BEGIN STRING_PREVIEW_PRINT, "ÐÐµÑÐ°ÑÑ" - STRING_PREVIEW_NEXTPAGE, "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" - STRING_PREVIEW_PREVPAGE, "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" - STRING_PREVIEW_TWOPAGES, "ÐÐ²Ðµ ÑÑÑÐ°Ð½Ð¸ÑÑ" - STRING_PREVIEW_ONEPAGE, "ÐÐ´Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°" + STRING_PREVIEW_NEXTPAGE, "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ" + STRING_PREVIEW_PREVPAGE, "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ" + STRING_PREVIEW_TWOPAGES, "ÐÐ¾ Ð´Ð²Ðµ" + STRING_PREVIEW_ONEPAGE, "ÐÐ¾ Ð¾Ð´Ð½Ð¾Ð¹" STRING_PREVIEW_ZOOMIN, "ÐÑÐ¸Ð±Ð»Ð¸Ð·Ð¸ÑÑ" STRING_PREVIEW_ZOOMOUT, "ÐÑÐ´Ð°Ð»Ð¸ÑÑ" STRING_PREVIEW_CLOSE, "ÐÐ°ÐºÑÑÑÑ" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" + STRING_PREVIEW_PAGE, "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°" + STRING_PREVIEW_PAGES, "Ð¡ÑÑÐ°Ð½Ð¸ÑÑ" END STRINGTABLE DISCARDABLE @@ -263,15 +263,15 @@ STRING_PROMPT_SAVE_CHANGES, "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² '%s'?" STRING_SEARCH_FINISHED, "ÐÐ¾Ð¸ÑÐº Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ Ð·Ð°Ð²ÐµÑÑÐµÐ½." STRING_LOAD_RICHED_FAILED, "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸ RichEdit." - STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð² Ð²Ð¸Ð´Ðµ Ð½ÐµÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐºÑÑÐ°, " \ - "Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿Ð¾ÑÐµÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ. ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ" \ + STRING_SAVE_LOSEFORMATTING, "Ð¡Ð¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð² Ð²Ð¸Ð´Ðµ Ð½ÐµÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐºÑÑÐ° " \ + "Ð¿ÑÐ¸Ð²ÐµÐ´ÑÑ Ðº Ð¿Ð¾ÑÐµÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ. ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ" \ "ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" - STRING_INVALID_NUMBER, "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ" + STRING_INVALID_NUMBER, "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ." STRING_WRITE_FAILED, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐ°Ð¹Ð»." STRING_WRITE_ACCESS_DENIED, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°." STRING_OPEN_FAILED, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ ÑÐ°Ð¹Ð»." STRING_OPEN_ACCESS_DENIED, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð°." - STRING_PRINTING_NOT_IMPLEMENTED, "ÐÐµÑÐ°ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ" + STRING_PRINTING_NOT_IMPLEMENTED, "ÐÐµÑÐ°ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ." STRING_MAX_TAB_STOPS, "ÐÐµÐ»ÑÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð±Ð¾Ð»ÐµÐµ 32 Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¹ ÑÐ°Ð±ÑÐ»ÑÑÐ¸Ð¸." END Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -131,127 +131,3 @@ MENUITEM "Automatic" ID_COLOR_AUTOMATIC END END - -IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "Available formats",-1,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY - PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 -END - -IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "New" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "New document type",-1,3,2,100,15 - LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 -END - -IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Paragraph format" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Indentation", -1, 10, 10, 120, 68 - LTEXT "Left", -1, 15, 22, 40, 13 - EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", -1, 15, 40, 40, 13 - EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", -1, 15, 58, 40, 13 - EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", -1, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 -END - -IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabs" -FONT 8, "MS SHell DLg" -BEGIN - GROUPBOX "Tab stops", -1, 10, 10, 120, 90 - COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE - DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15 -END - -IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 -STYLE DS_SYSMODAL -Caption "" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "Toolbars", -1, 150, 10, 120, 85 - CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15 - LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" - STRING_TEXT_FILES_TXT, "Text documents (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" - STRING_ALL_FILES, "All documents (*.*)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "Left" - STRING_ALIGN_RIGHT, "Right" - STRING_ALIGN_CENTER, "Center" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Text document" - STRING_NEWFILE_TXT_UNICODE, "Unicode text document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Options" - STRING_VIEWPROPS_TEXT, "Text" - STRING_VIEWPROPS_RICHTEXT, "Rich text" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "Print" - STRING_PREVIEW_NEXTPAGE, "Next page" - STRING_PREVIEW_PREVPAGE, "Previous page" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" - STRING_PREVIEW_CLOSE, "Close" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" -END Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -111,30 +111,6 @@ END END -IDM_COLOR_POPUP MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Black", ID_COLOR_BLACK - MENUITEM "Maroon", ID_COLOR_MAROON - MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC - END -END - IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "æ¥æåæ¶é´" @@ -250,13 +226,6 @@ STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "å³é" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" END STRINGTABLE DISCARDABLE @@ -480,11 +449,6 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_UNITS_CM, "cm" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_DEFAULT_FILENAME, "Document" STRING_PROMPT_SAVE_CHANGES, "å²åæ¹åå° '%s'?" STRING_SEARCH_FINISHED, "æªæ¡æ¥æ¾çµæ." Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -891,7 +891,7 @@ EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0); } -LRESULT print_preview(HWND hwndPreview) +static LRESULT print_preview(HWND hwndPreview) { HDC hdc; RECT window, background; @@ -1039,7 +1039,7 @@ /* Returns the page shown that the point is in (1 or 2) or 0 if the point * isn't inside either page */ -int preview_page_hittest(POINT pt) +static int preview_page_hittest(POINT pt) { RECT rc; rc.left = preview.spacing.cx; Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -2435,7 +2435,7 @@ break; case ID_TABSTOPS: - DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, tabstops_proc); + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_TABSTOPS), hWnd, tabstops_proc); break; case ID_ABOUT: @@ -2546,7 +2546,7 @@ HWND hwndEditor = preview_isactive() ? GetDlgItem(hWnd, IDC_PREVIEW) : GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); - HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER); + HWND hRulerWnd = GetDlgItem(hwndReBar, IDC_RULER); int rebarHeight = 0; if (hwndStatusBar) Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Sat Jun 26 13:56:41 2010 @@ -247,7 +247,6 @@ void init_preview(HWND, LPWSTR); void close_preview(HWND); BOOL preview_isactive(void); -LRESULT print_preview(HWND); void get_default_printer_opts(void); void registry_set_pagemargins(HKEY); void registry_read_pagemargins(HKEY);

1 0

[tkreuzer] 47853: [USER32] ntstatus.h is in psdk, not in ddk folder. (How did this work?)
by tkreuzer＠svn.reactos.org 26 Jun '10

26 Jun '10

Author: tkreuzer Date: Sat Jun 26 11:03:09 2010 New Revision: 47853 URL: http://svn.reactos.org/svn/reactos?rev=47853&view=rev Log: [USER32] ntstatus.h is in psdk, not in ddk folder. (How did this work?) Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sat Jun 26 11:03:09 2010 @@ -23,7 +23,7 @@ #include <windowsx.h> #include <winnls32.h> #include <ndk/ntndk.h> -#include <ddk/ntstatus.h> +#include <ntstatus.h> /* CSRSS Headers */ #include <csrss/csrss.h>

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