Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[dgorbachev] 26553: - Do not write beyond the buffer.
by dgorbachev＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: dgorbachev Date: Sat Apr 28 08:10:19 2007 New Revision: 26553 URL: http://svn.reactos.org/svn/reactos?rev=26553&view=rev Log: - Do not write beyond the buffer. Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sat Apr 28 08:10:19 2007 @@ -188,7 +188,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - ZeroMemory(list, sizeof(struct DeviceInfoSet)); + ZeroMemory(list, FIELD_OFFSET(struct DeviceInfoSet, szData)); list->magic = SETUP_DEV_INFO_SET_MAGIC; memcpy(

1 0

[dgorbachev] 26552: - Enlarge window name buffer. - Do not free Menu Item Info many times. - Remove r26508 hack.
by dgorbachev＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: dgorbachev Date: Sat Apr 28 08:09:56 2007 New Revision: 26552 URL: http://svn.reactos.org/svn/reactos?rev=26552&view=rev Log: - Enlarge window name buffer. - Do not free Menu Item Info many times. - Remove r26508 hack. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Sat Apr 28 08:09:56 2007 @@ -735,7 +735,7 @@ /* Fill in biSizeImage */ GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage * 2); /* HACK */ + bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); if (bits) { Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Sat Apr 28 08:09:56 2007 @@ -242,7 +242,7 @@ if (GET_WORD(p) == 0xffff) /* Is it an integer id? */ { - info->windowName = HeapAlloc( GetProcessHeap(), 0, 10 ); + info->windowName = HeapAlloc( GetProcessHeap(), 0, sizeof(L"#65535") ); swprintf((LPWSTR)info->windowName, L"#%d", GET_WORD(p + 1)); info->windowNameFree = TRUE; p += 2; Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sat Apr 28 08:09:56 2007 @@ -236,6 +236,7 @@ if (ItemInfo->dwTypeData != NULL) { HeapFree(GetProcessHeap(), 0, ItemInfo->dwTypeData); + ItemInfo->dwTypeData = NULL; } }

1 0

[dgorbachev] 26551: - Do not free statically allocated structure.
by dgorbachev＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: dgorbachev Date: Sat Apr 28 08:09:31 2007 New Revision: 26551 URL: http://svn.reactos.org/svn/reactos?rev=26551&view=rev Log: - Do not free statically allocated structure. Modified: trunk/reactos/dll/win32/shell32/changenotify.c Modified: trunk/reactos/dll/win32/shell32/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… ============================================================================== --- trunk/reactos/dll/win32/shell32/changenotify.c (original) +++ trunk/reactos/dll/win32/shell32/changenotify.c Sat Apr 28 08:09:31 2007 @@ -179,7 +179,7 @@ LeaveCriticalSection(&SHELL32_ChangenotifyCS); - DeleteCriticalSection(&SHELL32_ChangenotifyCS); + // DeleteCriticalSection(&SHELL32_ChangenotifyCS); // static } /*************************************************************************

1 0

[ekohl] 26550: - Enable and disable the "Long" and "Short" labels along with the mouse trails trackbar. - Use BS_MULILINE and BS_TOP button styles for checkboxes that display long texts. - Indent the edittext control on the wheel page.
by ekohl＠svn.reactos.org 28 Apr '07

28 Apr '07

