Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 67981: [DEVMGMT_NEW] enable/disable context menu items on selection change
by cwittich＠svn.reactos.org 31 May '15

31 May '15

Author: cwittich Date: Sun May 31 09:14:29 2015 New Revision: 67981 URL: http://svn.reactos.org/svn/reactos?rev=67981&view=rev Log: [DEVMGMT_NEW] enable/disable context menu items on selection change Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] Sun May 31 09:14:29 2015 @@ -110,6 +110,30 @@ (VOID)m_Devices->Uninitialize(); return TRUE; +} + +BOOL CDeviceView::HasChildItem( + _In_ HTREEITEM Item) +{ + return (TreeView_GetChild(m_hTreeView, Item) != NULL); +} + +BOOL CDeviceView::IsRootItem( + _In_ HTREEITEM Item) +{ + return (TreeView_GetRoot(m_hTreeView) == Item); +} + +BOOL CDeviceView::IsRootItemSelected() +{ + return (TreeView_GetRoot(m_hTreeView) == TreeView_GetSelection(m_hTreeView)); +} + +VOID CDeviceView::EnableContextMenuItem( + _In_ UINT Id, + _In_ UINT Enabled) +{ + EnableMenuItem(m_hShortcutMenu, Id, Enabled); } VOID Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] Sun May 31 09:14:29 2015 @@ -34,6 +34,11 @@ BOOL Initialize(); BOOL Uninitialize(); + VOID EnableContextMenuItem( + _In_ UINT Id, + _In_ UINT Enabled + ); + VOID ShowContextMenu( _In_ INT xPos, _In_ INT yPos @@ -49,12 +54,27 @@ VOID Refresh(); VOID DisplayPropertySheet(); VOID SetFocus(); - + + BOOL IsRootItemSelected(); + + BOOL IsRootItem( + _In_ HTREEITEM Item + ); + + BOOL HasChildItem( + _In_ HTREEITEM Item + ); + VOID SetDeviceListType(ListDevices List) { m_ListDevices = List; } + ListDevices GetDeviceListType() + { + return m_ListDevices; + } + VOID ShowHiddenDevices(_In_ BOOL ShowHidden) { m_ShowHidden = ShowHidden; Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] Sun May 31 09:14:29 2015 @@ -429,7 +429,61 @@ break; } - + + case TVN_SELCHANGED: + { + LPNM_TREEVIEW pnmtv = (LPNM_TREEVIEW)lParam; + ListDevices ListType = m_DeviceView->GetDeviceListType(); + + if (ListType == DevicesByType) + { + if (!m_DeviceView->HasChildItem(pnmtv->itemNew.hItem)) + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_ENABLED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_ENABLED); + } + else + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_GRAYED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_GRAYED); + } + } + else if (ListType == DevicesByConnection) + { + if (m_DeviceView->IsRootItem(pnmtv->itemNew.hItem)) + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_GRAYED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_GRAYED); + } + else + { + SendMessage(m_hToolBar, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(m_hMainWnd), IDC_PROP, MF_ENABLED); + m_DeviceView->EnableContextMenuItem(IDC_PROP, MF_ENABLED); + } + } + } + break; + case NM_DBLCLK: { m_DeviceView->DisplayPropertySheet(); @@ -438,7 +492,18 @@ case NM_RETURN: { - m_DeviceView->DisplayPropertySheet(); + ListDevices ListType = m_DeviceView->GetDeviceListType(); + if (ListType == DevicesByType) + { + m_DeviceView->DisplayPropertySheet(); + } + else if (ListType == DevicesByConnection) + { + if (!m_DeviceView->IsRootItemSelected()) + { + m_DeviceView->DisplayPropertySheet(); + } + } break; } }

1 0

[dreimer] 67980: [DXDIAG] Update german translation. Apply slight design fixes to the rest of the languages.
by dreimer＠svn.reactos.org 31 May '15

31 May '15

