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

Vladimir Pankratov : comdlg32: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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 July 24, 2009

July 24, 2009

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

Henri Verbeet : wined3d: Manage event queries in the context.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: fb77678e9f1bc5e1baa20f241d2fc00a718496e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb77678e9f1bc5e1baa20f241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:14 2009 +0200 wined3d: Manage event queries in the context. --- dlls/wined3d/context.c | 92 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 15 +------ dlls/wined3d/query.c | 92 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 20 ++++++--- 4 files changed, 146 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb77678e9f1bc5e1baa20…

1 0

Henri Verbeet : wined3d: Manage occlusion queries in the context.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 4ab7af65750bbf0fc9ce16b15ef57eb84a8ce977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab7af65750bbf0fc9ce16b15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:13 2009 +0200 wined3d: Manage occlusion queries in the context. --- dlls/wined3d/context.c | 84 +++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 14 +---- dlls/wined3d/query.c | 101 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 20 ++++++-- 4 files changed, 160 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ab7af65750bbf0fc9ce1…

1 0

Roderick Colenbrander : winex11: XRenderComposite can be inaccurate when scaled x / y source coordinates are passed to it.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 6a1aa9b166a571b219c317a59a000031cd2448ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1aa9b166a571b219c317a59… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jul 22 17:42:14 2009 +0200 winex11: XRenderComposite can be inaccurate when scaled x / y source coordinates are passed to it. Moving this translation to the transformation matrix fixes the problem. --- dlls/winex11.drv/bitblt.c | 3 +- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/xrender.c | 70 ++++++++++++++++++++++++++----------------- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 79078ae..119ac5b 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1438,8 +1438,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT wine_tsx11_unlock(); if(!X11DRV_XRender_GetSrcAreaStretch( physDevSrc, physDevDst, pixmaps[SRC], tmpGC, - xSrc, ySrc, widthSrc, heightSrc, - xDst, yDst, widthDst, heightDst, + widthSrc, heightSrc, widthDst, heightDst, &visRectSrc, &visRectDst)) { if (fStretch) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 10af183..1a7a634 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -269,9 +269,7 @@ extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UIN UINT count, const INT *lpDx); BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - INT xDst, INT yDst, INT widthDst, INT heightDst, RECT *visRectSrc, RECT *visRectDst); extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 6d290ba..072cd25 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1733,6 +1733,41 @@ static void set_xrender_transformation(Picture src_pict, float xscale, float ysc #endif } +/* Helper function for (stretched) blitting using xrender */ +static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, int x_src, int y_src, float xscale, float yscale, int width, int height) +{ + /* Further down a transformation matrix is used for stretching and mirroring the source data. + * xscale/yscale contain the scaling factors for the width and height. In case of mirroring + * we also need a x- and y-offset because without the pixels will be in the wrong quadrant of the x-y plane. + */ + int x_offset = (xscale<0) ? width : 0; + int y_offset = (yscale<0) ? height : 0; + + /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. + * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. + * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ + if(xscale != 1.0 || yscale != 1.0) + { + /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ + if(mask_pict) + set_xrender_transformation(mask_pict, xscale, yscale, x_offset, y_offset); + else + set_xrender_transformation(src_pict, xscale, yscale, x_src + x_offset, y_src + y_offset); + + pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, 0, 0, 0, 0, 0, 0, width, height); + } + else + { + /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ + if(mask_pict) + set_xrender_transformation(mask_pict, 1, 1, 0, 0); + else + set_xrender_transformation(src_pict, 1, 1, 0, 0); + + pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, 0, 0, width, height); + } +} + /****************************************************************************** * AlphaBlend (x11drv.@) */ @@ -1933,34 +1968,28 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - INT xDst, INT yDst, INT widthDst, INT heightDst, RECT *visRectSrc, RECT *visRectDst ) { BOOL stretch = (widthSrc != widthDst) || (heightSrc != heightDst); int width = visRectDst->right - visRectDst->left; int height = visRectDst->bottom - visRectDst->top; + int x_src = physDevSrc->dc_rect.left + visRectSrc->left; + int y_src = physDevSrc->dc_rect.top + visRectSrc->top; WineXRenderFormat *src_format = get_xrender_format_from_pdevice(physDevSrc); WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(physDevDst); Picture src_pict=0, dst_pict=0, mask_pict=0; - /* Further down a transformation matrix is used for stretching and mirroring the source data. - * xscale/yscale contain the scaling factors for the width and height. In case of mirroring - * we also need a x- and y-offset because without the pixels will be in the wrong quadrant of the x-y plane. - */ double xscale = widthSrc/(double)widthDst; double yscale = heightSrc/(double)heightDst; - int xoffset = (xscale<0) ? width : 0; - int yoffset = (yscale<0) ? height : 0; XRenderPictureAttributes pa; pa.subwindow_mode = IncludeInferiors; pa.repeat = RepeatNone; - TRACE("src depth=%d widthSrc=%d heightSrc=%d xSrc=%d ySrc=%d\n", physDevSrc->depth, widthSrc, heightSrc, xSrc, ySrc); - TRACE("dst depth=%d widthDst=%d heightDst=%d xDst=%d yDst=%d\n", physDevDst->depth, widthDst, heightDst, xDst, yDst); + TRACE("src depth=%d widthSrc=%d heightSrc=%d xSrc=%d ySrc=%d\n", physDevSrc->depth, widthSrc, heightSrc, x_src, y_src); + TRACE("dst depth=%d widthDst=%d heightDst=%d\n", physDevDst->depth, widthDst, heightDst); if(!X11DRV_XRender_Installed) { @@ -1981,10 +2010,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE { TRACE("Source and destination depth match and no stretching needed falling back to XCopyArea\n"); wine_tsx11_lock(); - XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0); + XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, x_src, y_src, width, height, 0, 0); wine_tsx11_unlock(); return TRUE; } @@ -1998,7 +2024,6 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE /* We use the source drawable as a mask */ wine_tsx11_lock(); mask_pict = pXRenderCreatePicture(gdi_display, physDevSrc->drawable, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - set_xrender_transformation(mask_pict, xscale, yscale, xoffset, yoffset); /* Use backgroundPixel as the foreground color */ src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); @@ -2007,12 +2032,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &col, 0, 0, width, height); - /* Notice that the source coordinates have to be relative to the transformated source picture */ - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, - (physDevSrc->dc_rect.left + visRectSrc->left)/xscale, - (physDevSrc->dc_rect.top + visRectSrc->top)/yscale, - 0, 0, 0, 0, - width, height); + xrender_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); if(mask_pict) pXRenderFreePicture(gdi_display, mask_pict); @@ -2024,18 +2044,12 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE src_pict = pXRenderCreatePicture(gdi_display, physDevSrc->drawable, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - set_xrender_transformation(src_pict, xscale, yscale, xoffset, yoffset); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - /* Notice that the source coordinates have to be relative to the transformated source picture */ - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, - (physDevSrc->dc_rect.left + visRectSrc->left)/xscale, - (physDevSrc->dc_rect.top + visRectSrc->top)/yscale, - 0, 0, 0, 0, - width, height); + xrender_blit(src_pict, 0, dst_pict, x_src, y_src, xscale, yscale, width, height); if(src_pict) pXRenderFreePicture(gdi_display, src_pict); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict);

1 0

Paul Vriens : jscript: Add Dutch translations.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 75fc48d4c5b9800333bcf68b19c7a4305cef59aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc48d4c5b9800333bcf68b1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 24 10:32:38 2009 +0200 jscript: Add Dutch translations. --- dlls/jscript/jscript_Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index 50cf92d..71ba6b5 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -26,9 +26,14 @@ STRINGTABLE DISCARDABLE IDS_INVALID_CALL_ARG "Ongeldige procedure-aanroep of argument" IDS_NO_PROPERTY "Dit object ondersteunt deze eigenschap of methode niet" IDS_ARG_NOT_OPT "Argument is niet optioneel" + IDS_SYNTAX_ERROR "Syntax fout" + IDS_SEMICOLON "';' verwacht" + IDS_LBRACKET "'(' verwacht" + IDS_RBRACKET "')' verwacht" IDS_NOT_FUNC "Functie verwacht" IDS_NOT_DATE "'[object]' is geen datum object" IDS_NOT_NUM "Getal verwacht" + IDS_ILLEGAL_ASSIGN "Ongeldige toekenning" IDS_UNDEFINED "'|' is ongedefinieerd" IDS_NOT_BOOL "Boolean object verwacht" IDS_INVALID_LENGTH "Array lengte moet een eindig, positief geheel getal zijn"

1 0

Rein Klazes : ws2_32: Do not make the unix file descriptor blocking. Too many places in the socket code assume it is not.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: d8f962e69cb92e4a6cc438394cff42779621af16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f962e69cb92e4a6cc438394… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Jul 24 10:29:17 2009 +0200 ws2_32: Do not make the unix file descriptor blocking. Too many places in the socket code assume it is not. --- dlls/ws2_32/socket.c | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1492640..2eb5837 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2406,25 +2406,11 @@ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) SetLastError(WSAEINVAL); return SOCKET_ERROR; } - fd = get_sock_fd( s, 0, NULL ); - if (fd != -1) - { - int ret; - if (*argp) - { - _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); - ret = fcntl( fd, F_SETFL, O_NONBLOCK ); - } - else - { - _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); - ret = fcntl( fd, F_SETFL, 0 ); - } - release_sock_fd( s, fd ); - if (!ret) return 0; - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); - } - return SOCKET_ERROR; + if (*argp) + _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); + else + _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); + return 0; case WS_SIOCATMARK: newcmd=SIOCATMARK;

1 0

Piotr Caban : jscript: Throw more SyntaxErrors in parser.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f3d24fdda90c0e7255df49c80b451143bd6afa5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d24fdda90c0e7255df49c80… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:23 2009 +0200 jscript: Throw more SyntaxErrors in parser. --- dlls/jscript/parser.y | 18 +++++++++++------- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 50092e5..a0ae471 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -202,7 +202,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <statement> Finally %type <statement_list> StatementList StatementList_opt %type <parameter_list> FormalParameterList FormalParameterList_opt -%type <expr> Expression Expression_opt +%type <expr> Expression Expression_opt Expression_err %type <expr> ExpressionNoIn ExpressionNoIn_opt %type <expr> FunctionExpression %type <expr> AssignmentExpression AssignmentExpressionNoIn @@ -381,16 +381,16 @@ ExpressionStatement /* ECMA-262 3rd Edition 12.5 */ IfStatement - : kIF left_bracket Expression right_bracket Statement kELSE Statement + : kIF left_bracket Expression_err right_bracket Statement kELSE Statement { $$ = new_if_statement(ctx, $3, $5, $7); } - | kIF left_bracket Expression right_bracket Statement %prec LOWER_THAN_ELSE + | kIF left_bracket Expression_err right_bracket Statement %prec LOWER_THAN_ELSE { $$ = new_if_statement(ctx, $3, $5, NULL); } /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE left_bracket Expression right_bracket semicolon_opt + : kDO Statement kWHILE left_bracket Expression_err right_bracket semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } - | kWHILE left_bracket Expression right_bracket Statement + | kWHILE left_bracket Expression_err right_bracket Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } | kFOR left_bracket ExpressionNoIn_opt { if(!explicit_error(ctx, $3, ';')) YYABORT; } @@ -404,9 +404,9 @@ IterationStatement { if(!explicit_error(ctx, $7, ';')) YYABORT; } semicolon Expression_opt right_bracket Statement { $$ = new_for_statement(ctx, $4, NULL, $7, $10, $12); } - | kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement + | kFOR left_bracket LeftHandSideExpression kIN Expression_err right_bracket Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } - | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement + | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression_err right_bracket Statement { $$ = new_forin_statement(ctx, $4, NULL, $6, $8); } /* ECMA-262 3rd Edition 12.7 */ @@ -493,6 +493,10 @@ Expression_opt : /* empty */ { $$ = NULL; } | Expression { $$ = $1; } +Expression_err + : Expression { $$ = $1; } + | error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; } + /* ECMA-262 3rd Edition 11.14 */ Expression : AssignmentExpression { $$ = $1; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 720e7c0..53b7f92 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1331,5 +1331,7 @@ exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); exception_test(function() {eval("for(i=0")}, "SyntaxError", -2146827284); exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); +exception_test(function() {eval("while(")}, "SyntaxError", -2146827286); +exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); reportSuccess();

