July 2009 - Wine-commits - list.winehq.org

Vladimir Pankratov : comdlg32: Convert the Russian resources to UTF-8.
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: 743225914f14842d926f40bdf3641a2eae883894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743225914f14842d926f40bdf… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:15:55 2009 +0500 comdlg32: Convert the Russian resources to UTF-8. --- dlls/comdlg32/cdlg_Ru.rc | 531 +++++++++++++++++++++++----------------------- 1 files changed, 267 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=743225914f14842d926f4…

1 0

Vladimir Pankratov : avifile: Convert the Russian resources to UTF-8.
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: 6f81330eb44a48be68875366617738b20d4a0cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f81330eb44a48be688753666… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:15:25 2009 +0500 avifile: Convert the Russian resources to UTF-8. --- dlls/avifil32/avifile_Ru.rc | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/avifil32/avifile_Ru.rc b/dlls/avifil32/avifile_Ru.rc index 512bf46..12ac27d 100644 --- a/dlls/avifil32/avifile_Ru.rc +++ b/dlls/avifil32/avifile_Ru.rc @@ -20,35 +20,38 @@ #include "avifile_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Настройки сжатия" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&�� :",-1,2,5,154,10 + LTEXT "&Выберите поток:",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&��...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&�� ",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + PUSHBUTTON "&Опции...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&Прослаивать каждые",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "��",-1,129,43,36,9 - LTEXT "�� :",-1,3,56,73,9 - LTEXT "�� ",IDC_FORMATTEXT,75,56,90,26 + LTEXT "фрейма",-1,129,43,36,9 + LTEXT "Текущий формат:",-1,3,56,73,9 + LTEXT "Это место сдаётся в аренду",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "��",IDCANCEL,170,61,50,14 + PUSHBUTTON "Отмена",IDCANCEL,170,61,50,14 END STRINGTABLE DISCARDABLE { - IDS_WAVESTREAMFORMAT "�� : %s" - IDS_WAVEFILETYPE "�� " - IDS_ALLMULTIMEDIA "�� " - IDS_ALLFILES "�� (*.*)(a)*.*" - IDS_VIDEO "��" - IDS_AUDIO "��" + IDS_WAVESTREAMFORMAT "Звуковой поток: %s" + IDS_WAVEFILETYPE "Звуковой поток" + IDS_ALLMULTIMEDIA "Все файлы мультимедиа" + IDS_ALLFILES "Все файлы (*.*)(a)*.*" + IDS_VIDEO "видео" + IDS_AUDIO "аудио" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "�� avi-�� Wine" - IDS_UNCOMPRESSED "�� " + IDS_AVIFILETYPE "Обработчик по умолчанию avi-файлов в Wine" + IDS_UNCOMPRESSED "без сжатия" }

1 0

Vladimir Pankratov : browseui: Convert the Russian resources to UTF-8.
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: 436683fb968c131a224e82d275bb7b8869a9e31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=436683fb968c131a224e82d27… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:15:33 2009 +0500 browseui: Convert the Russian resources to UTF-8. --- dlls/browseui/rsrc_Ru.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/rsrc_Ru.rc b/dlls/browseui/rsrc_Ru.rc index 40e26f9..31c9ec0 100644 --- a/dlls/browseui/rsrc_Ru.rc +++ b/dlls/browseui/rsrc_Ru.rc @@ -18,11 +18,14 @@ #include "resids.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_CANCELLING "��..." + IDS_CANCELLING "Отмена..." } IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 @@ -34,6 +37,6 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 - PUSHBUTTON "&��", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Отмена", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX }

1 0

