November 2010 - Wine-commits

Austin Lund : comctl32/tests: Fixed toolbar tests for varing width of button strings.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 05d82b637674cd1a61f69fd6c60288de338422ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d82b637674cd1a61f69fd6c… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Nov 8 15:22:22 2010 +1000 comctl32/tests: Fixed toolbar tests for varing width of button strings. --- dlls/comctl32/tests/toolbar.c | 72 +++++++++++++++++++++++++--------------- 1 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index ceeb6e3..75640a8 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -688,6 +688,17 @@ static int system_font_height(void) { return tm.tmHeight; } +static int string_width(const CHAR *s) { + SIZE sz; + HDC hdc; + + hdc = CreateCompatibleDC(NULL); + GetTextExtentPoint32A(hdc, s, strlen(s), &sz); + DeleteDC(hdc); + + return sz.cx; +} + typedef struct { RECT rcClient; @@ -714,12 +725,17 @@ void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right, int b tbsr->nButtons++; } +#define STRING0 "A" +#define STRING1 "MMMMMMMMMMMMM" +#define STRING2 "Tst" + tbsize_result_t *tbsize_results = NULL; #define tbsize_results_num 24 static void init_tbsize_results(void) { int fontheight = system_font_height(); + int buttonwidth; tbsize_results = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, tbsize_results_num*sizeof(tbsize_result_t)); @@ -919,26 +935,28 @@ static void init_tbsize_results(void) { tbsize_addbutton(&tbsize_results[16], 192, 0, 215, 22); tbsize_addbutton(&tbsize_results[16], 215, 0, 238, 22); + buttonwidth = 7 + string_width(STRING1); + tbsize_results[17] = init_tbsize_result(3, 0, 0, 672, 26, 489, 39); - tbsize_addbutton(&tbsize_results[17], 0, 2, 163, 25 + fontheight); - tbsize_addbutton(&tbsize_results[17], 163, 2, 330, 25 + fontheight); - tbsize_addbutton(&tbsize_results[17], 330, 2, 493, 25 + fontheight); + tbsize_addbutton(&tbsize_results[17], 0, 2, buttonwidth, 25 + fontheight); + tbsize_addbutton(&tbsize_results[17], buttonwidth, 2, 2*buttonwidth + 4, 25 + fontheight); + tbsize_addbutton(&tbsize_results[17], 2*buttonwidth + 4, 2, 3*buttonwidth + 4, 25 + fontheight); tbsize_results[18] = init_tbsize_result(6, 0, 0, 672, 104, 978, 24); - tbsize_addbutton(&tbsize_results[18], 0, 2, 163, 10 + fontheight); - tbsize_addbutton(&tbsize_results[18], 163, 2, 326, 10 + fontheight); - tbsize_addbutton(&tbsize_results[18], 326, 2, 489, 10 + fontheight); - tbsize_addbutton(&tbsize_results[18], 489, 2, 652, 10 + fontheight); - tbsize_addbutton(&tbsize_results[18], 652, 2, 819, 10 + fontheight); - tbsize_addbutton(&tbsize_results[18], 819, 2, 850, 10 + fontheight); + tbsize_addbutton(&tbsize_results[18], 0, 2, buttonwidth, 10 + fontheight); + tbsize_addbutton(&tbsize_results[18], buttonwidth, 2, 2*buttonwidth, 10 + fontheight); + tbsize_addbutton(&tbsize_results[18], 2*buttonwidth, 2, 3*buttonwidth, 10 + fontheight); + tbsize_addbutton(&tbsize_results[18], 3*buttonwidth, 2, 4*buttonwidth, 10 + fontheight); + tbsize_addbutton(&tbsize_results[18], 4*buttonwidth, 2, 5*buttonwidth + 4, 10 + fontheight); + tbsize_addbutton(&tbsize_results[18], 5*buttonwidth + 4, 2, 5*buttonwidth + 4 + string_width(STRING2) + 11, 10 + fontheight); tbsize_results[19] = init_tbsize_result(6, 0, 0, 672, 28, 978, 38); - tbsize_addbutton(&tbsize_results[19], 0, 0, 163, 22 + fontheight); - tbsize_addbutton(&tbsize_results[19], 163, 0, 326, 22 + fontheight); - tbsize_addbutton(&tbsize_results[19], 326, 0, 489, 22 + fontheight); - tbsize_addbutton(&tbsize_results[19], 489, 0, 652, 22 + fontheight); - tbsize_addbutton(&tbsize_results[19], 652, 0, 819, 22 + fontheight); - tbsize_addbutton(&tbsize_results[19], 819, 0, 850, 22 + fontheight); + tbsize_addbutton(&tbsize_results[19], 0, 0, buttonwidth, 22 + fontheight); + tbsize_addbutton(&tbsize_results[19], buttonwidth, 0, 2*buttonwidth, 22 + fontheight); + tbsize_addbutton(&tbsize_results[19], 2*buttonwidth, 0, 3*buttonwidth, 22 + fontheight); + tbsize_addbutton(&tbsize_results[19], 3*buttonwidth, 0, 4*buttonwidth, 22 + fontheight); + tbsize_addbutton(&tbsize_results[19], 4*buttonwidth, 0, 5*buttonwidth + 4, 22 + fontheight); + tbsize_addbutton(&tbsize_results[19], 5*buttonwidth + 4, 0, 5*buttonwidth + 4 + string_width(STRING2) + 11, 22 + fontheight); tbsize_results[20] = init_tbsize_result(3, 0, 0, 672, 100, 239, 102); tbsize_addbutton(&tbsize_results[20], 0, 2, 100, 102); @@ -948,10 +966,10 @@ static void init_tbsize_results(void) { tbsize_results[21] = init_tbsize_result(3, 0, 0, 672, 42, 185, 40); tbsize_addbutton(&tbsize_results[21], 0, 2, 75, 40); tbsize_addbutton(&tbsize_results[21], 75, 2, 118, 40); - tbsize_addbutton(&tbsize_results[21], 118, 2, 185, 40); + tbsize_addbutton(&tbsize_results[21], 118, 2, 165 + string_width(STRING2), 40); tbsize_results[22] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); - tbsize_addbutton(&tbsize_results[22], 0, 2, 67, 40); + tbsize_addbutton(&tbsize_results[22], 0, 2, 47 + string_width(STRING2), 40); tbsize_results[23] = init_tbsize_result(2, 0, 0, 672, 42, 67, 41); tbsize_addbutton(&tbsize_results[23], 0, 2, 672, 25 + fontheight); @@ -1025,7 +1043,7 @@ static TBBUTTON buttons3[] = { {0, 30, TBSTATE_ENABLED, 0, {0, }, 0, 0}, {0, 31, TBSTATE_ENABLED, 0, {0, }, 0, 1}, {0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1}, - {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)"Tst"} + {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2} }; static void test_sizes(void) @@ -1111,7 +1129,7 @@ static void test_sizes(void) check_sizes(); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[0]); /* TB_ADDSTRING resets the size */ - SendMessageA(hToolbar, TB_ADDSTRING, 0, (LPARAM)"A\0MMMMMMMMMMMMM\0"); + SendMessageA(hToolbar, TB_ADDSTRING, 0, (LPARAM) STRING0 "\0" STRING1 "\0"); check_button_size(hToolbar, 23, 23 + fontheight); check_sizes(); /* TB_SETBUTTONSIZE can be used to crop the text */ @@ -1145,7 +1163,7 @@ static void test_sizes(void) CHECK_IMAGELIST(16, 14, 12); rebuild_toolbar(&hToolbar); - SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"A\0MMMMMMMMMMMMM\0"); + SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)STRING0 "\0" STRING1 "\0"); /* the height is increased after a TB_ADDSTRING */ check_button_size(hToolbar, 23, 23 + fontheight); SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); @@ -1155,13 +1173,13 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); /* an BTNS_AUTOSIZE button is also considered when computing the new size */ SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[2]); - check_button_size(hToolbar, 163, 23 + fontheight); + check_button_size(hToolbar, 7 + string_width(STRING1), 23 + fontheight); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[0]); check_sizes(); /* delete button doesn't change the buttons size */ SendMessageA(hToolbar, TB_DELETEBUTTON, 2, 0); SendMessageA(hToolbar, TB_DELETEBUTTON, 1, 0); - check_button_size(hToolbar, 163, 23 + fontheight); + check_button_size(hToolbar, 7 + string_width(STRING1), 23 + fontheight); /* TB_INSERTBUTTONS will */ SendMessageA(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons2[0]); check_button_size(hToolbar, 23, 22); @@ -1198,11 +1216,11 @@ static void test_sizes(void) ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); check_button_size(hToolbar, 27, 21) /* the text is taken into account */ - SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"A\0MMMMMMMMMMMMM\0"); + SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)STRING0 "\0" STRING1 "\0"); SendMessageA(hToolbar, TB_ADDBUTTONS, 4, (LPARAM)buttons3); - check_button_size(hToolbar, 163, 22 + fontheight); + check_button_size(hToolbar, 7 + string_width(STRING1), 22 + fontheight); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, 0) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); - check_button_size(hToolbar, 163, 8 + fontheight); + check_button_size(hToolbar, 7 + string_width(STRING1), 8 + fontheight); /* the style change also comes into effect */ check_sizes(); SetWindowLong(hToolbar, GWL_STYLE, GetWindowLong(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); @@ -1214,9 +1232,9 @@ static void test_sizes(void) ImageList_Destroy(himl2); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); - check_button_size(hToolbar, 27, 23 + fontheight); + check_button_size(hToolbar, 7 + string_width(STRING2), 23 + fontheight); SendMessageA(hToolbar, TB_DELETEBUTTON, 0, 0); - check_button_size(hToolbar, 27, 23 + fontheight); + check_button_size(hToolbar, 7 + string_width(STRING2), 23 + fontheight); rebuild_toolbar(&hToolbar);