1 0

Piotr Caban : jscript: Added "Expected ';'" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 67c8a3e9194d6609e9a2cb626d4dbe01841f530d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c8a3e9194d6609e9a2cb626… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:20 2009 +0200 jscript: Added "Expected ';'" error. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 30 +++++++++++++++++++++++++----- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 ++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 96db21f..b47e951 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" + IDS_SEMICOLON "Expected ';'" IDS_LBRACKET "Expected '('" IDS_RBRACKET "Expected ')'" IDS_NOT_FUNC "Function expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index bcb2c24..50092e5 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -26,6 +26,7 @@ static int parser_error(const char*); static void set_error(parser_ctx_t*,UINT); +static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); @@ -391,10 +392,18 @@ IterationStatement { $$ = new_while_statement(ctx, TRUE, $5, $2); } | kWHILE left_bracket Expression right_bracket Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } - | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt right_bracket Statement - { $$ = new_for_statement(ctx, NULL, $3, $5, $7, $9); } - | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt right_bracket Statement - { $$ = new_for_statement(ctx, $4, NULL, $6, $8, $10); } + | kFOR left_bracket ExpressionNoIn_opt + { if(!explicit_error(ctx, $3, ';')) YYABORT; } + semicolon Expression_opt + { if(!explicit_error(ctx, $6, ';')) YYABORT; } + semicolon Expression_opt right_bracket Statement + { $$ = new_for_statement(ctx, NULL, $3, $6, $9, $11); } + | kFOR left_bracket kVAR VariableDeclarationListNoIn + { if(!explicit_error(ctx, $4, ';')) YYABORT; } + semicolon Expression_opt + { if(!explicit_error(ctx, $7, ';')) YYABORT; } + semicolon Expression_opt right_bracket Statement + { $$ = new_for_statement(ctx, $4, NULL, $7, $10, $12); } | kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement @@ -494,7 +503,6 @@ Expression ExpressionNoIn_opt : /* empty */ { $$ = NULL; } | ExpressionNoIn { $$ = $1; } - | error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; } /* ECMA-262 3rd Edition 11.14 */ ExpressionNoIn @@ -806,6 +814,10 @@ right_bracket : ')' | error { set_error(ctx, IDS_RBRACKET); YYABORT; } +semicolon + : ';' + | error { set_error(ctx, IDS_SEMICOLON); YYABORT; } + %% static BOOL allow_auto_semicolon(parser_ctx_t *ctx) @@ -1449,6 +1461,14 @@ static void set_error(parser_ctx_t *ctx, UINT error) ctx->hres = JSCRIPT_ERROR|error; } +static BOOL explicit_error(parser_ctx_t *ctx, void *obj, WCHAR next) +{ + if(obj || *(ctx->ptr-1)==next) return TRUE; + + set_error(ctx, IDS_SYNTAX_ERROR); + return FALSE; +} + static expression_t *new_identifier_expression(parser_ctx_t *ctx, const WCHAR *identifier) { diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 969ea13..0503961 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -23,6 +23,7 @@ #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA +#define IDS_SEMICOLON 0x03EC #define IDS_LBRACKET 0x03ED #define IDS_RBRACKET 0x03EE #define IDS_NOT_FUNC 0x138A diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7e43ffb..720e7c0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1329,5 +1329,7 @@ exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282); exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); +exception_test(function() {eval("for(i=0")}, "SyntaxError", -2146827284); +exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); reportSuccess();

1 0

Piotr Caban : jscript: Add "illegal assignment" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: c6412d98d9b3693bd7c15e6aa59d8b53ca737360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6412d98d9b3693bd7c15e6aa… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:16 2009 +0200 jscript: Add "illegal assignment" error. --- dlls/jscript/engine.c | 6 ++---- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c79c48f..ff5e6a8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -232,10 +232,8 @@ static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) /* ECMA-262 3rd Edition 8.7.2 */ static HRESULT put_value(script_ctx_t *ctx, exprval_t *ref, VARIANT *v, jsexcept_t *ei) { - if(ref->type != EXPRVAL_IDREF) { - FIXME("throw ReferemceError\n"); - return E_FAIL; - } + if(ref->type != EXPRVAL_IDREF) + return throw_reference_error(ctx, ei, IDS_ILLEGAL_ASSIGN, NULL); return disp_propput(ref->u.idref.disp, ref->u.idref.id, ctx->lcid, v, ei, NULL/*FIXME*/); } diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index d2470c7..96db21f 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -32,6 +32,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" + IDS_ILLEGAL_ASSIGN "Illegal assignment" IDS_UNDEFINED "'|' is undefined" IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 5fcbbae..969ea13 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -28,6 +28,7 @@ #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 +#define IDS_ILLEGAL_ASSIGN 0x1390 #define IDS_UNDEFINED 0x1391 #define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3ccb362..7e43ffb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1328,5 +1328,6 @@ exception_test(function() {eval("switch");}, "SyntaxError", -2146827283); exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282); exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); +exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); reportSuccess();

1 0

Piotr Caban : jscript: Added "Expected ')'" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 2fba39df272ba4c5f504b0121bd1a9b1942e0ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fba39df272ba4c5f504b0121… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:13 2009 +0200 jscript: Added "Expected ')'" error. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 28 ++++++++++++++++------------ dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 3 +++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 325df41..d2470c7 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -28,6 +28,7 @@ STRINGTABLE DISCARDABLE IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" IDS_LBRACKET "Expected '('" + IDS_RBRACKET "Expected ')'" IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3777478..bcb2c24 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -267,7 +267,7 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction Identifier_opt left_bracket FormalParameterList_opt ')' '{' FunctionBody '}' + : KFunction Identifier_opt left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } KFunction @@ -380,24 +380,24 @@ ExpressionStatement /* ECMA-262 3rd Edition 12.5 */ IfStatement - : kIF left_bracket Expression ')' Statement kELSE Statement + : kIF left_bracket Expression right_bracket Statement kELSE Statement { $$ = new_if_statement(ctx, $3, $5, $7); } - | kIF left_bracket Expression ')' Statement %prec LOWER_THAN_ELSE + | kIF left_bracket Expression right_bracket Statement %prec LOWER_THAN_ELSE { $$ = new_if_statement(ctx, $3, $5, NULL); } /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE left_bracket Expression ')' semicolon_opt + : kDO Statement kWHILE left_bracket Expression right_bracket semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } - | kWHILE left_bracket Expression ')' Statement + | kWHILE left_bracket Expression right_bracket Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } - | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt right_bracket Statement { $$ = new_for_statement(ctx, NULL, $3, $5, $7, $9); } - | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt right_bracket Statement { $$ = new_for_statement(ctx, $4, NULL, $6, $8, $10); } - | kFOR left_bracket LeftHandSideExpression kIN Expression ')' Statement + | kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } - | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression ')' Statement + | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement { $$ = new_forin_statement(ctx, $4, NULL, $6, $8); } /* ECMA-262 3rd Edition 12.7 */ @@ -417,7 +417,7 @@ ReturnStatement /* ECMA-262 3rd Edition 12.10 */ WithStatement - : kWITH left_bracket Expression ')' Statement + : kWITH left_bracket Expression right_bracket Statement { $$ = new_with_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.12 */ @@ -427,7 +427,7 @@ LabelledStatement /* ECMA-262 3rd Edition 12.11 */ SwitchStatement - : kSWITCH left_bracket Expression ')' CaseBlock + : kSWITCH left_bracket Expression right_bracket CaseBlock { $$ = new_switch_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.11 */ @@ -472,7 +472,7 @@ TryStatement /* ECMA-262 3rd Edition 12.14 */ Catch - : kCATCH left_bracket tIdentifier ')' Block + : kCATCH left_bracket tIdentifier right_bracket Block { $$ = new_catch_block(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.14 */ @@ -802,6 +802,10 @@ left_bracket : '(' | error { set_error(ctx, IDS_LBRACKET); YYABORT; } +right_bracket + : ')' + | error { set_error(ctx, IDS_RBRACKET); YYABORT; } + %% static BOOL allow_auto_semicolon(parser_ctx_t *ctx) diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index c0e73f9..5fcbbae 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -24,6 +24,7 @@ #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA #define IDS_LBRACKET 0x03ED +#define IDS_RBRACKET 0x03EE #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index efc8578..3ccb362 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1325,5 +1325,8 @@ exception_test(function() {eval("while");}, "SyntaxError", -2146827283); exception_test(function() {eval("for");}, "SyntaxError", -2146827283); exception_test(function() {eval("with");}, "SyntaxError", -2146827283); exception_test(function() {eval("switch");}, "SyntaxError", -2146827283); +exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282); +exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); +exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); reportSuccess();

1 0