Vladimir Pankratov : comctl32: Convert the Russian resources to UTF-8.
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: 65fac0d6646ffec6d8365558c2e34485e6fb0ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65fac0d6646ffec6d8365558c… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:15:41 2009 +0500 comctl32: Convert the Russian resources to UTF-8. --- dlls/comctl32/comctl_Ru.rc | 53 +++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/comctl_Ru.rc b/dlls/comctl32/comctl_Ru.rc index 511559b..9cba44d 100644 --- a/dlls/comctl32/comctl_Ru.rc +++ b/dlls/comctl32/comctl_Ru.rc @@ -20,31 +20,34 @@ #include "comctl32.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_PROPSHEET DIALOG DISCARDABLE 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 "OK", 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 + 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 "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG DISCARDABLE 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 - PUSHBUTTON "��", IDCANCEL,178,138,50,14 - PUSHBUTTON "&��", IDHELP,235,138,50,14,WS_GROUP + PUSHBUTTON "< &Назад", IDC_BACK_BUTTON,71,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 "Tab", 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 @@ -53,39 +56,39 @@ END IDD_TBCUSTOMIZE DIALOG DISCARDABLE 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_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 + DEFPUSHBUTTON "&Закрыть", IDCANCEL,308,6,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 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 + PUSHBUTTON "&Добавить ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Удалить", IDC_REMOVE_BTN,131,62,44,14 + 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 STRINGTABLE DISCARDABLE { - IDS_CLOSE "��" + IDS_CLOSE "Закрыть" } STRINGTABLE DISCARDABLE { - IDM_TODAY "��:" - IDM_GOTODAY "�� " + IDM_TODAY "Сегодня:" + IDM_GOTODAY "Текущая дата" } STRINGTABLE DISCARDABLE { - IDS_SEPARATOR "��" + IDS_SEPARATOR "Разделитель" } STRINGTABLE DISCARDABLE { - HKY_NONE "��" + HKY_NONE "Нет" }

1 0

Vladimir Pankratov : appwiz.cpl: Convert the Russian resources to UTF-8.
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: fe4e1f43edb8e6ccc7910d52f1487cbac761a1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4e1f43edb8e6ccc7910d52f… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jul 24 14:15:12 2009 +0500 appwiz.cpl: Convert the Russian resources to UTF-8. --- dlls/appwiz.cpl/Ru.rc | 57 +++++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index e3b0018..4de5991 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -21,57 +21,60 @@ #include "res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_CPL_TITLE, "��/�� " - IDS_CPL_DESC, "�� , �� ." - IDS_TAB1_TITLE, "��" + IDS_CPL_TITLE, "Установка/Удаление программ" + IDS_CPL_DESC, "Позволяет устанавливать новое ПО, или удалять существующее с Вашего компьютера." + IDS_TAB1_TITLE, "Приложения" - IDS_UNINSTALL_FAILED, "�� , '%s'. �� ?" - IDS_NOT_SPECIFIED, "��" + IDS_UNINSTALL_FAILED, "Невозможно выполнить, '%s'. Вы хотите удалить программу из списка?" + IDS_NOT_SPECIFIED, "Отсутствует" - IDS_COLUMN_NAME, "��" - IDS_COLUMN_PUBLISHER, "��" - IDS_COLUMN_VERSION, "��" + IDS_COLUMN_NAME, "Название" + IDS_COLUMN_PUBLISHER, "Издатель" + IDS_COLUMN_VERSION, "Версия" - IDS_REMOVE, "&��..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_REMOVE, "&Удалить..." + IDS_MODIFY_REMOVE, "&Изменить/Удалить..." } IDD_MAIN DIALOG 0, 0, 320, 235 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "��/��" +CAPTION "Установка/Удаление" FONT 8, "MS Shell Dlg" { -CONTROL "�� CD-ROM, �� , �� .", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 - CONTROL "��&��...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 +CONTROL "Чтобы установить программу с CD-ROM, дискеты или жёсткого диска, нажмите Установить.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Ус&тановить...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "&�� . �� , �� /��.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 55, 270, 32 + CONTROL "&Перечисленные программы можно удалить или переустановить автоматически. Чтобы удалить программу или изменить состав установленных компонентов, выберите нужный пункт списка и нажмите кнопку Установить/Удалить.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 55, 270, 32 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "&�� ...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 198, 94, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 - CONTROL "&��...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "&Сведения о поддержке...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 198, 94, 14 + CONTROL "&Изменить...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Удалить...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Сведения о поддержке" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "�� %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 23 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 33, 60, 8 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 43, 60, 8 - CONTROL "�� :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 53, 60, 8 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 63, 64, 8 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 73, 68, 8 - CONTROL "�� 'Readme':", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 83, 60, 8 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 93, 60, 8 - CONTROL "��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 103, 60, 8 + CONTROL "Перечисленная информация может быть использована для получения технической поддержки приложения %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 23 + CONTROL "Издатель:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 33, 60, 8 + CONTROL "Версия:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 43, 60, 8 + CONTROL "Контактное лицо:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 53, 60, 8 + CONTROL "Поддержка:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 63, 64, 8 + CONTROL "Телефон:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 73, 68, 8 + CONTROL "Файл 'Readme':", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 83, 60, 8 + CONTROL "Обновления:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 93, 60, 8 + CONTROL "Комментарий:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 103, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 33, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 43, 136, 8 CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 53, 136, 8