Author: dreimer Date: Sun May 31 07:15:23 2015 New Revision: 67980 URL: http://svn.reactos.org/svn/reactos?rev=67980&view=rev Log: [DXDIAG] Update german translation. Apply slight design fixes to the rest of the languages. Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/en-US.rc trunk/reactos/base/applications/dxdiag/lang/es-ES.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/he-IL.rc trunk/reactos/base/applications/dxdiag/lang/it-IT.rc trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc trunk/reactos/base/applications/dxdiag/lang/no-NO.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "ÐÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»:", IDC_STATIC, 20, 20, 70, 10 RTEXT "ÐÐ¸Ð´ Ð½Ð° ÑÐ¸Ð¿Ð°:", IDC_STATIC, 20, 30, 70, 10 RTEXT "ÐÐ¸Ð´ Ð¦ÐÐ:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "ÐÐ±ÑÐ° Ð¿Ð°Ð¼ÐµÑ Ð¾ÐºÐ¾Ð»Ð¾:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Ð ÐµÐ¶Ð¸Ð¼ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "ÐÐ±ÑÐ° Ð¿Ð°Ð¼ÐµÑ Ð¾ÐºÐ¾Ð»Ð¾:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Ð ÐµÐ¶Ð¸Ð¼ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°:", IDC_STATIC, 20, 60, 70, 10 RTEXT "ÐÐºÑÐ°Ð½:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -47,7 +47,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -59,8 +59,8 @@ RTEXT "VÃ½robce:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Typ Äipu:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Typ DAC:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "CelkovÃ¡ pamÄÅ¥:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "ZobrazovacÃ mÃ³d:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "CelkovÃ¡ pamÄÅ¥:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "ZobrazovacÃ mÃ³d:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -146,10 +146,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -189,9 +189,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "&Auf digitale WHQL-Signaturen prÃ¼fen", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "Hersteller:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Chiptyp:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC-Typ:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Gesamtspeicher ca.:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Anzeigemodus:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Gesamtspeicher ca.:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Anzeigemodus:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -65,7 +65,7 @@ EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Treiber", IDC_STATIC, 260, 0, 197, 95 - RTEXT "Hauptreiber:", IDC_STATIC, 275, 10, 55, 10 + RTEXT "Haupttreiber:", IDC_STATIC, 275, 10, 55, 10 RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10 RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10 RTEXT "Mit WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10 @@ -128,7 +128,7 @@ GROUPBOX "ReactX-Funktionen", IDC_STATIC, 5, 97, 452, 70 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17 RTEXT "Einstellung der Sound-\nhardwarebeschleunigung:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED - PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED + PUSHBUTTON "DirectSound &testen", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED GROUPBOX "Hinweise", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -137,17 +137,17 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10 + RTEXT "Standard-MIDI-DLS-Sammlung:", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 - GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + GROUPBOX "MusikanschlÃ¼sse", IDC_STATIC, 5, 10, 452, 85 + GROUPBOX "ReactX Funktionen", IDC_STATIC, 5, 97, 452, 70 + LTEXT "Standardanschluss- Beschleunigung:", IDC_STATIC, 15, 116, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 - PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + PUSHBUTTON "&Deaktivieren", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED + LTEXT "Mit diesem Anschluss testen:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED - GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 + PUSHBUTTON "DirectMusic &testen", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED + GROUPBOX "Hinweise", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -160,7 +160,7 @@ GROUPBOX "EingabegerÃ¤te", IDC_STATIC, 5, 87, 452, 81 CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200 - GROUPBOX "Hinweis", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "Hinweise", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -170,11 +170,11 @@ BEGIN GROUPBOX "Registrierte DirectPlay-Dienstanbieter", IDC_STATIC, 5, 0, 452, 75 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55 - GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55 - GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35 - PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED - PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED - GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "Registrierte verÃ¤nderbare DirectPlay-Anwendungen", IDC_STATIC, 5, 77, 452, 55 + GROUPBOX "ReactX Funktionen", IDC_STATIC, 5, 133, 452, 35 + PUSHBUTTON "DirectPlay &Voice-Optionen", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED + PUSHBUTTON "DirectPlay &testen", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED + GROUPBOX "Hinweise", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -182,11 +182,11 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 - PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 - PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Informationen, die Sie suchen immer noch nicht gefunden? Hier sind einige zusÃ¤tzliche Dinge, die Sie tun kÃ¶nnen:", IDC_STATIC, 5, 0, 300, 10 + PUSHBUTTON "Systeminformationen...", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED + LTEXT "Zeigt zusÃ¤tzliche Systeminformationen an", IDC_STATIC, 90, 23, 300, 10 + PUSHBUTTON "AuÃer Kraft setzen...", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + LTEXT "Ãberschreibt die Aktualisierungsrate fÃ¼r DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE @@ -243,12 +243,12 @@ IDS_D3DTEST_DESCRIPTION "Dies wird den Direct3D-Interfacetest starten. Fortfahren?" IDS_D3DTEST_D3Dx "Dieser Test wird das hardwarebeschleunigte Direct3D %u Interface verwenden." IDS_OS_VERSION "%s %s (%d.%d, Build %d)" - IDS_DMUSIC_DESC "Description" - IDS_DMUSIC_TYPE "Type" - IDS_DMUSIC_KERNEL "Kernel Mode" - IDS_DMUSIC_IO "In/Out" - IDS_DMUSIC_DLS "Supports DLS" - IDS_DMUSIC_EXT "External" - IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" -END + IDS_DMUSIC_DESC "Beschreibung" + IDS_DMUSIC_TYPE "Typ" + IDS_DMUSIC_KERNEL "Kernelmodus" + IDS_DMUSIC_IO "Ein/Aus" + IDS_DMUSIC_DLS "UnterstÃ¼tzt DLS" + IDS_DMUSIC_EXT "Extern" + IDS_DMUSIC_PORT "Standardanschluss" + IDS_DDDISABLE_MSG "Dies wird die Hardwarebeschleunigung von DirectDraw fÃ¼r alle AnzeigegerÃ¤te deaktivieren.\nMÃ¶chten Sie fortfahren?\n" +END Modified: trunk/reactos/base/applications/dxdiag/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "Manufacturer:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Chip Type:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC Type:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Approx. Total Memory:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Current Display Mode:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Approx. Total Memory:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Current Display Mode:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -44,7 +44,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -56,8 +56,8 @@ RTEXT "Fabricante:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Tipo de chip:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Tipo de DAC:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Memoria total aprox.:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "ResoluciÃ³n actual:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Memoria total aprox.:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "ResoluciÃ³n actual:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -143,10 +143,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notas", IDC_STATIC, 5, 170, 452, 50 @@ -186,9 +186,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "Fabricant :", IDC_STATIC, 20, 20, 70, 10 RTEXT "Type de puce :", IDC_STATIC, 20, 30, 70, 10 RTEXT "Type de DAC :", IDC_STATIC, 20, 40, 70, 10 - RTEXT "MÃ©moire totale approx. :", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Mode d'affichage actuelle:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "MÃ©moire totale approx. :", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Mode d'affichage actuelle:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Moniteur :", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -43,7 +43,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -55,8 +55,8 @@ RTEXT "××¦×¨×:", IDC_STATIC, 20, 20, 70, 10 RTEXT "×¡×× ×©××:", IDC_STATIC, 20, 30, 70, 10 RTEXT "×¡×× DAC:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "××××¨×× ×××× ××§××¨××:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "××¦× ×ª×¦××× × ××××:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "××××¨×× ×××× ××§××¨××:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "××¦× ×ª×¦××× × ××××:", IDC_STATIC, 20, 60, 70, 10 RTEXT "×¦×:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -142,10 +142,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -185,9 +185,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "Fabbricante:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Chip Type:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC Type:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Totale memnoria (Approssimativo):", IDC_STATIC, 14, 50, 75, 10 - RTEXT "ModalitÃ di visualizzazione corrente:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Totale memnoria (Approssimativo):", IDC_STATIC, 20, 50, 70, 10 + RTEXT "ModalitÃ di visualizzazione corrente:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "è£½é å:", IDC_STATIC, 20, 20, 70, 10 RTEXT "ãããã®ç¨®é¡:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC ã®ç¨®é¡:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "æ¦ç®ã¡ã¢ãªåè¨:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "ç¾å¨ã®ãã£ã¹ãã¬ã¤ ã¢ã¼ã:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "æ¦ç®ã¡ã¢ãªåè¨:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "ç¾å¨ã®ãã£ã¹ãã¬ã¤ ã¢ã¼ã:", IDC_STATIC, 20, 60, 70, 10 RTEXT "ã¢ãã¿:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -44,7 +44,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -56,8 +56,8 @@ RTEXT "ì ì¡°ì:", IDC_STATIC, 20, 20, 70, 10 RTEXT "ì¹© íì:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC íì:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "ì´ ë©ëª¨ë¦¬:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "íì¬ ëì¤íë ì´ ëª¨ë:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "ì´ ë©ëª¨ë¦¬:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "íì¬ ëì¤íë ì´ ëª¨ë:", IDC_STATIC, 20, 60, 70, 10 RTEXT "ëª¨ëí°:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -143,10 +143,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -186,9 +186,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "Fabrikans:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Chip-type:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC-type:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Totaal geheugen:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Huidige resolutie:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Totaal geheugen:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Huidige resolutie:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Beeldscherm:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "Fabrikant:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Brikketype:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC type:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Cirka total minne:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Gjeldende skjermmodus:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Cirka total minne:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Gjeldende skjermmodus:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Skjerm:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -51,7 +51,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -63,8 +63,8 @@ RTEXT "Producent:", IDC_STATIC, 20, 20, 70, 10 RTEXT "GPU:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Typ DAC:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "PamiÄÄ:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "BieÅ¼Äca rozdzielczoÅÄ:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "PamiÄÄ:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "BieÅ¼Äca rozdzielczoÅÄ:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -150,10 +150,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -193,9 +193,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -44,7 +44,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -56,8 +56,8 @@ RTEXT "Fabricante:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Tipo de processador:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Conv. analÃ³gico-digital:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Total aprox. memÃ³ria:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Modo de exib. atual:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Total aprox. memÃ³ria:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Modo de exib. atual:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -143,10 +143,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -186,9 +186,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -49,7 +49,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -61,8 +61,8 @@ RTEXT "ProducÄtor:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Tipul cipului:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Tipul CDA:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Memorie aprox.:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "AfiÈare curentÄ:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Memorie aprox.:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "AfiÈare curentÄ:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Ecran:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -148,10 +148,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -191,9 +191,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -42,7 +42,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 220, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 215, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -54,8 +54,8 @@ RTEXT "ÐÐ·Ð³Ð¾ÑÐ¾Ð²Ð¸ÑÐµÐ»Ñ:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Ð¢Ð¸Ð¿ Ð¼Ð¸ÐºÑÐ¾ÑÑÐµÐ¼:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Ð¢Ð¸Ð¿ ÐºÐ¾Ð½Ð²ÐµÑÑÐµÑÐ° DAC:", IDC_STATIC, 7, 40, 80, 10 - RTEXT "ÐÑÐµÐ³Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Ð ÐµÐ¶Ð¸Ð¼ ÑÐºÑÐ°Ð½Ð°:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "ÐÑÐµÐ³Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Ð ÐµÐ¶Ð¸Ð¼ ÑÐºÑÐ°Ð½Ð°:", IDC_STATIC, 20, 60, 70, 10 RTEXT "ÐÐ¾Ð½Ð¸ÑÐ¾Ñ:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -141,10 +141,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -184,9 +184,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -47,7 +47,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -59,8 +59,8 @@ RTEXT "VÃ½robca:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Typ Äipu:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Typ D-A konvertora:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Pribl. celkovÃ¡ pamÃ¤Å¥:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "SÃºÄasnÃ½ mÃ³d obrazovky:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Pribl. celkovÃ¡ pamÃ¤Å¥:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "SÃºÄasnÃ½ mÃ³d obrazovky:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -146,10 +146,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -189,9 +189,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -46,7 +46,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -58,8 +58,8 @@ RTEXT "Prodhuesi:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Tipi i procesorit:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Tipi DAC:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Memoria Totale:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Modaliteti vizual aktual:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Memoria Totale:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Modaliteti vizual aktual:", IDC_STATIC, 20, 60, 70, 10 RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -145,10 +145,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -188,9 +188,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -49,7 +49,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -61,8 +61,8 @@ RTEXT "Fabrikat:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Chip typ:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC type:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Uppskattat total minne:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Aktuellt BildskÃ¤rmslÃ¤ge:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "Uppskattat total minne:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Aktuellt BildskÃ¤rmslÃ¤ge:", IDC_STATIC, 20, 60, 70, 10 RTEXT "BildskÃ¤rm:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -148,10 +148,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -191,9 +191,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -44,7 +44,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -56,8 +56,8 @@ RTEXT "Ãretici:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Yonga TÃ¼rÃ¼:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC TÃ¼rÃ¼:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "YaklaÅÄ±k Toplam Bellek:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Åimdiki GÃ¶rÃ¼ntÃ¼ Kipi:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "YaklaÅÄ±k Toplam Bellek:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Åimdiki GÃ¶rÃ¼ntÃ¼ Kipi:", IDC_STATIC, 20, 60, 70, 10 RTEXT "GÃ¶stergeÃ§:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -143,10 +143,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -186,9 +186,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -50,7 +50,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -62,8 +62,8 @@ RTEXT "ÐÐ¸ÑÐ¾Ð±Ð½Ð¸Ðº:", IDC_STATIC, 20, 20, 70, 10 RTEXT "Ð¢Ð¸Ð¿ Ð¼ÑÐºÑÐ¾ÑÑÐµÐ¼:", IDC_STATIC, 20, 30, 70, 10 RTEXT "Ð¢Ð¸Ð¿ ÐºÐ¾Ð½Ð²ÐµÑÑÐµÑÐ° DAC:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "ÐÑÑÐ¾Ð³Ð¾ Ð¿Ð°Ð¼'ÑÑÑ:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "Ð ÐµÐ¶Ð¸Ð¼ ÐµÐºÑÐ°Ð½Ñ:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "ÐÑÑÐ¾Ð³Ð¾ Ð¿Ð°Ð¼'ÑÑÑ:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Ð ÐµÐ¶Ð¸Ð¼ ÐµÐºÑÐ°Ð½Ñ:", IDC_STATIC, 20, 60, 70, 10 RTEXT "ÐÐ¾Ð½ÑÑÐ¾Ñ:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -149,10 +149,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -192,9 +192,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -50,7 +50,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -62,8 +62,8 @@ RTEXT "å¶é å:", IDC_STATIC, 20, 20, 70, 10 RTEXT "æ¶çç±»å:", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC ç±»å:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "ååæ»è®¡çº¦:", IDC_STATIC, 14, 50, 75, 10 - RTEXT "ç®åæ¾ç¤ºæ¨¡å¼:", IDC_STATIC, 14, 60, 75, 10 + RTEXT "ååæ»è®¡çº¦:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "ç®åæ¾ç¤ºæ¨¡å¼:", IDC_STATIC, 20, 60, 70, 10 RTEXT "æ¾ç¤ºå¨:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -149,10 +149,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -192,9 +192,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] Sun May 31 07:15:23 2015 @@ -50,7 +50,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED + CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -62,8 +62,8 @@ RTEXT "è£½é åï¼", IDC_STATIC, 20, 20, 70, 10 RTEXT "æ¶çé¡åï¼", IDC_STATIC, 20, 30, 70, 10 RTEXT "DAC é¡åï¼", IDC_STATIC, 20, 40, 70, 10 - RTEXT "è¨æ¶é«ç¸½è¨ç´ï¼", IDC_STATIC, 14, 50, 75, 10 - RTEXT "ç®åé¡¯ç¤ºæ¨¡å¼ï¼", IDC_STATIC, 14, 60, 75, 10 + RTEXT "è¨æ¶é«ç¸½è¨ç´ï¼", IDC_STATIC, 20, 50, 70, 10 + RTEXT "ç®åé¡¯ç¤ºæ¨¡å¼ï¼", IDC_STATIC, 20, 60, 70, 10 RTEXT "é¡¯ç¤ºå¨ï¼", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -149,10 +149,10 @@ EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10 + LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10 + LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 @@ -192,9 +192,9 @@ BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14 + LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14 + LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE

1 0

[cwittich] 67979: [DEVMGMT_NEW] show popupmenu on right click (not finished yet)
by cwittich＠svn.reactos.org 30 May '15

30 May '15

Author: cwittich Date: Sat May 30 20:32:37 2015 New Revision: 67979 URL: http://svn.reactos.org/svn/reactos?rev=67979&view=rev Log: [DEVMGMT_NEW] show popupmenu on right click (not finished yet) Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] Sat May 30 20:32:37 2015 @@ -53,6 +53,8 @@ { delete m_Devices; m_Devices = NULL; + + DestroyMenu(m_hShortcutMenu); } BOOL @@ -63,6 +65,14 @@ /* Initialize the devices class */ bSuccess = m_Devices->Initialize(); if (bSuccess == FALSE) return FALSE; + + /* Create Popup Menu */ + m_hShortcutMenu = LoadMenu(g_hInstance, + MAKEINTRESOURCE(IDR_POPUP)); + m_hShortcutMenu = GetSubMenu(m_hShortcutMenu, + 0); + SetMenuDefaultItem(m_hShortcutMenu, IDC_PROP, FALSE); + /* Create the main treeview */ m_hTreeView = CreateWindowExW(WS_EX_CLIENTEDGE, @@ -100,6 +110,36 @@ (VOID)m_Devices->Uninitialize(); return TRUE; +} + +VOID +CDeviceView::ShowContextMenu( + _In_ INT xPos, + _In_ INT yPos) +{ + HTREEITEM hSelected; + POINT pt; + RECT rc; + + hSelected = TreeView_GetSelection(m_hTreeView); + + if (TreeView_GetItemRect(m_hTreeView, + hSelected, + &rc, + TRUE)) + { + if (GetCursorPos(&pt) && + ScreenToClient(m_hTreeView, &pt) && + PtInRect(&rc, pt)) + { + TrackPopupMenuEx(m_hShortcutMenu, + TPM_RIGHTBUTTON, + xPos, + yPos, + m_hMainWnd, + NULL); + } + } } VOID Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] Sat May 30 20:32:37 2015 @@ -15,7 +15,7 @@ HWND m_hMainWnd; HWND m_hTreeView; HWND m_hPropertyDialog; - HWND m_hShortcutMenu; + HMENU m_hShortcutMenu; ListDevices m_ListDevices; HIMAGELIST m_ImageList; @@ -34,6 +34,11 @@ BOOL Initialize(); BOOL Uninitialize(); + VOID ShowContextMenu( + _In_ INT xPos, + _In_ INT yPos + ); + VOID Size( _In_ INT x, _In_ INT y, Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] Sat May 30 20:32:37 2015 @@ -449,6 +449,10 @@ LRESULT CMainWindow::OnContext(LPARAM lParam) { + INT xPos = GET_X_LPARAM(lParam); + INT yPos = GET_Y_LPARAM(lParam); + + m_DeviceView->ShowContextMenu(xPos, yPos); return 0; }