Piotr Caban : jscript: Added "Expected '('" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 29d9f09992a3fa8821cb77588e1afe1b1c552f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d9f09992a3fa8821cb77588… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:04 2009 +0200 jscript: Added "Expected '('" error. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 40 ++++++++++++++++++++++++++-------------- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 7 +++++++ 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 154479a..325df41 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" + IDS_LBRACKET "Expected '('" IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index adec6bc..3777478 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -25,6 +25,7 @@ #define YYPARSE_PARAM ctx static int parser_error(const char*); +static void set_error(parser_ctx_t*,UINT); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); @@ -266,7 +267,7 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction Identifier_opt '(' FormalParameterList_opt ')' '{' FunctionBody '}' + : KFunction Identifier_opt left_bracket FormalParameterList_opt ')' '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } KFunction @@ -379,24 +380,24 @@ ExpressionStatement /* ECMA-262 3rd Edition 12.5 */ IfStatement - : kIF '(' Expression ')' Statement kELSE Statement + : kIF left_bracket Expression ')' Statement kELSE Statement { $$ = new_if_statement(ctx, $3, $5, $7); } - | kIF '(' Expression ')' Statement %prec LOWER_THAN_ELSE + | kIF left_bracket Expression ')' Statement %prec LOWER_THAN_ELSE { $$ = new_if_statement(ctx, $3, $5, NULL); } /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE '(' Expression ')' semicolon_opt + : kDO Statement kWHILE left_bracket Expression ')' semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } - | kWHILE '(' Expression ')' Statement + | kWHILE left_bracket Expression ')' Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } - | kFOR '(' ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt ')' Statement { $$ = new_for_statement(ctx, NULL, $3, $5, $7, $9); } - | kFOR '(' kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt ')' Statement { $$ = new_for_statement(ctx, $4, NULL, $6, $8, $10); } - | kFOR '(' LeftHandSideExpression kIN Expression ')' Statement + | kFOR left_bracket LeftHandSideExpression kIN Expression ')' Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } - | kFOR '(' kVAR VariableDeclarationNoIn kIN Expression ')' Statement + | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression ')' Statement { $$ = new_forin_statement(ctx, $4, NULL, $6, $8); } /* ECMA-262 3rd Edition 12.7 */ @@ -416,7 +417,7 @@ ReturnStatement /* ECMA-262 3rd Edition 12.10 */ WithStatement - : kWITH '(' Expression ')' Statement + : kWITH left_bracket Expression ')' Statement { $$ = new_with_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.12 */ @@ -426,8 +427,8 @@ LabelledStatement /* ECMA-262 3rd Edition 12.11 */ SwitchStatement - : kSWITCH '(' Expression ')' CaseBlock - { $$ = new_switch_statement(ctx, $3, $5); } + : kSWITCH left_bracket Expression ')' CaseBlock + { $$ = new_switch_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.11 */ CaseBlock @@ -471,8 +472,8 @@ TryStatement /* ECMA-262 3rd Edition 12.14 */ Catch - : kCATCH '(' tIdentifier ')' Block - { $$ = new_catch_block(ctx, $3, $5); } + : kCATCH left_bracket tIdentifier ')' Block + { $$ = new_catch_block(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.14 */ Finally @@ -493,6 +494,7 @@ Expression ExpressionNoIn_opt : /* empty */ { $$ = NULL; } | ExpressionNoIn { $$ = $1; } + | error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; } /* ECMA-262 3rd Edition 11.14 */ ExpressionNoIn @@ -796,6 +798,10 @@ semicolon_opt : ';' | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} } +left_bracket + : '(' + | error { set_error(ctx, IDS_LBRACKET); YYABORT; } + %% static BOOL allow_auto_semicolon(parser_ctx_t *ctx) @@ -1434,6 +1440,12 @@ static int parser_error(const char *str) return 0; } +static void set_error(parser_ctx_t *ctx, UINT error) +{ + ctx->hres = JSCRIPT_ERROR|error; +} + + static expression_t *new_identifier_expression(parser_ctx_t *ctx, const WCHAR *identifier) { identifier_expression_t *ret = parser_alloc(ctx, sizeof(identifier_expression_t)); diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index fd2cb82..c0e73f9 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -23,6 +23,7 @@ #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA +#define IDS_LBRACKET 0x03ED #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a71c0aa..efc8578 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1318,5 +1318,12 @@ exception_test(function() {arr.toString = Function.prototype.toString; arr.toStr exception_test(function() {date();}, "TypeError", -2146823286); exception_test(function() {arr();}, "TypeError", -2146823286); exception_test(function() {eval("for(i=0;) {}");}, "SyntaxError", -2146827286); +exception_test(function() {eval("function {};");}, "SyntaxError", -2146827283); +exception_test(function() {eval("if");}, "SyntaxError", -2146827283); +exception_test(function() {eval("do i=0; while");}, "SyntaxError", -2146827283); +exception_test(function() {eval("while");}, "SyntaxError", -2146827283); +exception_test(function() {eval("for");}, "SyntaxError", -2146827283); +exception_test(function() {eval("with");}, "SyntaxError", -2146827283); +exception_test(function() {eval("switch");}, "SyntaxError", -2146827283); reportSuccess();

1 0

Piotr Caban : jscript: Throw SyntaxError in eval function.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 98223b96e74d9d7403b00ba4acd11c6ebf74f3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98223b96e74d9d7403b00ba4a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:35:56 2009 +0200 jscript: Throw SyntaxError in eval function. --- dlls/jscript/error.c | 5 +++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 2 ++ dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 2 +- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index fb37fba..25a3836 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -424,7 +424,8 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH DispatchEx *err; HRESULT hres; - LoadStringW(jscript_hinstance, id, buf, sizeof(buf)/sizeof(WCHAR)); + buf[0] = '\0'; + LoadStringW(jscript_hinstance, id&0xFFFF, buf, sizeof(buf)/sizeof(WCHAR)); if(str) pos = strchrW(buf, '|'); if(pos) { @@ -435,7 +436,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH WARN("%s\n", debugstr_w(buf)); - id |= 0x800A0000; + id |= JSCRIPT_ERROR; hres = create_error(ctx, constr, &id, buf, &err); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 1ec113d..7d59e19 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -330,7 +330,7 @@ static HRESULT JSGlobal_eval(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA hres = script_parse(dispex->ctx, V_BSTR(arg), NULL, &parser_ctx); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_w(V_BSTR(arg)), hres); - return hres; + return throw_syntax_error(dispex->ctx, ei, hres, NULL); } hres = exec_source(dispex->ctx->exec_ctx, parser_ctx, parser_ctx->source, ei, retv); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index f99299f..70c9fea 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -33,6 +33,8 @@ #include "wine/unicode.h" #include "wine/list.h" +#define JSCRIPT_ERROR 0x800A0000 + typedef struct _script_ctx_t script_ctx_t; typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index df8ee2f..154479a 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -26,6 +26,7 @@ STRINGTABLE DISCARDABLE IDS_INVALID_CALL_ARG "Invalid procedure call or argument" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" + IDS_SYNTAX_ERROR "Syntax error" IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d47d40d..adec6bc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1568,7 +1568,7 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite return E_OUTOFMEMORY; parser_ctx->ref = 1; - parser_ctx->hres = E_FAIL; + parser_ctx->hres = JSCRIPT_ERROR|IDS_SYNTAX_ERROR; parser_ctx->is_html = delimiter && !strcmpiW(delimiter, html_tagW); parser_ctx->begin = parser_ctx->ptr = code; diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 0f5af9b..fd2cb82 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -22,6 +22,7 @@ #define IDS_INVALID_CALL_ARG 0x0005 #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 +#define IDS_SYNTAX_ERROR 0x03EA #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7428413..a71c0aa 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1317,5 +1317,6 @@ exception_test(function() {not_existing_variable.something();}, "TypeError", -21 exception_test(function() {arr.toString = Function.prototype.toString; arr.toString();}, "TypeError", -2146823286); exception_test(function() {date();}, "TypeError", -2146823286); exception_test(function() {arr();}, "TypeError", -2146823286); +exception_test(function() {eval("for(i=0;) {}");}, "SyntaxError", -2146827286); reportSuccess();

1 0

Alexandre Julliard : shell32/tests: Fix a couple of failures on Win9x and NT4.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: d1fbdbce3224f125cf36f1c851dd559bf55e0358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fbdbce3224f125cf36f1c85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 11:44:41 2009 +0200 shell32/tests: Fix a couple of failures on Win9x and NT4. --- dlls/shell32/tests/shfldr_special.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 8c14e51..06533ba 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -46,7 +46,6 @@ static void test_parse_for_entire_network(void) LPITEMIDLIST pidl; DWORD attr = ~0; DWORD expected_attr; - DWORD alter_attr; hr = SHGetDesktopFolder(&psfDesktop); ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); @@ -70,7 +69,9 @@ static void test_parse_for_entire_network(void) attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); - if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) + if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || + hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || + hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) { win_skip("'EntireNetwork' is not available on Win9x, NT4 and Vista\n"); return; @@ -78,12 +79,12 @@ static void test_parse_for_entire_network(void) ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); - expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_STORAGEANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - alter_attr = (expected_attr & (~SFGAO_STORAGEANCESTOR)) | SFGAO_STREAM; + expected_attr = SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_HASPROPSHEET|SFGAO_CANLINK; todo_wine - ok(attr == expected_attr || - attr == alter_attr, /* win2k */ - "attr should be 0x%x or 0x%x, not 0x%x\n", expected_attr, alter_attr, attr); + ok(attr == expected_attr || /* winme, nt4 */ + attr == (expected_attr | SFGAO_STREAM) || /* win2k */ + attr == (expected_attr | SFGAO_STORAGEANCESTOR), /* others */ + "attr should be 0x%x, not 0x%x\n", expected_attr, attr); ILFree(pidl); }

1 0

Andrew Talbot : ddraw: Constify some variables.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 99139d96718f2e5978555512bea9b08fa4b9305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99139d96718f2e5978555512b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 23 21:46:45 2009 +0100 ddraw: Constify some variables. --- dlls/ddraw/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 439e99f..360604e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5937,8 +5937,8 @@ static BOOL is_mip_level_subset(IDirectDrawSurfaceImpl *dest, static void copy_mipmap_chain(IDirect3DDeviceImpl *device, IDirectDrawSurfaceImpl *dest, IDirectDrawSurfaceImpl *src, - POINT *DestPoint, - RECT *SrcRect) + const POINT *DestPoint, + const RECT *SrcRect) { IDirectDrawSurfaceImpl *src_level, *dest_level; IDirectDrawSurface7 *temp;

1 0

Owen Rudge : winhlp32: Ensure Open dialog is modal.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 395acfc545413fc048b7532e11e6fc8f3ac1de9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=395acfc545413fc048b7532e1… Author: Owen Rudge <owen(a)owenrudge.net> Date: Thu Jul 23 17:18:57 2009 -0300 winhlp32: Ensure Open dialog is modal. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 56244d3..4c2d1ff 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -167,7 +167,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) lpszFile[0]='\0'; openfilename.lStructSize = sizeof(OPENFILENAME); - openfilename.hwndOwner = NULL; + openfilename.hwndOwner = (Globals.active_win ? Globals.active_win->hMainWnd : 0); openfilename.hInstance = Globals.hInstance; openfilename.lpstrFilter = szzFilter; openfilename.lpstrCustomFilter = 0;

1 0

Nikolay Sivov : comctl32/listview: Don' t alter selection mark in LVM_SETITEMSTATE.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 59e59c6bf97540a1c8ca5c248a10b9114cce9608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e59c6bf97540a1c8ca5c248… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:50:12 2009 +0400 comctl32/listview: Don't alter selection mark in LVM_SETITEMSTATE. --- dlls/comctl32/listview.c | 33 --------------------------------- dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4d27ba7..0713308 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8118,39 +8118,6 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE else bResult = LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE); - /* - * Update selection mark - * - * Investigation on windows 2k showed that selection mark was updated - * whenever a new selection was made, but if the selected item was - * unselected it was not updated. - * - * we are probably still not 100% accurate, but this at least sets the - * proper selection mark when it is needed - */ - - if (bResult && (lvItem.state & lvItem.stateMask & LVIS_SELECTED) && - (infoPtr->nSelectionMark == -1)) - { - int i; - for (i = 0; i < infoPtr->nItemCount; i++) - { - if (infoPtr->uCallbackMask & LVIS_SELECTED) - { - if (LISTVIEW_GetItemState(infoPtr, i, LVIS_SELECTED)) - { - infoPtr->nSelectionMark = i; - break; - } - } - else if (ranges_contain(infoPtr->selectionRanges, i)) - { - infoPtr->nSelectionMark = i; - break; - } - } - } - return bResult; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1a7e5d8..888b323 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1990,7 +1990,6 @@ static void test_multiselect(void) r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(3, r); r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); -todo_wine expect(-1, r); style = GetWindowLongPtrA(hwnd, GWL_STYLE); @@ -2022,7 +2021,6 @@ todo_wine r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(1, r); r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); -todo_wine expect(-1, r); /* try to select all on LVS_SINGLESEL */