1 0

Rein Klazes : user32: Fail if inserting a submenu would create a loop in the menu hierarchy.
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: 38dbe067c370610d0a2423d1ce7702e36ddd2679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38dbe067c370610d0a2423d1c… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Jul 24 09:18:34 2009 +0200 user32: Fail if inserting a submenu would create a loop in the menu hierarchy. --- dlls/user32/menu.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/user32/tests/menu.c | 4 ++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 460378c..203340a 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -147,6 +147,11 @@ typedef struct #define MENU_TOP_MARGIN 3 #define MENU_BOTTOM_MARGIN 2 +/* maximum allowed depth of any branch in the menu tree. + * This value is slightly larger than in windows (25) to + * stay on the safe side. */ +#define MAXMENUDEPTH 30 + /* (other menu->FocusedItem values give the position of the focused item) */ #define NO_SELECTED_ITEM 0xffff @@ -4627,6 +4632,30 @@ static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicod /********************************************************************** + * MENU_depth + * + * detect if there are loops in the menu tree (or the depth is too large) + */ +static int MENU_depth( POPUPMENU *pmenu, int depth) +{ + int i; + MENUITEM *item; + + depth++; + if( depth > MAXMENUDEPTH) return depth; + item = pmenu->items; + for( i = 0; i < pmenu->nItems && depth <= MAXMENUDEPTH; i++, item++){ + POPUPMENU *psubmenu = MENU_GetMenu( item->hSubMenu); + if( psubmenu){ + int bdepth = MENU_depth( psubmenu, depth); + if( bdepth > depth) depth = bdepth; + } + } + return depth; +} + + +/********************************************************************** * SetMenuItemInfo_common * * Note: does not support the MIIM_TYPE flag. Use the MIIM_FTYPE, @@ -4664,10 +4693,14 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, if (menu->hSubMenu) { POPUPMENU *subMenu = MENU_GetMenu(menu->hSubMenu); if (subMenu) { + if( MENU_depth( subMenu, 0) > MAXMENUDEPTH) { + ERR( "Loop detected in menu hierarchy or maximum menu depth exceeded!\n"); + menu->hSubMenu = 0; + return FALSE; + } subMenu->wFlags |= MF_POPUP; menu->fType |= MF_POPUP; - } - else { + } else { SetLastError( ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7382ec0..a1af944 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3018,6 +3018,7 @@ static void test_menu_maxdepth(void) int i; DWORD ret; + SetLastError(12345678); for( i = 0; i < NR_MENUS; i++) { hmenus[i] = CreatePopupMenu(); if( !hmenus[i]) break; @@ -3028,7 +3029,7 @@ static void test_menu_maxdepth(void) if( !ret) break; } trace("Maximum depth is %d\n", i); -todo_wine + ok( GetLastError() == 12345678, "unexpected error %d\n", GetLastError()); ok( i < NR_MENUS || broken( i == NR_MENUS), /* win98, NT */ "no ( or very large) limit on menu depth!\n"); @@ -3055,7 +3056,6 @@ static void test_menu_circref(void) ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); /* now attempt to change the string of the first item of menu1 */ ret = ModifyMenuA( menu1, (UINT_PTR)menu2, MF_POPUP, (UINT_PTR)menu2, "menu 2"); -todo_wine ok( !ret || broken( ret), /* win98, NT */ "ModifyMenu should have failed.\n");

