August 2010 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : shdocvw: Make the Home button in IE work.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 871a65d230b754ad812d01cfa53be271ede6e701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=871a65d230b754ad812d01cfa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 7 16:26:15 2010 +0200 shdocvw: Make the Home button in IE work. --- dlls/shdocvw/iexplore.c | 6 +++++- dlls/shdocvw/resource.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index a908744..9144e85 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -372,7 +372,7 @@ static void create_rebar(HWND hwnd) add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_FORWARD); add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_STOP); add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_REFRESH); - add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_HOME); + add_tb_button(hwndToolbar, I_IMAGENONE, ID_BROWSE_HOME, IDS_TB_HOME); add_tb_separator(hwndToolbar); add_tb_button(hwndToolbar, I_IMAGENONE, ID_BROWSE_PRINT, IDS_TB_PRINT); SendMessageW(hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(50,40)); @@ -491,6 +491,10 @@ static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT } break; + case ID_BROWSE_HOME: + IWebBrowser2_GoHome(WEBBROWSER2(This)); + break; + case ID_BROWSE_ABOUT: ie_dialog_about(hwnd); break; diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 3e497fe..853538f 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -40,6 +40,7 @@ #define ID_BROWSE_ABOUT 336 #define ID_BROWSE_ADDFAV 1200 +#define ID_BROWSE_HOME 1201 #define ID_BROWSE_GOTOFAV_FIRST 2000 #define ID_BROWSE_GOTOFAV_MAX 65000

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add icons to the IE toolbar.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 4432f57e35b6bc59f652d79be0904e356a5b25fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4432f57e35b6bc59f652d79be… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 9 19:15:51 2010 +0200 shdocvw: Add icons to the IE toolbar. --- dlls/shdocvw/ietoolbar.bmp | Bin 0 -> 3170 bytes dlls/shdocvw/iexplore.c | 26 ++++++++++++++++++-------- dlls/shdocvw/resource.h | 1 + dlls/shdocvw/shdocvw.rc | 3 +++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/ietoolbar.bmp b/dlls/shdocvw/ietoolbar.bmp new file mode 100644 index 0000000..b76d50e Binary files /dev/null and b/dlls/shdocvw/ietoolbar.bmp differ diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 9144e85..c4d545b 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -355,6 +355,8 @@ static void create_rebar(HWND hwnd) REBARINFO rebarinf; REBARBANDINFOW bandinf; WCHAR addr[] = {'A','d','d','r','e','s','s',0}; + HIMAGELIST imagelist; + WCHAR idb_ietoolbar[] = {'I','D','B','_','I','E','T','O','O','L','B','A','R',0}; hwndRebar = CreateWindowExW(WS_EX_TOOLWINDOW, REBARCLASSNAMEW, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|RBS_VARHEIGHT|CCS_TOP|CCS_NODIVIDER, 0, 0, 0, 0, hwnd, (HMENU)IDC_BROWSE_REBAR, shdocvw_hinstance, NULL); @@ -367,22 +369,25 @@ static void create_rebar(HWND hwnd) hwndToolbar = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwndRebar, (HMENU)IDC_BROWSE_TOOLBAR, shdocvw_hinstance, NULL); + imagelist = ImageList_LoadImageW(shdocvw_hinstance, idb_ietoolbar, 32, 0, RGB(255,0,255), IMAGE_BITMAP, LR_DEFAULTCOLOR); + + SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)imagelist); SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_BACK); - add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_FORWARD); - add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_STOP); - add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_REFRESH); - add_tb_button(hwndToolbar, I_IMAGENONE, ID_BROWSE_HOME, IDS_TB_HOME); + add_tb_button(hwndToolbar, 0, 0, IDS_TB_BACK); + add_tb_button(hwndToolbar, 1, 0, IDS_TB_FORWARD); + add_tb_button(hwndToolbar, 2, 0, IDS_TB_STOP); + add_tb_button(hwndToolbar, 3, 0, IDS_TB_REFRESH); + add_tb_button(hwndToolbar, 4, ID_BROWSE_HOME, IDS_TB_HOME); add_tb_separator(hwndToolbar); - add_tb_button(hwndToolbar, I_IMAGENONE, ID_BROWSE_PRINT, IDS_TB_PRINT); - SendMessageW(hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(50,40)); + add_tb_button(hwndToolbar, 5, ID_BROWSE_PRINT, IDS_TB_PRINT); + SendMessageW(hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(55,50)); SendMessageW(hwndToolbar, TB_AUTOSIZE, 0, 0); bandinf.cbSize = sizeof(bandinf); bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE; bandinf.fStyle = RBBS_CHILDEDGE; bandinf.cx = 100; - bandinf.cyMinChild = 42; + bandinf.cyMinChild = 52; bandinf.hwndChild = hwndToolbar; SendMessageW(hwndRebar, RB_INSERTBANDW, -1, (LPARAM)&bandinf); @@ -460,9 +465,14 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar static LRESULT iewnd_OnDestroy(InternetExplorer *This) { + HWND hwndRebar = GetDlgItem(This->frame_hwnd, IDC_BROWSE_REBAR); + HWND hwndToolbar = GetDlgItem(hwndRebar, IDC_BROWSE_TOOLBAR); + HIMAGELIST list = (HIMAGELIST)SendMessageW(hwndToolbar, TB_GETIMAGELIST, 0, 0); + TRACE("%p\n", This); free_fav_menu_data(get_fav_menu(This->menu)); + ImageList_Destroy(list); This->frame_hwnd = NULL; PostQuitMessage(0); /* FIXME */ diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 853538f..11b710d 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -28,6 +28,7 @@ #define IDC_BROWSE_ADDRESSBAR 1004 #define IDC_BROWSE_STATUSBAR 1005 #define IDC_BROWSE_TOOLBAR 1006 +#define IDB_IETOOLBAR 1007 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256 diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 9872c23..08d9ebc 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -33,3 +33,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: shdocvw.inf */ REGINST REGINST shdocvw.inf + +/* @makedep: ietoolbar.bmp */ +IDB_IETOOLBAR BITMAP ietoolbar.bmp

1 0

Mariusz Pluciński : gameux/tests: Add test of IGameExplorer creation.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: cb886f49bead941476eb3f643c337bb1311ab7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb886f49bead941476eb3f643… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Aug 3 11:58:01 2010 +0200 gameux/tests: Add test of IGameExplorer creation. --- configure | 1 + configure.ac | 1 + dlls/gameux/tests/Makefile.in | 12 +++++++ dlls/gameux/tests/gameexplorer.c | 61 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3a5b7b6..bc1196c 100755 --- a/configure +++ b/configure @@ -14511,6 +14511,7 @@ wine_fn_config_dll fusion enable_fusion wine_fn_config_test dlls/fusion/tests fusion_test wine_fn_config_dll fwpuclnt enable_fwpuclnt wine_fn_config_dll gameux enable_gameux +wine_fn_config_test dlls/gameux/tests gameux_test wine_fn_config_dll gdi.exe16 enable_win16 wine_fn_config_dll gdi32 enable_gdi32 gdi32 wine_fn_config_test dlls/gdi32/tests gdi32_test diff --git a/configure.ac b/configure.ac index 37b0cf0..b5430bd 100644 --- a/configure.ac +++ b/configure.ac @@ -2367,6 +2367,7 @@ WINE_CONFIG_DLL(fusion) WINE_CONFIG_TEST(dlls/fusion/tests) WINE_CONFIG_DLL(fwpuclnt) WINE_CONFIG_DLL(gameux) +WINE_CONFIG_TEST(dlls/gameux/tests) WINE_CONFIG_DLL(gdi.exe16,enable_win16) WINE_CONFIG_DLL(gdi32,,[gdi32]) WINE_CONFIG_TEST(dlls/gdi32/tests) diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in new file mode 100644 index 0000000..b8e27d7 --- /dev/null +++ b/dlls/gameux/tests/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = gameux.dll +IMPORTS = ole32 + +C_SRCS = \ + gameexplorer.c + + +(a)MAKE_TEST_RULES@ diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c new file mode 100644 index 0000000..b87fd02 --- /dev/null +++ b/dlls/gameux/tests/gameexplorer.c @@ -0,0 +1,61 @@ +/* + * IGameExplorer tests + * + * Copyright (C) 2010 Mariusz Pluciński + * + * 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 + */ + +#define COBJMACROS + +#include "initguid.h" + +#include "windows.h" +#include "ole2.h" +#include "objsafe.h" +#include "objbase.h" +#include "gameux.h" + +#include "wine/test.h" + + +static void test_create( void ) +{ + HRESULT hr; + + IGameExplorer* ge = NULL; + + /* interface available up from Vista */ + hr = CoCreateInstance( &CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer, (LPVOID*)&ge); + if(ge) + { + ok(hr == S_OK, "IGameExplorer creating failed (result false)\n"); + IGameExplorer_Release(ge); + } + else + win_skip("IGameExplorer cannot be created\n"); +} + +START_TEST(gameexplorer) +{ + HRESULT r; + + r = CoInitialize( NULL ); + ok( r == S_OK, "failed to init COM\n"); + + test_create(); + + CoUninitialize(); +}

1 0

Alexandre Julliard : shdocvw: Fix an incorrect const typecast.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 76dd207733b6ea220da8705dc6312f3179443eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dd207733b6ea220da8705dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 19:23:55 2010 +0200 shdocvw: Fix an incorrect const typecast. --- dlls/shdocvw/iexplore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index ea3fdf4..c8b93af 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -83,7 +83,7 @@ static HMENU get_fav_menu(HMENU menu) return GetSubMenu(menu, 1); } -static LPCWSTR get_fav_url_from_id(HMENU menu, UINT id) +static LPWSTR get_fav_url_from_id(HMENU menu, UINT id) { MENUITEMINFOW item; @@ -98,11 +98,11 @@ static LPCWSTR get_fav_url_from_id(HMENU menu, UINT id) static void free_fav_menu_data(HMENU menu) { - LPCWSTR url; + LPWSTR url; int i; for(i = 0; (url = get_fav_url_from_id(menu, ID_BROWSE_GOTOFAV_FIRST + i)); i++) - heap_free((LPWSTR)url); + heap_free( url ); } static int get_menu_item_count(HMENU menu)

1 0

Vincent Povirk : gdiplus: Stub GdipGetPenTransform.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 2da2c9fd6b3628216444a6f2deaf748370877dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da2c9fd6b3628216444a6f2d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 18:00:49 2010 -0500 gdiplus: Stub GdipGetPenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4b9444e..495bc14 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -365,7 +365,7 @@ @ stdcall GdipGetPenMiterLimit(ptr ptr) @ stdcall GdipGetPenMode(ptr ptr) @ stdcall GdipGetPenStartCap(ptr ptr) -@ stub GdipGetPenTransform +@ stdcall GdipGetPenTransform(ptr ptr) @ stdcall GdipGetPenUnit(ptr ptr) @ stdcall GdipGetPenWidth(ptr ptr) @ stdcall GdipGetPixelOffsetMode(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index c2b3399..4fed4d2 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -419,6 +419,21 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p,%p)\n", pen, matrix); + + if(!pen || !matrix) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { static int calls;

1 0

Alexander Nicolaysen Sørnes : shdocvw: Recurse into directories when adding Favorite in IE.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: abc1e565636a1749c983cda28fe98dd4cf1acde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc1e565636a1749c983cda28… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 22 18:12:02 2010 +0200 shdocvw: Recurse into directories when adding Favorite in IE. --- dlls/shdocvw/iexplore.c | 88 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 66 insertions(+), 22 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index b794a8b..c934753 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -105,11 +105,31 @@ static void free_fav_menu_data(HMENU menu) heap_free((LPWSTR)url); } -static void add_fav_to_menu(HMENU menu, LPWSTR title, LPCWSTR url) +static int get_menu_item_count(HMENU menu) +{ + MENUITEMINFOW item; + int count = 0; + int i; + + item.cbSize = sizeof(item); + item.fMask = MIIM_DATA | MIIM_SUBMENU; + + for(i = 0; GetMenuItemInfoW(menu, i, TRUE, &item); i++) + { + if(item.hSubMenu) + count += get_menu_item_count(item.hSubMenu); + else + count++; + } + + return count; +} + +static void add_fav_to_menu(HMENU favmenu, HMENU menu, LPWSTR title, LPCWSTR url) { MENUITEMINFOW item; /* Subtract the number of standard elements in the Favorites menu */ - INT favcount = GetMenuItemCount(menu) - 2; + int favcount = get_menu_item_count(favmenu) - 2; LPWSTR urlbuf; if(favcount > (ID_BROWSE_GOTOFAV_MAX - ID_BROWSE_GOTOFAV_FIRST)) @@ -131,13 +151,13 @@ static void add_fav_to_menu(HMENU menu, LPWSTR title, LPCWSTR url) item.dwTypeData = title; item.wID = ID_BROWSE_GOTOFAV_FIRST + favcount; item.dwItemData = (ULONG_PTR)urlbuf; - InsertMenuItemW(menu, favcount + 2, TRUE, &item); + InsertMenuItemW(menu, -1, TRUE, &item); } -static void add_favs_to_menu(HMENU menu, LPCWSTR dir) +static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) { WCHAR path[MAX_PATH*2]; - const WCHAR urlext[] = {'*','.','u','r','l',0}; + const WCHAR search[] = {'*',0}; WCHAR* filename; HANDLE findhandle; WIN32_FIND_DATAW finddata; @@ -146,7 +166,7 @@ static void add_favs_to_menu(HMENU menu, LPCWSTR dir) HRESULT res; lstrcpyW(path, dir); - PathAppendW(path, urlext); + PathAppendW(path, search); findhandle = FindFirstFileW(path, &finddata); @@ -160,25 +180,48 @@ static void add_favs_to_menu(HMENU menu, LPCWSTR dir) if(SUCCEEDED(res)) { - filename = path + lstrlenW(path) - lstrlenW(urlext); + filename = path + lstrlenW(path) - lstrlenW(search); do { - WCHAR* fileext; - WCHAR* url = NULL; lstrcpyW(filename, finddata.cFileName); - if(FAILED(IPersistFile_Load(urlfile, path, 0))) - continue; + if(finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + MENUITEMINFOW item; + const WCHAR ignore1[] = {'.','.',0}; + const WCHAR ignore2[] = {'.',0}; + + if(!lstrcmpW(filename, ignore1) || !lstrcmpW(filename, ignore2)) + continue; + + item.cbSize = sizeof(item); + item.fMask = MIIM_STRING | MIIM_SUBMENU; + item.dwTypeData = filename; + item.hSubMenu = CreatePopupMenu(); + InsertMenuItemW(menu, -1, TRUE, &item); + add_favs_to_menu(favmenu, item.hSubMenu, path); + } else + { + WCHAR* fileext; + WCHAR* url = NULL; + const WCHAR urlext[] = {'.','u','r','l',0}; + + if(lstrcmpiW(PathFindExtensionW(filename), urlext)) + continue; - urlobj->lpVtbl->GetURL(urlobj, &url); + if(FAILED(IPersistFile_Load(urlfile, path, 0))) + continue; - if(!url) - continue; + urlobj->lpVtbl->GetURL(urlobj, &url); - fileext = filename + lstrlenW(filename) - lstrlenW(urlext) + 1; - *fileext = 0; - add_fav_to_menu(menu, filename, url); + if(!url) + continue; + + fileext = filename + lstrlenW(filename) - lstrlenW(urlext); + *fileext = 0; + add_fav_to_menu(favmenu, menu, filename, url); + } } while(FindNextFileW(findhandle, &finddata)); } @@ -194,13 +237,14 @@ static void add_favs_to_menu(HMENU menu, LPCWSTR dir) static HMENU create_ie_menu(void) { HMENU menu = LoadMenuW(shdocvw_hinstance, MAKEINTRESOURCEW(IDR_BROWSE_MAIN_MENU)); + HMENU favmenu = get_fav_menu(menu); WCHAR path[MAX_PATH]; if(SHGetFolderPathW(NULL, CSIDL_COMMON_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path) == S_OK) - add_favs_to_menu(get_fav_menu(menu), path); + add_favs_to_menu(favmenu, favmenu, path); if(SHGetFolderPathW(NULL, CSIDL_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path) == S_OK) - add_favs_to_menu(get_fav_menu(menu), path); + add_favs_to_menu(favmenu, favmenu, path); return menu; }

1 0

David Hedberg : explorerframe: Add IOleWindow implementation.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: c32fa3485bb1c38fbd23fd39feea9f3d98aaef80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32fa3485bb1c38fbd23fd39f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 03:43:08 2010 +0200 explorerframe: Add IOleWindow implementation. --- dlls/explorerframe/nstc.c | 62 +++++++++++++++++++++++++++ dlls/explorerframe/tests/nstc.c | 90 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 2f2c3dc..e9c8346 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nstc); typedef struct { const INameSpaceTreeControl2Vtbl *lpVtbl; + const IOleWindowVtbl *lpowVtbl; LONG ref; HWND hwnd_main; @@ -207,6 +208,10 @@ static HRESULT WINAPI NSTC2_fnQueryInterface(INameSpaceTreeControl2* iface, { *ppvObject = This; } + else if(IsEqualIID(riid, &IID_IOleWindow)) + { + *ppvObject = &This->lpowVtbl; + } if(*ppvObject) { @@ -531,6 +536,62 @@ static const INameSpaceTreeControl2Vtbl vt_INameSpaceTreeControl2 = { NSTC2_fnGetControlStyle2 }; +/************************************************************************** + * IOleWindow Implementation + */ + +static inline NSTC2Impl *impl_from_IOleWindow(IOleWindow *iface) +{ + return (NSTC2Impl *)((char*)iface - FIELD_OFFSET(NSTC2Impl, lpowVtbl)); +} + +static HRESULT WINAPI IOW_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObject) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p\n", This); + return NSTC2_fnQueryInterface((INameSpaceTreeControl2*)This, riid, ppvObject); +} + +static ULONG WINAPI IOW_fnAddRef(IOleWindow *iface) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p\n", This); + return NSTC2_fnAddRef((INameSpaceTreeControl2*)This); +} + +static ULONG WINAPI IOW_fnRelease(IOleWindow *iface) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p\n", This); + return NSTC2_fnRelease((INameSpaceTreeControl2*)This); +} + +static HRESULT WINAPI IOW_fnGetWindow(IOleWindow *iface, HWND *phwnd) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p (%p)\n", This, phwnd); + + *phwnd = This->hwnd_main; + return S_OK; +} + +static HRESULT WINAPI IOW_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + NSTC2Impl *This = impl_from_IOleWindow(iface); + TRACE("%p (%d)\n", This, fEnterMode); + + /* Not implemented */ + return E_NOTIMPL; +} + +static const IOleWindowVtbl vt_IOleWindow = { + IOW_fnQueryInterface, + IOW_fnAddRef, + IOW_fnRelease, + IOW_fnGetWindow, + IOW_fnContextSensitiveHelp +}; + HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { NSTC2Impl *nstc; @@ -548,6 +609,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); nstc->ref = 1; nstc->lpVtbl = &vt_INameSpaceTreeControl2; + nstc->lpowVtbl = &vt_IOleWindow; ret = INameSpaceTreeControl_QueryInterface((INameSpaceTreeControl*)nstc, riid, ppv); INameSpaceTreeControl_Release((INameSpaceTreeControl*)nstc); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 122cb8d..6a72eb3 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -34,7 +34,9 @@ static HWND hwnd; static BOOL test_initialization(void) { INameSpaceTreeControl *pnstc; + IOleWindow *pow; IUnknown *punk; + HWND hwnd_host1; LONG lres; HRESULT hr; RECT rc; @@ -60,8 +62,89 @@ static BOOL test_initialization(void) hr = INameSpaceTreeControl_Initialize(pnstc, (HWND)0xDEADBEEF, &rc, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) + { + hr = IOleWindow_GetWindow(pow, &hwnd_host1); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok(hwnd_host1 == NULL, "hwnd is not null.\n"); + + hr = IOleWindow_ContextSensitiveHelp(pow, TRUE); + ok(hr == E_NOTIMPL, "Got (0x%08x)\n", hr); + hr = IOleWindow_ContextSensitiveHelp(pow, FALSE); + ok(hr == E_NOTIMPL, "Got (0x%08x)\n", hr); + IOleWindow_Release(pow); + } + hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, NULL, 0); ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + static const CHAR namespacetree[] = "NamespaceTreeControl"; + char buf[1024]; + LONG style, expected_style; + HWND hwnd_tv; + hr = IOleWindow_GetWindow(pow, &hwnd_host1); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok(hwnd_host1 != NULL, "hwnd_host1 is null.\n"); + buf[0] = '\0'; + GetClassNameA(hwnd_host1, buf, 1024); + ok(!lstrcmpA(namespacetree, buf), "Class name was %s\n", buf); + + expected_style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + style = GetWindowLongPtrW(hwnd_host1, GWL_STYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = 0; + style = GetWindowLongPtrW(hwnd_host1, GWL_EXSTYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = 0; + style = SendMessageW(hwnd_host1, TVM_GETEXTENDEDSTYLE, 0, 0); + ok(style == expected_style, "Got 0x%08x\n", style); + + hwnd_tv = FindWindowExW(hwnd_host1, NULL, WC_TREEVIEWW, NULL); + ok(hwnd_tv != NULL, "Failed to get treeview hwnd.\n"); + if(hwnd_tv) + { + expected_style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | WS_TABSTOP | TVS_NOHSCROLL | + TVS_NONEVENHEIGHT | TVS_INFOTIP | TVS_TRACKSELECT | TVS_EDITLABELS; + style = GetWindowLongPtrW(hwnd_tv, GWL_STYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = 0; + style = GetWindowLongPtrW(hwnd_tv, GWL_EXSTYLE); + ok(style == expected_style, "Got style %08x\n", style); + + expected_style = TVS_EX_NOSINGLECOLLAPSE | TVS_EX_DOUBLEBUFFER | + TVS_EX_RICHTOOLTIP | TVS_EX_DRAWIMAGEASYNC; + style = SendMessageW(hwnd_tv, TVM_GETEXTENDEDSTYLE, 0, 0); + todo_wine ok(style == expected_style, "Got 0x%08x\n", style); + } + + IOleWindow_Release(pow); + } + + if(0) + { + /* The control can be initialized again without crashing, but + * the reference counting will break. */ + hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, &rc, 0); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); + if(SUCCEEDED(hr)) + { + HWND hwnd_host2; + hr = IOleWindow_GetWindow(pow, &hwnd_host2); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok(hwnd_host1 != hwnd_host2, "Same hwnd.\n"); + IOleWindow_Release(pow); + } + } /* Some "random" interfaces */ hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObject, (void**)&punk); @@ -87,8 +170,13 @@ static BOOL test_initialization(void) /* On windows, the reference count won't go to zero until the * window is destroyed. */ + INameSpaceTreeControl_AddRef(pnstc); + lres = INameSpaceTreeControl_Release(pnstc); + ok(lres > 1, "Reference count was (%d).\n", lres); + + DestroyWindow(hwnd_host1); lres = INameSpaceTreeControl_Release(pnstc); - ok(lres, "lres was %d\n", lres); + ok(!lres, "lres was %d\n", lres); return TRUE; }