1 0

Nikolay Sivov : comctl32/listview: Set LVIS_FOCUSED for all items with LVM_SETITEMSTATE not allowed.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 092263f051dca826c8b93fed26ee3dfe2b72a54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=092263f051dca826c8b93fed2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:48:23 2009 +0400 comctl32/listview: Set LVIS_FOCUSED for all items with LVM_SETITEMSTATE not allowed. --- dlls/comctl32/listview.c | 3 +++ dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 05c033e..4d27ba7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8108,6 +8108,9 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL)) return FALSE; + /* focus all isn't allowed */ + if (lvItem.state & lvItem.stateMask & LVIS_FOCUSED) return FALSE; + /* apply to all items */ for (lvItem.iItem = 0; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++) if (!LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE)) bResult = FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index bf87bca..1a7e5d8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2547,10 +2547,10 @@ static void test_ownerdata(void) item.state = LVIS_FOCUSED; g_dump_itemchanged = TRUE; res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); - todo_wine expect(FALSE, res); + expect(FALSE, res); g_dump_itemchanged = FALSE; ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "ownerdata focus all notification", TRUE); + "ownerdata focus all notification", FALSE); /* focus single item, remove all */ item.stateMask = LVIS_FOCUSED; item.state = LVIS_FOCUSED;

1 0

Nikolay Sivov : comctl32/listview: Handle NULL lParam in LVM_SETITEMSTATE.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 440218cfdea41a60b53822e2735afea74630b54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=440218cfdea41a60b53822e27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:46:22 2009 +0400 comctl32/listview: Handle NULL lParam in LVM_SETITEMSTATE. --- dlls/comctl32/listview.c | 1 + dlls/comctl32/tests/listview.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 73781b2..05c033e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10653,6 +10653,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, *((POINT*)lParam)); case LVM_SETITEMSTATE: + if (lParam == 0) return FALSE; return LISTVIEW_SetItemState(infoPtr, (INT)wParam, (LPLVITEMW)lParam); case LVM_SETITEMTEXTA: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9e92202..bf87bca 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1963,6 +1963,10 @@ static void test_multiselect(void) item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items,item_count); + /* try with NULL pointer */ + r = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)NULL); + expect(FALSE, r); + /* select all, check notifications */ ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED);

1 0