1 0

Henri Verbeet : wined3d: Return proper NULLs from CreateContext().
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: 9baf7864c5f6bc81d1588f97d0b805f09aab8446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9baf7864c5f6bc81d1588f97d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:18 2009 +0200 wined3d: Return proper NULLs from CreateContext(). --- dlls/wined3d/context.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 336c4d7..413c1d6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1164,7 +1164,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar /* If we still don't have a pixel format, something is very wrong as ChoosePixelFormat barely fails */ if(!iPixelFormat) { ERR("Can't find a suitable iPixelFormat\n"); - return FALSE; + return NULL; } DescribePixelFormat(hdc, iPixelFormat, sizeof(pfd), &pfd); @@ -1183,7 +1183,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar if(!res) { ERR("wglSetPixelFormatWINE failed on HDC=%p for iPixelFormat=%d\n", hdc, iPixelFormat); - return FALSE; + return NULL; } } else if(oldPixelFormat) { /* OpenGL doesn't allow pixel format adjustments. Print an error and continue using the old format. @@ -1191,7 +1191,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar ERR("HDC=%p is already set to iPixelFormat=%d and OpenGL doesn't allow changes!\n", hdc, oldPixelFormat); } else { ERR("SetPixelFormat failed on HDC=%p for iPixelFormat=%d\n", hdc, iPixelFormat); - return FALSE; + return NULL; } } }

1 0

Henri Verbeet : wined3d: Get rid of activeContext.
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: be536ebe2f93e14d8d6f3e84cb2c7834f8223fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be536ebe2f93e14d8d6f3e84c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:17 2009 +0200 wined3d: Get rid of activeContext. --- dlls/wined3d/arb_program_shader.c | 42 ++++++++++++++++++------------------ dlls/wined3d/context.c | 7 ------ dlls/wined3d/device.c | 42 ++++++++++++++++++------------------ dlls/wined3d/drawprim.c | 10 +++++--- dlls/wined3d/surface.c | 10 ++++++-- dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 55 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be536ebe2f93e14d8d6f3…

1 0

Henri Verbeet : wined3d: Explicitly pass the context to surface_load_ds_location().
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: c8fe24d29e50db6e19b2eb5e5c10415162b57d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fe24d29e50db6e19b2eb5e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:16 2009 +0200 wined3d: Explicitly pass the context to surface_load_ds_location(). --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/drawprim.c | 5 +++-- dlls/wined3d/surface.c | 22 +++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa16d9e..7e596b8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4948,19 +4948,19 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa if (vp->X != 0 || vp->Y != 0 || vp->Width < depth_stencil->currentDesc.Width || vp->Height < depth_stencil->currentDesc.Height) { - surface_load_ds_location(This->stencilBufferTarget, location); + surface_load_ds_location(This->stencilBufferTarget, context, location); } else if (This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE] && ( This->stateBlock->scissorRect.left > 0 || This->stateBlock->scissorRect.top > 0 || This->stateBlock->scissorRect.right < depth_stencil->currentDesc.Width || This->stateBlock->scissorRect.bottom < depth_stencil->currentDesc.Height)) { - surface_load_ds_location(This->stencilBufferTarget, location); + surface_load_ds_location(This->stencilBufferTarget, context, location); } else if (Count > 0 && pRects && ( pRects[0].x1 > 0 || pRects[0].y1 > 0 || pRects[0].x2 < depth_stencil->currentDesc.Width || pRects[0].y2 < depth_stencil->currentDesc.Height)) { - surface_load_ds_location(This->stencilBufferTarget, location); + surface_load_ds_location(This->stencilBufferTarget, context, location); } } @@ -6591,8 +6591,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * || ((IWineD3DSurfaceImpl *)This->stencilBufferTarget)->Flags & SFLAG_DISCARD) { surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_DISCARDED); } else { - ActivateContext(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); - surface_load_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); + struct WineD3DContext *context = ActivateContext(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); + surface_load_ds_location(This->stencilBufferTarget, context, SFLAG_DS_OFFSCREEN); surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); } } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 172228b..889ef6b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -558,6 +558,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT numberOfVertice IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *target; + struct WineD3DContext *context; unsigned int i; if (!index_count) return; @@ -579,7 +580,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT numberOfVertice /* Signals other modules that a drawing is in progress and the stateblock finalized */ This->isInDraw = TRUE; - ActivateContext(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); + context = ActivateContext(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); if (This->stencilBufferTarget) { /* Note that this depends on the ActivateContext call above to set @@ -590,7 +591,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT numberOfVertice DWORD location = This->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE] || This->stateBlock->renderState[WINED3DRS_ZENABLE]) - surface_load_ds_location(This->stencilBufferTarget, location); + surface_load_ds_location(This->stencilBufferTarget, context, location); if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) surface_modify_ds_location(This->stencilBufferTarget, location); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cecc460..db33675 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4370,7 +4370,8 @@ void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) { } /* Context activation is done by the caller. */ -void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { +void surface_load_ds_location(IWineD3DSurface *iface, struct WineD3DContext *context, DWORD location) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; @@ -4404,7 +4405,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ - context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, NULL); if (This->texture_target == GL_TEXTURE_RECTANGLE_ARB) { glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); @@ -4439,20 +4440,17 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { device->depth_blt_rb_h = This->currentDesc.Height; } - context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, &device->activeContext->dst_fbo); + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, &context->dst_fbo); GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, device->depth_blt_rb)); checkGLcall("glFramebufferRenderbufferEXT"); - context_attach_depth_stencil_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, iface, FALSE); + context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER_EXT, iface, FALSE); /* Do the actual blit */ surface_depth_blt(This, device->depth_blt_texture, This->currentDesc.Width, This->currentDesc.Height, bind_target); checkGLcall("depth_blt"); - if (device->activeContext->current_fbo) { - context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, &device->activeContext->current_fbo->id); - } else { - context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, NULL); - } + if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER_EXT, &context->current_fbo->id); + else context_bind_fbo(context, GL_FRAMEBUFFER_EXT, NULL); LEAVE_GL(); } else { @@ -4464,14 +4462,12 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { ENTER_GL(); - context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, NULL); surface_depth_blt(This, This->texture_name, This->currentDesc.Width, This->currentDesc.Height, This->texture_target); checkGLcall("depth_blt"); - if (device->activeContext->current_fbo) { - context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, &device->activeContext->current_fbo->id); - } + if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER_EXT, &context->current_fbo->id); LEAVE_GL(); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 545c33c..f2b376a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2533,7 +2533,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect); GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain); -void surface_load_ds_location(IWineD3DSurface *iface, DWORD location); +void surface_load_ds_location(IWineD3DSurface *iface, struct WineD3DContext *context, DWORD location); void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location); void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height); void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name);

