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

Jay Yang : explorer: Add dropdown entries to explorer's combobox.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: c1b6d91c5bc42b60f8be582977c34b4c1ec485df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b6d91c5bc42b60f8be58297… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Sun Jul 3 21:36:05 2011 -0400 explorer: Add dropdown entries to explorer's combobox. --- programs/explorer/explorer.c | 185 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 182 insertions(+), 3 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 0cb00a4..e42065f 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -62,6 +62,7 @@ typedef struct HWND main_window,path_box; INT rebar_height; LPCITEMIDLIST pidl; + IImageList *icon_list; } explorer_info; enum @@ -101,11 +102,153 @@ static ULONG WINAPI IExplorerBrowserEventsImpl_fnRelease(IExplorerBrowserEvents return ref; } +static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImageList *icon_list, COMBOBOXEXITEMW *item) +{ + STRRET strret; + HRESULT hres; + IExtractIconW *extract_icon; + UINT reserved; + WCHAR icon_file[MAX_PATH]; + INT icon_index; + UINT icon_flags; + HICON icon; + strret.uType=STRRET_WSTR; + hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret); + if(FAILED(hres)) + { + WINE_WARN("Could not get name for pidl\n"); + return FALSE; + } + switch(strret.uType) + { + case STRRET_WSTR: + item->pszText = strret.pOleStr; + break; + default: + WINE_FIXME("Unimplemented STRRET type:%u\n",strret.uType); + break; + } + hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW, + &reserved,(void**)&extract_icon); + if(SUCCEEDED(hres)) + { + item->mask |= CBEIF_IMAGE; + IExtractIconW_GetIconLocation(extract_icon,GIL_FORSHELL,icon_file, + sizeof(icon_file)/sizeof(WCHAR), + &icon_index,&icon_flags); + IExtractIconW_Extract(extract_icon,icon_file,icon_index,NULL,&icon,20); + item->iImage = ImageList_AddIcon((HIMAGELIST)icon_list,icon); + } + else + { + item->mask &= ~CBEIF_IMAGE; + WINE_WARN("Could not get an icon for %s\n",wine_dbgstr_w(item->pszText)); + } + return TRUE; +} + static void update_path_box(explorer_info *info) { - WCHAR path[MAX_PATH]; - SHGetPathFromIDListW(info->pidl,path); - SetWindowTextW(info->path_box,path); + COMBOBOXEXITEMW item; + COMBOBOXEXITEMW main_item; + IShellFolder *desktop; + IPersistFolder2 *persist; + LPITEMIDLIST desktop_pidl; + IEnumIDList *ids; + + ImageList_Remove((HIMAGELIST)info->icon_list,-1); + SendMessageW(info->path_box,CB_RESETCONTENT,0,0); + SHGetDesktopFolder(&desktop); + IShellFolder_QueryInterface(desktop,&IID_IPersistFolder2,(void**)&persist); + IPersistFolder2_GetCurFolder(persist,&desktop_pidl); + IPersistFolder2_Release(persist); + persist = NULL; + /*Add Desktop*/ + item.iItem = -1; + item.mask = CBEIF_TEXT | CBEIF_INDENT | CBEIF_LPARAM; + item.iIndent = 0; + create_combobox_item(desktop,desktop_pidl,info->icon_list,&item); + item.lParam = (LPARAM)desktop_pidl; + SendMessageW(info->path_box,CBEM_INSERTITEMW,0,(LPARAM)&item); + if(ILIsEqual(info->pidl,desktop_pidl)) + main_item = item; + else + CoTaskMemFree(item.pszText); + /*Add all direct subfolders of Desktop*/ + if(SUCCEEDED(IShellFolder_EnumObjects(desktop,NULL,SHCONTF_FOLDERS,&ids)) + && ids!=NULL) + { + LPITEMIDLIST curr_pidl; + HRESULT hres; + + item.iIndent = 1; + while(1) + { + hres = IEnumIDList_Next(ids,1,&curr_pidl,NULL); + if(FAILED(hres) || hres == S_FALSE) + break; + if(!create_combobox_item(desktop,curr_pidl,info->icon_list,&item)) + WINE_WARN("Could not create a combobox item\n"); + else + { + LPITEMIDLIST full_pidl = ILCombine(desktop_pidl,curr_pidl); + item.lParam = (LPARAM)full_pidl; + SendMessageW(info->path_box,CBEM_INSERTITEMW,0,(LPARAM)&item); + if(ILIsEqual(full_pidl,info->pidl)) + main_item = item; + else if(ILIsParent(full_pidl,info->pidl,FALSE)) + { + /*add all parents of the pidl passed in*/ + LPITEMIDLIST next_pidl = ILFindChild(full_pidl,info->pidl); + IShellFolder *curr_folder = NULL, *temp; + hres = IShellFolder_BindToObject(desktop,curr_pidl,NULL, + &IID_IShellFolder, + (void**)&curr_folder); + if(FAILED(hres)) + WINE_WARN("Could not get an IShellFolder\n"); + while(!ILIsEmpty(next_pidl)) + { + LPITEMIDLIST first = ILCloneFirst(next_pidl); + CoTaskMemFree(item.pszText); + if(!create_combobox_item(curr_folder,first, + info->icon_list,&item)) + { + WINE_WARN("Could not create a combobox item\n"); + break; + } + ++item.iIndent; + full_pidl = ILCombine(full_pidl,first); + item.lParam = (LPARAM)full_pidl; + SendMessageW(info->path_box,CBEM_INSERTITEMW,0,(LPARAM)&item); + temp=NULL; + hres = IShellFolder_BindToObject(curr_folder,first,NULL, + &IID_IShellFolder, + (void**)&temp); + if(FAILED(hres)) + { + WINE_WARN("Could not get an IShellFolder\n"); + break; + } + IShellFolder_Release(curr_folder); + curr_folder = temp; + + ILFree(first); + next_pidl = ILGetNext(next_pidl); + } + memcpy(&main_item,&item,sizeof(item)); + if(curr_folder) + IShellFolder_Release(curr_folder); + item.iIndent = 1; + } + else + CoTaskMemFree(item.pszText); + } + } + } + else + WINE_WARN("Could not enumerate the desktop\n"); + SendMessageW(info->path_box,CBEM_SETITEMW,0,(LPARAM)&main_item); + CoTaskMemFree(main_item.pszText); } static HRESULT WINAPI IExplorerBrowserEventsImpl_fnOnNavigationComplete(IExplorerBrowserEvents *iface, PCIDLIST_ABSOLUTE pidl) @@ -148,6 +291,8 @@ static IExplorerBrowserEvents *make_explorer_events(explorer_info *info) = HeapAlloc(GetProcessHeap(), 0, sizeof(IExplorerBrowserEventsImpl)); ret->IExplorerBrowserEvents_iface.lpVtbl = &vt_IExplorerBrowserEvents; ret->info = info; + SHGetImageList(SHIL_SMALL,&IID_IImageList,(void**)&(ret->info->icon_list)); + SendMessageW(info->path_box,CBEM_SETIMAGELIST,0,(LPARAM)ret->info->icon_list); IExplorerBrowserEvents_AddRef(&ret->IExplorerBrowserEvents_iface); return &ret->IExplorerBrowserEvents_iface; } @@ -287,6 +432,12 @@ static LRESULT explorer_on_end_edit(explorer_info *info,NMCBEENDEDITW *edit_info WINE_TRACE("iWhy=%x\n",edit_info->iWhy); switch(edit_info->iWhy) { + case CBENF_DROPDOWN: + if(edit_info->iNewSelection!=CB_ERR) + pidl = (LPITEMIDLIST)SendMessageW(edit_info->hdr.hwndFrom, + CB_GETITEMDATA, + edit_info->iNewSelection,0); + break; case CBENF_RETURN: { WCHAR path[MAX_PATH]; @@ -330,8 +481,36 @@ static LRESULT explorer_on_notify(explorer_info* info,NMHDR* notification) WINE_TRACE("code=%i\n",notification->code); switch(notification->code) { + case CBEN_BEGINEDIT: + { + WCHAR path[MAX_PATH]; + HWND edit_ctrl = (HWND)SendMessageW(notification->hwndFrom, + CBEM_GETEDITCONTROL,0,0); + SHGetPathFromIDListW(info->pidl,path); + SetWindowTextW(edit_ctrl,path); + break; + } + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *edit_info_a = (NMCBEENDEDITA*)notification; + NMCBEENDEDITW edit_info_w; + edit_info_w.hdr = edit_info_a->hdr; + edit_info_w.fChanged = edit_info_a->fChanged; + edit_info_w.iNewSelection = edit_info_a->iNewSelection; + MultiByteToWideChar(CP_ACP,0,edit_info_a->szText,-1, + edit_info_w.szText,CBEMAXSTRLEN); + edit_info_w.iWhy = edit_info_a->iWhy; + return explorer_on_end_edit(info,&edit_info_w); + } case CBEN_ENDEDITW: return explorer_on_end_edit(info,(NMCBEENDEDITW*)notification); + case CBEN_DELETEITEM: + { + NMCOMBOBOXEXW *entry = (NMCOMBOBOXEXW*)notification; + if(entry->ceItem.lParam) + ILFree((LPITEMIDLIST)entry->ceItem.lParam); + break; + } case RBN_AUTOSIZE: return update_rebar_size(info,(NMRBAUTOSIZE*)notification); default:

1 0

Lucas Fialho Zawacki : dinput: Keyboard and mouse implementation of BuildActionMap.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 83aded2754c86a31edc4498c2060580706b52a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83aded2754c86a31edc4498c2… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Jul 2 01:06:37 2011 -0300 dinput: Keyboard and mouse implementation of BuildActionMap. --- dlls/dinput/device.c | 32 +++++++++++++++++++++- dlls/dinput/device_private.h | 2 + dlls/dinput/keyboard.c | 58 ++++++++++++++++++++++++++++++++++++++++- dlls/dinput/mouse.c | 55 ++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/device.c | 10 +++--- 5 files changed, 146 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83aded2754c86a31edc44…

1 0

André Hentschel : wined3d: Remove dead code (clang).
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: a7c1b5f02ec48769b4f4334c67deb13635e4986a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c1b5f02ec48769b4f4334c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 21:06:07 2011 +0200 wined3d: Remove dead code (clang). --- dlls/wined3d/arb_program_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e533018..0823c03 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3777,8 +3777,6 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, shader_addline(buffer, "PARAM np2fixup[%u] = { program.env[%u..%u] };\n", fixup->super.num_consts, fixup->offset, fixup->super.num_consts + fixup->offset - 1); } - - next_local += fixup->super.num_consts; } if (shader_priv->clipplane_emulation != ~0U && args->clip)

1 0

André Hentschel : imm32: Remove redundant check.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: ee44ff9597346bd9c8e6205ffd2d8009b62958f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44ff9597346bd9c8e6205ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 19:32:05 2011 +0200 imm32: Remove redundant check. --- dlls/imm32/imm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index fe394e3..a8392ff 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1889,7 +1889,6 @@ BOOL WINAPI ImmIsUIMessageA( (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == WM_IME_SELECT) || (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || (msg == WM_MSIME_RECONVERTOPTIONS) || (msg == WM_MSIME_MOUSE) || @@ -1920,7 +1919,6 @@ BOOL WINAPI ImmIsUIMessageW( (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == WM_IME_SELECT) || (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || (msg == WM_MSIME_RECONVERTOPTIONS) || (msg == WM_MSIME_MOUSE) ||

1 0

Jay Yang : explorer: Add navigation buttons to explorer.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 9544bcd10b4b7e0b97c16286ff2355c72ec777a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9544bcd10b4b7e0b97c16286f… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Sun Jul 3 21:35:55 2011 -0400 explorer: Add navigation buttons to explorer. --- programs/explorer/explorer.c | 134 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 123 insertions(+), 11 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 0dc82cf..bcdfcff 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -31,12 +31,15 @@ #include <windows.h> #include <shobjidl.h> #include <shlobj.h> - +#include <commoncontrols.h> +#include <commctrl.h> WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define EXPLORER_INFO_INDEX 0 +#define NAV_TOOLBAR_HEIGHT 30 + #define DEFAULT_WIDTH 640 #define DEFAULT_HEIGHT 480 @@ -54,16 +57,28 @@ typedef struct parametersTAG { typedef struct { IExplorerBrowser *browser; + HWND main_window; + INT rebar_height; } explorer_info; +enum +{ + BACK_BUTTON,FORWARD_BUTTON,UP_BUTTON +}; + static void make_explorer_window(IShellFolder* startFolder) { RECT explorerRect; - HWND window; + HWND rebar,nav_toolbar; FOLDERSETTINGS fs; explorer_info *info; HRESULT hres; WCHAR explorer_title[100]; + TBADDBITMAP bitmap_info; + TBBUTTON nav_buttons[3]; + int hist_offset,view_offset; + REBARBANDINFOW band_info; + memset(nav_buttons,0,sizeof(nav_buttons)); LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, sizeof(explorer_title)/sizeof(WCHAR)); info = HeapAlloc(GetProcessHeap(),0,sizeof(explorer_info)); @@ -80,10 +95,12 @@ static void make_explorer_window(IShellFolder* startFolder) HeapFree(GetProcessHeap(),0,info); return; } + info->rebar_height=0; + info->main_window + = CreateWindowW(EXPLORER_CLASS,explorer_title,WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT,CW_USEDEFAULT,DEFAULT_WIDTH, + DEFAULT_HEIGHT,NULL,NULL,explorer_hInstance,NULL); - window = CreateWindowW(EXPLORER_CLASS,explorer_title,WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT,CW_USEDEFAULT,DEFAULT_WIDTH, - DEFAULT_HEIGHT,NULL,NULL,explorer_hInstance,NULL); fs.ViewMode = FVM_DETAILS; fs.fFlags = FWF_AUTOARRANGE; explorerRect.left = 0; @@ -91,20 +108,60 @@ static void make_explorer_window(IShellFolder* startFolder) explorerRect.right = DEFAULT_WIDTH; explorerRect.bottom = DEFAULT_HEIGHT; - IExplorerBrowser_Initialize(info->browser,window,&explorerRect,&fs); + IExplorerBrowser_Initialize(info->browser,info->main_window,&explorerRect,&fs); IExplorerBrowser_SetOptions(info->browser,EBO_SHOWFRAMES); - SetWindowLongPtrW(window,EXPLORER_INFO_INDEX,(LONG_PTR)info); + SetWindowLongPtrW(info->main_window,EXPLORER_INFO_INDEX,(LONG)info); + + /*setup navbar*/ + rebar = CreateWindowExW(WS_EX_TOOLWINDOW,REBARCLASSNAMEW,NULL, + WS_CHILD|WS_VISIBLE|RBS_VARHEIGHT|CCS_TOP|CCS_NODIVIDER, + 0,0,0,0,info->main_window,NULL,explorer_hInstance,NULL); + nav_toolbar + = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS,TOOLBARCLASSNAMEW,NULL, + WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT,0,0,0,0,rebar,NULL, + explorer_hInstance,NULL); + + bitmap_info.hInst = HINST_COMMCTRL; + bitmap_info.nID = IDB_HIST_LARGE_COLOR; + hist_offset= SendMessageW(nav_toolbar,TB_ADDBITMAP,0,(LPARAM)&bitmap_info); + bitmap_info.nID = IDB_VIEW_LARGE_COLOR; + view_offset= SendMessageW(nav_toolbar,TB_ADDBITMAP,0,(LPARAM)&bitmap_info); + + nav_buttons[0].iBitmap=hist_offset+HIST_BACK; + nav_buttons[0].idCommand=BACK_BUTTON; + nav_buttons[0].fsState=TBSTATE_ENABLED; + nav_buttons[0].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; + nav_buttons[1].iBitmap=hist_offset+HIST_FORWARD; + nav_buttons[1].idCommand=FORWARD_BUTTON; + nav_buttons[1].fsState=TBSTATE_ENABLED; + nav_buttons[1].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; + nav_buttons[2].iBitmap=view_offset+VIEW_PARENTFOLDER; + nav_buttons[2].idCommand=UP_BUTTON; + nav_buttons[2].fsState=TBSTATE_ENABLED; + nav_buttons[2].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; + SendMessageW(nav_toolbar,TB_BUTTONSTRUCTSIZE,sizeof(TBBUTTON),0); + SendMessageW(nav_toolbar,TB_ADDBUTTONSW,sizeof(nav_buttons)/sizeof(TBBUTTON),(LPARAM)nav_buttons); + + band_info.cbSize = sizeof(band_info); + band_info.fMask = RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; + band_info.hwndChild = nav_toolbar; + band_info.fStyle=RBBS_GRIPPERALWAYS|RBBS_CHILDEDGE; + band_info.cyChild=NAV_TOOLBAR_HEIGHT; + band_info.cx=0; + band_info.cyMinChild=NAV_TOOLBAR_HEIGHT; + band_info.cxMinChild=0; + SendMessageW(rebar,RB_INSERTBANDW,-1,(LPARAM)&band_info); IExplorerBrowser_BrowseToObject(info->browser,(IUnknown*)startFolder, SBSP_ABSOLUTE); - ShowWindow(window,SW_SHOWDEFAULT); - UpdateWindow(window); + ShowWindow(info->main_window,SW_SHOWDEFAULT); + UpdateWindow(info->main_window); } static void update_window_size(explorer_info *info, int height, int width) { RECT new_rect; new_rect.left = 0; - new_rect.top = 0; + new_rect.top = info->rebar_height; new_rect.right = width; new_rect.bottom = height; IExplorerBrowser_SetRect(info->browser,NULL,new_rect); @@ -116,12 +173,40 @@ static void do_exit(int code) ExitProcess(code); } +static LRESULT update_rebar_size(explorer_info* info,NMRBAUTOSIZE *size_info) +{ + RECT new_rect; + RECT window_rect; + info->rebar_height = size_info->rcTarget.bottom-size_info->rcTarget.top; + GetWindowRect(info->main_window,&window_rect); + new_rect.left = 0; + new_rect.top = info->rebar_height; + new_rect.right = window_rect.right-window_rect.left; + new_rect.bottom = window_rect.bottom-window_rect.top; + IExplorerBrowser_SetRect(info->browser,NULL,new_rect); + return 0; +} + +static LRESULT explorer_on_notify(explorer_info* info,NMHDR* notification) +{ + WINE_TRACE("code=%i\n",notification->code); + switch(notification->code) + { + case RBN_AUTOSIZE: + return update_rebar_size(info,(NMRBAUTOSIZE*)notification); + default: + break; + } + return 0; +} + static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { explorer_info *info = (explorer_info*)GetWindowLongPtrW(hwnd,EXPLORER_INFO_INDEX); IExplorerBrowser *browser = NULL; + WINE_TRACE("(hwnd=%p,uMsg=%u,wParam=%lx,lParam=%lx)\n",hwnd,uMsg,wParam,lParam); if(info) browser = info->browser; switch(uMsg) @@ -133,6 +218,25 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L break; case WM_QUIT: do_exit(wParam); + case WM_NOTIFY: + return explorer_on_notify(info,(NMHDR*)lParam); + case WM_COMMAND: + if(HIWORD(wParam)==BN_CLICKED) + { + switch(LOWORD(wParam)) + { + case BACK_BUTTON: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_NAVIGATEBACK); + break; + case FORWARD_BUTTON: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_NAVIGATEFORWARD); + break; + case UP_BUTTON: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_PARENT); + break; + } + } + break; case WM_SIZE: update_window_size(info,HIWORD(lParam),LOWORD(lParam)); break; @@ -153,7 +257,7 @@ static void register_explorer_window_class(void) window_class.hInstance = explorer_hInstance; window_class.hIcon = NULL; window_class.hCursor = NULL; - window_class.hbrBackground = NULL; + window_class.hbrBackground = (HBRUSH)COLOR_BACKGROUND; window_class.lpszMenuName = NULL; window_class.lpszClassName = EXPLORER_CLASS; window_class.hIconSm = NULL; @@ -309,6 +413,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, HRESULT hres; MSG msg; IShellFolder *folder; + INITCOMMONCONTROLSEX init_info; memset(&parameters,0,sizeof(parameters)); explorer_hInstance = hinstance; @@ -319,6 +424,13 @@ int WINAPI wWinMain(HINSTANCE hinstance, WINE_ERR("Could not initialize COM\n"); ExitProcess(EXIT_FAILURE); } + init_info.dwSize = sizeof(INITCOMMONCONTROLSEX); + init_info.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; + if(!InitCommonControlsEx(&init_info)) + { + WINE_ERR("Could not initialize Comctl\n"); + ExitProcess(EXIT_FAILURE); + } register_explorer_window_class(); folder = get_starting_shell_folder(&parameters); make_explorer_window(folder);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 406e2107210ef1250ac03861860f17fbfcfb404b URL: http://source.winehq.org/git/wine.git/?a=commit;h=406e2107210ef1250ac038618… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 10:57:49 2011 +0400 po: Update Russian translation. --- po/ru.po | 64 +++++++++++++++++++++++-------------------------------------- 1 files changed, 24 insertions(+), 40 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1f04849..6d6a80c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -66,14 +66,12 @@ msgid "All files (*.*)" msgstr "Все файлы (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "&Удалить..." +msgstr "&Удалить" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "&Изменить/Удалить..." +msgstr "&Изменить/Удалить" #: appwiz.rc:48 msgid "Downloading..." @@ -358,9 +356,8 @@ msgstr "" "Введите их заново" #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." -msgstr "Значение Числа Копий не может быть пустым" +msgstr "Число копий не может быть пустым" #: comdlg32.rc:76 msgid "" @@ -686,9 +683,8 @@ msgid "Unstructured Address" msgstr "Неструктурированный адрес" #: crypt32.rc:51 -#, fuzzy msgid "S/MIME Capabilities" -msgstr "Возможности SMIME" +msgstr "Возможности S/MIME" #: crypt32.rc:52 msgid "Prefer Signed Data" @@ -6246,9 +6242,8 @@ msgid "Pr&int..." msgstr "Пе&чать..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w" -msgstr "Пред&варительный просмотр..." +msgstr "Пред&варительный просмотр" #: shdocvw.rc:40 oleview.rc:80 taskmgr.rc:139 msgid "&Close" @@ -6286,9 +6281,8 @@ msgid "&Help" msgstr "&Справка" #: shdocvw.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "&О программе..." +msgstr "&О программе Internet Explorer" #: shdocvw.rc:67 #, fuzzy @@ -6393,9 +6387,8 @@ msgid "E&xit" msgstr "В&ыйти" #: shell32.rc:115 -#, fuzzy msgid "&About Control Panel" -msgstr "&О Панели Управления..." +msgstr "&О Панели Управления" #: shell32.rc:123 shell32.rc:127 winefile.rc:113 msgid "Size" @@ -6832,13 +6825,12 @@ msgid "&About Wine" msgstr "&О Wine" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl-F4" -msgstr "&Закрыть\tAlt-F4" +msgstr "&Закрыть\tCtrl-F4" #: user32.rc:48 msgid "Nex&t\tCtrl-F6" -msgstr "" +msgstr "С&ледующее\tCtrl-F6" #: user32.rc:68 regedit.rc:176 winefile.rc:100 msgid "Error" @@ -8410,11 +8402,13 @@ msgstr "Введённая команда слишком длинная.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" -msgstr "" +msgstr "Утилита диагностики DirectX" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" msgstr "" +"Использование: dxdiag [/whql:off | /whql:on] [/t <имя файла> | /x <имя " +"файла>]" #: explorer.rc:28 #, fuzzy @@ -8423,18 +8417,17 @@ msgstr "Wine Internet Explorer" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Использование: hostname\n" #: hostname.rc:28 -#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "Ошибка: неправильное имя раздела\n" +msgstr "Ошибка: неверная опция '%c'.\n" #: hostname.rc:29 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "" +msgstr "Ошибка: с помощью hostname невозможно измененить имя машины.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n" @@ -8793,9 +8786,8 @@ msgid "&View TypeLib..." msgstr "&Просмотр TypeLib..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "&Конфигурация системы..." +msgstr "&Конфигурация системы" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9080,18 +9072,16 @@ msgid "&Copy...\tF8" msgstr "&Копировать...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" -msgstr "Свойства...\tAlt+Enter" +msgstr "&Свойства\tAlt+Enter" #: progman.rc:37 msgid "&Execute..." msgstr "&Запустить..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" -msgstr "Вы&ход из Wine..." +msgstr "Вы&ход из Windows" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options" @@ -9259,9 +9249,8 @@ msgid "&Export Registry File..." msgstr "&Экспортировать файл реестра..." #: regedit.rc:42 regedit.rc:87 -#, fuzzy msgid "&Modify..." -msgstr "&Изменить" +msgstr "&Изменить..." #: regedit.rc:46 regedit.rc:97 msgid "&Key" @@ -9320,9 +9309,8 @@ msgid "&About Registry Editor" msgstr "&О редакторе реестра" #: regedit.rc:88 -#, fuzzy msgid "Modify Binary Data..." -msgstr "Изменить &двоичные данные" +msgstr "Изменить &двоичные данные..." #: regedit.rc:109 msgid "&Export..." @@ -10248,9 +10236,8 @@ msgid "Regular Metafile Viewer" msgstr "Просмотрщик обычных метафайлов" #: winecfg.rc:32 -#, fuzzy msgid "Configure..." -msgstr "Настроить" +msgstr "Настроить..." #: winecfg.rc:39 msgid "Libraries" @@ -10391,9 +10378,8 @@ msgid "None" msgstr "Нет" #: winecfg.rc:81 -#, fuzzy msgid "Autodetect..." -msgstr "Автоопределение" +msgstr "Автоопределение..." #: winecfg.rc:82 msgid "Local hard disk" @@ -10801,9 +10787,8 @@ msgid "Re&name..." msgstr "Переименовать..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" -msgstr "Свойства...\tAlt+Enter" +msgstr "&Свойства\tAlt+Enter" #: winefile.rc:33 msgid "&Run..." @@ -10822,9 +10807,8 @@ msgid "&Disk" msgstr "&Диск" #: winefile.rc:45 -#, fuzzy msgid "Connect &Network Drive..." -msgstr "Подклю&чить сетевой диск" +msgstr "Подклю&чить сетевой диск..." #: winefile.rc:46 msgid "&Disconnect Network Drive"

1 0

Henri Verbeet : wined3d: Get rid of the GL_SupportedExt typedef.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 5d6f29818f24236f66b4ff7c7742f3ae41b9afcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6f29818f24236f66b4ff7c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:23 2011 +0200 wined3d: Get rid of the GL_SupportedExt typedef. --- dlls/wined3d/directx.c | 11 +++++++---- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_gl.h | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 504cb2c..8453af1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,11 +72,14 @@ enum wined3d_gl_vendor static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; /* Extension detection */ -static const struct { +static const struct +{ const char *extension_string; - GL_SupportedExt extension; + enum wined3d_gl_extension extension; DWORD version; -} EXTENSION_MAP[] = { +} +EXTENSION_MAP[] = +{ /* APPLE */ {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 }, {"GL_APPLE_fence", APPLE_FENCE, 0 }, @@ -446,7 +449,7 @@ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_inf return ret; } -static DWORD ver_for_ext(GL_SupportedExt ext) +static DWORD ver_for_ext(enum wined3d_gl_extension ext) { unsigned int i; for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fe767ea..25cb4ee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -249,7 +249,7 @@ struct wined3d_format_texture_info GLint gl_type; unsigned int conv_byte_count; unsigned int flags; - GL_SupportedExt extension; + enum wined3d_gl_extension extension; void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); }; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 85e5fea..24c366e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1721,7 +1721,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; USE_WGL_FUNC(wglShareLists) /* OpenGL extensions. */ -typedef enum wined3d_gl_extension +enum wined3d_gl_extension { WINED3D_GL_EXT_NONE, @@ -1845,7 +1845,7 @@ typedef enum wined3d_gl_extension WINED3D_GL_VERSION_2_0, WINED3D_GL_EXT_COUNT, -} GL_SupportedExt; +}; /* GL_APPLE_client_storage */ #ifndef GL_APPLE_client_storage diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b6f27..f4947f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1139,7 +1139,7 @@ struct StateEntryTemplate { DWORD state; struct StateEntry content; - GL_SupportedExt extension; + enum wined3d_gl_extension extension; }; struct fragment_caps

1 0

Henri Verbeet : wined3d: Get rid of the tex_op_args typedef.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 82d74d563a750c8c640de9cae5c626e3c1fe24a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d74d563a750c8c640de9cae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:22 2011 +0200 wined3d: Get rid of the tex_op_args typedef. --- dlls/wined3d/nvidia_texture_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index f20fc7a..624d630 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -70,11 +70,12 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st } } -typedef struct { +struct tex_op_args +{ GLenum input[3]; GLenum mapping[3]; GLenum component_usage[3]; -} tex_op_args; +}; static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx) { switch (d3dta) { @@ -134,7 +135,7 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum* void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) { - tex_op_args tex_op_args = {{0}, {0}, {0}}; + struct tex_op_args tex_op_args = {{0}, {0}, {0}}; GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; GLenum target = GL_COMBINER0_NV + stage; GLenum output;

1 0

Henri Verbeet : wined3d: Get rid of some macros.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 8f6ae4ba38b4fd3cf268bf2de8b890f2c4ddfb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6ae4ba38b4fd3cf268bf2de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:19 2011 +0200 wined3d: Get rid of some macros. --- dlls/wined3d/directx.c | 90 +++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 7 --- 2 files changed, 61 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f45ff04..b1dd957 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1398,14 +1398,35 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } +static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) +{ + UINT level = 0; + if (gl_info->supported[ARB_MULTITEXTURE]) + level = 6; + if (gl_info->supported[ARB_TEXTURE_COMPRESSION] + && gl_info->supported[ARB_TEXTURE_CUBE_MAP] + && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) + level = 7; + if (level == 7 && gl_info->supported[ARB_MULTISAMPLE] + && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) + level = 8; + if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] + && gl_info->supported[ARB_VERTEX_SHADER]) + level = 9; + if (level == 9 && gl_info->supported[EXT_GPU_SHADER4]) + level = 10; + + return level; +} static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); unsigned int i; - if (WINE_D3D10_CAPABLE(gl_info)) + if (d3d_level >= 10) { static const struct { @@ -1480,7 +1501,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ - if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + if (d3d_level >= 9 && gl_info->supported[NV_VERTEX_PROGRAM3]) { static const struct { @@ -1514,7 +1535,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_6200; /* Geforce 6100/6150/6200/7300/7400/7500 */ } - if (WINE_D3D9_CAPABLE(gl_info)) + if (d3d_level >= 9) { /* GeforceFX - highend */ if (strstr(gl_renderer, "5800") @@ -1538,7 +1559,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCEFX_5200; /* GeforceFX 5100/5200/5250/5300/5500 */ } - if (WINE_D3D8_CAPABLE(gl_info)) + if (d3d_level >= 8) { if (strstr(gl_renderer, "GeForce4 Ti") || strstr(gl_renderer, "Quadro4")) { @@ -1548,7 +1569,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE3; /* Geforce3 standard/Ti200/Ti500, Quadro DCC */ } - if (WINE_D3D7_CAPABLE(gl_info)) + if (d3d_level >= 7) { if (strstr(gl_renderer, "GeForce4 MX")) { @@ -1579,11 +1600,13 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); + /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx * * Beware: renderer string do not match exact card model, * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ - if (WINE_D3D10_CAPABLE(gl_info)) + if (d3d_level >= 10) { unsigned int i; @@ -1648,7 +1671,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return CARD_AMD_RADEON_HD3200; } - if (WINE_D3D8_CAPABLE(gl_info)) + if (d3d_level >= 9) { /* Radeon R5xx */ if (strstr(gl_renderer, "X1600") @@ -1687,15 +1710,11 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return CARD_AMD_RADEON_9500; /* Radeon 9500/9550/9600/9700/9800/X300/X550/X600 */ } - if (WINE_D3D8_CAPABLE(gl_info)) - { + if (d3d_level >= 8) return CARD_AMD_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */ - } - if (WINE_D3D7_CAPABLE(gl_info)) - { + if (d3d_level >= 7) return CARD_AMD_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ - } return CARD_AMD_RAGE_128PRO; } @@ -1728,6 +1747,7 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level; unsigned int i; /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx @@ -1817,7 +1837,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } } - if (WINE_D3D9_CAPABLE(gl_info)) + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) { static const struct { @@ -1853,15 +1874,11 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } } - if (WINE_D3D8_CAPABLE(gl_info)) - { + if (d3d_level >= 8) return CARD_AMD_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */ - } - if (WINE_D3D7_CAPABLE(gl_info)) - { + if (d3d_level >= 7) return CARD_AMD_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ - } return CARD_AMD_RAGE_128PRO; } @@ -1869,6 +1886,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level; + if (strstr(gl_renderer, "Gallium")) { unsigned int i; @@ -1944,10 +1963,16 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer)); - if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; - if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; - if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE; - if (WINE_D3D6_CAPABLE(gl_info)) return CARD_NVIDIA_RIVA_TNT; + + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) + return CARD_NVIDIA_GEFORCEFX_5600; + if (d3d_level >= 8) + return CARD_NVIDIA_GEFORCE3; + if (d3d_level >= 7) + return CARD_NVIDIA_GEFORCE; + if (d3d_level >= 6) + return CARD_NVIDIA_RIVA_TNT; return CARD_NVIDIA_RIVA_128; } @@ -1977,6 +2002,8 @@ static const struct vendor_card_selection vendor_card_select_table[] = static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) { + UINT d3d_level; + /* Above is a list of Nvidia and ATI GPUs. Both vendors have dozens of * different GPUs with roughly the same features. In most cases GPUs from a * certain family differ in clockspeeds, the amount of video memory and the @@ -2050,10 +2077,15 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * for Nvidia was because the hardware and drivers they make are of good quality. This makes * them a good generic choice. */ *card_vendor = HW_VENDOR_NVIDIA; - if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; - if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; - if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE; - if (WINE_D3D6_CAPABLE(gl_info)) return CARD_NVIDIA_RIVA_TNT; + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) + return CARD_NVIDIA_GEFORCEFX_5600; + if (d3d_level >= 8) + return CARD_NVIDIA_GEFORCE3; + if (d3d_level >= 7) + return CARD_NVIDIA_GEFORCE; + if (d3d_level >= 6) + return CARD_NVIDIA_RIVA_TNT; return CARD_NVIDIA_RIVA_128; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8fddb7..32b50d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1245,13 +1245,6 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DEC void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -/* Macros for doing basic GPU detection based on opengl capabilities */ -#define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE]) -#define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) -#define WINE_D3D8_CAPABLE(gl_info) WINE_D3D7_CAPABLE(gl_info) && (gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) -#define WINE_D3D9_CAPABLE(gl_info) WINE_D3D8_CAPABLE(gl_info) && (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) -#define WINE_D3D10_CAPABLE(gl_info) WINE_D3D9_CAPABLE(gl_info) && (gl_info->supported[EXT_GPU_SHADER4]) - /***************************************************************************** * Internal representation of a light */