1 0

David Hedberg : explorerframe: Implement Set/GetControlStyle(2).
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: a5cb7652defc20959d446659a2a2eaa1ad8c5d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5cb7652defc20959d446659a… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 03:43:09 2010 +0200 explorerframe: Implement Set/GetControlStyle(2). --- dlls/explorerframe/nstc.c | 81 +++++++++++-- dlls/explorerframe/tests/nstc.c | 255 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 327 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5cb7652defc20959d446…

1 0

Andrew Nguyen : gdi32: Improve AddFontMemResourceEx parameter validation.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: ca96aed384709aca388c7a4f76a1d6422087d583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca96aed384709aca388c7a4f7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Aug 3 07:07:59 2010 -0500 gdi32: Improve AddFontMemResourceEx parameter validation. --- dlls/gdi32/font.c | 6 +++ dlls/gdi32/tests/font.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9ebf7b3..133681c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3188,6 +3188,12 @@ HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD HANDLE ret; DWORD num_fonts; + if (!pbFont || !cbFont || !pcFonts) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + ret = WineEngAddFontMemResourceEx(pbFont, cbFont, pdv, &num_fonts); if (ret) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bbb54cd..fa48360 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3185,6 +3185,8 @@ static void test_AddFontMemResource(void) void *font; DWORD font_size, num_fonts; HANDLE ret; + DEVMODEA dmA; + BOOL is_winxp; if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) { @@ -3199,6 +3201,74 @@ static void test_AddFontMemResource(void) return; } + is_winxp = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA) && + (dmA.dmFields & DM_DISPLAYORIENTATION); + + if (is_winxp) + { + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected GetLastError() to return 0xdeadbeef, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + } + else + win_skip("AddFontMemResourceEx invalid parameter tests are problematic on Win2k\n"); + num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); @@ -3215,11 +3285,19 @@ static void test_AddFontMemResource(void) font = load_font("sserife.fon", &font_size); ok(font != NULL, "Unable to locate and load font sserife.fon\n"); + SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, font_size, NULL, (void *)0xdeadbeef); ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected GetLastError() to return 0xdeadbeef, got %u\n", + GetLastError()); + SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, font_size, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); free_font(font); }

1 0

André Hentschel : comdlg32: Fix German shortcut conflict.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: ae01727f362f9c8a718b5175dd4ed548c6d804d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae01727f362f9c8a718b5175d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 3 16:25:44 2010 +0200 comdlg32: Fix German shortcut conflict. --- dlls/comdlg32/cdlg_De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index 5bc8f59..d1331ee 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "Öffnen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Schreibgeschüt&zt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "Speichern als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Schreibgeschüt&zt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -270,7 +270,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Datei&typen",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "&Schreibgeschützt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + CONTROL "Schreibgeschüt&zt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 DEFPUSHBUTTON "Ö&ffnen", IDOK,222,110,50,14 PUSHBUTTON "Abbrechen", IDCANCEL,222,128,50,14

1 0