1 0

[cwittich] 67978: [DEVMGMT_NEW] update german translation
by cwittich＠svn.reactos.org 30 May '15

30 May '15

Author: cwittich Date: Sat May 30 20:05:34 2015 New Revision: 67978 URL: http://svn.reactos.org/svn/reactos?rev=67978&view=rev Log: [DEVMGMT_NEW] update german translation Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] Sat May 30 20:05:34 2015 @@ -8,19 +8,19 @@ END POPUP "Aktion" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH - MENUITEM "Drucken", IDC_PRINT, GRAYED + MENUITEM "Nach HardwareÃ¤nderungen suchen", IDC_REFRESH + MENUITEM "Drucken", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Eigenschaften", IDC_PROP, GRAYED + MENUITEM "Eigenschaften", IDC_PROP, GRAYED END POPUP "Ansicht" BEGIN - MENUITEM "GerÃ¤te nach Typ", IDC_DEVBYTYPE - MENUITEM "GerÃ¤te nach Verbindung", IDC_DEVBYCONN - MENUITEM "Resourcen nach Typ", IDC_RESBYTYPE, GRAYED - MENUITEM "Resourcen nach Verbindung", IDC_RESBYCONN, GRAYED + MENUITEM "GerÃ¤te nach Typ", IDC_DEVBYTYPE + MENUITEM "GerÃ¤te nach Verbindung", IDC_DEVBYCONN + MENUITEM "Ressourcen nach Typ", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressourcen nach Verbindung", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Ausgeblendete GerÃ¤te anzeigen", IDC_SHOWHIDDEN END POPUP "&?" BEGIN @@ -70,10 +70,10 @@ IDS_HINT_HELP " Hilfe-Fenster anzeigen." IDS_HINT_ABOUT " Ãber ReactOS GerÃ¤te-Manager." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" + IDS_HINT_DEV_BY_TYPE "GerÃ¤te nach Typ anzeigen" + IDS_HINT_DEV_BY_CONN "GerÃ¤te nach Verbindung anzeigen" + IDS_HINT_RES_BY_TYPE "Resourcen nach Typ anzeigen" + IDS_HINT_RES_BY_CONN "Resourcen nach Verbindung anzeigen" IDS_HINT_SYS_RESTORE " Dieses Fenster auf normale GrÃ¶Ãe wiederherstellen." IDS_HINT_SYS_MOVE " Dieses Fenster verschieben." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc [iso-8859-1] Sat May 30 20:05:34 2015 @@ -72,7 +72,7 @@ IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" + IDS_HINT_RES_BY_TYPE "Displays resources by type" IDS_HINT_RES_BY_CONN "Displays resources by connection type" IDS_HINT_SYS_RESTORE " Restores this window to normal size."