Nikolay Sivov : comctl32/listview: Additional tests for LVM_SETITEMSTATE for all items.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 9e222c6cbbb387afa037db04b195d8141f4a35ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e222c6cbbb387afa037db04b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 23 23:43:24 2009 +0400 comctl32/listview: Additional tests for LVM_SETITEMSTATE for all items. --- dlls/comctl32/tests/listview.c | 123 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6454187..9e92202 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -79,6 +79,8 @@ static const WCHAR testparentclassW[] = HWND hwndparent, hwndparentW; /* prevents edit box creation, LVN_BEGINLABELEDIT return value */ BOOL blockEdit; +/* dumps LVN_ITEMCHANGED message data */ +static BOOL g_dump_itemchanged; /* format reported to control: -1 falls to defproc, anything else returned */ INT notifyFormat; @@ -205,7 +207,20 @@ static const struct message ownderdata_select_focus_parent_seq[] = { { 0 } }; -static const struct message ownerdata_select_all_parent_seq[] = { +static const struct message ownerdata_setstate_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_defocus_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message ownerdata_deselect_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ODCACHEHINT }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { 0 } }; @@ -328,6 +343,14 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP "BEGIN" : "END", pScroll->dx, pScroll->dy); } break; + case LVN_ITEMCHANGED: + if (g_dump_itemchanged) + { + NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; + trace("LVN_ITEMCHANGED: item=%d,new=%x,old=%x,changed=%x\n", + nmlv->iItem, nmlv->uNewState, nmlv->uOldState, nmlv->uChanged); + } + break; } break; } @@ -2457,12 +2480,108 @@ static void test_ownerdata(void) item.stateMask = LVIS_SELECTED; item.state = LVIS_SELECTED; + + g_dump_itemchanged = TRUE; res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, res); + g_dump_itemchanged = FALSE; - ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_all_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, "ownerdata select all notification", TRUE); + /* select all again, note that all items are selected already */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, + "ownerdata select all notification", TRUE); + /* deselect all */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_SELECTED; + item.state = 0; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_deselect_all_parent_seq, + "ownerdata deselect all notification", TRUE); + + /* select one, then deselect all */ + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_SELECTED; + item.state = 0; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_deselect_all_parent_seq, + "ownerdata select all notification", TRUE); + + /* remove focused, try to focus all */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + item.stateMask = LVIS_FOCUSED; + item.state = 0; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + item.stateMask = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); + expect(0, res); + /* setting all to focused returns failure value */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + todo_wine expect(FALSE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata focus all notification", TRUE); + /* focus single item, remove all */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessage(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_FOCUSED; + item.state = 0; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_defocus_all_parent_seq, + "ownerdata remove focus all notification", TRUE); + /* set all cut */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_CUT; + item.state = LVIS_CUT; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, + "ownerdata cut all notification", TRUE); + /* all marked cut, try again */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.stateMask = LVIS_CUT; + item.state = LVIS_CUT; + g_dump_itemchanged = TRUE; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + g_dump_itemchanged = FALSE; + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_setstate_all_parent_seq, + "ownerdata cut all notification #2", TRUE); + DestroyWindow(hwnd); /* check notifications on LVM_GETITEM */

1 0

Hans Leidekker : wininet: Update Dutch translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 88813358429d36a58e1eef9bef111b854ae1fcf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88813358429d36a58e1eef9be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 20:57:19 2009 +0200 wininet: Update Dutch translation. --- dlls/wininet/wininet_Nl.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Nl.rc b/dlls/wininet/wininet_Nl.rc index 017bce3..f0e891c 100644 --- a/dlls/wininet/wininet_Nl.rc +++ b/dlls/wininet/wininet_Nl.rc @@ -42,6 +42,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authenticatie vereist" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Voer uw gebruikersnaam en wachtwoord in:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "Gebruikersnaam", -1, 40, 66, 50, 10 + LTEXT "Wachtwoord", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Wachtwoord opslaan (onveilig)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN Verbinding"

1 0

Hans Leidekker : wininet: Use a different pointer for the password in WININET_SetAuthorization.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 50761eac23204148a7fcb5af9b7d97cedacf91ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=50761eac23204148a7fcb5af9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 23 20:56:42 2009 +0200 wininet: Use a different pointer for the password in WININET_SetAuthorization. --- dlls/wininet/dialogs.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 7f150c7..d66e7e3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -242,7 +242,7 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, http_request_t *lpwhr; http_session_t *lpwhs; BOOL ret = FALSE; - LPWSTR p; + LPWSTR p, q; lpwhr = (http_request_t*) WININET_GetObject( hRequest ); if( !lpwhr ) @@ -259,8 +259,8 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, if( !p ) goto done; - p = heap_strdupW(password); - if( !p ) + q = heap_strdupW(password); + if( !q ) { HeapFree(GetProcessHeap(), 0, username); goto done; @@ -274,7 +274,7 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, hIC->lpszProxyUsername = p; HeapFree(GetProcessHeap(), 0, hIC->lpszProxyPassword); - hIC->lpszProxyPassword = p; + hIC->lpszProxyPassword = q; } else { @@ -282,7 +282,7 @@ static BOOL WININET_SetAuthorization( HINTERNET hRequest, LPWSTR username, lpwhs->lpszUserName = p; HeapFree(GetProcessHeap(), 0, lpwhs->lpszPassword); - lpwhs->lpszPassword = p; + lpwhs->lpszPassword = q; } ret = TRUE;

1 0

Frédéric Delanoy : wininet: Update French translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 2b18ed11a5096df4c2256e5614ef4c0246ffe216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b18ed11a5096df4c2256e561… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 23 23:22:51 2009 +0200 wininet: Update French translation. --- dlls/wininet/wininet_Fr.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Fr.rc b/dlls/wininet/wininet_Fr.rc index e12aa6d..74ee208 100644 --- a/dlls/wininet/wininet_Fr.rc +++ b/dlls/wininet/wininet_Fr.rc @@ -49,6 +49,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Annuler", IDCANCEL, 147, 128, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 218, 150 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authentification requise" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Entrez votre nom d'utilisateur et votre mot de passe :", -1, 10, 8, 173, 12 + LTEXT "Serveur", -1, 10, 28, 50, 17 + LTEXT "Domaine", -1, 10, 50, 50, 10 + LTEXT "Utilisateur", -1, 10, 71, 50, 10 + LTEXT "Mot de passe", -1, 10, 90, 50, 10 + LTEXT "" IDC_SERVER, 58, 28, 150, 14, 0 + LTEXT "" IDC_REALM, 58, 48, 150, 14, 0 + EDITTEXT IDC_USERNAME, 58, 68, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 58, 88, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD, + 58, 108, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 87, 128, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 147, 128, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Connexion réseau local (LAN)"

1 0

André Hentschel : wininet: Update German translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f32366a6b952962807919562eabb23aa03ed12bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f32366a6b952962807919562e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 23 19:50:12 2009 +0200 wininet: Update German translation. --- dlls/wininet/wininet_De.rc | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet_De.rc b/dlls/wininet/wininet_De.rc index 4766589..f602a97 100644 --- a/dlls/wininet/wininet_De.rc +++ b/dlls/wininet/wininet_De.rc @@ -1,5 +1,6 @@ /* * Copyright 2004 Henning Gerhardt + * Copyright 2009 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,8 +30,8 @@ FONT 8, "MS Shell Dlg" { LTEXT "Geben Sie Benutzernamen und Kennwort ein:", -1, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 - LTEXT "Realm", -1, 40, 46, 50, 10 - LTEXT "Ben&utzername", -1, 40, 66, 50, 10 + LTEXT "Bereich", -1, 40, 46, 50, 10 + LTEXT "Ben&utzer", -1, 40, 66, 50, 10 LTEXT "Kenn&wort", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 @@ -42,6 +43,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Benutzeranmeldung" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Geben Sie Benutzernamen und Kennwort ein:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Bereich", -1, 40, 46, 50, 10 + LTEXT "Benutzer", -1, 40, 66, 50, 10 + LTEXT "Kennwort", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Dieses &Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN Verbindung"

1 0

Aurimas Fišeras : wininet: Update Lithuanian translation.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: fb374536f0d0c409cd7f7ff6a3942a0c1cedead9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb374536f0d0c409cd7f7ff6a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 23 20:23:29 2009 +0300 wininet: Update Lithuanian translation. --- dlls/wininet/wininet_Lt.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Lt.rc b/dlls/wininet/wininet_Lt.rc index 6cb176c..cd4bf48 100644 --- a/dlls/wininet/wininet_Lt.rc +++ b/dlls/wininet/wininet_Lt.rc @@ -43,6 +43,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Reikalingas tapatumo nustatymas" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Įveskite savo naudotojo vardą ir slaptažodį:", -1, 40, 6, 150, 15 + LTEXT "Serveris", -1, 40, 26, 50, 10 + LTEXT "Sritis", -1, 40, 46, 50, 10 + LTEXT "Naudotojas", -1, 40, 66, 50, 10 + LTEXT "Slaptažodis", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Vietinio tinklo ryšys"

1 0

Juan Lang : winhttp: Only output fixme for unhandled resolve timeout.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 2b99adc2f1b84fca6b582b947c584c70e9b36acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b99adc2f1b84fca6b582b947… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 23 09:12:29 2009 -0700 winhttp: Only output fixme for unhandled resolve timeout. --- dlls/winhttp/session.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 4c93123..7bc61a9 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1169,7 +1169,8 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int return FALSE; } - FIXME("resolve timeout not supported\n"); + if (resolve > 0) + FIXME("resolve timeout (%d) not supported\n", resolve); if (!(request = (request_t *)grab_object( handle ))) {

1 0

Juan Lang : winhttp: Implement connect timeout.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 68039dcaff74876ea2eb9193b8b059c6b437d75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68039dcaff74876ea2eb9193b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 23 09:11:32 2009 -0700 winhttp: Implement connect timeout. --- dlls/winhttp/net.c | 41 ++++++++++++++++++++++++++++++++++----- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 6 ++++- dlls/winhttp/winhttp_private.h | 3 +- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6f2d5f5..ed4d4b9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -287,15 +287,44 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len ) +BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned int addr_len, int timeout ) { - if (connect( conn->socket, sockaddr, addr_len ) == -1) + BOOL ret = FALSE; + int res = 0, state; + + if (timeout > 0) { - WARN("unable to connect to host (%s)\n", strerror(errno)); - set_last_error( sock_get_error( errno ) ); - return FALSE; + state = 1; + ioctlsocket( conn->socket, FIONBIO, &state ); } - return TRUE; + if (connect( conn->socket, sockaddr, addr_len ) < 0) + { + res = sock_get_error( errno ); + if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) + { + struct pollfd pfd; + + pfd.fd = conn->socket; + pfd.events = POLLOUT; + if (poll( &pfd, 1, timeout ) > 0) + ret = TRUE; + else + res = sock_get_error( errno ); + } + } + else + ret = TRUE; + if (timeout > 0) + { + state = 0; + ioctlsocket( conn->socket, FIONBIO, &state ); + } + if (!ret) + { + WARN("unable to connect to host (%d)\n", res); + set_last_error( res ); + } + return ret; } BOOL netconn_secure_connect( netconn_t *conn ) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 83d6117..0efada4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -925,7 +925,7 @@ static BOOL open_connection( request_t *request ) } netconn_set_timeout( &request->netconn, TRUE, request->send_timeout ); netconn_set_timeout( &request->netconn, FALSE, request->recv_timeout ); - if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen )) + if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen, request->connect_timeout )) { netconn_close( &request->netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 27509e1..4c93123 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); +#define DEFAULT_CONNECT_TIMEOUT 60000 #define DEFAULT_SEND_TIMEOUT 30000 #define DEFAULT_RECEIVE_TIMEOUT 30000 @@ -636,6 +637,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o list_add_head( &connect->hdr.children, &request->hdr.entry ); if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; + request->connect_timeout = DEFAULT_CONNECT_TIMEOUT; request->send_timeout = DEFAULT_SEND_TIMEOUT; request->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; @@ -1167,7 +1169,7 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int return FALSE; } - FIXME("resolve and connect timeout not supported\n"); + FIXME("resolve timeout not supported\n"); if (!(request = (request_t *)grab_object( handle ))) { @@ -1182,6 +1184,8 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int return FALSE; } + request->connect_timeout = connect; + if (send < 0) send = 0; request->send_timeout = send; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 97c8f90..83df0c0 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -139,6 +139,7 @@ typedef struct LPWSTR version; LPWSTR raw_headers; netconn_t netconn; + int connect_timeout; int send_timeout; int recv_timeout; LPWSTR status_text; @@ -206,7 +207,7 @@ void send_callback( object_header_t *, DWORD, LPVOID, DWORD ); void close_connection( request_t * ); BOOL netconn_close( netconn_t * ); -BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int ); +BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ); BOOL netconn_connected( netconn_t * ); BOOL netconn_create( netconn_t *, int, int, int ); BOOL netconn_get_next_line( netconn_t *, char *, DWORD * );

1 0

Alexandre Julliard : kernel32: Fetch more information from the DosDevices directory for QueryDosDevice.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f18276fe0bc0bedf5c58c51f53f9491265f500dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18276fe0bc0bedf5c58c51f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 11:01:41 2009 +0200 kernel32: Fetch more information from the DosDevices directory for QueryDosDevice. --- dlls/kernel32/volume.c | 66 ++++++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 0f4161c..9fcd061 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1018,11 +1018,10 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) static const WCHAR prnW[] = {'P','R','N',0}; static const WCHAR comW[] = {'C','O','M',0}; static const WCHAR lptW[] = {'L','P','T',0}; - static const WCHAR rootW[] = {'A',':','\\',0}; static const WCHAR com0W[] = {'\\','?','?','\\','C','O','M','0',0}; static const WCHAR com1W[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','C','O','M','1',0,0}; static const WCHAR lpt1W[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','L','P','T','1',0,0}; - static const WCHAR driveW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','A',':',0}; + static const WCHAR dosdevW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1046,15 +1045,21 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) memcpy( name, devname + HIWORD(dosdev)/sizeof(WCHAR), LOWORD(dosdev) ); name[LOWORD(dosdev)/sizeof(WCHAR)] = 0; } - else if (devname[0] && devname[1] == ':' && !devname[2]) + else { - /* FIXME: should do this for all devices, not just drives */ NTSTATUS status; - WCHAR buffer[sizeof(driveW)/sizeof(WCHAR)]; + WCHAR *buffer; - memcpy( buffer, driveW, sizeof(driveW) ); - buffer[12] = devname[0]; - if ((status = read_nt_symlink( buffer, target, bufsize ))) + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(dosdevW) + strlenW(devname)*sizeof(WCHAR) ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } + memcpy( buffer, dosdevW, sizeof(dosdevW) ); + strcatW( buffer, devname ); + status = read_nt_symlink( buffer, target, bufsize ); + HeapFree( GetProcessHeap(), 0, buffer ); + if (status) { SetLastError( RtlNtStatusToDosError(status) ); return 0; @@ -1062,11 +1067,8 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) ret = strlenW( target ) + 1; goto done; } - else - { - SetLastError( ERROR_BAD_PATHNAME ); - return 0; - } + + /* FIXME: should read NT symlink for all devices */ if (!(path = get_dos_device_path( name ))) return 0; link = read_symlink( path ); @@ -1125,6 +1127,8 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } else /* return a list of all devices */ { + OBJECT_ATTRIBUTES attr; + HANDLE handle; WCHAR *p = target; int i; @@ -1134,6 +1138,8 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) return 0; } + /* FIXME: these should be NT symlinks too */ + memcpy( p, auxW, sizeof(auxW) ); p += sizeof(auxW) / sizeof(WCHAR); memcpy( p, nulW, sizeof(nulW) ); @@ -1180,30 +1186,36 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } } - strcpyW( nt_buffer + 4, rootW ); - RtlInitUnicodeString( &nt_name, nt_buffer ); - - /* FIXME: should simply enumerate the DosDevices directory instead */ - for (i = 0; i < 26; i++) + RtlInitUnicodeString( &nt_name, dosdevW ); + nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nt_name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = NtOpenDirectoryObject( &handle, FILE_LIST_DIRECTORY, &attr ); + if (!status) { - WCHAR buffer[sizeof(driveW)/sizeof(WCHAR)], dummy[8]; - NTSTATUS status; + char data[1024]; + DIRECTORY_BASIC_INFORMATION *info = (DIRECTORY_BASIC_INFORMATION *)data; + ULONG ctx = 0, len; - memcpy( buffer, driveW, sizeof(driveW) ); - buffer[12] = 'A' + i; - status = read_nt_symlink( buffer, dummy, sizeof(dummy)/sizeof(WCHAR) ); - if (status == STATUS_SUCCESS || status == STATUS_BUFFER_TOO_SMALL) + while (!NtQueryDirectoryObject( handle, info, sizeof(data), 1, 0, &ctx, &len )) { - if (p + 3 >= target + bufsize) + if (p + info->ObjectName.Length/sizeof(WCHAR) + 1 >= target + bufsize) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); + NtClose( handle ); return 0; } - *p++ = 'A' + i; - *p++ = ':'; + memcpy( p, info->ObjectName.Buffer, info->ObjectName.Length ); + p += info->ObjectName.Length/sizeof(WCHAR); *p++ = 0; } + NtClose( handle ); } + *p++ = 0; /* terminating null */ return p - target; }

1 0