1 0

Jacek Caban : shobjidl.idl: Added some missing coclasses.
by Alexandre Julliard July 4, 2011

July 4, 2011

Module: wine Branch: master Commit: 547cc079618b20da2d9143c44ba08889045a79a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547cc079618b20da2d9143c44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 4 12:33:46 2011 +0200 shobjidl.idl: Added some missing coclasses. --- dlls/uuid/uuid.c | 1 - include/shlguid.h | 1 - include/shobjidl.idl | 41 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index d4ad2ae..0a60a5c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -122,7 +122,6 @@ DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49, DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); -DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); diff --git a/include/shlguid.h b/include/shlguid.h index e11f9ff..a19b70c 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -20,7 +20,6 @@ #define __WINE_SHLGUID_H DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); -DEFINE_OLEGUID(CLSID_ShellLink, 0x00021401L, 0, 0); DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 1b4d385..910118d 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1855,8 +1855,6 @@ interface ITaskbarList : IUnknown [in] HWND hwnd); } -cpp_quote("EXTERN_C const CLSID CLSID_TaskbarList;") - /***************************************************************************** * ITaskbarList2 interface */ @@ -3342,4 +3340,43 @@ library ShellObjects { interface IKnownFolderManager; } + + [ + uuid(591209c7-767b-42b2-9fba-44ee4615f2c7) + ] + coclass ApplicationAssociationRegistration + { + interface IApplicationAssociationRegistration; + } + + [ + uuid(00021401-0000-0000-c000-000000000046) + ] + coclass ShellLink + { + interface IShellLinkW; + } + + [ + uuid(56fdf344-fd6d-11d0-958a-006097c9a090) + ] + coclass TaskbarList + { + interface ITaskbarList4; + } + + [ + uuid(77f10cf0-3db5-4966-b520-b7c54fd35ed6) + ] + coclass DestinationList { + interface ICustomDestinationList; + } + + [ + uuid(2d3468c1-36a7-43b6-ac24-d3f02fd9607a) + ] + coclass EnumerableObjectCollection + { + interface IEnumObjects; + } }

1 0