1 0

[dquintana] 67977: [devmgmt_new] Hopefully fix build in case-sensitive hosts.
by dquintana＠svn.reactos.org 30 May '15

30 May '15

Author: dquintana Date: Sat May 30 19:57:18 2015 New Revision: 67977 URL: http://svn.reactos.org/svn/reactos?rev=67977&view=rev Log: [devmgmt_new] Hopefully fix build in case-sensitive hosts. Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h [iso-8859-1] Sat May 30 19:57:18 2015 @@ -15,8 +15,8 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <commctrl.h> -#include <Uxtheme.h> -#include <Cfgmgr32.h> +#include <uxtheme.h> +#include <cfgmgr32.h> #include <devguid.h> #include <atlbase.h>

1 0

[dquintana] 67976: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlStr...
by dquintana＠svn.reactos.org 30 May '15

30 May '15

Author: dquintana Date: Sat May 30 19:53:44 2015 New Revision: 67976 URL: http://svn.reactos.org/svn/reactos?rev=67976&view=rev Log: [DEVMGMT_NEW] At the request of Christoph von Wittich, bring devmgmt_new into the build. * Created CMakeLists.txt and added to parent folder. * Removed some references to CAtlString that were not needed and are not implemented in our headers. * Fixed build with gcc. * Spread all the changes done to the english resources to the other languages. Many languages now contain untranslated strings that will need to be fixed. Note that I made no effort to fix any bugs or improve any features. The app comes as-is, except it now builds with rosbe. Added: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt (with props) trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h - copied, changed from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h - copied unchanged from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Copied: trunk/reactos/base/applications/mscutils/devmgmt_new/precomp.h (from r67940, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

1 0

[akhaldi] 67975: [DXDIAG] Improve the content of the tabs that have missing content. By Lee Schroeder. See CORE-8969 for more details.
by akhaldi＠svn.reactos.org 30 May '15

30 May '15

Author: akhaldi Date: Sat May 30 19:04:23 2015 New Revision: 67975 URL: http://svn.reactos.org/svn/reactos?rev=67975&view=rev Log: [DXDIAG] Improve the content of the tabs that have missing content. By Lee Schroeder. See CORE-8969 for more details. Modified: trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/help.c trunk/reactos/base/applications/dxdiag/input.c trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/en-US.rc trunk/reactos/base/applications/dxdiag/lang/es-ES.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/he-IL.rc trunk/reactos/base/applications/dxdiag/lang/it-IT.rc trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc trunk/reactos/base/applications/dxdiag/lang/no-NO.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc trunk/reactos/base/applications/dxdiag/network.c trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/resource.h trunk/reactos/base/applications/dxdiag/sound.c trunk/reactos/base/applications/dxdiag/system.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… Modified: trunk/reactos/base/applications/dxdiag/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/h… Modified: trunk/reactos/base/applications/dxdiag/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/i… Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/n… Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… Modified: trunk/reactos/base/applications/dxdiag/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… Modified: trunk/reactos/base/applications/dxdiag/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s…