1 0

Paul Vriens : shell32: Update Serbian (Latin and Cyrillic) translations.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 2ab1b7c816c811329bf9285f8d33281c6cb54287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab1b7c816c811329bf9285f8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 6 12:51:59 2010 +0100 shell32: Update Serbian (Latin and Cyrillic) translations. Translation by Đorđe Vasiljević. --- dlls/shell32/shell32_Sr.rc | 491 ++++++++++++++++++++++++-------------------- 1 files changed, 268 insertions(+), 223 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ab1b7c816c811329bf92…

1 0

Paul Vriens : user32: Update Serbian (Latin and Cyrillic) translations.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 3d20c8777f873861302d3e55c1c404c2563f0656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d20c8777f873861302d3e55c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 6 13:05:17 2010 +0100 user32: Update Serbian (Latin and Cyrillic) translations. Translation by Đorđe Vasiljević. --- dlls/user32/resources/user32_Sr.rc | 70 ++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/user32/resources/user32_Sr.rc b/dlls/user32/resources/user32_Sr.rc index c83b5a4..3c530a2 100644 --- a/dlls/user32/resources/user32_Sr.rc +++ b/dlls/user32/resources/user32_Sr.rc @@ -1,6 +1,7 @@ /* * Copyright 2010 Nenad Vujic * Paul Vriens + * Copyright 2010 Đorđe Vasiljević * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,29 +26,29 @@ LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN SYSMENU MENU { - MENUITEM "&Obnovi", 61728 - MENUITEM "&Pomeri", 61456 + MENUITEM "&Povrati", 61728 + MENUITEM "Pr&emesti", 61456 MENUITEM "&Veličina", 61440 - MENUITEM "&Smanji", 61472 - MENUITEM "&Ceo ekran", 61488 + MENUITEM "&Umanji", 61472 + MENUITEM "U&većaj", 61488 MENUITEM SEPARATOR MENUITEM "&Zatvori\tAlt-F4", 61536 MENUITEM SEPARATOR - MENUITEM "O &Wine...", 61761 + MENUITEM "&O Wine-u...", 61761 } EDITMENU MENU { POPUP "" BEGIN - MENUITEM "&Opozovi", EM_UNDO + MENUITEM "&Opozivi", EM_UNDO MENUITEM SEPARATOR - MENUITEM "Ise&ci", WM_CUT - MENUITEM "&Kopiraj", WM_COPY + MENUITEM "&Iseci", WM_CUT + MENUITEM "&Umnoži", WM_COPY MENUITEM "&Ubaci", WM_PASTE - MENUITEM "O&briši", WM_CLEAR + MENUITEM "Iz&briši", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "Izaberi &Sve", EM_SETSEL + MENUITEM "Izaberi &sve", EM_SETSEL END } @@ -56,62 +57,61 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "O&tkaži", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&U redu", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Otkaži", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Prekini", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Po&kusaj ponovo", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ignoriši", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Pokušaj &ponovo", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Zanemari", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Da", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ne", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Probaj ponovo", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Pok&ušaj ponovo", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nastavi", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Pomoć", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Izaberi prozor" +CAPTION "Izbor" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ - DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + DEFPUSHBUTTON "U redu", IDOK, 75, 100, 35, 14 PUSHBUTTON "Otkaži", IDCANCEL, 120, 100, 35, 14 END - STRINGTABLE { IDS_ERROR "Greška" - IDS_MDI_MOREWINDOWS "&Vise Prozora..." + IDS_MDI_MOREWINDOWS "&Više prozora..." } LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC SYSMENU MENU { - MENUITEM "&Обнови", 61728 - MENUITEM "&Помери", 61456 + MENUITEM "&Поврати", 61728 + MENUITEM "Пр&емести", 61456 MENUITEM "&Величина", 61440 - MENUITEM "С&мањи", 61472 - MENUITEM "Цео &екран", 61488 + MENUITEM "&Умањи", 61472 + MENUITEM "У&већај", 61488 MENUITEM SEPARATOR MENUITEM "&Затвори\tAlt-F4", 61536 MENUITEM SEPARATOR - MENUITEM "&O Wine...", 61761 + MENUITEM "&О Wine-у...", 61761 } EDITMENU MENU { POPUP "" BEGIN - MENUITEM "&Опозови", EM_UNDO + MENUITEM "&Опозиви", EM_UNDO MENUITEM SEPARATOR - MENUITEM "Исе&ци", WM_CUT - MENUITEM "&Копирај", WM_COPY + MENUITEM "&Исеци", WM_CUT + MENUITEM "&Умножи", WM_COPY MENUITEM "&Убаци", WM_PASTE - MENUITEM "&Обриши", WM_CLEAR + MENUITEM "Из&бриши", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "Изабери &Све", EM_SETSEL + MENUITEM "Изабери &све", EM_SETSEL END } @@ -120,25 +120,25 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "&ОK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&У реду", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Откажи", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Прекини", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Покушај поново", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Игнриши", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Покушај &поново", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Занемари", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Да", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Не", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Пробај поново", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Пок&ушај поново", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Настави", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Помоћ", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Изабери прозор" +CAPTION "Избор" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ - DEFPUSHBUTTON "ОK", IDOK, 75, 100, 35, 14 + DEFPUSHBUTTON "У реду", IDOK, 75, 100, 35, 14 PUSHBUTTON "Откажи", IDCANCEL, 120, 100, 35, 14 END

1 0

Paul Vriens : appwiz.cpl: Update Serbian (Latin and Cyrillic) translations.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: ec3ce4b05cf1a2b4b19da991baf3b5ab8a91e072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3ce4b05cf1a2b4b19da991b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 6 15:05:10 2010 +0100 appwiz.cpl: Update Serbian (Latin and Cyrillic) translations. Translation by Đorđe Vasiljević. --- dlls/appwiz.cpl/Sr.rc | 71 +++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec3ce4b05cf1a2b4b19da…

1 0

Paul Vriens : comctl32: Update Serbian (Latin and Cyrillic) translations.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: afc5bf72c47f35b1d89c829d190726fdd38cf36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc5bf72c47f35b1d89c829d1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 6 15:15:25 2010 +0100 comctl32: Update Serbian (Latin and Cyrillic) translations. Translation by Đorđe Vasiljević. --- dlls/comctl32/comctl_Sr.rc | 61 ++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/comctl_Sr.rc b/dlls/comctl32/comctl_Sr.rc index 8681ecb..5a41c79 100644 --- a/dlls/comctl32/comctl_Sr.rc +++ b/dlls/comctl32/comctl_Sr.rc @@ -1,6 +1,7 @@ /* * Copyright 2010 Nenad Vujic * Paul Vriens + * Copyright 2010 Đorđe Vasiljević * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,48 +26,48 @@ LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Detalji za %s" +CAPTION "Svojstva za %s" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + DEFPUSHBUTTON "U redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "Otkaži", IDCANCEL,58,122,50,14 PUSHBUTTON "&Primeni", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Pomoć", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 + CONTROL "Jezičak", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Čarobnjak" +CAPTION "Vodič" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Nazad", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Sledeće >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Završi", IDC_FINISH_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Napred >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Kraj", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Otkaži", IDCANCEL,178,138,50,14 PUSHBUTTON "Pomoć", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + CONTROL "Jezičak", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE END IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Podesi Toolbar" +CAPTION "Prilagodi alatnicu" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Zatvori", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&esetuj", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Poništi", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "&Pomoć", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Pomeri &Gore", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Pomeri &Dole", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "D&ostupni tasteri:", -1,4,5,84,10 + PUSHBUTTON "Pomeri na&gore", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Pomeri na&dole", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Dostupni dugmići:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Dodaj ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- &Ukloni", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbar tasteri:", -1,182,5,78,10 + LTEXT "&Dugmići na alatnici:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END @@ -78,12 +79,12 @@ STRINGTABLE STRINGTABLE { IDM_TODAY "Danas:" - IDM_GOTODAY "Idi na danas" + IDM_GOTODAY "Pređi na današnji dan" } STRINGTABLE { - IDS_SEPARATOR "Odvajanje" + IDS_SEPARATOR "Razdvajač" } STRINGTABLE @@ -95,48 +96,48 @@ LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Детаљи за %s" +CAPTION "Својства за %s" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "ОK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + DEFPUSHBUTTON "У реду", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "Откажи", IDCANCEL,58,122,50,14 PUSHBUTTON "&Примени", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Помоћ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Таб", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 + CONTROL "Језичак", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Чаробњак" +CAPTION "Водич" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Назад", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Следеће >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Заврши", IDC_FINISH_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Напред >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Крај", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Откажи", IDCANCEL,178,138,50,14 PUSHBUTTON "Помоћ", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Таб", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + CONTROL "Језичак", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE END IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Подеси Тулбар" +CAPTION "Прилагоди алатницу" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Затвори", IDCANCEL,308,6,44,14 - PUSHBUTTON "Р&есетуј", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Поништи", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "&Помоћ", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Помери &Горе", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Помери &Доле", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Д&оступни тастери:", -1,4,5,84,10 + PUSHBUTTON "Помери на&горе", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Помери на&доле", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Доступни дугмићи:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Додај ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- &Уклони", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Тулбар тастери:", -1,182,5,78,10 + LTEXT "&Дугмићи на алатници:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END @@ -148,12 +149,12 @@ STRINGTABLE STRINGTABLE { IDM_TODAY "Данас:" - IDM_GOTODAY "Иди на данас" + IDM_GOTODAY "Пређи на данашњи дан" } STRINGTABLE { - IDS_SEPARATOR "Одвајање" + IDS_SEPARATOR "Раздвајач" } STRINGTABLE

1 0

Jacek Caban : jscript: Added Date.setYear stub implementation.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 668f417b9d3a0de724e5b65a7e13aee4444e353c URL: http://source.winehq.org/git/wine.git/?a=commit;h=668f417b9d3a0de724e5b65a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 6 21:29:19 2010 +0100 jscript: Added Date.setYear stub implementation. --- dlls/jscript/date.c | 10 ++++++++++ dlls/jscript/tests/api.js | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d058f8f..3be8a36 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -91,6 +91,7 @@ static const WCHAR setUTCMonthW[] = {'s','e','t','U','T','C','M','o','n','t','h' static const WCHAR setFullYearW[] = {'s','e','t','F','u','l','l','Y','e','a','r',0}; static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l','Y','e','a','r',0}; static const WCHAR getYearW[] = {'g','e','t','Y','e','a','r',0}; +static const WCHAR setYearW[] = {'s','e','t','Y','e','a','r',0}; static const WCHAR UTCW[] = {'U','T','C',0}; static const WCHAR parseW[] = {'p','a','r','s','e',0}; @@ -2023,6 +2024,14 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return S_OK; } +/* ECMA-262 3rd Edition B2.5 */ +static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT Date_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -2074,6 +2083,7 @@ static const builtin_prop_t Date_props[] = { {setUTCMinutesW, Date_setUTCMinutes, PROPF_METHOD|3}, {setUTCMonthW, Date_setUTCMonth, PROPF_METHOD|2}, {setUTCSecondsW, Date_setUTCSeconds, PROPF_METHOD|2}, + {setYearW, Date_setYear, PROPF_METHOD|1}, {toDateStringW, Date_toDateString, PROPF_METHOD}, {toGMTStringW, Date_toGMTString, PROPF_METHOD}, {toLocaleDateStringW, Date_toLocaleDateString, PROPF_METHOD}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6d88b53..f35d11a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2136,6 +2136,7 @@ testFunctions(Date.prototype, [ ["setUTCMinutes", 3], ["setUTCMonth", 2], ["setUTCSeconds", 2], + ["setYear", 1], ["toDateString", 0], ["toLocaleDateString", 0], ["toLocaleString", 0],

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_nodeTypeString implementations.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 8036509c09efce63c346d308de3f48bcb158eb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8036509c09efce63c346d308d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 7 20:28:36 2010 +0100 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_nodeTypeString implementations. --- dlls/msxml3/attribute.c | 6 +++- dlls/msxml3/cdata.c | 6 +++- dlls/msxml3/comment.c | 6 +++- dlls/msxml3/docfrag.c | 6 +++- dlls/msxml3/domdoc.c | 8 ++++- dlls/msxml3/element.c | 6 +++- dlls/msxml3/entityref.c | 6 +++- dlls/msxml3/node.c | 70 +++------------------------------------------- dlls/msxml3/pi.c | 7 ++++- dlls/msxml3/text.c | 6 +++- 10 files changed, 52 insertions(+), 75 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index e7e8f48..e634867 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -370,7 +370,11 @@ static HRESULT WINAPI domattr_get_nodeTypeString( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR attributeW[] = {'a','t','t','r','i','b','u','t','e',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(attributeW, p); } static HRESULT WINAPI domattr_get_text( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index d602bfa..e4f24c5 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -381,7 +381,11 @@ static HRESULT WINAPI domcdata_get_nodeTypeString( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR cdatasectionW[] = {'c','d','a','t','a','s','e','c','t','i','o','n',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(cdatasectionW, p); } static HRESULT WINAPI domcdata_get_text( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 5402a54..6ea3e71 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -374,7 +374,11 @@ static HRESULT WINAPI domcomment_get_nodeTypeString( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(commentW, p); } static HRESULT WINAPI domcomment_get_text( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index ec86579..2dcb894 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -378,7 +378,11 @@ static HRESULT WINAPI domfrag_get_nodeTypeString( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR documentfragmentW[] = {'d','o','c','u','m','e','n','t','f','r','a','g','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(documentfragmentW, p); } static HRESULT WINAPI domfrag_get_text( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8e12098..985d33a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1190,10 +1190,14 @@ static HRESULT WINAPI domdoc_cloneNode( static HRESULT WINAPI domdoc_get_nodeTypeString( IXMLDOMDocument3 *iface, - BSTR* nodeType ) + BSTR *p) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), nodeType ); + static const WCHAR documentW[] = {'d','o','c','u','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(documentW, p); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 1400088..f1d38ee 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -386,7 +386,11 @@ static HRESULT WINAPI domelem_get_nodeTypeString( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR elementW[] = {'e','l','e','m','e','n','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(elementW, p); } static HRESULT WINAPI domelem_get_text( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 570d711..698f1e5 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -372,7 +372,11 @@ static HRESULT WINAPI entityref_get_nodeTypeString( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR entityreferenceW[] = {'e','n','t','i','t','y','r','e','f','e','r','e','n','c','e',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(entityreferenceW, p); } static HRESULT WINAPI entityref_get_text( diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 0b81418..3c6748b 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -521,69 +521,6 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) return S_OK; } -static HRESULT WINAPI xmlnode_get_nodeTypeString( - IXMLDOMNode *iface, - BSTR* xmlnodeType) -{ - xmlnode *This = impl_from_IXMLDOMNode( iface ); - const xmlChar *str; - - TRACE("(%p)->(%p)\n", This, xmlnodeType ); - - if (!xmlnodeType) - return E_INVALIDARG; - - if ( !This->node ) - return E_FAIL; - - switch( This->node->type ) - { - case XML_ATTRIBUTE_NODE: - str = (const xmlChar*) "attribute"; - break; - case XML_CDATA_SECTION_NODE: - str = (const xmlChar*) "cdatasection"; - break; - case XML_COMMENT_NODE: - str = (const xmlChar*) "comment"; - break; - case XML_DOCUMENT_NODE: - str = (const xmlChar*) "document"; - break; - case XML_DOCUMENT_FRAG_NODE: - str = (const xmlChar*) "documentfragment"; - break; - case XML_ELEMENT_NODE: - str = (const xmlChar*) "element"; - break; - case XML_ENTITY_NODE: - str = (const xmlChar*) "entity"; - break; - case XML_ENTITY_REF_NODE: - str = (const xmlChar*) "entityreference"; - break; - case XML_NOTATION_NODE: - str = (const xmlChar*) "notation"; - break; - case XML_PI_NODE: - str = (const xmlChar*) "processinginstruction"; - break; - case XML_TEXT_NODE: - str = (const xmlChar*) "text"; - break; - default: - FIXME("Unknown node type (%d)\n", This->node->type); - str = This->node->name; - break; - } - - *xmlnodeType = bstr_from_xmlChar( str ); - if (!*xmlnodeType) - return S_FALSE; - - return S_OK; -} - static inline xmlChar* trim_whitespace(xmlChar* str) { xmlChar* ret = str; @@ -1344,7 +1281,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = xmlnode_hasChildNodes, xmlnode_get_ownerDocument, NULL, - xmlnode_get_nodeTypeString, + NULL, xmlnode_get_text, NULL, NULL, @@ -1726,7 +1663,10 @@ static HRESULT WINAPI unknode_get_nodeTypeString( BSTR* p) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + + FIXME("(%p)->(%p)\n", This, p); + + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI unknode_get_text( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 44ccb96..9ada032 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -388,7 +388,12 @@ static HRESULT WINAPI dom_pi_get_nodeTypeString( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR processinginstructionW[] = + {'p','r','o','c','e','s','s','i','n','g','i','n','s','t','r','u','c','t','i','o','n',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(processinginstructionW, p); } static HRESULT WINAPI dom_pi_get_text( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 47bb1f0..9b25008 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -387,7 +387,11 @@ static HRESULT WINAPI domtext_get_nodeTypeString( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(&This->node), p ); + static const WCHAR textW[] = {'t','e','x','t',0}; + + TRACE("(%p)->(%p)\n", This, p); + + return return_bstr(textW, p); } static HRESULT WINAPI domtext_get_text(

1 0

Detlef Riekenberg : ntdll: Add stubs for Rtl[G/S]etCurrentTransaction.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 5e95d7039ebd1d4fa245886983514963cb6c2bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e95d7039ebd1d4fa24588698… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 7 22:20:02 2010 +0100 ntdll: Add stubs for Rtl[G/S]etCurrentTransaction. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/rtl.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8df3d8c..1a33595 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -619,6 +619,7 @@ @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetCurrentDirectory_U(long ptr) @ stdcall RtlGetCurrentPeb() +@ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetElementGenericTable # @ stub RtlGetElementGenericTableAvl @@ -825,6 +826,7 @@ @ stdcall RtlSetCriticalSectionSpinCount(ptr long) @ stdcall RtlSetCurrentDirectory_U(ptr) @ stdcall RtlSetCurrentEnvironment(wstr ptr) +@ stdcall RtlSetCurrentTransaction(ptr) @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetEnvironmentVariable(ptr ptr ptr) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 5b8527b..a81c8e7 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1323,3 +1323,21 @@ DWORD WINAPI RtlGetThreadErrorMode( void ) { return NtCurrentTeb()->HardErrorDisabled; } + +/****************************************************************************** + * RtlGetCurrentTransaction [NTDLL.@] + */ +HANDLE WINAPI RtlGetCurrentTransaction(void) +{ + FIXME("() :stub\n"); + return NULL; +} + +/****************************************************************************** + * RtlSetCurrentTransaction [NTDLL.@] + */ +BOOL WINAPI RtlSetCurrentTransaction(HANDLE new_transaction) +{ + FIXME("(%p) :stub\n", new_transaction); + return FALSE; +}

1 0

Vladimir Panteleev : winex11: Add X11DRV_PALETTE_GetColor function to resolve any COLORREF to an RGB.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: d7d5fb0abf6b59329b237937b432e26fb45ab067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d5fb0abf6b59329b237937b… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Sun Nov 7 05:15:13 2010 +0200 winex11: Add X11DRV_PALETTE_GetColor function to resolve any COLORREF to an RGB. --- dlls/winex11.drv/palette.c | 50 ++++++++++++++++++++++++++++++++++++++----- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index adff6c1..a7a6b35 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -874,6 +874,49 @@ static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) } /*********************************************************************** + * X11DRV_PALETTE_GetColor + * + * Resolve PALETTEINDEX/PALETTERGB/DIBINDEX COLORREFs to an RGB COLORREF. + */ +COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) +{ + HPALETTE hPal = GetCurrentObject(physDev->hdc, OBJ_PAL ); + unsigned char spec_type = color >> 24; + unsigned idx = color & 0xffff; + PALETTEENTRY entry; + RGBQUAD quad; + + switch(spec_type) + { + case 2: /* PALETTERGB */ + idx = GetNearestPaletteIndex( hPal, color ); + /* fall through to PALETTEINDEX */ + + case 1: /* PALETTEINDEX */ + if (!GetPaletteEntries( hPal, idx, 1, &entry )) + { + WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); + return 0; + } + return RGB( entry.peRed, entry.peGreen, entry.peBlue ); + + case 0x10: /* DIBINDEX */ + if( GetDIBColorTable( physDev->hdc, idx, 1, &quad ) != 1 ) { + WARN("DIBINDEX(%x) : idx %d is out of bounds, assuming black\n", color , idx); + return 0; + } + return RGB( quad.rgbRed, quad.rgbGreen, quad.rgbBlue ); + + default: + color &= 0xffffff; + /* fall through to RGB */ + + case 0: /* RGB */ + return color; + } +} + +/*********************************************************************** * X11DRV_PALETTE_ToPhysical * * Return the physical color closest to 'color'. @@ -898,16 +941,11 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) unsigned long red, green, blue; unsigned idx = color & 0xffff; - RGBQUAD quad; switch(spec_type) { case 0x10: /* DIBINDEX */ - if( GetDIBColorTable( physDev->hdc, idx, 1, &quad ) != 1 ) { - WARN("DIBINDEX(%x) : idx %d is out of bounds, assuming black\n", color , idx); - return 0; - } - color = RGB( quad.rgbRed, quad.rgbGreen, quad.rgbBlue ); + color = X11DRV_PALETTE_GetColor( physDev, color ); break; case 1: /* PALETTEINDEX */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f0c0dc6..4412f3e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -502,6 +502,7 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color); extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); +extern COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ); extern int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color); extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask);

1 0

Vladimir Panteleev : winex11: Correctly handle non-RGB COLORREFs in BRUSH_SelectSolidBrush.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 208aeedcda948134ea08fa91a3ef00a9b8cb1d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208aeedcda948134ea08fa91a… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Sun Nov 7 04:38:02 2010 +0200 winex11: Correctly handle non-RGB COLORREFs in BRUSH_SelectSolidBrush. --- dlls/winex11.drv/brush.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index ffbf4cb..61f1a86 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -183,17 +183,18 @@ static Pixmap BRUSH_DitherMono( COLORREF color ) */ static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color ) { + COLORREF colorRGB = X11DRV_PALETTE_GetColor( physDev, color ); if ((physDev->depth > 1) && (screen_depth <= 8) && !X11DRV_IsSolidColor( color )) { /* Dithered brush */ - physDev->brush.pixmap = BRUSH_DitherColor( color, physDev->depth ); + physDev->brush.pixmap = BRUSH_DitherColor( colorRGB, physDev->depth ); physDev->brush.fillStyle = FillTiled; physDev->brush.pixel = 0; } - else if (physDev->depth == 1 && color != WHITE && color != BLACK) + else if (physDev->depth == 1 && colorRGB != WHITE && colorRGB != BLACK) { physDev->brush.pixel = 0; - physDev->brush.pixmap = BRUSH_DitherMono( color ); + physDev->brush.pixmap = BRUSH_DitherMono( colorRGB ); physDev->brush.fillStyle = FillTiled; } else

1 0