1 0

Henri Verbeet : wined3d: Explicitly pass the context to get_drawable_size() .
by Alexandre Julliard 24 Jul '09

24 Jul '09

Module: wine Branch: master Commit: 2c71b853345b07ccc4ae476a212ed32040ce7314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c71b853345b07ccc4ae476a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:15 2009 +0200 wined3d: Explicitly pass the context to get_drawable_size(). --- dlls/wined3d/device.c | 40 +++++++++++++++++++++------------------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/swapchain.c | 11 ++++++----- dlls/wined3d/wined3d_private.h | 10 +++++----- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6edb39e..aa16d9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4888,6 +4888,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa UINT drawable_width, drawable_height; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; IWineD3DSwapChainImpl *swapchain = NULL; + struct WineD3DContext *context; /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the * drawable. After the clear we'll mark the drawable up to date, so we have to make sure that this is true @@ -4923,9 +4924,9 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa } } - ActivateContext(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); + context = ActivateContext(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); - target->get_drawable_size(target, &drawable_width, &drawable_height); + target->get_drawable_size(context, &drawable_width, &drawable_height); ENTER_GL(); @@ -7695,28 +7696,29 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { } } -void get_drawable_size_pbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { - IWineD3DDeviceImpl *dev = This->resource.wineD3DDevice; - /* The drawable size of a pbuffer render target is the current pbuffer size - */ - *width = dev->pbufferWidth; - *height = dev->pbufferHeight; +void get_drawable_size_pbuffer(struct WineD3DContext *context, UINT *width, UINT *height) +{ + IWineD3DDeviceImpl *device = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.wineD3DDevice; + /* The drawable size of a pbuffer render target is the current pbuffer size. */ + *width = device->pbufferWidth; + *height = device->pbufferHeight; } -void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { - /* The drawable size of a fbo target is the opengl texture size, which is the power of two size - */ - *width = This->pow2Width; - *height = This->pow2Height; +void get_drawable_size_fbo(struct WineD3DContext *context, UINT *width, UINT *height) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)context->current_rt; + /* The drawable size of a fbo target is the opengl texture size, which is the power of two size. */ + *width = surface->pow2Width; + *height = surface->pow2Height; } -void get_drawable_size_backbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { - IWineD3DDeviceImpl *dev = This->resource.wineD3DDevice; +void get_drawable_size_backbuffer(struct WineD3DContext *context, UINT *width, UINT *height) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)context->surface; /* The drawable size of a backbuffer / aux buffer offscreen target is the size of the * current context's drawable, which is the size of the back buffer of the swapchain * the active context belongs to. The back buffer of the swapchain is stored as the - * surface the context belongs to. - */ - *width = ((IWineD3DSurfaceImpl *) dev->activeContext->surface)->currentDesc.Width; - *height = ((IWineD3DSurfaceImpl *) dev->activeContext->surface)->currentDesc.Height; + * surface the context belongs to. */ + *width = surface->currentDesc.Width; + *height = surface->currentDesc.Height; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e4de1cf..44c0c06 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4532,7 +4532,7 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, W stateblock->viewport.Width, stateblock->viewport.Height); } else { target = (IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0]; - target->get_drawable_size(target, &width, &height); + target->get_drawable_size(context, &width, &height); glViewport(stateblock->viewport.X, (height - (stateblock->viewport.Y + stateblock->viewport.Height)), @@ -4674,7 +4674,7 @@ static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D UINT width; IWineD3DSurfaceImpl *target = (IWineD3DSurfaceImpl *) stateblock->wineD3DDevice->render_targets[0]; - target->get_drawable_size(target, &width, &height); + target->get_drawable_size(context, &width, &height); /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply * Warning2: Even in windowed mode the coords are relative to the window, not the screen */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 683640a..0994c6d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -402,10 +402,11 @@ WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain * return ctx; } -void get_drawable_size_swapchain(IWineD3DSurfaceImpl *This, UINT *width, UINT *height) { +void get_drawable_size_swapchain(struct WineD3DContext *context, UINT *width, UINT *height) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)context->surface; /* The drawable size of an onscreen drawable is the surface size. - * (Actually: The window size, but the surface is created in window size) - */ - *width = This->currentDesc.Width; - *height = This->currentDesc.Height; + * (Actually: The window size, but the surface is created in window size) */ + *width = surface->currentDesc.Width; + *height = surface->currentDesc.Height; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index be2811b..545c33c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1957,7 +1957,7 @@ struct IWineD3DSurfaceImpl UINT pow2Height; /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ - void (*get_drawable_size)(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); + void (*get_drawable_size)(struct WineD3DContext *context, UINT *width, UINT *height); /* Oversized texture */ RECT glRect; @@ -2051,10 +2051,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb); const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface); -void get_drawable_size_swapchain(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); -void get_drawable_size_backbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); -void get_drawable_size_pbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); -void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); +void get_drawable_size_swapchain(struct WineD3DContext *context, UINT *width, UINT *height); +void get_drawable_size_backbuffer(struct WineD3DContext *context, UINT *width, UINT *height); +void get_drawable_size_pbuffer(struct WineD3DContext *context, UINT *width, UINT *height); +void get_drawable_size_fbo(struct WineD3DContext *context, UINT *width, UINT *height); void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back);

1 0