1 0

[akhaldi] 67974: [USER32] Sync edit.c with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 30 May '15

30 May '15

Author: akhaldi Date: Sat May 30 17:14:16 2015 New Revision: 67974 URL: http://svn.reactos.org/svn/reactos?rev=67974&view=rev Log: [USER32] Sync edit.c with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 30 17:14:16 2015 @@ -294,7 +294,7 @@ User32 - reactos/win32ss/user/user32/controls/button.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/combo.c # Synced to WineStaging-1.7.37 - reactos/win32ss/user/user32/controls/edit.c # Synced to Wine-1_1_40 + reactos/win32ss/user/user32/controls/edit.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/icontitle.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/controls/listbox.c # Synced to Wine-1_1_39 reactos/win32ss/user/user32/controls/scrollbar.c # Forked Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Sat May 30 17:14:16 2015 @@ -237,7 +237,14 @@ msg = WM_CTLCOLOREDIT; /* why do we notify to es->hwndParent, and we send this one to GetParent()? */ - hbrush = GetControlBrush(es->hwndSelf, hdc, msg); // reactos r54259 +#ifdef __REACTOS__ + /* ReactOS r54259 */ + hbrush = GetControlBrush(es->hwndSelf, hdc, msg); +#else + hbrush = (HBRUSH)SendMessageW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); + if (!hbrush) + hbrush = (HBRUSH)DefWindowProcW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); +#endif return hbrush; } @@ -255,11 +262,11 @@ * EDIT_WordBreakProc * * Find the beginning of words. - * Note: unlike the specs for a WordBreakProc, this function only - * allows to be called without linebreaks between s[0] up to + * Note: unlike the specs for a WordBreakProc, this function can + * only be called without linebreaks between s[0] up to * s[count - 1]. Remember it is only called * internally, so we can decide this for ourselves. - * Additional we will always be breaking the full string. + * Additionally we will always be breaking the full string. * */ static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT action) @@ -342,7 +349,10 @@ countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); textA = HeapAlloc(GetProcessHeap(), 0, countA); - if (textA == NULL) return 0; // reactos r33503 +#ifdef __REACTOS__ + /* ReactOS r33503 */ + if (textA == NULL) return 0; +#endif WideCharToMultiByte(CP_ACP, 0, es->text + start, count, textA, countA, NULL, NULL); TRACE_(relay)("(ANSI wordbrk=%p,str=%s,idx=%d,cnt=%d,act=%d)\n", es->word_break_proc, debugstr_an(textA, countA), index, countA, action); @@ -402,31 +412,29 @@ tabdef.iScale = 0; tabdef.pTabStops = es->tabs; tabdef.iTabOrigin = 0; - //// ReactOS r57679 + hr = ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, - (3*line_def->net_length/2+16), -1, - SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, - NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); - //// +#ifdef __REACTOS__ + /* ReactOS r57679 */ + (3*line_def->net_length/2+16), -1, +#else + (1.5*line_def->net_length+16), -1, +#endif + SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, + NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); if (FAILED(hr)) { - WARN("ScriptStringAnalyse failed (%x)\n",hr); - line_def->ssa = NULL; - } - - if (es->font) + WARN("ScriptStringAnalyse failed (%x)\n",hr); + line_def->ssa = NULL; + } + + if (es->font) SelectObject(udc, old_font); if (udc != dc) ReleaseDC(es->hwndSelf, udc); } return line_def->ssa; -} - -static inline INT get_vertical_line_count(EDITSTATE *es) -{ - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; - return max(1,vlc); } static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, INT line) @@ -445,12 +453,22 @@ udc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(udc, es->font); - //// ReactOS r57677 + if (es->style & ES_PASSWORD) +#ifdef __REACTOS__ + /* ReactOS r57677 */ ScriptStringAnalyse(udc, &es->password_char, length, (3*length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_PASSWORD, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); +#else + ScriptStringAnalyse(udc, &es->password_char, length, (1.5*length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_PASSWORD, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); +#endif else +#ifdef __REACTOS__ + /* ReactOS r57677 */ ScriptStringAnalyse(udc, es->text, length, (3*length/2+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); - //// +#else + ScriptStringAnalyse(udc, es->text, length, (1.5*length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &es->ssa); +#endif + if (es->font) SelectObject(udc, old_font); if (udc != dc) @@ -469,6 +487,12 @@ return EDIT_UpdateUniscribeData_linedef(es,dc,line_def); } +} + +static inline INT get_vertical_line_count(EDITSTATE *es) +{ + INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + return max(1,vlc); } /********************************************************************* @@ -541,8 +565,11 @@ /* The buffer has been expanded, create a new line and insert it into the link list */ LINEDEF *new_line = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)); - if (new_line == NULL) // reactos r33509 - break; // reactos r33509 +#ifdef __REACTOS__ + /* ReactOS r33509 */ + if (new_line == NULL) + break; +#endif new_line->next = previous_line->next; previous_line->next = new_line; current_line = new_line; @@ -573,7 +600,7 @@ while (*cp) { if (*cp == '\n') break; if ((*cp == '\r') && (*(cp + 1) == '\n')) - break; + break; cp++; } @@ -598,12 +625,12 @@ EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); if (current_line->ssa) - { - sz = ScriptString_pSize(current_line->ssa); - /* Calculate line width */ - current_line->width = sz->cx; - } - else current_line->width = es->char_width * current_line->net_length; + { + sz = ScriptString_pSize(current_line->ssa); + /* Calculate line width */ + current_line->width = sz->cx; + } + else current_line->width = es->char_width * current_line->net_length; } else current_line->width = 0; @@ -649,23 +676,23 @@ EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - if (current_line->ssa) - { - count = ScriptString_pcOutChars(current_line->ssa); - piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); - ScriptStringGetLogicalWidths(current_line->ssa,piDx); - - prev = current_line->net_length-1; - do { - current_line->width -= piDx[prev]; - prev--; - } while ( prev > 0 && current_line->width > fw); - if (prev<=0) - prev = 1; - HeapFree(GetProcessHeap(),0,piDx); - } - else - prev = (fw / es->char_width); + if (current_line->ssa) + { + count = ScriptString_pcOutChars(current_line->ssa); + piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); + ScriptStringGetLogicalWidths(current_line->ssa,piDx); + + prev = current_line->net_length-1; + do { + current_line->width -= piDx[prev]; + prev--; + } while ( prev > 0 && current_line->width > fw); + if (prev<=0) + prev = 1; + HeapFree(GetProcessHeap(),0,piDx); + } + else + prev = (fw / es->char_width); } /* If the first line we are calculating, wrapped before istart, we must @@ -780,7 +807,7 @@ if ((es->style & ES_CENTER) || (es->style & ES_RIGHT)) rc.left = es->format_rect.left; else - rc.left = LOWORD(EDIT_EM_PosFromChar(es, nstart_index, FALSE)); + rc.left = LOWORD(EDIT_EM_PosFromChar(es, nstart_index, FALSE)); rc.right = es->format_rect.right; SetRectRgn(hrgn, rc.left, rc.top, rc.right, rc.bottom); @@ -1258,6 +1285,8 @@ if (!es->text) { +#ifdef __REACTOS__ +/* FIXME: What is this ? */ CHAR *textA = NULL; // ReactOS Hacked! r45670 //UINT countA = 0; @@ -1277,6 +1306,13 @@ if (textA) //// ReactOS { +#else + if(!es->hloc32W) return; + + if(es->hloc32A) + { + CHAR *textA = LocalLock(es->hloc32A); +#endif HLOCAL hloc32W_new; UINT countW_new = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); if(countW_new > es->buffer_size + 1) @@ -1310,6 +1346,7 @@ */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { + if (es->hlocapp) return; /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) @@ -1385,7 +1422,7 @@ TRACE("trying to ReAlloc to %d+1 characters\n", size); - /* Force edit to unlock it's buffer. es->text now NULL */ + /* Force edit to unlock its buffer. es->text now NULL */ EDIT_UnlockBuffer(es, TRUE); if (es->hloc32W) { @@ -2603,7 +2640,7 @@ es->text_width = 0; /* Issue the EN_MAXTEXT notification and continue with replacing text - * such that buffer limit is honored. */ + * so that buffer limit is honored. */ if ((honor_limit) && (size > es->buffer_limit)) { EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); /* Buffer limit can be smaller than the actual length of text in combobox */ @@ -2835,11 +2872,11 @@ es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; - /* The text buffer handle belongs to the control */ + /* The text buffer handle belongs to the control */ es->hlocapp = NULL; EDIT_LockBuffer(es); - text_buffer_changed(es); + text_buffer_changed(es); es->x_offset = es->y_offset = 0; es->selection_start = es->selection_end = 0; @@ -2998,11 +3035,14 @@ es->tabs = NULL; else { es->tabs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); - if (es->tabs == NULL) // reactos r33503 +#ifdef __REACTOS__ + /* ReactOS r33503 */ + if (es->tabs == NULL) { es->tabs_count = 0; return FALSE; - } // reactos r33503 + } +#endif memcpy(es->tabs, tabs, count * sizeof(INT)); } EDIT_InvalidateUniscribeData(es); @@ -3047,8 +3087,11 @@ ulength = strlenW(es->undo_text); utext = HeapAlloc(GetProcessHeap(), 0, (ulength + 1) * sizeof(WCHAR)); - if (utext == NULL) // reactos r33503 - return FALSE; // reactos r33503 +#ifdef __REACTOS__ + /* ReactOS r33503 */ + if (utext == NULL) + return FALSE; +#endif strcpyW(utext, es->undo_text); @@ -3277,7 +3320,7 @@ SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0); break; case EM_SETSEL: - SendMessageW(es->hwndSelf, EM_SETSEL, 0, -1); + SendMessageW(es->hwndSelf, EM_SETSEL, 0, -1); break; default: ERR("unknown menu item, please report\n"); @@ -3329,10 +3372,13 @@ { RECT rc; /* Windows places the menu at the edit's center in this case */ - // reactos r55202 +#ifdef __REACTOS__ + /* ReactOS r55202 */ GetClientRect(es->hwndSelf, &rc); MapWindowPoints(es->hwndSelf, 0, (POINT *)&rc, 2); - //WIN_GetRectangles( es->hwndSelf, COORDS_SCREEN, NULL, &rc ); +#else + WIN_GetRectangles( es->hwndSelf, COORDS_SCREEN, NULL, &rc ); +#endif x = rc.left + (rc.right - rc.left) / 2; y = rc.top + (rc.bottom - rc.top) / 2; } @@ -3419,7 +3465,7 @@ case WM_SYSKEYDOWN: /* Handle Alt+up/down arrows */ if (nEUI) - SendMessageW(hCombo, CB_SHOWDROPDOWN, bDropped ? FALSE : TRUE, 0); + SendMessageW(hCombo, CB_SHOWDROPDOWN, !bDropped, 0); else SendMessageW(hLBox, WM_KEYDOWN, VK_F4, 0); break; @@ -3559,12 +3605,15 @@ if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; +#ifdef __REACTOS__ + /* ReactOS CORE-1419 */ case VK_BACK: if (control) { - FIXME("Ctrl+Backspace\n"); // See bug 1419. + FIXME("Ctrl+Backspace\n"); } break; +#endif } return TRUE; } @@ -3582,8 +3631,8 @@ if(!(es->style & ES_NOHIDESEL)) EDIT_InvalidateText(es, es->selection_start, es->selection_end); EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); - /* throw away left over scroll when we lose focus */ - es->wheelDeltaRemainder = 0; + /* throw away left over scroll when we lose focus */ + es->wheelDeltaRemainder = 0; return 0; } @@ -4443,10 +4492,16 @@ return; if (CompFlag & GCS_RESULTSTR) + { EDIT_GetResultStr(hIMC, es); - if (CompFlag & GCS_COMPSTR) - EDIT_GetCompositionStr(hIMC, CompFlag, es); - cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); + cursor = 0; + } + else + { + if (CompFlag & GCS_COMPSTR) + EDIT_GetCompositionStr(hIMC, CompFlag, es); + cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); + } ImmReleaseContext(hwnd, hIMC); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); } @@ -4629,12 +4684,12 @@ /* The app can own the text buffer handle */ if (es->hloc32W && (es->hloc32W != es->hlocapp)) { - LocalFree(es->hloc32W); - } + LocalFree(es->hloc32W); + } if (es->hloc32A && (es->hloc32A != es->hlocapp)) { - LocalFree(es->hloc32A); - } - EDIT_InvalidateUniscribeData(es); + LocalFree(es->hloc32A); + } + EDIT_InvalidateUniscribeData(es); pc = es->first_line_def; while (pc) { @@ -4670,25 +4725,26 @@ { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; -#ifdef __REACTOS__ // r50219 - PWND pWnd; - - pWnd = ValidateHwnd(hwnd); - if (pWnd) +#ifdef __REACTOS__ + /* ReactOS r50219 */ + PWND pWnd; + + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) { - if (!pWnd->fnid) - { - NtUserSetWindowFNID(hwnd, FNID_EDIT); - } - else - { - if (pWnd->fnid != FNID_EDIT) - { - ERR("Wrong window class for Edit! fnId 0x%x\n",pWnd->fnid); - return 0; - } - } + NtUserSetWindowFNID(hwnd, FNID_EDIT); } + else + { + if (pWnd->fnid != FNID_EDIT) + { + ERR("Wrong window class for Edit! fnId 0x%x\n",pWnd->fnid); + return 0; + } + } + } #endif TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); @@ -4932,9 +4988,10 @@ case WM_NCDESTROY: result = EDIT_WM_NCDestroy(es); -// es = NULL; reactos #ifdef __REACTOS__ NtUserSetWindowFNID(hwnd, FNID_DESTROY); +#else + es = NULL; #endif break; @@ -4958,7 +5015,7 @@ if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) result |= DLGC_WANTMESSAGE; } - } + } } break; @@ -5240,22 +5297,26 @@ } break; - default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; } - /* reactos: check GetWindowLong in case es has been destroyed during processing */ +#ifdef __REACTOS__ + /* ReactOS: check GetWindowLong in case es has been destroyed during processing */ if (IsWindow(hwnd) && es && GetWindowLongPtrW(hwnd, 0)) EDIT_UnlockBuffer(es, FALSE); +#else + if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); +#endif TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); return result; } -// reactos +#ifdef __REACTOS__ + /********************************************************************* * * EditWndProc (USER32.@) @@ -5273,6 +5334,8 @@ { return EditWndProc_common(hWnd, uMsg, wParam, lParam, TRUE); } + +#endif /* __REACTOS__ */ /********************************************************************* * edit class descriptor @@ -5282,9 +5345,12 @@ { editW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ - // reactos +#ifdef __REACTOS__ EditWndProcA, /* procA */ EditWndProcW, /* procW */ +#else + WINPROC_EDIT, /* proc */ +#endif #ifndef _WIN64 sizeof(EDITSTATE *) + sizeof(WORD), /* extra */ #else