Author: ekohl Date: Sat Apr 28 04:20:41 2007 New Revision: 26550 URL: http://svn.reactos.org/svn/reactos?rev=26550&view=rev Log: - Enable and disable the "Long" and "Short" labels along with the mouse trails trackbar. - Use BS_MULILINE and BS_TOP button styles for checkboxes that display long texts. - Indent the edittext control on the wheel page. Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Nastavení tlaèítek", -1, 5, 5, 230, 70 CHECKBOX "Z&amìnit levé a pravé tlaèítko", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Zakrtnutím toto políèka nastavíte pravé tlaèítko jako primární pro funkce jako výbìr nebo pøetaení.", -1, 10, 30, 150, 30 GROUPBOX "Rychlost poklepání", -1, 5, 75, 230, 70 LTEXT "Poklepejte na sloku pro otestování nastavení. Pokud se sloka neotevøe, zkuste nií rychlost.", -1, 10, 85, 150, 30 LTEXT "&Rychlost: Malá", -1, 10, 120, 90, 8 LTEXT "Velká", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Funkce ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Zapnout funkci ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 100, 20 PUSHBUTTON "&Nastavení...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -104,23 +104,24 @@ GROUPBOX "Pohyb", -1, 5, 5, 230, 60 LTEXT "&Vyberte rychlost ukazatele:", -1, 60, 15, 110, 10 LTEXT "Malá", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Velká", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Zvýit pøesnost ukazatele.", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Pøichytit", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "&Automaticky pøesunout ukazatel nad výchozí tlaèítko.", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "&Automaticky pøesunout ukazatel nad výchozí tlaèítko.", -1, 73, 75, 152, 20 - GROUPBOX "Viditelnost", -1, 5, 105, 230, 90 - CHECKBOX "&Zobrazit stopu ukazatele.", IDC_CHECK_POINTER_TRAIL, 60, 110, 150, 10 - LTEXT "Krátká", -1, 60, 130, 30, 10 - LTEXT "Dlouhá", -1, 160, 130, 30, 10 + GROUPBOX "Viditelnost", -1, 5, 105, 230, 95 + CHECKBOX "&Zobrazit stopu ukazatele.", IDC_CHECK_POINTER_TRAIL, 60, 115, 150, 10 + LTEXT "Krátká", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Dlouhá", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Skrýt ukazatel, pokud píete.", IDC_CHECK_HIDE_POINTER, 60, 150, 150, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Ukázat pozici ukazatele pøi stisknutí klávesy Ctrl.", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Ukázat pozici ukazatele pøi stisknutí klávesy Ctrl.", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Otoèení koleèka o jeden krok posune o:", -1, 60, 15, 150, 10 RADIOBUTTON "&tento poèet øádkù", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&celou obrazovku", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Sat Apr 28 04:20:41 2007 @@ -61,7 +61,7 @@ LTEXT "Doppelklicken Sie auf den Ordner, um die Einstellung zu testen. Verwenden Sie eine langsamere Einstellung, wenn der Ordner sich nicht öffnen oder schließen lässt.", -1, 10, 85, 150, 32 LTEXT "Langsam", -1, 10, 120, 90, 8 LTEXT "Schnell", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "KlickEinrasten", -1, 5, 150, 230, 70 CHECKBOX "&KlickEinrasten aktivieren", IDC_CHECK_CLICK_LOCK, 10, 160, 91, 20 @@ -103,26 +103,27 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Bewegung", -1, 5, 5, 230, 60 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 LTEXT "&Zeigergeschwindigkeit auswählen:", -1, 60, 15, 110, 10 LTEXT "Langsam", -1, 60, 30, 29, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Schnell", -1, 170, 30, 23, 10 - ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "Z&eigerbeschleunigung verbessern", IDC_CHECK_POINTER_PRECISION, 60, 50, 121, 10 GROUPBOX "Zur Standardschaltfläche springen", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "&In Dialogfeldern automatisch zur Standardschaltfläche springen", -1, 73, 75, 152, 20 - GROUPBOX "Sichtbarkeit", -1, 5, 105, 230, 90 - CHECKBOX "&Mausspur anzeigen", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Kurz", -1, 60, 130, 30, 10 - LTEXT "Lang", -1, 160, 130, 30, 10 + CHECKBOX "&In Dialogfeldern automatisch zur Standardschaltfläche springen", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP + GROUPBOX "Sichtbarkeit", -1, 5, 105, 230, 95 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Mausspur anzeigen", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Kurz", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Lang", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Zeiger bei &Tastatureingaben ausblenden", IDC_CHECK_HIDE_POINTER, 60, 150, 141, 10 - ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "Zeigerposition beim Drücken der &STRG-Taste anzeigen", IDC_CHECK_SHOW_POINTER, 60, 175, 173, 10 ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 + CHECKBOX "Zeigerposition beim Drücken der &STRG-Taste anzeigen", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP END IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 @@ -135,8 +136,8 @@ LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 RADIOBUTTON "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -104,23 +104,24 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 - GROUPBOX "Visibility", -1, 5, 105, 230, 90 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Short", -1, 60, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + GROUPBOX "Visibility", -1, 5, 105, 230, 95 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Show location of pointer when I press the CTRL key", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -104,23 +104,24 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 - GROUPBOX "Visibility", -1, 5, 105, 230, 90 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Short", -1, 60, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + GROUPBOX "Visibility", -1, 5, 105, 230, 95 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Show location of pointer when I press the CTRL key", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Configuration des boutons", -1, 5, 5, 230, 70 CHECKBOX "&Inverser les boutons gauche et droite", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Cochez cette case pour faire du bouton droit le bouton principal pour les fonctions telles que la sélection et le déplacement.", -1, 10, 30, 150, 30 GROUPBOX "Vitesse du double-click ", -1, 5, 75, 230, 70 LTEXT "Double-cliquer le dossier pour tester le paramètre. Si le dossier ne s'ouvre pas ou se ferme, essayez un réglage plus lent.", -1, 10, 85, 150, 30 LTEXT "Vite&sse: Lente", -1, 10, 120, 90, 8 LTEXT "Rapide", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Verrouillage clic", -1, 5, 150, 230, 70 CHECKBOX "&Activer le Verrouillage clic", IDC_CHECK_CLICK_LOCK, 10, 160, 95, 20 PUSHBUTTON "&Paramètres...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 15 @@ -104,23 +104,24 @@ GROUPBOX "Mouvement", -1, 5, 5, 230, 60 LTEXT "Séle&ctionner une vitesse de curseur :", -1, 40, 15, 120, 10 LTEXT "Lent", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Rapide", -1, 170, 30, 30, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Augmenter la précision du pointeur", IDC_CHECK_POINTER_PRECISION, 40, 50, 130, 10 GROUPBOX "Accrocher", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 40, 80, 10, 10 + CHECKBOX "Déplacer automatiquement le curseur sur le bouton par défaut dans une boite de dialogue", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "Déplacer automatiquement le curseur sur le bouton par défaut dans une boite de dialogue", -1, 60, 75, 152, 20 - GROUPBOX "Visibilité", -1, 5, 105, 230, 90 + GROUPBOX "Visibilité", -1, 5, 105, 230, 95 CHECKBOX "&Afficher les traces du pointeur", IDC_CHECK_POINTER_TRAIL, 40, 115, 110, 10 - LTEXT "Court", -1, 40, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + LTEXT "Court", IDC_TEXT_TRAIL_SHORT, 40, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Cacher le pointeur en écrivant", IDC_CHECK_HIDE_POINTER, 40, 150, 110, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Afficher le curseur quand je presse la touche CTRL", IDC_CHECK_SHOW_POINTER, 40, 175, 180, 10 + CHECKBOX "&Afficher le curseur quand je presse la touche CTRL", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Bouger la roulette pour défiler", -1, 60, 15, 150, 10 RADIOBUTTON "Le nombre suivant de &lignes à la fois", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Une page à la fois", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -104,23 +104,24 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 - GROUPBOX "Visibility", -1, 5, 105, 230, 90 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Short", -1, 60, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + GROUPBOX "Visibility", -1, 5, 105, 230, 95 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Show location of pointer when I press the CTRL key", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Konfigurasi tombol", -1, 5, 5, 230, 70 CHECKBOX "&Saklar primer dan tombol sekunder", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Pilih kotak centang ini untuk membuat tombol yang benar yang biasa anda pakai fungsi primer seperi memilih dan menggeser", -1, 10, 30, 150, 30 GROUPBOX "Kecepatan klik-dobel", -1, 5, 75, 230, 70 LTEXT "Klik-dobel folder untuk menguji setelan anda. Jika folder tidak membuka atau menutup, coba menggunakan setelan lebih lambat.", -1, 10, 85, 150, 30 LTEXT "Ke&cepatan: Lambat", -1, 10, 120, 90, 8 LTEXT "Cepat", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Kunci Klik", -1, 5, 150, 230, 70 CHECKBOX "&Hidupkan KunciKlik", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Setelan...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -104,23 +104,24 @@ GROUPBOX "Gerakan", -1, 5, 5, 230, 60 LTEXT "Pilih ke&cepatan pointer:", -1, 60, 15, 110, 10 LTEXT "Lambat", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Cepat", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Naikkan ketepatan pointer", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Menempel Ke", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "Otomat&is memindahkan pointer ke tombol standar dalam kotak dialog", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "Otomat&is memindahkan pointer ke tombol standar dalam kotak dialog", -1, 73, 75, 152, 20 - GROUPBOX "Visibilitas", -1, 5, 105, 230, 90 - CHECKBOX "&Tampilkan ekor pointer", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Pendek", -1, 60, 130, 30, 10 - LTEXT "Panjang", -1, 160, 130, 30, 10 + GROUPBOX "Visibilitas", -1, 5, 105, 230, 95 + CHECKBOX "&Tampilkan ekor pointer", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Pendek", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Panjang", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Sembunyikan pointer saat mengetik", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "T&ampilkan lokasi pointer saat Saya menekan tombol CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "T&ampilkan lokasi pointer saat Saya menekan tombol CTRL", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Putar roda satu derajat untuk menggulung", -1, 60, 15, 150, 10 RADIOBUTTON "&Jumlah baris berikut sekali waktu", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Satu layar sekali waktu", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Sat Apr 28 04:20:41 2007 @@ -55,14 +55,14 @@ BEGIN GROUPBOX "Configurazione dei bottoni", -1, 5, 5, 230, 70 CHECKBOX "&Scambia il bottone secondario e primario", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento", -1, 10, 30, 150, 30 GROUPBOX "Velocità del doppio clic", -1, 5, 75, 230, 70 LTEXT "Fai doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 85, 150, 30 LTEXT "Velocità: Lenta", -1, 10, 120, 90, 8 LTEXT "Veloce", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Blocca clic", -1, 5, 150, 230, 70 CHECKBOX "&Abilita Blocca Clic", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Impostazioni...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -106,23 +106,24 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Scegli una velocità per il puntatore:", -1, 60, 15, 110, 10 LTEXT "Lento", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Veloce", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Aumenta la precisione del puntatore", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Salta a", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "Muove automaticamente il puntatore al bottone preselezionato nelle finestre di dialogo", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "Muove automaticamente il puntatore al bottone preselezionato nelle finestre di dialogo", -1, 73, 75, 152, 20 - GROUPBOX "Visibilità", -1, 5, 105, 230, 90 - CHECKBOX "&Visualizza la traccia del puntatore", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Corta", -1, 60, 130, 30, 10 - LTEXT "Lunga", -1, 160, 130, 30, 10 + GROUPBOX "Visibilità", -1, 5, 105, 230, 95 + CHECKBOX "&Visualizza la traccia del puntatore", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Corta", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Lunga", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Nascondi il puntatore mentre si scrive", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Mostra la posizione del puntatore quando si preme il tasto CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Mostra la posizione del puntatore quando si preme il tasto CTRL", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -136,8 +137,8 @@ LTEXT "Gira la rotella una tacca per scorrere", -1, 60, 15, 150, 10 RADIOBUTTON "Il seguente numero di linee per volta", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Uno schermo alla volta", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -104,23 +104,24 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 - GROUPBOX "Visibility", -1, 5, 105, 230, 90 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Short", -1, 60, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + GROUPBOX "Visibility", -1, 5, 105, 230, 95 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_SHORT, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Show location of pointer when I press the CTRL key", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Sat Apr 28 04:20:41 2007 @@ -52,14 +52,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -103,23 +103,24 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 - GROUPBOX "Visibility", -1, 5, 105, 230, 90 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Short", -1, 60, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + GROUPBOX "Visibility", -1, 5, 105, 230, 95 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Show location of pointer when I press the CTRL key", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -133,8 +134,8 @@ LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/pl-PL.rc Sat Apr 28 04:20:41 2007 @@ -59,14 +59,14 @@ BEGIN GROUPBOX "Konfiguracja przycisków", -1, 5, 5, 230, 70 CHECKBOX "&Prze³¹cz przycisk podstawowy i pomocniczy", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Zaznacz to pole wyboru, aby u¿ywaæ prawego przycisku do wykonywania funkcji podstawowych, takich jak zaznaczanie i przeci¹ganie.", -1, 10, 30, 150, 30 GROUPBOX "Szybkoæ dwukrotnego klikniêcia", -1, 5, 75, 230, 70 LTEXT "Kliknij dwukrotnie folder, aby przetestowaæ ustawienie. Jeli folder nie otworzy siê lub nie zamknie, spróbuj u¿yæ wolniejszego ustawienia.", -1, 10, 85, 150, 30 LTEXT "&Szybkoæ: Wolno", -1, 10, 120, 90, 8 LTEXT "Szybko", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "BlokadaKlikniêcia", -1, 5, 150, 230, 70 CHECKBOX "&W³¹cz funkcjê BlokadaKlikniêcia", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Ustawienia...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -110,23 +110,24 @@ GROUPBOX "Ruch", -1, 5, 5, 230, 60 LTEXT "&Wybierz szybkoæ wskanika:", -1, 60, 15, 110, 10 LTEXT "Wolno", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Szybko", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "Zwiêksz pr&ecyzjê wskanika", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Przyci¹ganie do", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "&Automatycznie przenie wskanik na domylny przycisk w oknie dialogowym", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "&Automatycznie przenie wskanik na domylny przycisk w oknie dialogowym", -1, 73, 75, 152, 20 - GROUPBOX "Widocznoæ", -1, 5, 105, 230, 90 - CHECKBOX "&Poka¿ lady wskanika", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "D³ugo", -1, 60, 130, 30, 10 - LTEXT "Krótko", -1, 160, 130, 30, 10 + GROUPBOX "Widocznoæ", -1, 5, 105, 230, 95 + CHECKBOX "&Poka¿ lady wskanika", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "D³ugo", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Krótko", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Ukryj wskanik podczas pisania", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "Poka¿ lokalizacjê wskanika po naciniêciu klawisza &CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "Poka¿ lokalizacjê wskanika po naciniêciu klawisza &CTRL", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -140,8 +141,8 @@ LTEXT "Obrócenie kó³kiem o jeden skok powoduje przewiniêcie:", -1, 60, 15, 150, 10 RADIOBUTTON "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Sat Apr 28 04:20:41 2007 @@ -53,14 +53,14 @@ BEGIN GROUPBOX "Button configuration", -1, 5, 5, 230, 70 CHECKBOX "&Switch primary and secondary buttons", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Select this checkbox to make the button the right one the one you use for primary functions such as selecting and dragging", -1, 10, 30, 150, 30 GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 150, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 LTEXT "Fast", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -104,23 +104,24 @@ GROUPBOX "Motion", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Fast", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Enhance pointer precision", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Snap To", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "A&utomatically move pointer to the default button in a dialog box", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 - GROUPBOX "Visibility", -1, 5, 105, 230, 90 - CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Short", -1, 60, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + GROUPBOX "Visibility", -1, 5, 105, 230, 95 + CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Short", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Long", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "&Show location of pointer when I press the CTRL key", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -134,8 +135,8 @@ LTEXT "Roll the wheel one notch to scroll", -1, 60, 15, 150, 10 RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Sat Apr 28 04:20:41 2007 @@ -61,14 +61,14 @@ BEGIN GROUPBOX "Êîíô³ãóðàö³ÿ êíîïîê", -1, 5, 5, 230, 70 CHECKBOX "&Ïîì³íÿòè ïðèçíà÷åííÿ êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü, ùîá ïðèçíà÷èòè ïðàâó êíîïêó äëÿ âèêîíàííÿ òàêèõ îñíîâíèõ ôóíêö³é, ÿê âèá³ð ³ ïåðåòÿãóâàííÿ", -1, 10, 30, 150, 30 GROUPBOX "Øâèäê³ñòü ïîäâ³éíîãî êëàöàííÿ", -1, 5, 75, 230, 70 LTEXT "Çðîá³òü ïîäâ³éíå êëàöàííÿ ïî ïàïö³. ßêùî ïàïêà íå â³äêðèâàºòüñÿ àáî íå çàêðèâàºòüñÿ, âèáåð³òü íèæ÷ó øâèäê³ñòü.", -1, 10, 85, 150, 30 LTEXT "&Øâèäê³ñòü: Íèæ÷å", -1, 10, 120, 90, 8 LTEXT "Âèùå", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Çàë³ïàí³ÿ", -1, 5, 150, 230, 70 CHECKBOX "&Â³âìêíóòè Çàë³ïàí³ÿ", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Ïàðàìåòðè...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 @@ -112,23 +112,24 @@ GROUPBOX "Ïåðåì³ùåííÿ", -1, 5, 5, 230, 60 LTEXT "&Âèáåð³òü øâèäê³ñòü ðóõó âêàç³âíèêà:", -1, 60, 15, 110, 10 LTEXT "Íèæ÷å", -1, 60, 30, 20, 10 - CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Âèùå", -1, 170, 30, 20, 10 ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Ï³äâèùåíà òî÷í³ñòü âêàç³âíèêà", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 GROUPBOX "Ïðèâ'ÿçêà äî", -1, 5, 65, 230, 40 - CHECKBOX "", IDC_CHECK_SNAP_TO, 60, 75, 10, 10 + CHECKBOX "Êíîïêè, ùî &âèáèðàíà çà çàìîâ÷óâàííÿì â ä³àëîãîâîìó â³êí³", + IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - LTEXT "Êíîïêè, ùî &âèáèðàíà çà çàìîâ÷óâàííÿì â ä³àëîãîâîìó â³êí³", -1, 73, 75, 152, 20 - GROUPBOX "Âèäèì³ñòü", -1, 5, 105, 230, 90 - CHECKBOX "&Â³äîáðàæàòè ñë³ä âêàç³âíèêà", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Êîðîòøå", -1, 60, 130, 30, 10 - LTEXT "Äîâøå", -1, 160, 130, 30, 10 + GROUPBOX "Âèäèì³ñòü", -1, 5, 105, 230, 95 + CHECKBOX "&Â³äîáðàæàòè ñë³ä âêàç³âíèêà", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 + LTEXT "Êîðîòøå", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "Äîâøå", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "Ï&ðèõîâóâàòè âêàç³âíèê ï³ä ÷àñ ââåäåííÿ ç êëàâ³àòóðè", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "Ïîêàçóâàòè ðî&çòàøóâàííÿ âêàç³âíèêà ïðè íàòèñíåíí³ CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 10 + CHECKBOX "Ïîêàçóâàòè ðî&çòàøóâàííÿ âêàç³âíèêà ïðè íàòèñíåíí³ CTRL", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 END @@ -142,8 +143,8 @@ LTEXT "Ïîâîðîò êîëèñ÷àòêà íà îäíå êëàöàííÿ ïðîêðó÷óº", -1, 60, 15, 150, 10 RADIOBUTTON "Íà âêàçàíó ê³ëüê³ñòü &ðÿäê³â:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "Íà îäèí &åêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Sat Apr 28 04:20:41 2007 @@ -1357,6 +1357,8 @@ { SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)5); EnableWindow(hDlgCtrl, FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_SHORT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_LONG), FALSE); } else { @@ -1423,12 +1425,16 @@ { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_SHORT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_LONG), FALSE); pOptionData->uMouseTrails = 0; } else { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_SHORT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_TRAIL_LONG), TRUE); pOptionData->uMouseTrails = (UINT)SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; } SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, 0); Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Sat Apr 28 04:20:41 2007 @@ -90,6 +90,8 @@ #define IDC_EDIT_REPEAT_RATE 2054 #define IDC_SLIDER_CURSOR_BLINK 2055 #define IDC_TEXT_CURSOR_BLINK 2056 +#define IDC_TEXT_TRAIL_SHORT 2057 +#define IDC_TEXT_TRAIL_LONG 2058 #endif /* __CPL_RESOURCE_H */