Alexandre Julliard : winemenubuilder: Reduce memory usage for string copies .
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f428813ce283949e05b93afa04d79b6774c124e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f428813ce283949e05b93afa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 10:41:25 2009 +0200 winemenubuilder: Reduce memory usage for string copies. --- programs/winemenubuilder/winemenubuilder.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 1eaa530..15ce483 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -692,11 +692,20 @@ static unsigned short crc16(const char* string) return crc; } +static char *strdupA( const char *str ) +{ + char *ret; + + if (!str) return NULL; + if ((ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ))) strcpy( ret, str ); + return ret; +} + static char* heap_printf(const char *format, ...) { va_list args; int size = 4096; - char *buffer; + char *buffer, *ret; int n; va_start(args, format); @@ -715,7 +724,9 @@ static char* heap_printf(const char *format, ...) HeapFree(GetProcessHeap(), 0, buffer); } va_end(args); - return buffer; + ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 ); + if (!ret) ret = buffer; + return ret; } static BOOL create_directories(char *directory) @@ -1429,8 +1440,8 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) if (mime_type_entry) { *pos = 0; - mime_type_entry->mimeType = heap_printf("%s", line); - mime_type_entry->glob = heap_printf("%s", pos + 1); + mime_type_entry->mimeType = strdupA(line); + mime_type_entry->glob = strdupA(pos + 1); if (mime_type_entry->mimeType && mime_type_entry->glob) list_add_tail(mime_types, &mime_type_entry->entry); else @@ -1480,7 +1491,7 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim if (xdg_data_dirs == NULL) xdg_data_dirs = heap_printf("/usr/local/share/:/usr/share/"); else - xdg_data_dirs = heap_printf("%s", xdg_data_dirs); + xdg_data_dirs = strdupA(xdg_data_dirs); if (xdg_data_dirs) { @@ -1543,7 +1554,7 @@ static BOOL match_glob(struct list *native_mime_types, const char *extension, if (*match != NULL) { - *match = heap_printf("%s", *match); + *match = strdupA(*match); if (*match == NULL) return FALSE; } @@ -2664,7 +2675,7 @@ static BOOL init_xdg(void) { create_directories(xdg_config_dir); if (getenv("XDG_DATA_HOME")) - xdg_data_dir = heap_printf("%s", getenv("XDG_DATA_HOME")); + xdg_data_dir = strdupA(getenv("XDG_DATA_HOME")); else xdg_data_dir = heap_printf("%s/.local/share", getenv("HOME")); if (xdg_data_dir)

1 0

Alexandre Julliard : libwine: Fix the wctomb validity check for codepages where the default chars don' t convert to each other.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 464c956a0a0c81d3871362630e0647a5c1ebd010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464c956a0a0c81d3871362630… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 24 10:40:32 2009 +0200 libwine: Fix the wctomb validity check for codepages where the default chars don't convert to each other. --- libs/wine/wctomb.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/wine/wctomb.c b/libs/wine/wctomb.c index 966e6af..3b081d4 100644 --- a/libs/wine/wctomb.c +++ b/libs/wine/wctomb.c @@ -69,9 +69,9 @@ WCHAR compose( const WCHAR *str ) static inline int is_valid_sbcs_mapping( const struct sbcs_table *table, int flags, WCHAR wch, unsigned char ch ) { - if (flags & WC_NO_BEST_FIT_CHARS) return (table->cp2uni[ch] == wch); - if (ch != (unsigned char)table->info.def_char) return 1; - return (wch == table->info.def_unicode_char); + if ((flags & WC_NO_BEST_FIT_CHARS) || ch == (unsigned char)table->info.def_char) + return (table->cp2uni[ch] == wch); + return 1; } /* query necessary dst length for src string */ @@ -262,8 +262,7 @@ static int wcstombs_sbcs_slow( const struct sbcs_table *table, int flags, static inline int is_valid_dbcs_mapping( const struct dbcs_table *table, int flags, WCHAR wch, unsigned short ch ) { - if (ch == table->info.def_char && wch != table->info.def_unicode_char) return 0; - if (flags & WC_NO_BEST_FIT_CHARS) + if ((flags & WC_NO_BEST_FIT_CHARS) || ch == table->info.def_char) { /* check if char maps back to the same Unicode value */ if (ch & 0xff00)

1 0

Roderick Colenbrander : winex11: Make X11DRV_SetupGCForPatBlt independent of screen_depth.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: c6570a50f89b20a652e37530cca01991eb57d7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6570a50f89b20a652e37530c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jul 22 21:33:44 2009 +0200 winex11: Make X11DRV_SetupGCForPatBlt independent of screen_depth. --- dlls/winex11.drv/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index abdd505..7a64022 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -233,7 +233,7 @@ BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ) register int x, y; XImage *image; wine_tsx11_lock(); - pixmap = XCreatePixmap( gdi_display, root_window, 8, 8, screen_depth ); + pixmap = XCreatePixmap( gdi_display, root_window, 8, 8, physDev->depth ); image = XGetImage( gdi_display, physDev->brush.pixmap, 0, 0, 8, 8, AllPlanes, ZPixmap ); for (y = 0; y < 8; y++)

1 0

Roderick Colenbrander : winex11: Make BRUSH_DitherColor independent of the screen_depth.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: d01235332cf4df8bd8b3d0c8614ba7c80d43ad42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01235332cf4df8bd8b3d0c86… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jul 22 20:17:10 2009 +0200 winex11: Make BRUSH_DitherColor independent of the screen_depth. --- dlls/winex11.drv/brush.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 3368bbf..c94e04e 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -114,7 +114,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) if (!ditherImage) { - ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, screen_depth ); + ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, depth ); if (!ditherImage) { ERR("Could not create dither image\n"); @@ -144,7 +144,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) prevColor = color; } - pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, screen_depth ); + pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, depth ); XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, 0, 0, MATRIX_SIZE, MATRIX_SIZE ); wine_tsx11_unlock();

1 0

Roderick Colenbrander : winex11: Add support for GCs at more depths.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: e082bf66268519653ed37ccc4984285443e5ce0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e082bf66268519653ed37ccc4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 19 15:03:24 2009 +0200 winex11: Add support for GCs at more depths. --- dlls/winex11.drv/bitmap.c | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 4fb3ef0..a288352 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -31,20 +31,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* GCs used for B&W and color bitmap operations */ -GC BITMAP_monoGC = 0, BITMAP_colorGC = 0; +static GC bitmap_gc[32]; X_PHYSBITMAP BITMAP_stock_phys_bitmap = { 0 }; /* phys bitmap for the default stock bitmap */ static XContext bitmap_context; /* X context to associate a phys bitmap to a handle */ GC get_bitmap_gc(int depth) { - switch(depth) - { - case 1: - return BITMAP_monoGC; - default: - return BITMAP_colorGC; - } + if(depth < 1 || depth > 32) + return 0; + + return bitmap_gc[depth-1]; } /*********************************************************************** @@ -52,28 +49,38 @@ GC get_bitmap_gc(int depth) */ void X11DRV_BITMAP_Init(void) { + int depth_count, index, i; + int *depth_list; Pixmap tmpPixmap; - /* Create the necessary GCs */ - wine_tsx11_lock(); bitmap_context = XUniqueContext(); BITMAP_stock_phys_bitmap.pixmap_depth = 1; BITMAP_stock_phys_bitmap.pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); - BITMAP_monoGC = XCreateGC( gdi_display, BITMAP_stock_phys_bitmap.pixmap, 0, NULL ); - XSetGraphicsExposures( gdi_display, BITMAP_monoGC, False ); - XSetSubwindowMode( gdi_display, BITMAP_monoGC, IncludeInferiors ); - - if (screen_depth != 1) + bitmap_gc[0] = XCreateGC( gdi_display, BITMAP_stock_phys_bitmap.pixmap, 0, NULL ); + XSetGraphicsExposures( gdi_display, bitmap_gc[0], False ); + XSetSubwindowMode( gdi_display, bitmap_gc[0], IncludeInferiors ); + + /* Create a GC for all available depths. GCs at depths other than 1-bit/screen_depth are for use + * in combination with XRender which allows us to create dibsections at more depths. + */ + depth_list = XListDepths(gdi_display, DefaultScreen(gdi_display), &depth_count); + for (i = 0; i < depth_count; i++) { - if ((tmpPixmap = XCreatePixmap( gdi_display, root_window, 1, 1, screen_depth ))) + index = depth_list[i] - 1; + if (bitmap_gc[index]) continue; + if ((tmpPixmap = XCreatePixmap( gdi_display, root_window, 1, 1, depth_list[i]))) { - BITMAP_colorGC = XCreateGC( gdi_display, tmpPixmap, 0, NULL ); - XSetGraphicsExposures( gdi_display, BITMAP_colorGC, False ); - XSetSubwindowMode( gdi_display, BITMAP_colorGC, IncludeInferiors ); + if ((bitmap_gc[index] = XCreateGC( gdi_display, tmpPixmap, 0, NULL ))) + { + XSetGraphicsExposures( gdi_display, bitmap_gc[index], False ); + XSetSubwindowMode( gdi_display, bitmap_gc[index], IncludeInferiors ); + } XFreePixmap( gdi_display, tmpPixmap ); } } + XFree( depth_list ); + wine_tsx11_unlock(); }

1 0