1 0

[akhaldi] 67973: [README.WINE] Mark sortkey.c as synced with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 30 May '15

30 May '15

Author: akhaldi Date: Sat May 30 17:13:30 2015 New Revision: 67973 URL: http://svn.reactos.org/svn/reactos?rev=67973&view=rev Log: [README.WINE] Mark sortkey.c as synced with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 30 17:13:30 2015 @@ -278,7 +278,7 @@ reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.7.37 msvcrt - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528

1 0

[akhaldi] 67972: [WIN32K] Apply some bits of Wine commit 88acc9c8 by Akihiro Sagawa: Don't modify output glyph metrics unless the function succeeds. CORE-9746
by akhaldi＠svn.reactos.org 30 May '15

30 May '15

Author: akhaldi Date: Sat May 30 17:00:52 2015 New Revision: 67972 URL: http://svn.reactos.org/svn/reactos?rev=67972&view=rev Log: [WIN32K] Apply some bits of Wine commit 88acc9c8 by Akihiro Sagawa: Don't modify output glyph metrics unless the function succeeds. CORE-9746 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat May 30 17:00:52 2015 @@ -2027,11 +2027,11 @@ IntUnLockFreeType; - if (pgm) RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); if (iFormat == GGO_METRICS) { DPRINT("GGO_METRICS Exit!\n"); + *pgm = gm; return 1; /* FIXME */ } @@ -2234,6 +2234,7 @@ } DPRINT("ftGdiGetGlyphOutline END and needed %lu\n", needed); + *pgm = gm; return needed; }

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