Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[jimtabor] 21986: Add TT_PRIM_CSPLINE, from wine.
by jimtabor＠svn.reactos.org 23 May '06

23 May '06

Author: jimtabor Date: Tue May 23 06:14:46 2006 New Revision: 21986 URL: http://svn.reactos.ru/svn/reactos?rev=21986&view=rev Log: Add TT_PRIM_CSPLINE, from wine. Modified: trunk/reactos/include/wingdi.h Modified: trunk/reactos/include/wingdi.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/wingdi.h?rev=21986&… ============================================================================== --- trunk/reactos/include/wingdi.h (original) +++ trunk/reactos/include/wingdi.h Tue May 23 06:14:46 2006 @@ -1128,6 +1128,7 @@ #define TT_POLYGON_TYPE 24 #define TT_PRIM_LINE 1 #define TT_PRIM_QSPLINE 2 +#define TT_PRIM_CSPLINE 3 #define FONTMAPPER_MAX 10 #define ENHMETA_STOCK_OBJECT 0x80000000 #define WGL_FONT_LINES 0

1 0

[fireball] 21985: - Update text-outputting routines in user32.dll to Wine's trunk (22052006). May fix some layout and text-placement issues. - "user32_winetest.exe text" gives only 1 failure now - Silence debug messages in win32k.sys
by fireball＠svn.reactos.org 22 May '06

22 May '06