Rein Klazes : user32: Get rid of internal function MENU_SetItemData, use SetMenuItemInfo_common instead.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 50cfcffd32084e5282e552cc4410a7d66cd33ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cfcffd32084e5282e552cc4… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 23 07:56:08 2009 +0200 user32: Get rid of internal function MENU_SetItemData, use SetMenuItemInfo_common instead. --- dlls/user32/menu.c | 140 +++++++++++++++++++--------------------------------- 1 files changed, 51 insertions(+), 89 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 64e536b..460378c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -185,6 +185,8 @@ static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFONT hFont); +static BOOL SetMenuItemInfo_common( MENUITEM *, const MENUITEMINFOW *, BOOL); + /********************************************************************* * menu class descriptor */ @@ -2048,92 +2050,6 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset ) /********************************************************************** - * MENU_SetItemData - * - * Set an item's flags, id and text ptr. Called by InsertMenu() and - * ModifyMenu(). - */ -static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT_PTR id, - LPCWSTR str ) -{ - debug_print_menuitem("MENU_SetItemData from: ", item, ""); - TRACE("flags=%x str=%p\n", flags, str); - - if (IS_STRING_ITEM(flags)) - { - LPWSTR prevText = item->text; - if (!str) - { - flags |= MF_SEPARATOR; - item->text = NULL; - } - else - { - LPWSTR text; - /* Item beginning with a backspace is a help item */ - if (*str == '\b') - { - flags |= MF_HELP; - str++; - } - if (!(text = HeapAlloc( GetProcessHeap(), 0, (strlenW(str)+1) * sizeof(WCHAR) ))) - return FALSE; - strcpyW( text, str ); - item->text = text; - } - item->hbmpItem = NULL; - HeapFree( GetProcessHeap(), 0, prevText ); - } - else if(( flags & MFT_BITMAP)) { - item->hbmpItem = HBITMAP_32(LOWORD(str)); - /* setting bitmap clears text */ - HeapFree( GetProcessHeap(), 0, item->text ); - item->text = NULL; - } - - if (flags & MF_SEPARATOR) flags |= MF_GRAYED | MF_DISABLED; - - if (flags & MF_OWNERDRAW) - item->dwItemData = (DWORD_PTR)str; - else - item->dwItemData = 0; - - if ((item->fType & MF_POPUP) && (flags & MF_POPUP) && (item->hSubMenu != (HMENU)id) ) - DestroyMenu( item->hSubMenu ); /* ModifyMenu() spec */ - - if (flags & MF_POPUP) - { - POPUPMENU *menu = MENU_GetMenu((HMENU)id); - if (menu) menu->wFlags |= MF_POPUP; - else - { - item->wID = 0; - item->hSubMenu = 0; - item->fType = 0; - item->fState = 0; - return FALSE; - } - } - - item->wID = id; - if (flags & MF_POPUP) item->hSubMenu = (HMENU)id; - - if ((item->fType & MF_POPUP) && !(flags & MF_POPUP) ) - flags |= MF_POPUP; /* keep popup */ - - item->fType = flags & TYPE_MASK; - /* MFS_DEFAULT is not accepted. MF_HILITE is not listed as a valid flag - for ModifyMenu, but Windows accepts it */ - item->fState = flags & MENUITEMINFO_STATE_MASK & ~MFS_DEFAULT; - - /* Don't call SetRectEmpty here! */ - - debug_print_menuitem("MENU_SetItemData to : ", item, ""); - return TRUE; -} - - -/********************************************************************** * MENU_InsertItem * * Insert (allocate) a new item into a menu. @@ -3826,6 +3742,49 @@ UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) } +/********************************************************************** + * MENU_mnu2mnuii + * + * Uses flags, id and text ptr, passed by InsertMenu() and + * ModifyMenu() to setup a MenuItemInfo structure. + */ +static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, + LPMENUITEMINFOW pmii) +{ + ZeroMemory( pmii, sizeof( MENUITEMINFOW)); + pmii->cbSize = sizeof( MENUITEMINFOW); + pmii->fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE; + /* setting bitmap clears text and vice versa */ + if( IS_STRING_ITEM(flags)) { + pmii->fMask |= MIIM_STRING | MIIM_BITMAP; + if( !str) + flags |= MF_SEPARATOR; + /* Item beginning with a backspace is a help item */ + /* FIXME: wrong place, this is only true in win16 */ + else if( *str == '\b') { + flags |= MF_HELP; + str++; + } + pmii->dwTypeData = (LPWSTR)str; + } else if( flags & MFT_BITMAP){ + pmii->fMask |= MIIM_BITMAP | MIIM_STRING; + pmii->hbmpItem = HBITMAP_32(LOWORD(str)); + } + if( flags & MF_OWNERDRAW){ + pmii->fMask |= MIIM_DATA; + pmii->dwItemData = (ULONG_PTR) str; + } + if( flags & MF_POPUP) { + pmii->fMask |= MIIM_SUBMENU; + pmii->hSubMenu = (HMENU)id; + } + if( flags & MF_SEPARATOR) flags |= MF_GRAYED | MF_DISABLED; + pmii->fState = flags & MENUITEMINFO_STATE_MASK & ~MFS_DEFAULT; + pmii->fType = flags & MENUITEMINFO_TYPE_MASK; + pmii->wID = (UINT)id; +} + + /******************************************************************* * InsertMenuW (USER32.@) */ @@ -3833,6 +3792,7 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { MENUITEM *item; + MENUITEMINFOW mii; if (IS_STRING_ITEM(flags) && str) TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n", @@ -3841,8 +3801,8 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, hMenu, pos, flags, id, str ); if (!(item = MENU_InsertItem( hMenu, pos, flags ))) return FALSE; - - if (!(MENU_SetItemData( item, flags, id, str ))) + MENU_mnu2mnuii( flags, id, str, &mii); + if (!(SetMenuItemInfo_common( item, &mii, TRUE))) { RemoveMenu( hMenu, pos, flags ); return FALSE; @@ -3954,6 +3914,7 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { MENUITEM *item; + MENUITEMINFOW mii; if (IS_STRING_ITEM(flags)) TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) ); @@ -3962,7 +3923,8 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, if (!(item = MENU_FindItem( &hMenu, &pos, flags ))) return FALSE; MENU_GetMenu(hMenu)->Height = 0; /* force size recalculate */ - return MENU_SetItemData( item, flags, id, str ); + MENU_mnu2mnuii( flags, id, str, &mii); + return SetMenuItemInfo_common( item, &mii, TRUE); }

1 0

Rein Klazes : user32: When setting a menu item, handle MIIM_TYPE flag by setting approriate MIIM_BITMAP, MIIM_FTYPE and MIIM_STRING flags.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 95551710444cf31ddc1d7aed62edc48b5fa79b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95551710444cf31ddc1d7aed6… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 23 07:56:07 2009 +0200 user32: When setting a menu item, handle MIIM_TYPE flag by setting approriate MIIM_BITMAP, MIIM_FTYPE and MIIM_STRING flags. --- dlls/user32/menu.c | 47 ++++++++++++++++++++++------------------------- 1 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6d81e69..64e536b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4666,6 +4666,9 @@ static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicod /********************************************************************** * SetMenuItemInfo_common + * + * Note: does not support the MIIM_TYPE flag. Use the MIIM_FTYPE, + * MIIM_BITMAP and MIIM_STRING flags instead. */ static BOOL SetMenuItemInfo_common(MENUITEM * menu, @@ -4676,30 +4679,7 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, debug_print_menuitem("SetMenuItemInfo_common from: ", menu, ""); - if (lpmii->fMask & MIIM_TYPE ) { - if( lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) { - WARN("invalid combination of fMask bits used\n"); - /* this does not happen on Win9x/ME */ - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Remove the old type bits and replace them with the new ones */ - menu->fType &= ~MENUITEMINFO_TYPE_MASK; - menu->fType |= lpmii->fType & MENUITEMINFO_TYPE_MASK; - - if (IS_STRING_ITEM(menu->fType)) { - HeapFree(GetProcessHeap(), 0, menu->text); - set_menu_item_text( menu, lpmii->dwTypeData, unicode ); - } else if( (menu->fType) & MFT_BITMAP) - menu->hbmpItem = HBITMAP_32(LOWORD(lpmii->dwTypeData)); - } - if (lpmii->fMask & MIIM_FTYPE ) { - if(( lpmii->fType & MFT_BITMAP)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } menu->fType &= ~MENUITEMINFO_TYPE_MASK; menu->fType |= lpmii->fType & MENUITEMINFO_TYPE_MASK; } @@ -4710,11 +4690,9 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, } if (lpmii->fMask & MIIM_STATE) - { /* Other menu items having MFS_DEFAULT are not converted to normal items */ menu->fState = lpmii->fState & MENUITEMINFO_STATE_MASK; - } if (lpmii->fMask & MIIM_ID) menu->wID = lpmii->wID; @@ -4776,6 +4754,25 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, pmii_out->cbSize = sizeof( MENUITEMINFOW); pmii_out->hbmpItem = NULL; } + /* test for invalid bit combinations */ + if( (pmii_out->fMask & MIIM_TYPE && + pmii_out->fMask & (MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) || + (pmii_out->fMask & MIIM_FTYPE && pmii_out->fType & MFT_BITMAP)) { + WARN("invalid combination of fMask bits used\n"); + /* this does not happen on Win9x/ME */ + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; + } + /* convert old style (MIIM_TYPE) to the new */ + if( pmii_out->fMask & MIIM_TYPE){ + pmii_out->fMask |= MIIM_FTYPE; + if( IS_STRING_ITEM(pmii_out->fType)){ + pmii_out->fMask |= MIIM_STRING; + } else if( (pmii_out->fType) & MFT_BITMAP){ + pmii_out->fMask |= MIIM_BITMAP; + pmii_out->hbmpItem = HBITMAP_32(LOWORD(pmii_out->dwTypeData)); + } + } return TRUE; }

1 0

Rein Klazes : user32: Put some repeated code for checking and extending of a MENUITEMINFO structure in a separate function .
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: e9f4c6bb02c4360333b1957311ef2d77a7a75f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f4c6bb02c4360333b195731… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 23 12:32:30 2009 +0200 user32: Put some repeated code for checking and extending of a MENUITEMINFO structure in a separate function. --- dlls/user32/menu.c | 78 ++++++++++++++++++++++----------------------------- 1 files changed, 34 insertions(+), 44 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e35372b..6d81e69 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4755,27 +4755,44 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, } /********************************************************************** + * MENU_NormalizeMenuItemInfoStruct + * + * Helper for SetMenuItemInfo and InsertMenuItemInfo: + * check, copy and extend the MENUITEMINFO struct from the version that the application + * supplied to the version used by wine source. */ +static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, + MENUITEMINFOW *pmii_out ) +{ + /* do we recognize the size? */ + if( pmii_in->cbSize != sizeof( MENUITEMINFOW) && + pmii_in->cbSize != sizeof( MENUITEMINFOW) - sizeof( pmii_in->hbmpItem)) { + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; + } + /* copy the fields that we have */ + memcpy( pmii_out, pmii_in, pmii_in->cbSize); + /* if the hbmpItem member is missing then extend */ + if( pmii_in->cbSize != sizeof( MENUITEMINFOW)) { + pmii_out->cbSize = sizeof( MENUITEMINFOW); + pmii_out->hbmpItem = NULL; + } + return TRUE; +} + +/********************************************************************** * SetMenuItemInfoA (USER32.@) */ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEMINFOA mii; + MENUITEMINFOW mii; TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE; + return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0), - (const MENUITEMINFOW *)&mii, FALSE); + &mii, FALSE); } /********************************************************************** @@ -4788,16 +4805,7 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0), &mii, TRUE); } @@ -4900,23 +4908,14 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOA *lpmii) { MENUITEM *item; - MENUITEMINFOA mii; + MENUITEMINFOW mii; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( (MENUITEMINFOW *)lpmii, &mii )) return FALSE; item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, (const MENUITEMINFOW *)&mii, FALSE); + return SetMenuItemInfo_common(item, &mii, FALSE); } @@ -4931,16 +4930,7 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); - if( lpmii->cbSize != sizeof( mii) && - lpmii->cbSize != sizeof( mii) - sizeof ( mii.hbmpItem)) { - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - memcpy( &mii, lpmii, lpmii->cbSize); - if( lpmii->cbSize != sizeof( mii)) { - mii.cbSize = sizeof( mii); - mii.hbmpItem = NULL; - } + if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); return SetMenuItemInfo_common(item, &mii, TRUE);

1 0

Jacek Caban : mshtml: Added VT_UINT handling to debugstr_variant.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 57f23b875c630a30d8554d13df387e2cae29d641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f23b875c630a30d8554d13d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 15:25:38 2009 +0200 mshtml: Added VT_UINT handling to debugstr_variant. --- dlls/mshtml/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 3057276..548c50c 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -433,6 +433,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); case VT_BOOL: return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + case VT_UINT: + return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Huw Davies : include: Add crtrow.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 8d8bef944d88abe7e010be637af1565f941af90f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8bef944d88abe7e010be637… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 23 11:53:34 2009 +0100 include: Add crtrow.idl. --- include/Makefile.in | 1 + include/crtrow.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 4 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 603de27..aee348f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -121,6 +121,7 @@ SRCDIR_INCLUDES = \ corerror.h \ corhdr.h \ cpl.h \ + crtrow.idl \ cryptdlg.h \ cryptuiapi.h \ custcntl.h \ diff --git a/include/crtrow.idl b/include/crtrow.idl new file mode 100644 index 0000000..da26a72 --- /dev/null +++ b/include/crtrow.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733ab2-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICreateRow : IUnknown +{ + [local] + HRESULT CreateRow([in, unique] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in, unique] IAuthenticate *pAuthenticate, + [in, out, unique] DBIMPLICITSESSION *pImplSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [out, /*annotation("__deref_opt_out_opt")*/] LPOLESTR *ppwszNewURL, + [out, iid_is(riid)] IUnknown **ppUnk); + + [call_as(CreateRow)] + HRESULT RemoteCreateRow([in] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in] IAuthenticate *pAuthenticate, + [in] IUnknown *pSessionUnkOuter, + [in, unique] IID *piid, + [in, out, unique, iid_is(piid)] IUnknown **ppSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [in, out, unique] LPOLESTR *ppwszNewURL, + [out, iid_is(riid)] IUnknown **ppUnk); +} diff --git a/include/oledb.idl b/include/oledb.idl index 5cb5c0e..31e2111 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -35,3 +35,4 @@ typedef ULONG DBCOUNTITEM; #include "sesprp.idl" #include "opnrst.idl" #include "binres.idl" +#include "crtrow.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 775de81..fb15697 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -110,6 +110,7 @@ my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1, + "crtrow.idl" => 1, "dbccmd.idl" => 1, "dbcses.idl" => 1, "dbdsad.idl" => 1,

