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

Alexander Nicolaysen Sørnes : shdocvw: Add View menu to IE with list of installed toolbars.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 6d381a4cf594e020e1a9ce540088c24768c73638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d381a4cf594e020e1a9ce540… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 3 13:56:56 2010 +0200 shdocvw: Add View menu to IE with list of installed toolbars. --- dlls/shdocvw/En.rc | 8 +++++ dlls/shdocvw/iexplore.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/shdocvw/resource.h | 3 ++ 3 files changed, 88 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index 014245b..0d55909 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -50,6 +50,14 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Properties...", ID_BROWSE_PROPERTIES } + POPUP "&View" + { + POPUP "&Toolbars" + { + MENUITEM "&Standard bar" ID_BROWSE_BAR_STD + MENUITEM "&Address bar" ID_BROWSE_BAR_ADDR + } + } POPUP "&Favorites" { MENUITEM "&Add to Favorites..." ID_BROWSE_ADDFAV diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index c8b93af..59f9173 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -78,9 +78,16 @@ void adjust_ie_docobj_rect(HWND frame, RECT* rc) } } +static HMENU get_tb_menu(HMENU menu) +{ + HMENU menu_view = GetSubMenu(menu, 1); + + return GetSubMenu(menu_view, 0); +} + static HMENU get_fav_menu(HMENU menu) { - return GetSubMenu(menu, 1); + return GetSubMenu(menu, 2); } static LPWSTR get_fav_url_from_id(HMENU menu, UINT id) @@ -234,12 +241,81 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) FindClose(findhandle); } +static void add_tbs_to_menu(HMENU menu) +{ + HUSKEY toolbar_handle; + WCHAR toolbar_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ', + 'E','x','p','l','o','r','e','r','\\', + 'T','o','o','l','b','a','r',0}; + + if(SHRegOpenUSKeyW(toolbar_key, KEY_READ, NULL, &toolbar_handle, TRUE) == ERROR_SUCCESS) + { + HUSKEY classes_handle; + WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; + WCHAR guid[39]; + DWORD value_len = sizeof(guid)/sizeof(guid[0]); + int i; + + if(SHRegOpenUSKeyW(classes_key, KEY_READ, NULL, &classes_handle, TRUE) != ERROR_SUCCESS) + { + SHRegCloseUSKey(toolbar_handle); + ERR("Failed to open key %s\n", debugstr_w(classes_key)); + return; + } + + for(i = 0; SHRegEnumUSValueW(toolbar_handle, i, guid, &value_len, NULL, NULL, NULL, SHREGENUM_HKLM) == ERROR_SUCCESS; i++) + { + WCHAR tb_name[100]; + DWORD tb_name_len = sizeof(tb_name)/sizeof(tb_name[0]); + HUSKEY tb_class_handle; + MENUITEMINFOW item; + LSTATUS ret; + value_len = sizeof(guid)/sizeof(guid[0]); + + if(lstrlenW(guid) != 38) + { + TRACE("Found invalid IE toolbar entry: %s\n", debugstr_w(guid)); + continue; + } + + if(SHRegOpenUSKeyW(guid, KEY_READ, classes_handle, &tb_class_handle, TRUE) != ERROR_SUCCESS) + { + ERR("Failed to get class info for %s\n", debugstr_w(guid)); + continue; + } + + ret = SHRegQueryUSValueW(tb_class_handle, NULL, NULL, tb_name, &tb_name_len, TRUE, NULL, 0); + + SHRegCloseUSKey(tb_class_handle); + + if(ret != ERROR_SUCCESS) + { + ERR("Failed to get toolbar name for %s\n", debugstr_w(guid)); + continue; + } + + item.cbSize = sizeof(item); + item.fMask = MIIM_STRING; + item.dwTypeData = tb_name; + InsertMenuItemW(menu, GetMenuItemCount(menu), TRUE, &item); + } + + SHRegCloseUSKey(classes_handle); + SHRegCloseUSKey(toolbar_handle); + } +} + 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]; + add_tbs_to_menu(get_tb_menu(menu)); + if(SHGetFolderPathW(NULL, CSIDL_COMMON_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path) == S_OK) add_favs_to_menu(favmenu, favmenu, path); diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index c313ef7..e18a9c0 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -43,6 +43,9 @@ #define ID_BROWSE_ADDFAV 1200 #define ID_BROWSE_HOME 1201 +#define ID_BROWSE_BAR_STD 1300 +#define ID_BROWSE_BAR_ADDR 1301 + #define ID_BROWSE_GOTOFAV_FIRST 2000 #define ID_BROWSE_GOTOFAV_MAX 65000

1 0