Author: fireball Date: Tue May 23 02:05:40 2006 New Revision: 21985 URL: http://svn.reactos.ru/svn/reactos?rev=21985&view=rev Log: - Update text-outputting routines in user32.dll to Wine's trunk (22052006). May fix some layout and text-placement issues. - "user32_winetest.exe text" gives only 1 failure now - Silence debug messages in win32k.sys Modified: trunk/reactos/dll/win32/user32/windows/font.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/fo… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c (original) +++ trunk/reactos/dll/win32/user32/windows/font.c Tue May 23 02:05:40 2006 @@ -73,6 +73,7 @@ * Note: this doesn't work too well for text-alignment modes other * than TA_LEFT|TA_TOP. But we want bug-for-bug compatibility :-) */ +/* WINE synced 22-May-2006 */ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, INT count, INT cTabStops, const INT *lpTabPos, INT nTabOrg, BOOL fDisplayText ) @@ -181,7 +182,7 @@ return TEXT_TabbedTextOut(hDC, X, Y, lpString, nCount, nTabPositions, lpnTabStopPositions, nTabOrigin, TRUE); } - +/* WINE synced 22-May-2006 */ /* * @implemented */ @@ -978,13 +979,14 @@ * (logical coordinates) * str [in] The text of the line segment * offset [in] The offset of the underscored character within str - */ - -static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int offset) + * rect [in] Clipping rectangle (if not NULL) + */ +/* WINE synced 22-May-2006 */ +static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int offset, const RECT *rect) { int prefix_x; int prefix_end; - SIZE size = {0, 0}; + SIZE size; HPEN hpen; HPEN oldPen; @@ -994,6 +996,17 @@ prefix_end = x + size.cx - 1; /* The above method may eventually be slightly wrong due to kerning etc. */ + /* Check for clipping */ + if (rect) + { + if (prefix_x > rect->right || prefix_end < rect->left || + y < rect->top || y > rect->bottom) + return; /* Completely outside */ + /* Partially outside */ + if (prefix_x < rect->left ) prefix_x = rect->left; + if (prefix_end > rect->right) prefix_end = rect->right; + } + hpen = CreatePen (PS_SOLID, 1, GetTextColor (hdc)); oldPen = SelectObject (hdc, hpen); MoveToEx (hdc, prefix_x, y, NULL); @@ -1012,7 +1025,8 @@ * 3 more than a null-terminated string). If this is not so then increase * the allowance in DrawTextExA. */ -#define MAX_STATIC_BUFFER 1024 +#define MAX_BUFFER 1024 +/* WINE synced 22-May-2006 */ /* * @implemented */ @@ -1024,7 +1038,7 @@ const WCHAR *strPtr; WCHAR *retstr, *p_retstr; size_t size_retstr; - WCHAR line[MAX_STATIC_BUFFER]; + WCHAR line[MAX_BUFFER]; int len, lh, count=i_count; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; @@ -1037,16 +1051,27 @@ ellipsis_data ellip; #if 0 - TRACE("%s, %d , [(%d,%d),(%d,%d)]\n", debugstr_wn (str, count), count, - rect->left, rect->top, rect->right, rect->bottom); + TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, + wine_dbgstr_rect(rect), flags); if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin); #endif - if (!str) return 0; - if (count == -1) count = wcslen(str); - if (count == 0) return 0; + if (!str || count == 0) return 0; + if (count == -1) + { + count = strlenW(str); + if (count == 0) + { + if( flags & DT_CALCRECT) + { + rect->right = rect->left; + rect->bottom = rect->top; + } + return 0; + } + } strPtr = str; if (flags & DT_SINGLELINE) @@ -1054,9 +1079,9 @@ GetTextMetricsW(hdc, &tm); if (flags & DT_EXTERNALLEADING) - lh = tm.tmHeight + tm.tmExternalLeading; + lh = tm.tmHeight + tm.tmExternalLeading; else - lh = tm.tmHeight; + lh = tm.tmHeight; if (dtp) { @@ -1070,7 +1095,7 @@ if (flags & DT_EXPANDTABS) { int tabstop = ((flags & DT_TABSTOP) && dtp) ? dtp->iTabLength : 8; - tabwidth = tm.tmAveCharWidth * tabstop; + tabwidth = tm.tmAveCharWidth * tabstop; } if (flags & DT_CALCRECT) flags |= DT_NOCLIP; @@ -1091,23 +1116,23 @@ do { - len = MAX_STATIC_BUFFER; + len = sizeof(line)/sizeof(line[0]); last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; - strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); - - if (flags & DT_CENTER) x = (rect->left + rect->right - - size.cx) / 2; - else if (flags & DT_RIGHT) x = rect->right - size.cx; - - if (flags & DT_SINGLELINE) - { - if (flags & DT_VCENTER) y = rect->top + - (rect->bottom - rect->top) / 2 - size.cy / 2; - else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; - } - - if (!(flags & DT_CALCRECT)) - { + strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); + + if (flags & DT_CENTER) + x = (rect->left + rect->right - size.cx) / 2; + else if (flags & DT_RIGHT) x = rect->right - size.cx; + + if (flags & DT_SINGLELINE) + { + if (flags & DT_VCENTER) y = rect->top + + (rect->bottom - rect->top) / 2 - size.cy / 2; + else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; + } + + if (!(flags & DT_CALCRECT)) + { const WCHAR *str = line; int xseg = x; while (len) @@ -1131,7 +1156,7 @@ rect, str, len_seg, NULL )) return 0; if (prefix_offset != -1 && prefix_offset < len_seg) { - TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset); + TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect); } len -= len_seg; str += len_seg; @@ -1157,11 +1182,11 @@ } } } - } - else if (size.cx > max_width) - max_width = size.cx; - - y += lh; + } + else if (size.cx > max_width) + max_width = size.cx; + + y += lh; if (dtp) dtp->uiLengthDrawn += len; } @@ -1169,8 +1194,8 @@ if (flags & DT_CALCRECT) { - rect->right = rect->left + max_width; - rect->bottom = y; + rect->right = rect->left + max_width; + rect->bottom = y; if (dtp) rect->right += lmargin + rmargin; } @@ -1191,6 +1216,7 @@ * * @implemented */ +/* WINE synced 22-May-2006 */ int STDCALL DrawTextExA( HDC hdc, LPSTR str, INT count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) @@ -1203,9 +1229,16 @@ DWORD wmax; DWORD amax; - if (!str) return 0; - if (count == -1) count = strlen(str); if (!count) return 0; + if( !str || ((count == -1) && !(count = strlen(str)))) + { + if( flags & DT_CALCRECT) + { + rect->right = rect->left; + rect->bottom = rect->top; + } + return 0; + } wcount = MultiByteToWideChar( CP_ACP, 0, str, count, NULL, 0 ); wmax = wcount; amax = count; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Tue May 23 02:05:40 2006 @@ -11,8 +11,7 @@ #include <w32k.h> -//#define NDEBUG -#undef NDEBUG +#define NDEBUG #include <debug.h> /* registered Logon process */

1 0

[janderwald] 21984: increase mouse thread priority - patch by w3seek should fix 1427
by janderwald＠svn.reactos.org 22 May '06

22 May '06

Author: janderwald Date: Tue May 23 01:57:38 2006 New Revision: 21984 URL: http://svn.reactos.ru/svn/reactos?rev=21984&view=rev Log: increase mouse thread priority - patch by w3seek should fix 1427 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Tue May 23 01:57:38 2006 @@ -176,6 +176,9 @@ FILE_SYNCHRONOUS_IO_ALERT); } while (!NT_SUCCESS(Status)); + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, + LOW_REALTIME_PRIORITY + 3); + for(;;) { /* @@ -454,6 +457,9 @@ DPRINT1("Win32K: Failed making keyboard thread a win32 thread.\n"); return; //(Status); } + + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, + LOW_REALTIME_PRIORITY + 3); IntKeyboardGetIndicatorTrans(KeyboardDeviceHandle, &IndicatorTrans);