1 0

Huw Davies : include: Add binres.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: d328e9a14ac86dfe09261535dfa9def115aefd75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d328e9a14ac86dfe09261535d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 17:18:50 2009 +0100 include: Add binres.idl. --- include/Makefile.in | 1 + include/binres.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ include/dbs.idl | 10 ++++++++++ include/oledb.idl | 2 ++ tools/make_makefiles | 1 + 5 files changed, 63 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 8cc4fb8..603de27 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -106,6 +106,7 @@ SRCDIR_INCLUDES = \ basetsd.h \ basetyps.h \ bcrypt.h \ + binres.idl \ bitsmsg.h \ cderr.h \ cfgmgr32.h \ diff --git a/include/binres.idl b/include/binres.idl new file mode 100644 index 0000000..3797c02 --- /dev/null +++ b/include/binres.idl @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733ab1-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IBindResource : IUnknown +{ + [local] + HRESULT Bind([in] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in] IAuthenticate *pAuthenticate, + [in, out, unique] DBIMPLICITSESSION *pImplSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [out, iid_is(riid)] IUnknown **ppUnk); + + [call_as(Bind)] + HRESULT RemoteBind([in] IUnknown *pUnkOuter, + [in] LPCOLESTR pwszURL, + [in] DBBINDURLFLAG dwBindURLFlags, + [in] REFGUID rguid, + [in] REFIID riid, + [in] IAuthenticate *pAuthenticate, + [in] IUnknown *pSessionUnkOuter, + [in, unique] IID *piid, + [in, out, unique, iid_is(piid)] IUnknown **ppSession, + [in, out, unique] DBBINDURLSTATUS *pdwBindStatus, + [out, iid_is(riid)] IUnknown **ppUnk); +} diff --git a/include/dbs.idl b/include/dbs.idl index 19c2997..9909c9d 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -99,3 +99,13 @@ typedef struct tagDBPROPINFOSET { ULONG cPropertyInfos; GUID guidPropertySet; } DBPROPINFOSET; + +typedef DWORD DBBINDURLFLAG; +typedef DWORD DBBINDURLSTATUS; + +typedef struct tagDBIMPLICITSESSION +{ + IUnknown *pUnkOuter; + IID *piid; + IUnknown *pSession; +} DBIMPLICITSESSION; diff --git a/include/oledb.idl b/include/oledb.idl index 181b00a..5cb5c0e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -20,6 +20,7 @@ import "wtypes.idl"; import "oaidl.idl"; import "ocidl.idl"; import "propidl.idl"; +import "urlmon.idl"; typedef ULONG DBBYTEOFFSET; typedef ULONG DBCOUNTITEM; @@ -33,3 +34,4 @@ typedef ULONG DBCOUNTITEM; #include "dbdsad.idl" #include "sesprp.idl" #include "opnrst.idl" +#include "binres.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 075916f..775de81 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -109,6 +109,7 @@ my %exported_wine_headers = ( my %private_idl_headers = ( "axcore.idl" => 1, "axextend.idl" => 1, + "binres.idl" => 1, "dbccmd.idl" => 1, "dbcses.idl" => 1, "dbdsad.idl" => 1,

1 0

Huw Davies : include: Add a missing parameter and fix a few attributes.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: c04275d75395848e43b765d65dd1ecb7511fe96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04275d75395848e43b765d65… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 16:42:27 2009 +0100 include: Add a missing parameter and fix a few attributes. --- include/dbprop.idl | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/dbprop.idl b/include/dbprop.idl index 5ed5301..088cf8c 100644 --- a/include/dbprop.idl +++ b/include/dbprop.idl @@ -30,7 +30,7 @@ interface IDBProperties : IUnknown { [call_as(GetProperties)] HRESULT RemoteGetProperties( [in] ULONG cPropertyIDSets, - [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertySets, [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets, [out] IErrorInfo **ppErrorInfoRem); @@ -39,17 +39,18 @@ interface IDBProperties : IUnknown { [in] ULONG cPropertyIDSets, [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], [in, out] ULONG *pcPropertyInfoSets, - [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets); + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, + [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); [call_as(GetPropertyInfo)] HRESULT RemoteGetPropertyInfo( [in] ULONG cPropertyIDSets, - [in,size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, [in, out] ULONG *pcPropertyInfoSets, [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, [in, out] ULONG *pcOffsets, [out, size_is(,*pcOffsets)] DBBYTEOFFSET **prgDescOffsets, [in, out] ULONG *pcbDescBuffer, - [out, size_is(,*pcbDescBuffer)] OLECHAR **ppDescBuffer, + [in, out, unique, size_is(,*pcbDescBuffer)] OLECHAR **ppDescBuffer, [out] IErrorInfo **ppErrorInfoRem); [local] HRESULT SetProperties( @@ -58,7 +59,7 @@ interface IDBProperties : IUnknown { [call_as(SetProperties)] HRESULT RemoteSetProperties( [in] ULONG cPropertySets, - [in, out, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in, unique, size_is(cPropertySets)] DBPROPSET *rgPropertySets, [in] ULONG cTotalProps, [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, [out] IErrorInfo **ppErrorInfoRem);

1 0

Huw Davies : include: Add sesprp.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: f80c419585928ebf946ceffa417594204f69d6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80c419585928ebf946ceffa4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 16:33:17 2009 +0100 include: Add sesprp.idl. --- include/Makefile.in | 1 + include/oledb.idl | 1 + include/sesprp.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 4 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c3c8cb0..8cc4fb8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -401,6 +401,7 @@ SRCDIR_INCLUDES = \ secext.h \ security.h \ sensapi.h \ + sesprp.idl \ setupapi.h \ sfc.h \ shdispid.h \ diff --git a/include/oledb.idl b/include/oledb.idl index c415d3a..181b00a 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -31,4 +31,5 @@ typedef ULONG DBCOUNTITEM; #include "dbprop.idl" #include "dbinit.idl" #include "dbdsad.idl" +#include "sesprp.idl" #include "opnrst.idl" diff --git a/include/sesprp.idl b/include/sesprp.idl new file mode 100644 index 0000000..11e6391 --- /dev/null +++ b/include/sesprp.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a85-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ISessionProperties : IUnknown +{ + [local] + HRESULT GetProperties([in] ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] const DBPROPSET **prgPropertySets); + + [call_as(GetProperties)] + HRESULT RemoteGetProperties([in] ULONG cPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] const DBPROPSET **prgPropertySets, + [out] IErrorInfo **ppErrorInfoRem); + + + [local] + HRESULT SetProperties([in] ULONG cPropertySets, + [in, out, unique, size_is(cPropertySets)] DBPROPSET rgPropertySets[]); + + [call_as(SetProperties)] + HRESULT RemoteSetProperties([in] ULONG cPropertySets, + [in, unique, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in] ULONG cTotalProps, + [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, + [out] IErrorInfo **ppErrorInfoRem); + +} diff --git a/tools/make_makefiles b/tools/make_makefiles index ee4bdf6..075916f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -118,6 +118,7 @@ my %private_idl_headers = ( "devenum.idl" => 1, "dyngraph.idl" => 1, "opnrst.idl" => 1, + "sesprp.idl" => 1, "vmrender.idl" => 1, "wine/wined3d.idl" => 1, "wine/winedxgi.idl" => 1,

1 0

Huw Davies : include: Add dbdsad.idl.
by Alexandre Julliard July 23, 2009

July 23, 2009

Module: wine Branch: master Commit: 50c43ed868316a31e56658f72ed447a5b6119b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c43ed868316a31e56658f72… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 15:49:06 2009 +0100 include: Add dbdsad.idl. --- include/Makefile.in | 1 + include/dbdsad.idl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 2 + tools/make_makefiles | 1 + 4 files changed, 79 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 716cec3..c3c8cb0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -150,6 +150,7 @@ SRCDIR_INCLUDES = \ d3dx9tex.h \ dbccmd.idl \ dbcses.idl \ + dbdsad.idl \ dbghelp.h \ dbinit.idl \ dbprop.idl \ diff --git a/include/dbdsad.idl b/include/dbdsad.idl new file mode 100644 index 0000000..1fb8c9f --- /dev/null +++ b/include/dbdsad.idl @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a7a-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBDataSourceAdmin : IUnknown +{ + [local] + HRESULT CreateDataSource([in] ULONG cPropertySets, + [in, out, size_is(cPropertySets)] DBPROPSET rgPropertySets[], + [in] IUnknown *pUnkOuter, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppDBSession); + + [call_as(CreateDataSource)] + HRESULT RemoteCreateDataSource([in] ULONG cPropertySets, + [in, unique, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [in] IUnknown *pUnkOuter, + [in] REFIID riid, + [in, out, unique, iid_is(riid)] IUnknown **ppDBSession, + [in] ULONG cTotalProps, + [out, size_is(cTotalProps)] DBPROPSTATUS *rgPropStatus, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT DestroyDataSource(); + + [call_as(DestroyDataSource)] + HRESULT RemoteDestroyDataSource([out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetCreationProperties([in] ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets)] const DBPROPIDSET rgPropertyIDSets[], + [in, out] ULONG *pcPropertyInfoSets, + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, + [out, /*annotation("__deref_out_z_opt")*/] OLECHAR **ppDescBuffer); + + [call_as(GetCreationProperties)] + HRESULT RemoteGetCreationProperties([in] ULONG cPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, out] ULONG *pcPropertyInfoSets, + [out, size_is(,*pcPropertyInfoSets)] DBPROPINFOSET **prgPropertyInfoSets, + [in, out] DBCOUNTITEM *pcOffsets, + [out, size_is(,(ULONG)*pcOffsets)] DBBYTEOFFSET **prgDescOffsets, + [in, out] ULONG *pcbDescBuffer, + [in, out, unique, size_is(,*pcbDescBuffer)] OLECHAR **ppDescBuffer, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT ModifyDataSource([in] ULONG cPropertySets, + [in, size_is(cPropertySets)] DBPROPSET rgPropertySets[]); + + [call_as(ModifyDataSource)] + HRESULT RemoteModifyDataSource([in] ULONG cPropertySets, + [in, size_is(cPropertySets)] DBPROPSET *rgPropertySets, + [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/oledb.idl b/include/oledb.idl index a2f70d5..c415d3a 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -22,6 +22,7 @@ import "ocidl.idl"; import "propidl.idl"; typedef ULONG DBBYTEOFFSET; +typedef ULONG DBCOUNTITEM; #include "dbs.idl" @@ -29,4 +30,5 @@ typedef ULONG DBBYTEOFFSET; #include "dbcses.idl" #include "dbprop.idl" #include "dbinit.idl" +#include "dbdsad.idl" #include "opnrst.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 8f9ca56..ee4bdf6 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -111,6 +111,7 @@ my %private_idl_headers = ( "axextend.idl" => 1, "dbccmd.idl" => 1, "dbcses.idl" => 1, + "dbdsad.idl" => 1, "dbinit.idl" => 1, "dbprop.idl" => 1, "dbs.idl" => 1,

1 0