1 0

[gedmurphy] 26549: add hhctrl.ocx to bootcd
by gedmurphy＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: gedmurphy Date: Sat Apr 28 03:06:43 2007 New Revision: 26549 URL: http://svn.reactos.org/svn/reactos?rev=26549&view=rev Log: add hhctrl.ocx to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Apr 28 03:06:43 2007 @@ -163,6 +163,7 @@ dll\win32\gdi32\gdi32.dll 1 dll\win32\gdiplus\gdiplus.dll 1 dll\win32\glu32\glu32.dll 1 +dll\win32\hhctrl.ocx\hhctrl.ocx 1 dll\win32\hid\hid.dll 1 dll\win32\icmp\icmp.dll 1 dll\win32\imagehlp\imagehlp.dll 1

1 0

[gedmurphy] 26548: - fix hhctrl.ocx and add to the build - remove autogenerated itss.h, it was committed accidentally
by gedmurphy＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: gedmurphy Date: Sat Apr 28 02:27:46 2007 New Revision: 26548 URL: http://svn.reactos.org/svn/reactos?rev=26548&view=rev Log: - fix hhctrl.ocx and add to the build - remove autogenerated itss.h, it was committed accidentally Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.h Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Sat Apr 28 02:27:46 2007 @@ -1,4 +1,4 @@ -<module name="hhctrl" type="win32ocx" baseaddress="${BASEADDRESS_HHCTRL}" installbase="system32" installname="hhctrl.ocx" allowwarnings="true"> +<module name="hhctrl" type="win32ocx" baseaddress="${BASEADDRESS_HHCTRL}" installbase="system32" installname="hhctrl.ocx" usewrc="false" allowwarnings="true"> <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> @@ -9,6 +9,7 @@ <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>uuid</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/itss.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/itss.h (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/itss.h (removed) @@ -1,307 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from dll\win32\hhctrl.ocx\itss.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_DLL_WIN32_HHCTRL_OCX_ITSS_H -#define __WIDL_DLL_WIN32_HHCTRL_OCX_ITSS_H -#ifdef __cplusplus -extern "C" { -#endif -#include <oaidl.h> -typedef struct _ITS_Control_Data { - UINT cdwControlData; - UINT adwControlData[1]; -} ITS_Control_Data, *PITS_Control_Data; -typedef enum ECompactionLev { - COMPACT_DATA = 0, - COMPACT_DATA_AND_PATH = 1 -} ECompactionLev; -#ifndef __IITStorage_FWD_DEFINED__ -#define __IITStorage_FWD_DEFINED__ -typedef interface IITStorage IITStorage; -#endif - -/***************************************************************************** - * IITStorage interface - */ -#ifndef __IITStorage_INTERFACE_DEFINED__ -#define __IITStorage_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IITStorage, 0x88cc31de, 0x27ab, 0x11d0, 0x9d,0xf9, 0x00,0xa0,0xc9,0x22,0xe6,0xec); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IITStorage : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE StgCreateDocfile( - const WCHAR* pwcsName, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgCreateDocfileOnILockBytes( - ILockBytes* plkbyt, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgIsStorageFile( - const WCHAR* pwcsName) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgIsStorageILockBytes( - ILockBytes* plkbyt) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgOpenStorage( - const WCHAR* pwcsName, - IStorage* pstgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgOpenStorageOnILockBytes( - ILockBytes* plkbyt, - IStorage* pStgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgSetTimes( - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetControlData( - PITS_Control_Data pControlData) = 0; - - virtual HRESULT STDMETHODCALLTYPE DefaultControlData( - PITS_Control_Data* ppControlData) = 0; - - virtual HRESULT STDMETHODCALLTYPE Compact( - const WCHAR* pwcsName, - ECompactionLev iLev) = 0; - -}; -#else -typedef struct IITStorageVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IITStorage* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IITStorage* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IITStorage* This); - - /*** IITStorage methods ***/ - HRESULT (STDMETHODCALLTYPE *StgCreateDocfile)( - IITStorage* This, - const WCHAR* pwcsName, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgCreateDocfileOnILockBytes)( - IITStorage* This, - ILockBytes* plkbyt, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgIsStorageFile)( - IITStorage* This, - const WCHAR* pwcsName); - - HRESULT (STDMETHODCALLTYPE *StgIsStorageILockBytes)( - IITStorage* This, - ILockBytes* plkbyt); - - HRESULT (STDMETHODCALLTYPE *StgOpenStorage)( - IITStorage* This, - const WCHAR* pwcsName, - IStorage* pstgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgOpenStorageOnILockBytes)( - IITStorage* This, - ILockBytes* plkbyt, - IStorage* pStgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgSetTimes)( - IITStorage* This, - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime); - - HRESULT (STDMETHODCALLTYPE *SetControlData)( - IITStorage* This, - PITS_Control_Data pControlData); - - HRESULT (STDMETHODCALLTYPE *DefaultControlData)( - IITStorage* This, - PITS_Control_Data* ppControlData); - - HRESULT (STDMETHODCALLTYPE *Compact)( - IITStorage* This, - const WCHAR* pwcsName, - ECompactionLev iLev); - - END_INTERFACE -} IITStorageVtbl; -interface IITStorage { - const IITStorageVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IITStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IITStorage_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IITStorage_Release(p) (p)->lpVtbl->Release(p) -/*** IITStorage methods ***/ -#define IITStorage_StgCreateDocfile(p,a,b,c,d) (p)->lpVtbl->StgCreateDocfile(p,a,b,c,d) -#define IITStorage_StgCreateDocfileOnILockBytes(p,a,b,c,d) (p)->lpVtbl->StgCreateDocfileOnILockBytes(p,a,b,c,d) -#define IITStorage_StgIsStorageFile(p,a) (p)->lpVtbl->StgIsStorageFile(p,a) -#define IITStorage_StgIsStorageILockBytes(p,a) (p)->lpVtbl->StgIsStorageILockBytes(p,a) -#define IITStorage_StgOpenStorage(p,a,b,c,d,e,f) (p)->lpVtbl->StgOpenStorage(p,a,b,c,d,e,f) -#define IITStorage_StgOpenStorageOnILockBytes(p,a,b,c,d,e,f) (p)->lpVtbl->StgOpenStorageOnILockBytes(p,a,b,c,d,e,f) -#define IITStorage_StgSetTimes(p,a,b,c,d) (p)->lpVtbl->StgSetTimes(p,a,b,c,d) -#define IITStorage_SetControlData(p,a) (p)->lpVtbl->SetControlData(p,a) -#define IITStorage_DefaultControlData(p,a) (p)->lpVtbl->DefaultControlData(p,a) -#define IITStorage_Compact(p,a,b) (p)->lpVtbl->Compact(p,a,b) -#endif - -#endif - -HRESULT CALLBACK IITStorage_StgCreateDocfile_Proxy( - IITStorage* This, - const WCHAR* pwcsName, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgCreateDocfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgCreateDocfileOnILockBytes_Proxy( - IITStorage* This, - ILockBytes* plkbyt, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgCreateDocfileOnILockBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgIsStorageFile_Proxy( - IITStorage* This, - const WCHAR* pwcsName); -void __RPC_STUB IITStorage_StgIsStorageFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgIsStorageILockBytes_Proxy( - IITStorage* This, - ILockBytes* plkbyt); -void __RPC_STUB IITStorage_StgIsStorageILockBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgOpenStorage_Proxy( - IITStorage* This, - const WCHAR* pwcsName, - IStorage* pstgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgOpenStorage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgOpenStorageOnILockBytes_Proxy( - IITStorage* This, - ILockBytes* plkbyt, - IStorage* pStgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgOpenStorageOnILockBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgSetTimes_Proxy( - IITStorage* This, - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime); -void __RPC_STUB IITStorage_StgSetTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_SetControlData_Proxy( - IITStorage* This, - PITS_Control_Data pControlData); -void __RPC_STUB IITStorage_SetControlData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_DefaultControlData_Proxy( - IITStorage* This, - PITS_Control_Data* ppControlData); -void __RPC_STUB IITStorage_DefaultControlData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_Compact_Proxy( - IITStorage* This, - const WCHAR* pwcsName, - ECompactionLev iLev); -void __RPC_STUB IITStorage_Compact_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IITStorage_INTERFACE_DEFINED__ */ - -DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec); -DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec); -DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6); -DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6); -/* Begin additional prototypes for all interfaces */ - -unsigned long __RPC_USER SNB_UserSize (unsigned long *, unsigned long, SNB *); -unsigned char * __RPC_USER SNB_UserMarshal (unsigned long *, unsigned char *, SNB *); -unsigned char * __RPC_USER SNB_UserUnmarshal(unsigned long *, unsigned char *, SNB *); -void __RPC_USER SNB_UserFree (unsigned long *, SNB *); - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_DLL_WIN32_HHCTRL_OCX_ITSS_H */ Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sat Apr 28 02:27:46 2007 @@ -82,6 +82,9 @@ <directory name="glu32"> <xi:include href="glu32/glu32.rbuild" /> </directory> +<directory name="hhctrl.ocx"> + <xi:include href="hhctrl.ocx/hhctrl.ocx.rbuild" /> +</directory> <directory name="hid"> <xi:include href="hid/hid.rbuild" /> </directory>