1 0

[janderwald] 21983: french translation by Usurp from bug 1492 :-)
by janderwald＠svn.reactos.org 22 May '06

22 May '06

Author: janderwald Date: Tue May 23 01:40:29 2006 New Revision: 21983 URL: http://svn.reactos.ru/svn/reactos?rev=21983&view=rev Log: french translation by Usurp from bug 1492 :-) Added: trunk/reactos/dll/cpl/mmsys/Fr.rc Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc Added: trunk/reactos/dll/cpl/mmsys/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/mmsys/Fr.rc?rev=219… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/Fr.rc (added) +++ trunk/reactos/dll/cpl/mmsys/Fr.rc Tue May 23 01:40:29 2006 @@ -1,0 +1,15 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Matériel" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Son et périphériques audio" + IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." +END + Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Tue May 23 01:40:29 2006 @@ -14,3 +14,4 @@ #include "De.rc" #include "Es.rc" #include "Ru.rc" +#include "Fr.rc"

1 0

[janderwald] 21982: french translation by Usurp from bug 1416
by janderwald＠svn.reactos.org 22 May '06

22 May '06

Author: janderwald Date: Tue May 23 01:33:22 2006 New Revision: 21982 URL: http://svn.reactos.ru/svn/reactos?rev=21982&view=rev Log: french translation by Usurp from bug 1416 Added: trunk/reactos/dll/cpl/main/Fr.rc Modified: trunk/reactos/dll/cpl/main/main.rc Added: trunk/reactos/dll/cpl/main/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/Fr.rc?rev=2198… ============================================================================== --- trunk/reactos/dll/cpl/main/Fr.rc (added) +++ trunk/reactos/dll/cpl/main/Fr.rc Tue May 23 01:33:22 2006 @@ -1,0 +1,163 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vitesse" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Répétition des caractères", -1, 5, 5, 230, 130 + ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 + LTEXT "&Délai de répétition", -1, 40, 15, 50, 10 + LTEXT "Long", -1, 40, 30, 20, 10 + LTEXT "Court", -1, 200, 30, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 + ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 + LTEXT "&Délai de répétition", -1, 40, 70, 50, 10 + LTEXT "Lent", -1, 40, 85, 20, 10 + LTEXT "Rapide", -1, 200, 85, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 + LTEXT "Cliquer ici et enfoncer une touche pour &tester le délai de répétition:", -1, 15, 105, 150, 10 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Taux de &clignotement du curseur:", -1, 5, 145, 230, 50 + LTEXT "Aucun", -1, 40, 165, 30, 10 + LTEXT "Rapide", -1, 200, 165, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Matériel" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Verrouillage du clic" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Court", -1, 35, 50, 30, 10 + LTEXT "Long", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "&Annuler", IDCANCEL, 175, 75, 50, 15 + LTEXT "&Ajuste le temps nécessaire pendant lequel vous devez cliquer avant de verrouiller le clic.",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Boutons" +FONT 8, "MS Shell Dlg" +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_OWNERDRAW, 155, 15, 75, 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, 140, 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, 135, 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_OWNERDRAW, 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 + LTEXT "Vous permet de sélectionner ou de déplacer sans maintenir le bouton de la souris enfoncé. Pour activer, presser le bouton brièvement. Pour désactiver, presser de nouveau le bouton.", -1, 10, 180, 200, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Pointeur" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Profil", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 + PUSHBUTTON "Sa&uver...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + PUSHBUTTON "&Effacer", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + LTEXT "&Modifier", -1, 5, 60, 40, 10 + CHECKBOX "&Afficher l'ombre du curseur", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + PUSHBUTTON "Par dé&faut", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 + PUSHBUTTON "&Choisir", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 +END + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Sauver Profil" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sauver ce profil de curseur comme:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&Annuler", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Options du pointeur" +FONT 8, "MS Shell Dlg" +BEGIN + 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_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Rapide", -1, 170, 30, 30, 10 + ICON -1, IDC_ICON_MOUSE_SENSITIVITY, 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 + 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 + 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 + 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 "&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 + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Roulette" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Défilement", -1, 5, 5, 230, 80 + LTEXT "Bouger la roulette pour défiler", -1, 60, 15, 150, 10 + CONTROL "Le nombre suivant de &lignes à la fois", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "&Une page à la fois", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Souris" + IDS_CPLDESCRIPTION_1 "Changer les paramètres souris" + IDS_CPLNAME_2 "Clavier" + IDS_CPLDESCRIPTION_2 "Changer les paramètres clavier" + IDS_ARROW "Sélection normale" + IDS_HELP "Sélection d'aide" + IDS_APPSTARTING "Actif en arrière plan" + IDS_WAIT "Occupé" + IDS_CROSSHAIR "Sélection précise" + IDS_IBEAM "Sélection de texte" + IDS_NWPEN "Écriture" + IDS_NO "Indisponible" + IDS_SIZENS "Redimensionnement vertical" + IDS_SIZENWSE "Redimensionnement en diagonale 1" + IDS_SIZENESW "Redimensionnement en diagonale 2" + IDS_SIZEALL "Déplacer" + IDS_UPARROW "Sélection alternative" + IDS_HAND "Sélection de lien" + IDS_NONE "(Aucun)" + IDS_SYSTEM_SCHEME "(Arrangement système)" +END Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc (original) +++ trunk/reactos/dll/cpl/main/main.rc Tue May 23 01:33:22 2006 @@ -15,6 +15,7 @@ #include "En.rc" #include "De.rc" +#include "Fr.rc" #include "Nl.rc" #include "Ja.rc" #include "Hu.rc"