André Hentschel : shdocvw: Update German translation.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: d0deb836242e103869fb3d47fb7a854bc864df79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0deb836242e103869fb3d47f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 3 20:33:25 2010 +0200 shdocvw: Update German translation. --- dlls/shdocvw/De.rc | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/shdocvw/De.rc index 82a06b5..c7978ff 100644 --- a/dlls/shdocvw/De.rc +++ b/dlls/shdocvw/De.rc @@ -40,20 +40,40 @@ IDR_BROWSE_MAIN_MENU MENU { POPUP "&Neu" { - MENUITEM "&Fenster" ID_BROWSE_NEW_WINDOW + MENUITEM "&Fenster" ID_BROWSE_NEW_WINDOW } - MENUITEM "&Öffnen...", ID_BROWSE_OPEN - MENUITEM "&Speichern", ID_BROWSE_SAVE + MENUITEM "Ö&ffnen...", ID_BROWSE_OPEN + MENUITEM "&Speichern", ID_BROWSE_SAVE MENUITEM "Speichern &als...", ID_BROWSE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Seite &einrichten...", ID_BROWSE_PRINT_FORMAT - MENUITEM "Dr&ucken...", ID_BROWSE_PRINT - MENUITEM "Seiten&vorschau...", ID_BROWSE_PRINT_PREVIEW + MENUITEM "Seite &einrichten...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Dr&ucken...", ID_BROWSE_PRINT + MENUITEM "Seiten&vorschau...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "Ei&genschaften...", ID_BROWSE_PROPERTIES + } + POPUP "&Favoriten" + { + MENUITEM "&Zu den Favoriten hinzufügen..." ID_BROWSE_ADDFAV MENUITEM SEPARATOR - MENUITEM "&Eigenschaften...", ID_BROWSE_PROPERTIES } POPUP "&Hilfe" { - MENUITEM "&Über Internet Explorer...", ID_BROWSE_ABOUT + MENUITEM "Über &Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Zurück" + IDS_TB_FORWARD "Vorwärts" + IDS_TB_STOP "Stopp" + IDS_TB_REFRESH "Neu laden" + IDS_TB_HOME "Start" + IDS_TB_PRINT "Drucken" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adresse" +}

1 0

Vincent Povirk : gdiplus: Stub GdipMultiplyPathGradientTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 00aeee6e8eab57538c20fa74c65b494d654eb291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00aeee6e8eab57538c20fa74c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:17:06 2010 -0500 gdiplus: Stub GdipMultiplyPathGradientTransform. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 529b9a2..3063a64 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1601,6 +1601,19 @@ GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad, + GDIPCONST GpMatrix *matrix, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%p,%i)\n", grad, matrix, order); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) { TRACE("(%p, %x)\n", sf, argb); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0e64185..5cb755c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -444,7 +444,7 @@ @ stdcall GdipMeasureString(ptr wstr long ptr ptr ptr ptr ptr ptr) @ stdcall GdipMultiplyLineTransform(ptr ptr long) @ stdcall GdipMultiplyMatrix(ptr ptr long) -@ stub GdipMultiplyPathGradientTransform +@ stdcall GdipMultiplyPathGradientTransform(ptr ptr long) @ stdcall GdipMultiplyPenTransform(ptr ptr long) @ stdcall GdipMultiplyTextureTransform(ptr ptr long) @ stdcall GdipMultiplyWorldTransform(ptr ptr long)

1 0