1 0

[spetreolle] 26547: fix msi winetest
by spetreolle＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: spetreolle Date: Sat Apr 28 01:31:07 2007 New Revision: 26547 URL: http://svn.reactos.org/svn/reactos?rev=26547&view=rev Log: fix msi winetest Modified: trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/format.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/record.c trunk/rostests/winetests/msi/suminfo.c Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=26… ============================================================================== --- trunk/rostests/winetests/msi/db.c (original) +++ trunk/rostests/winetests/msi/db.c Sat Apr 28 01:31:07 2007 @@ -24,7 +24,6 @@ #include <msiquery.h> #include "wine/test.h" -#include "wine/windef.h" static const char *msifile = "winetest.msi"; Modified: trunk/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/format.c?re… ============================================================================== --- trunk/rostests/winetests/msi/format.c (original) +++ trunk/rostests/winetests/msi/format.c Sat Apr 28 01:31:07 2007 @@ -25,7 +25,6 @@ #include <msiquery.h> #include "wine/test.h" -#include "wine/windef.h" static MSIHANDLE helper_createpackage( const char *szName ) { Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c (original) +++ trunk/rostests/winetests/msi/install.c Sat Apr 28 01:31:07 2007 @@ -27,7 +27,6 @@ #include <fci.h> #include "wine/test.h" -#include "wine/windef.h" static const char *msifile = "winetest.msi"; CHAR CURR_DIR[MAX_PATH]; Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=2… ============================================================================== --- trunk/rostests/winetests/msi/msi.c (original) +++ trunk/rostests/winetests/msi/msi.c Sat Apr 28 01:31:07 2007 @@ -24,7 +24,6 @@ #include <msiquery.h> #include "wine/test.h" -#include "wine/windef.h" typedef struct test_MSIFILEHASHINFO { ULONG dwFileHashInfoSize; Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c (original) +++ trunk/rostests/winetests/msi/package.c Sat Apr 28 01:31:07 2007 @@ -27,7 +27,6 @@ #include <msiquery.h> #include "wine/test.h" -#include "wine/windef.h" static const char msifile[] = "winetest.msi"; Modified: trunk/rostests/winetests/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/record.c?re… ============================================================================== --- trunk/rostests/winetests/msi/record.c (original) +++ trunk/rostests/winetests/msi/record.c Sat Apr 28 01:31:07 2007 @@ -23,7 +23,6 @@ #include <msiquery.h> #include "wine/test.h" -#include "wine/windef.h" static BOOL create_temp_file(char *name) { Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r… ============================================================================== --- trunk/rostests/winetests/msi/suminfo.c (original) +++ trunk/rostests/winetests/msi/suminfo.c Sat Apr 28 01:31:07 2007 @@ -26,7 +26,6 @@ #include <msiquery.h> #include "wine/test.h" -#include "wine/windef.h" /* * The following are defined in Windows SDK's msidefs.h