1 0

[fireball] 21981: - Update TEXT_TabbedTextOut from Wine's trunk. Reduces number of failures in "user32_winetest.exe text" from 64 to 4.
by fireball＠svn.reactos.org 22 May '06

22 May '06

Author: fireball Date: Tue May 23 00:12:29 2006 New Revision: 21981 URL: http://svn.reactos.ru/svn/reactos?rev=21981&view=rev Log: - Update TEXT_TabbedTextOut from Wine's trunk. Reduces number of failures in "user32_winetest.exe text" from 64 to 4. Modified: trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/fo… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c (original) +++ trunk/reactos/dll/win32/user32/windows/font.c Tue May 23 00:12:29 2006 @@ -79,16 +79,13 @@ { INT defWidth; SIZE extent; - int i, tabPos = x; + int i, j; int start = x; - - extent.cx = 0; - extent.cy = 0; if (!lpTabPos) cTabStops=0; - if (cTabStops == 1 && *lpTabPos >= /* sic */ 0) + if (cTabStops == 1) { defWidth = *lpTabPos; cTabStops = 0; @@ -96,50 +93,75 @@ else { TEXTMETRICA tm; - if (GetTextMetricsA( hdc, &tm )) - defWidth = 8 * tm.tmAveCharWidth; - else - defWidth = 0; - if (cTabStops == 1) - cTabStops = 0; /* on negative *lpTabPos */ + GetTextMetricsA( hdc, &tm ); + defWidth = 8 * tm.tmAveCharWidth; } while (count > 0) { + RECT r; + INT x0; + x0 = x; + r.left = x0; + /* chop the string into substrings of 0 or more <tabs> + * possibly followed by 1 or more normal characters */ for (i = 0; i < count; i++) - if (lpstr[i] == '\t') break; - GetTextExtentPointW( hdc, lpstr, i, &extent ); - while ((cTabStops > 0) && - (nTabOrg + *lpTabPos <= x + extent.cx)) - { - lpTabPos++; - cTabStops--; - } - if (i == count) - tabPos = x + extent.cx; - else if (cTabStops > 0) - tabPos = nTabOrg + *lpTabPos; - else if (defWidth <= 0) - tabPos = x + extent.cx; - else - tabPos = nTabOrg + ((x + extent.cx - nTabOrg) / defWidth + 1) * defWidth; + if (lpstr[i] != '\t') break; + for (j = i; j < count; j++) + if (lpstr[j] == '\t') break; + /* get the extent of the normal character part */ + GetTextExtentPointW( hdc, lpstr + i, j - i , &extent ); + /* and if there is a <tab>, calculate its position */ + if( i) { + /* get x coordinate for the drawing of this string */ + for (; cTabStops > i; lpTabPos++, cTabStops--) + { + if( nTabOrg + abs( *lpTabPos) > x) { + if( lpTabPos[ i - 1] >= 0) { + /* a left aligned tab */ + x = nTabOrg + lpTabPos[ i-1] + extent.cx; + break; + } + else + { + /* if tab pos is negative then text is right-aligned + * to tab stop meaning that the string extends to the + * left, so we must subtract the width of the string */ + if (nTabOrg - lpTabPos[ i - 1] - extent.cx > x) + { + x = nTabOrg - lpTabPos[ i - 1]; + x0 = x - extent.cx; + break; + } + } + } + } + /* if we have run out of tab stops and we have a valid default tab + * stop width then round x up to that width */ + if ((cTabStops <= i) && (defWidth > 0)) { + x0 = nTabOrg + ((x - nTabOrg) / defWidth + i) * defWidth; + x = x0 + extent.cx; + } else if ((cTabStops <= i) && (defWidth < 0)) { + x = nTabOrg + ((x - nTabOrg + extent.cx) / -defWidth + i) + * -defWidth; + x0 = x - extent.cx; + } + } else + x += extent.cx; + if (fDisplayText) { - RECT r; - r.left = x; r.top = y; - r.right = tabPos; + r.right = x; r.bottom = y + extent.cy; - ExtTextOutW( hdc, x, y, GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, - &r, lpstr, i, NULL ); - } - x = tabPos; - count -= i+1; - lpstr += i+1; - } - return MAKELONG(tabPos - start, extent.cy); -} - + ExtTextOutW( hdc, x0, y, GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, + &r, lpstr + i, j - i, NULL ); + } + count -= j; + lpstr += j; + } + return MAKELONG(x - start, extent.cy); +} /* * @implemented