Alexandre Julliard : makefiles: Add dependencies for cross-compiled objects in static libraries.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 3bc110d91672d726657c58e038d01fd66c4dc6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc110d91672d726657c58e03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 19:51:38 2010 +0200 makefiles: Add dependencies for cross-compiled objects in static libraries. --- dlls/Makeimplib.rules.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 1f9287d..a02cb4d 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -9,6 +9,7 @@ DLLFLAGS = @DLLFLAGS@ DEFS = -D__WINESRC__ $(EXTRADEFS) INSTALLDIRS = $(DESTDIR)$(dlldir) +MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add a toolbar to IE.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 5d7c46096222b2f1c78c450defb0558eb29559b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7c46096222b2f1c78c450de… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 3 12:36:30 2010 +0200 shdocvw: Add a toolbar to IE. --- dlls/shdocvw/En.rc | 10 ++++++++ dlls/shdocvw/iexplore.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/shdocvw/resource.h | 8 ++++++ 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index 0c70851..ee6e378 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -60,3 +60,13 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "&About Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Back" + IDS_TB_FORWARD "Forward" + IDS_TB_STOP "Stop" + IDS_TB_REFRESH "Refresh" + IDS_TB_HOME "Home" + IDS_TB_PRINT "Print" +} diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index c934753..a908744 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -319,10 +319,39 @@ static void ie_dialog_about(HWND hwnd) DestroyIcon(icon); } +static void add_tb_separator(HWND hwnd) +{ + TBBUTTON btn; + + ZeroMemory(&btn, sizeof(btn)); + + btn.iBitmap = 3; + btn.fsStyle = BTNS_SEP; + SendMessageW(hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); +} + +static void add_tb_button(HWND hwnd, int bmp, int cmd, int strId) +{ + TBBUTTON btn; + WCHAR buf[30]; + + LoadStringW(shdocvw_hinstance, strId, buf, sizeof(buf)/sizeof(buf[0])); + + btn.iBitmap = bmp; + btn.idCommand = cmd; + btn.fsState = TBSTATE_ENABLED; + btn.fsStyle = BTNS_SHOWTEXT; + btn.dwData = 0; + btn.iString = (INT_PTR)buf; + + SendMessageW(hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); +} + static void create_rebar(HWND hwnd) { HWND hwndRebar; HWND hwndAddress; + HWND hwndToolbar; REBARINFO rebarinf; REBARBANDINFOW bandinf; WCHAR addr[] = {'A','d','d','r','e','s','s',0}; @@ -336,16 +365,37 @@ static void create_rebar(HWND hwnd) SendMessageW(hwndRebar, RB_SETBARINFO, 0, (LPARAM)&rebarinf); + 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); + + 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, 0, 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)); + 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.hwndChild = hwndToolbar; + + SendMessageW(hwndRebar, RB_INSERTBANDW, -1, (LPARAM)&bandinf); + hwndAddress = CreateWindowExW(0, WC_COMBOBOXEXW, NULL, WS_BORDER|WS_CHILD|WS_VISIBLE|CBS_DROPDOWN, 0, 0, 100,20,hwndRebar, (HMENU)IDC_BROWSE_ADDRESSBAR, shdocvw_hinstance, NULL); - bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_TEXT; - bandinf.fStyle = RBBS_CHILDEDGE | RBBS_GRIPPERALWAYS; + bandinf.fMask |= RBBIM_TEXT; + bandinf.fStyle = RBBS_CHILDEDGE | RBBS_BREAK; bandinf.lpText = addr; - bandinf.cx = 100; bandinf.cyMinChild = 20; bandinf.hwndChild = hwndAddress; - SendMessageW(hwndRebar, RB_INSERTBANDW, 0, (LPARAM)&bandinf); + SendMessageW(hwndRebar, RB_INSERTBANDW, -1, (LPARAM)&bandinf); } static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 898703c..3e497fe 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -27,6 +27,7 @@ #define IDC_BROWSE_REBAR 1003 #define IDC_BROWSE_ADDRESSBAR 1004 #define IDC_BROWSE_STATUSBAR 1005 +#define IDC_BROWSE_TOOLBAR 1006 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256 @@ -42,3 +43,10 @@ #define ID_BROWSE_GOTOFAV_FIRST 2000 #define ID_BROWSE_GOTOFAV_MAX 65000 + +#define IDS_TB_BACK 1100 +#define IDS_TB_FORWARD 1101 +#define IDS_TB_STOP 1102 +#define IDS_TB_REFRESH 1103 +#define IDS_TB_HOME 1104 +#define IDS_TB_PRINT 1105

1 0

Alexander Nicolaysen Sørnes : shdocvw: Make the Home button in IE work.
by Alexandre Julliard 03 Aug '10

03 Aug '10

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 03 Aug '10

03 Aug '10

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

Alexander Nicolaysen Sørnes : shdocvw: Allow the addressbar text in IE to be localized.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: f74a563120165ca1f4de2656430c2a156bc38475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74a563120165ca1f4de26564… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 3 13:00:10 2010 +0200 shdocvw: Allow the addressbar text in IE to be localized. --- dlls/shdocvw/En.rc | 5 +++++ dlls/shdocvw/iexplore.c | 4 +++- dlls/shdocvw/resource.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index ee6e378..014245b 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -70,3 +70,8 @@ STRINGTABLE IDS_TB_HOME "Home" IDS_TB_PRINT "Print" } + +STRINGTABLE +{ + IDS_ADDRESS "Address" +} diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index c4d545b..ea3fdf4 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -354,10 +354,12 @@ static void create_rebar(HWND hwnd) HWND hwndToolbar; REBARINFO rebarinf; REBARBANDINFOW bandinf; - WCHAR addr[] = {'A','d','d','r','e','s','s',0}; + WCHAR addr[40]; HIMAGELIST imagelist; WCHAR idb_ietoolbar[] = {'I','D','B','_','I','E','T','O','O','L','B','A','R',0}; + LoadStringW(shdocvw_hinstance, IDS_ADDRESS, addr, sizeof(addr)/sizeof(addr[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); rebarinf.cbSize = sizeof(rebarinf); diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 11b710d..c313ef7 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -52,3 +52,5 @@ #define IDS_TB_REFRESH 1103 #define IDS_TB_HOME 1104 #define IDS_TB_PRINT 1105 + +#define IDS_ADDRESS 1106

1 0

Mariusz Pluciński : gameux/tests: Add test of IGameExplorer creation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

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 03 Aug '10

03 Aug '10

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