1 0

[greatlrd] 26546: patch by hto. Fixing the crash in win32k after user-mode callback Some forget use seh. all user mode param shall always be using seh. See issue #2212 for more details.
by greatlrd＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: greatlrd Date: Fri Apr 27 23:11:22 2007 New Revision: 26546 URL: http://svn.reactos.org/svn/reactos?rev=26546&view=rev Log: patch by hto. Fixing the crash in win32k after user-mode callback Some forget use seh. all user mode param shall always be using seh. See issue #2212 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Fri Apr 27 23:11:22 2007 @@ -195,8 +195,16 @@ &ResultPointer, &ResultLength); - /* Simulate old behaviour: copy into our local buffer */ - RtlMoveMemory(Arguments, ResultPointer, ArgumentLength); + _SEH_TRY + { + /* Simulate old behaviour: copy into our local buffer */ + RtlMoveMemory(Arguments, ResultPointer, ArgumentLength); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; UserEnterCo();

1 0

[hpoussin] 26545: Fix mkdir command, if compiled in UNICODE. Patch by Pierre Schweitzer (heis_spiter at hotmail dot com) See issue #2216 for more details.
by hpoussin＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: hpoussin Date: Fri Apr 27 21:40:50 2007 New Revision: 26545 URL: http://svn.reactos.org/svn/reactos?rev=26545&view=rev Log: Fix mkdir command, if compiled in UNICODE. Patch by Pierre Schweitzer (heis_spiter at hotmail dot com) See issue #2216 for more details. Modified: trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c (original) +++ trunk/reactos/base/shell/cmd/internal.c Fri Apr 27 21:40:50 2007 @@ -440,7 +440,7 @@ while ((p = _tcschr(p, _T('\\'))) != NULL) { n = p - DirPath + 1; - memcpy(path, DirPath, n); + _tcsncpy(path, DirPath, n); path[n] = _T('\0'); if( !CreateDirectory(path, NULL) && (GetLastError() != ERROR_ALREADY_EXISTS)) Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc Fri Apr 27 21:40:50 2007 @@ -570,6 +570,8 @@ STRING_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options" STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION, "Option invalide : %s" +STRING_MD_ERROR, "Un sous répertoire ou un fichier est déjà existant.\n" +STRING_MD_ERROR2, "Le chemin vers le nouveau répertoire n'existe pas.\n" STRING_CMD_ERROR1, "Ne peut rediriger l'entrée depuis le fichier %s\n" STRING_CMD_ERROR2, "Erreur à la création du fichier temporaire pour les données du pipe\n" STRING_CMD_ERROR3, "Ne peut rediriger vers le fichier %s\n" Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h (original) +++ trunk/reactos/base/shell/cmd/resource.h Fri Apr 27 21:40:50 2007 @@ -219,9 +219,9 @@ #define STRING_EXPECTED_CLOSE_PAREN 721 #define STRING_EXPECTED_NUMBER_OR_VARIABLE 722 #define STRING_SYNTAX_COMMAND_INCORRECT 723 -#define STRING_RMDIR_HELP2 724 -#define STRING_MD_ERROR 725 -#define STRING_MD_ERROR2 726 +#define STRING_RMDIR_HELP2 724 +#define STRING_MD_ERROR 725 +#define STRING_MD_ERROR2 726 /* These strings are language independent (cmd.rc) */

1 0

[jimtabor] 26544: Fix build, Error conflict.
by jimtabor＠svn.reactos.org 27 Apr '07

27 Apr '07

Author: jimtabor Date: Fri Apr 27 20:31:55 2007 New Revision: 26544 URL: http://svn.reactos.org/svn/reactos?rev=26544&view=rev Log: Fix build, Error conflict. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Fri Apr 27 20:31:55 2007 @@ -263,12 +263,12 @@ /* * @unimplemented */ -DWORD +HANDLE WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes, - DWORD n + INT n ) { UNIMPLEMENTED;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2007