1 0

[frik85] 21980: RSDB - ReactOS Support Database: http://www.reactos.org/support/ I have worked on this software since November 2005. This is the version from today (2006-05-22). The Support DB is currently in the beta phase. Some of the features of the Compatibility Database are: * Browse through the database in several different ways (by category, name, vendor, ranks, search). * Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. * Ability
by frik85＠svn.reactos.org 22 May '06

22 May '06

1 0

[frik85] 21979: RosCMS update: Finally, I found time to upload the ReactOS Content System update. Some new features: * interface language support * diff interface (ajax) * improved page generator * fixed a lot of tiny bugs Note: because of the interface translation support, the language file has been extended, please submit/send patches for the translation files, thx.
by frik85＠svn.reactos.org 22 May '06

22 May '06

1 0

[fireball] 21978: - Implement GetTabbedTextExtentA(), based on implementation from Wine (trunk). Reduces number of failures in "user32_winetest.exe text" from 84 to 64.
by fireball＠svn.reactos.org 22 May '06

22 May '06

Author: fireball Date: Mon May 22 23:07:59 2006 New Revision: 21978 URL: http://svn.reactos.ru/svn/reactos?rev=21978&view=rev Log: - Implement GetTabbedTextExtentA(), based on implementation from Wine (trunk). Reduces number of failures in "user32_winetest.exe text" from 84 to 64. Modified: trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/fo… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c (original) +++ trunk/reactos/dll/win32/user32/windows/font.c Mon May 22 23:07:59 2006 @@ -161,7 +161,7 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL @@ -172,8 +172,19 @@ int nTabPositions, CONST LPINT lpnTabStopPositions) { - UNIMPLEMENTED; - return 0; + LONG ret; + DWORD len = MultiByteToWideChar(CP_ACP, 0, lpString, nCount, NULL, 0); + LPWSTR strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + if (!strW) + return 0; + MultiByteToWideChar(CP_ACP, 0, lpString, nCount, strW, len); + + ret = GetTabbedTextExtentW(hDC, strW, len, nTabPositions, + lpnTabStopPositions); + + HeapFree(GetProcessHeap(), 0, strW); + return ret; }

1 0

[fireball] 21977: - Fix compiling of win32k without compilation units
by fireball＠svn.reactos.org 22 May '06

22 May '06

Author: fireball Date: Mon May 22 18:46:31 2006 New Revision: 21977 URL: http://svn.reactos.ru/svn/reactos?rev=21977&view=rev Log: - Fix compiling of win32k without compilation units Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Mon May 22 18:46:31 2006 @@ -225,5 +225,11 @@ IN DWORD dwflags, IN PVOID lParam OPTIONAL); +HBITMAP +FASTCALL +IntCreateCompatibleBitmap(PDC Dc, + INT Width, + INT Height); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Mon May 22 18:46:31 2006 @@ -42,6 +42,10 @@ INT FASTCALL IntGdiGetArcDirection(DC *dc); + +VOID FASTCALL +IntGetCurrentPositionEx(PDC dc, LPPOINT pt); + BOOL STDCALL

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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 May 2006