wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

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 + + +@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

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

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: 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 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: Recurse into directories when adding Favorite in IE.
by Alexandre Julliard 03 Aug '10

03 Aug '10

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

André Hentschel : comdlg32: Fix German shortcut conflict.
by Alexandre Julliard 03 Aug '10

03 Aug '10

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

André Hentschel : comdlg32: Fix German font dialog.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: bd38bb122dd816e830d995b128c4f31ff8ef65d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd38bb122dd816e830d995b12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 3 16:24:33 2010 +0200 comdlg32: Fix German font dialog. --- dlls/comdlg32/cdlg_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index a471584..5bc8f59 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -162,7 +162,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Schrift&stil:",1089 ,108,3,44,9 COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Schrift&größe:",1090,179,3,30,9 + LTEXT "&Größe:",1090,179,3,30,9 COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP

1 0

Andrew Eikum : shell32/tests: Fix some Win9x failures.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 61b670a3924419e270b76c05400fc56a45681e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b670a3924419e270b76c054… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 3 08:50:47 2010 -0500 shell32/tests: Fix some Win9x failures. --- dlls/shell32/tests/shlfolder.c | 58 +++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c2305c8..482a31d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -69,6 +69,13 @@ static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_ static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + static void init_function_pointers(void) { HMODULE hmod; @@ -2233,13 +2240,16 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); - res = SHGetPathFromIDListW(pidl, buf); - ok(res == TRUE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + if(pSHGetPathFromIDListW){ + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); + res = pSHGetPathFromIDListW(pidl, buf); + ok(res == TRUE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + }else + win_skip("pSHGetPathFromIDListW not available\n"); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2289,13 +2299,16 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); - res = SHGetPathFromIDListW(pidl, buf); - ok(res == FALSE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + if(pSHGetPathFromIDListW){ + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); + res = pSHGetPathFromIDListW(pidl, buf); + ok(res == FALSE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + }else + win_skip("pSHGetPathFromIDListW not available\n"); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */, @@ -3347,7 +3360,7 @@ static void test_GetUIObject(void) CreateFilesFolders(); hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); - ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { IShellFolder *psf; @@ -3462,10 +3475,17 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) return; } - ok_(__FILE__,l)(filename.uType == STRRET_WSTR, "Got unexpected string type: %d\n", filename.uType); - ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0, - "didn't get expected path (%s), instead: %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr)); + ok_(__FILE__,l)(filename.uType == STRRET_WSTR || filename.uType == STRRET_CSTR, + "Got unexpected string type: %d\n", filename.uType); + if(filename.uType == STRRET_WSTR){ + ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0, + "didn't get expected path (%s), instead: %s\n", + wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr)); + }else if(filename.uType == STRRET_CSTR){ + ok_(__FILE__,l)(strcmp_wa(path, filename.cStr) == 0, + "didn't get expected path (%s), instead: %s\n", + wine_dbgstr_w(path), filename.cStr); + } IShellFolder_Release(parent); }else

1 0

Jacek Caban : mshtml: Improved tracing of nsACString arguments.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 5a30f4143b801a32dbc347b6c9ce7018ba63c9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a30f4143b801a32dbc347b6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 15:44:56 2010 +0200 mshtml: Improved tracing of nsACString arguments. --- dlls/mshtml/nsio.c | 64 +++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a30f4143b801a32dbc34…

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010