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

Alexander Nicolaysen Sørnes : shdocvw: Add Open URL dialog to IE.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 3feb26a2e14fbb221fdd50a0ba6b9410f434e05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3feb26a2e14fbb221fdd50a0b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 21 16:38:45 2010 +0200 shdocvw: Add Open URL dialog to IE. --- dlls/shdocvw/En.rc | 12 ++++++++++++ dlls/shdocvw/iexplore.c | 23 +++++++++++++++++++++++ dlls/shdocvw/resource.h | 3 +++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index 154d080..749c849 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -20,6 +20,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Specify the URL you wish to open in Internet Explorer",-1,25, 5, 150,15 + LTEXT "Open:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 85, 50, 50, 15 +} + IDR_BROWSE_MAIN_MENU MENU { POPUP "&File" diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 2ca756e..04b386c 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -47,6 +47,25 @@ static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; static const WCHAR wszWineInternetExplorer[] = {'W','i','n','e',' ','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',0}; +static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg) + { + case WM_INITDIALOG: + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wparam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hwnd, wparam); + return TRUE; + } + } + return FALSE; +} + static void ie_dialog_about(HWND hwnd) { HICON icon = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED); @@ -85,6 +104,10 @@ static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT { switch(LOWORD(wparam)) { + case ID_BROWSE_OPEN: + DialogBoxW(shdocvw_hinstance, MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc); + break; + case ID_BROWSE_PRINT: if(This->doc_host.document) { diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 3a1f0e7..31a7005 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -19,8 +19,11 @@ */ #include <windef.h> +#include <winuser.h> #define IDR_BROWSE_MAIN_MENU 1000 +#define IDD_BROWSE_OPEN 1001 +#define IDC_BROWSE_OPEN_URL 1002 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256

1 0

Paul Vriens : user32: Add the Serbian (Latin) translation.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 664e3e3f4ad98d8eac90dc9f8be66da8e0d3af71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664e3e3f4ad98d8eac90dc9f8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 23 13:56:39 2010 +0200 user32: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/user32_Sr.rc | 86 ++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index ba55db9..917e076 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -78,6 +78,7 @@ RC_SRCS = \ resources/user32_Ru.rc \ resources/user32_Si.rc \ resources/user32_Sk.rc \ + resources/user32_Sr.rc \ resources/user32_Sv.rc \ resources/user32_Tr.rc \ resources/user32_Uk.rc \ diff --git a/dlls/user32/resources/user32_Sr.rc b/dlls/user32/resources/user32_Sr.rc new file mode 100644 index 0000000..eadb81f --- /dev/null +++ b/dlls/user32/resources/user32_Sr.rc @@ -0,0 +1,86 @@ +/* + * Copyright 2010 Nenad Vujic + * Paul Vriens + * + * 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 + */ + +#include "resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +SYSMENU MENU +{ + MENUITEM "&Obnovi", 61728 + MENUITEM "&Pomeri", 61456 + MENUITEM "&Veličina", 61440 + MENUITEM "&Smanji", 61472 + MENUITEM "&Ceo ekran", 61488 + MENUITEM SEPARATOR + MENUITEM "&Zatvori\tAlt-F4", 61536 + MENUITEM SEPARATOR + MENUITEM "O &Wine...", 61761 +} + +EDITMENU MENU +{ + POPUP "" + BEGIN + MENUITEM "&Opozovi", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "Ise&ci", WM_CUT + MENUITEM "&Kopiraj", WM_COPY + MENUITEM "&Ubaci", WM_PASTE + MENUITEM "O&briši", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Izaberi &Sve", EM_SETSEL + END +} + +MSGBOX DIALOG 100, 80, 216, 168 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE + LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX + PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "O&tkaži", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Prekini", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Po&kusaj ponovo", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ignoriši", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Da", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ne", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Probaj ponovo", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Nastavi", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Pomoć", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +MDI_MOREWINDOWS DIALOG 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Izaberi prozor" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Otkaži", IDCANCEL, 120, 100, 35, 14 +END + + +STRINGTABLE +{ + IDS_ERROR "Greška" + IDS_MDI_MOREWINDOWS "&Vise Prozora..." +}

1 0

Paul Vriens : shell32: Add the Serbian (Latin) translation.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: ce405b7125e427d136101e78b2691333e7709425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce405b7125e427d136101e78b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 23 12:18:43 2010 +0200 shell32: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32_Sr.rc | 312 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce405b7125e427d136101…

1 0

Alexander Nicolaysen Sørnes : shdocvw: Make the Open URL dialog open URLs.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: e4620d8e3a9e3223fac0bff2d7efa6cc442bcbda URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4620d8e3a9e3223fac0bff2d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jun 21 17:47:55 2010 +0200 shdocvw: Make the Open URL dialog open URLs. --- dlls/shdocvw/iexplore.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 04b386c..fa643fe 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -49,15 +49,45 @@ static const WCHAR wszWineInternetExplorer[] = static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + static InternetExplorer* This; + switch(msg) { case WM_INITDIALOG: + This = (InternetExplorer*)lparam; + EnableWindow(GetDlgItem(hwnd, IDOK), FALSE); return TRUE; case WM_COMMAND: switch(LOWORD(wparam)) { + case IDC_BROWSE_OPEN_URL: + { + HWND hwndurl = GetDlgItem(hwnd, IDC_BROWSE_OPEN_URL); + int len = GetWindowTextLengthW(hwndurl); + + EnableWindow(GetDlgItem(hwnd, IDOK), len ? TRUE : FALSE); + break; + } case IDOK: + { + HWND hwndurl = GetDlgItem(hwnd, IDC_BROWSE_OPEN_URL); + int len = GetWindowTextLengthW(hwndurl); + + if(len) + { + VARIANT url; + + V_VT(&url) = VT_BSTR; + V_BSTR(&url) = SysAllocStringLen(NULL, len); + + GetWindowTextW(hwndurl, V_BSTR(&url), len); + IWebBrowser2_Navigate2(WEBBROWSER2(This), &url, NULL, NULL, NULL, NULL); + + SysFreeString(V_BSTR(&url)); + } + } + /* fall through */ case IDCANCEL: EndDialog(hwnd, wparam); return TRUE; @@ -105,7 +135,7 @@ static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT switch(LOWORD(wparam)) { case ID_BROWSE_OPEN: - DialogBoxW(shdocvw_hinstance, MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc); + DialogBoxParamW(shdocvw_hinstance, MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc, (LPARAM)This); break; case ID_BROWSE_PRINT:

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add About dialog to IE.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 8e03cefbfa40500b66582429e174ca8417cf59e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e03cefbfa40500b66582429e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 21 16:34:41 2010 +0200 shdocvw: Add About dialog to IE. --- dlls/shdocvw/iexplore.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index b473d41..2ca756e 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -33,6 +33,7 @@ #include "shdocvw.h" #include "mshtmcid.h" +#include "shellapi.h" #include "wine/debug.h" @@ -42,6 +43,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; +/* Windows uses "Microsoft Internet Explorer" */ +static const WCHAR wszWineInternetExplorer[] = + {'W','i','n','e',' ','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',0}; + +static void ie_dialog_about(HWND hwnd) +{ + HICON icon = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED); + + ShellAboutW(hwnd, wszWineInternetExplorer, NULL, icon); + + DestroyIcon(icon); +} + static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) { SetWindowLongPtrW(hwnd, 0, (LONG_PTR) lpcs->lpCreateParams); @@ -85,6 +99,10 @@ static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT } break; + case ID_BROWSE_ABOUT: + ie_dialog_about(hwnd); + break; + default: return DefWindowProcW(hwnd, msg, wparam, lparam); } @@ -141,10 +159,6 @@ void unregister_iewindow_class(void) static void create_frame_hwnd(InternetExplorer *This) { - /* Windows uses "Microsoft Internet Explorer" */ - static const WCHAR wszWineInternetExplorer[] = - {'W','i','n','e',' ','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',0}; - This->frame_hwnd = CreateWindowExW( WS_EX_WINDOWEDGE, szIEWinFrame, wszWineInternetExplorer,

1 0

Alexander Nicolaysen Sørnes : shdocvw: Allow printing from the menubar in IE.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 87f4e436ebb9ac10dac8369d1daf2bcde0d4b908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f4e436ebb9ac10dac8369d1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jun 21 00:49:59 2010 +0200 shdocvw: Allow printing from the menubar in IE. --- dlls/shdocvw/iexplore.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 10292db..b473d41 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -32,6 +32,7 @@ #include "oleidl.h" #include "shdocvw.h" +#include "mshtmcid.h" #include "wine/debug.h" @@ -66,6 +67,30 @@ static LRESULT iewnd_OnDestroy(InternetExplorer *This) return 0; } +static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(LOWORD(wparam)) + { + case ID_BROWSE_PRINT: + if(This->doc_host.document) + { + IOleCommandTarget* target; + + if(FAILED(IUnknown_QueryInterface(This->doc_host.document, &IID_IOleCommandTarget, (LPVOID*)&target))) + break; + + IOleCommandTarget_Exec(target, &CGID_MSHTML, IDM_PRINT, OLECMDEXECOPT_DODEFAULT, NULL, NULL); + + IOleCommandTarget_Release(target); + } + break; + + default: + return DefWindowProcW(hwnd, msg, wparam, lparam); + } + return 0; +} + static LRESULT CALLBACK ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -79,6 +104,8 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) return iewnd_OnDestroy(This); case WM_SIZE: return iewnd_OnSize(This, LOWORD(lparam), HIWORD(lparam)); + case WM_COMMAND: + return iewnd_OnCommand(This, hwnd, msg, wparam, lparam); case WM_DOCHOSTTASK: return process_dochost_task(&This->doc_host, lparam); }

1 0

Damjan Jovanovic : winemenubuilder: Remove legacy PNG and XPM conversion code.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 1a1ef6e09170a232cdd43105845d64933909fa5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1ef6e09170a232cdd431058… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 22 21:41:35 2010 +0200 winemenubuilder: Remove legacy PNG and XPM conversion code. --- programs/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 469 +--------------------------- 2 files changed, 7 insertions(+), 463 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a1ef6e09170a232cdd43…

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add menu bar to Internet Explorer.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: f2802b981dce9305cbaddd325e7b496224c001ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2802b981dce9305cbaddd325… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jun 20 20:25:34 2010 +0200 shdocvw: Add menu bar to Internet Explorer. --- dlls/shdocvw/En.rc | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 5 ++++- dlls/shdocvw/ie.c | 21 +++++++++++++++++++-- dlls/shdocvw/iexplore.c | 1 + dlls/shdocvw/resource.h | 33 +++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 2 ++ 6 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc new file mode 100644 index 0000000..154d080 --- /dev/null +++ b/dlls/shdocvw/En.rc @@ -0,0 +1,45 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * 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 + */ + +#include "resource.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&File" + { + POPUP "&New" + { + MENUITEM "&Window" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Open...", ID_BROWSE_OPEN + MENUITEM "&Save", ID_BROWSE_SAVE + MENUITEM "Save &as...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Print &format...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Pr&int...", ID_BROWSE_PRINT + MENUITEM "Print previe&w...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Properties...", ID_BROWSE_PROPERTIES + } + POPUP "&Help" + { + MENUITEM "&About Internet Explorer...", ID_BROWSE_ABOUT + } +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index e8ee8dd..8326b78 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -28,7 +28,10 @@ C_SRCS = \ view.c \ webbrowser.c -RC_SRCS = shdocvw.rc +RC_SRCS = \ + En.rc \ + shdocvw.rc + IDL_TLB_SRCS = shdocvw_v1.idl @MAKE_DLL_RULES@ diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 7b07de6..9d661ca 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -422,8 +422,25 @@ static HRESULT WINAPI InternetExplorer_get_MenuBar(IWebBrowser2 *iface, VARIANT_ static HRESULT WINAPI InternetExplorer_put_MenuBar(IWebBrowser2 *iface, VARIANT_BOOL Value) { InternetExplorer *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + HMENU menu = NULL; + + TRACE("(%p)->(%x)\n", This, Value); + + if((menu = GetMenu(This->frame_hwnd))) + DestroyMenu(menu); + + menu = NULL; + + if(Value) + menu = LoadMenuW(shdocvw_hinstance, MAKEINTRESOURCEW(IDR_BROWSE_MAIN_MENU)); + + if(!SetMenu(This->frame_hwnd, menu)) + { + DestroyMenu(menu); + return HRESULT_FROM_WIN32(GetLastError()); + } + + return S_OK; } static HRESULT WINAPI InternetExplorer_get_FullScreen(IWebBrowser2 *iface, VARIANT_BOOL *pbFullScreen) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 0984889..10292db 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -136,6 +136,7 @@ static IWebBrowser2 *create_ie_window(LPCSTR cmdline) return NULL; IWebBrowser2_put_Visible(wb, VARIANT_TRUE); + IWebBrowser2_put_MenuBar(wb, VARIANT_TRUE); if(!*cmdline) { IWebBrowser2_GoHome(wb); diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h new file mode 100644 index 0000000..3a1f0e7 --- /dev/null +++ b/dlls/shdocvw/resource.h @@ -0,0 +1,33 @@ +/* + * Resource identifiers for shdocvw.dll + * + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * 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 + */ + +#include <windef.h> + +#define IDR_BROWSE_MAIN_MENU 1000 + +#define ID_BROWSE_NEW_WINDOW 275 +#define ID_BROWSE_OPEN 256 +#define ID_BROWSE_SAVE 257 +#define ID_BROWSE_SAVE_AS 258 +#define ID_BROWSE_PRINT_FORMAT 259 +#define ID_BROWSE_PRINT 260 +#define ID_BROWSE_PRINT_PREVIEW 277 +#define ID_BROWSE_PROPERTIES 262 +#define ID_BROWSE_ABOUT 336 diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 1af0365..d1787cb 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -40,6 +40,8 @@ #include "htiframe.h" #include "wine/unicode.h" +#include "resource.h" + /********************************************************************** * Shell Instance Objects

1 0

Andrew Eikum : comdlg32/tests: Untie ok_testcases from test_ok().
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 93f9b4e1442bfa14ab32e64eb9286dc717d79610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f9b4e1442bfa14ab32e64eb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jul 22 14:18:37 2010 -0500 comdlg32/tests: Untie ok_testcases from test_ok(). --- dlls/comdlg32/tests/filedlg.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 71f7d2a..5333c7f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -562,14 +562,16 @@ static void test_resize(void) /* test cases for control message IDOK */ /* Show case for bug #19079 */ -static struct { +typedef struct { int retval; /* return code of the message handler */ BOOL setmsgresult; /* set the result in the DWLP_MSGRESULT */ BOOL usemsgokstr; /* use the FILEOKSTRING message instead of WM_NOTIFY:CDN_FILEOK */ BOOL do_subclass; /* subclass the dialog hook procedure */ BOOL expclose; /* is the dialog expected to close ? */ BOOL actclose; /* has the dialog actually closed ? */ -} ok_testcases[] = { +} ok_wndproc_testcase; + +static ok_wndproc_testcase ok_testcases[] = { { 0, FALSE, FALSE, FALSE, TRUE}, { 0, TRUE, FALSE, FALSE, TRUE}, { 0, FALSE, FALSE, TRUE, TRUE}, @@ -590,12 +592,12 @@ static struct { static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { HWND parent = GetParent( dlg); - static int index; + static ok_wndproc_testcase *testcase = NULL; static UINT msgFILEOKSTRING; if (msg == WM_INITDIALOG) { - index = ((OPENFILENAME*)lParam)->lCustData; - ok_testcases[index].actclose = TRUE; + testcase = (ok_wndproc_testcase*)((OPENFILENAME*)lParam)->lCustData; + testcase->actclose = TRUE; msgFILEOKSTRING = RegisterWindowMessageA( FILEOKSTRING); } if( msg == WM_NOTIFY) { @@ -604,28 +606,28 @@ static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM PostMessage( parent, WM_COMMAND, IDOK, 0); return FALSE; } else if(((LPNMHDR)lParam)->code == CDN_FILEOK) { - if( ok_testcases[index].usemsgokstr) + if( testcase->usemsgokstr) return FALSE; - if( ok_testcases[index].setmsgresult) - SetWindowLongPtrA( dlg, DWLP_MSGRESULT, ok_testcases[index].retval); - return ok_testcases[index].retval; + if( testcase->setmsgresult) + SetWindowLongPtrA( dlg, DWLP_MSGRESULT, testcase->retval); + return testcase->retval; } } if( msg == msgFILEOKSTRING) { - if( !ok_testcases[index].usemsgokstr) + if( !testcase->usemsgokstr) return FALSE; - if( ok_testcases[index].setmsgresult) - SetWindowLongPtrA( dlg, DWLP_MSGRESULT, ok_testcases[index].retval); - return ok_testcases[index].retval; + if( testcase->setmsgresult) + SetWindowLongPtrA( dlg, DWLP_MSGRESULT, testcase->retval); + return testcase->retval; } if( msg == WM_TIMER) { /* the dialog did not close automatically */ - ok_testcases[index].actclose = FALSE; + testcase->actclose = FALSE; KillTimer( dlg, 0); PostMessage( parent, WM_COMMAND, IDCANCEL, 0); return FALSE; } - if( ok_testcases[index].do_subclass) + if( testcase && testcase->do_subclass) return DefWindowProc( dlg, msg, wParam, lParam); return FALSE; } @@ -658,7 +660,7 @@ static void test_ok(void) ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE ; for( i = 0; ok_testcases[i].retval != -1; i++) { strcpy( filename, tmpfilename); - ofn.lCustData = i; + ofn.lCustData = (LPARAM)(ok_testcases + i); ofn.lpfnHook = ok_testcases[i].do_subclass ? (LPOFNHOOKPROC) ok_template_hook : (LPOFNHOOKPROC) test_ok_wndproc;

1 0

Damjan Jovanovic : winemenubuilder: Use windowscodecs for all ICO to PNG conversion.
by Alexandre Julliard July 23, 2010

July 23, 2010

Module: wine Branch: master Commit: 74a2d8e3519afe962f07f0fe71c092c48012a0a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a2d8e3519afe962f07f0fe7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 22 21:41:03 2010 +0200 winemenubuilder: Use windowscodecs for all ICO to PNG conversion. --- programs/winemenubuilder/winemenubuilder.c | 64 ++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 41a3be3..d959a3d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -749,6 +749,64 @@ static BOOL SaveIconResAsXPM(const BITMAPINFO *pIcon, const char *szXPMFileName, return FALSE; } +static BOOL reassemble_and_save_to_png(GRPICONDIRENTRY *grpIconDirEntry, BITMAPINFO *pIcon, + const char *pngFileName, LPCWSTR commentW) +{ + SIZE_T size; + HGLOBAL hGlobal = NULL; + IStream *stream = NULL; + char *p; + ICONDIR *pIconDir; + ICONDIRENTRY *pIconDirEntry; + HRESULT hr = E_FAIL; + + size = sizeof(ICONDIR) + sizeof(ICONDIRENTRY) + grpIconDirEntry->dwBytesInRes; + hGlobal = GlobalAlloc(GMEM_MOVEABLE, size); + if (hGlobal == NULL) + { + WINE_ERR("out of memory allocating icon\n"); + goto end; + } + + p = GlobalLock(hGlobal); + pIconDir = (ICONDIR*)p; + pIconDir->idReserved = 0; + pIconDir->idType = 1; + pIconDir->idCount = 1; + p += sizeof(ICONDIR); + pIconDirEntry = (ICONDIRENTRY*)p; + pIconDirEntry->bWidth = grpIconDirEntry->bWidth; + pIconDirEntry->bHeight = grpIconDirEntry->bHeight; + pIconDirEntry->bColorCount = grpIconDirEntry->bColorCount; + pIconDirEntry->bReserved = grpIconDirEntry->bReserved; + pIconDirEntry->wPlanes = grpIconDirEntry->wPlanes; + pIconDirEntry->wBitCount = grpIconDirEntry->wBitCount; + pIconDirEntry->dwBytesInRes = grpIconDirEntry->dwBytesInRes; + pIconDirEntry->dwImageOffset = sizeof(ICONDIR) + sizeof(ICONDIRENTRY); + p += sizeof(ICONDIRENTRY); + memcpy(p, pIcon, grpIconDirEntry->dwBytesInRes); + GlobalUnlock(hGlobal); + + hr = CreateStreamOnHGlobal(hGlobal, FALSE, &stream); + if (FAILED(hr)) + { + WINE_ERR("could not create stream on icon hglobal, error 0x%08X\n", hr); + goto end; + } + + if (SaveIconStreamAsPNG(stream, 0, pngFileName, commentW)) + hr = S_OK; + else + hr = E_FAIL; + +end: + if (hGlobal) + GlobalFree(hGlobal); + if (stream) + IStream_Release(stream); + return SUCCEEDED(hr); +} + static BOOL CALLBACK EnumResNameProc(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) { ENUMRESSTRUCT *sEnumRes = (ENUMRESSTRUCT *) lParam; @@ -773,6 +831,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) ENUMRESSTRUCT sEnumRes; int nMax = 0; int nMaxBits = 0; + GRPICONDIRENTRY iconDirEntry = {0}; int i; BOOL ret = FALSE; @@ -823,6 +882,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) lpName = MAKEINTRESOURCEW(pIconDir->idEntries[i].nID); nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth; nMaxBits = pIconDir->idEntries[i].wBitCount; + iconDirEntry = pIconDir->idEntries[i]; } } } @@ -844,11 +904,9 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) { if ((pIcon = LockResource(hResData))) { -#ifdef SONAME_LIBPNG - if (SaveIconResAsPNG(pIcon, szXPMFileName, szFileName)) + if (reassemble_and_save_to_png(&iconDirEntry, pIcon, szXPMFileName, szFileName)) ret = TRUE; else -#endif { memcpy(szXPMFileName + strlen(szXPMFileName) - 3, "xpm", 3); if (SaveIconResAsXPM(pIcon, szXPMFileName, szFileName))

1 0