October 2006 - Wine-Commits

Huw Davies : oledlg: Add PS_MAXLINKTYPES.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: ccca9bc8c03ae6c9413abc0f9221f19c3ee892c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccca9bc8c03ae6c9413abc0f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 15:32:42 2006 +0100 oledlg: Add PS_MAXLINKTYPES. --- include/oledlg.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index 2313b69..6d7ad57 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -360,6 +360,8 @@ DECL_WINELIB_TYPE_AW(OLEUIPASTESPECIAL) DECL_WINELIB_TYPE_AW(POLEUIPASTESPECIAL) DECL_WINELIB_TYPE_AW(LPOLEUIPASTESPECIAL) +#define PS_MAXLINKTYPES 8 + #define PSF_SHOWHELP 0x00000001L #define PSF_SELECTPASTE 0x00000002L #define PSF_SELECTPASTELINK 0x00000004L

1 0

Huw Davies : oledlg: Move the flag defines to under their respective structure definitions and remove some duplicates .
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 3f46f74e5285c50fcc7706e080965995363399a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f46f74e5285c50fcc7706e08… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 15:28:40 2006 +0100 oledlg: Move the flag defines to under their respective structure definitions and remove some duplicates. --- include/oledlg.h | 106 ++++++++++++++++++++++++++---------------------------- 1 files changed, 51 insertions(+), 55 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index 2d95f45..2313b69 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -41,56 +41,6 @@ typedef struct IOleUIObjInfoW *POLEUIOBJ #define IDC_OLEUIHELP 99 -/* Change Source Dialog flags */ -#define CSF_SHOWHELP 0x00000001L -#define CSF_VALIDSOURCE 0x00000002L -#define CSF_ONLYGETSOURCE 0x00000004L -#define CSF_EXPLORER 0x00000008L - -#define PSF_SHOWHELP 0x00000001L -#define PSF_SELECTPASTE 0x00000002L -#define PSF_SELECTPASTELINK 0x00000004L -#define PSF_CHECKDISPLAYASICON 0x00000008L -#define PSF_DISABLEDISPLAYASICON 0x00000010L -#define PSF_HIDECHANGEICON 0x00000020L -#define PSF_STAYONCLIPBOARDCHANGE 0x00000040L -#define PSF_NOREFRESHDATAOBJECT 0x00000080L - -#define IOF_SHOWHELP 0x00000001L -#define IOF_SELECTCREATENEW 0x00000002L -#define IOF_SELECTCREATEFROMFILE 0x00000004L -#define IOF_CHECKLINK 0x00000008L -#define IOF_CHECKDISPLAYASICON 0x00000010L -#define IOF_CREATENEWOBJECT 0x00000020L -#define IOF_CREATEFILEOBJECT 0x00000040L -#define IOF_CREATELINKOBJECT 0x00000080L -#define IOF_DISABLELINK 0x00000100L -#define IOF_VERIFYSERVERSEXIST 0x00000200L -#define IOF_DISABLEDISPLAYASICON 0x00000400L -#define IOF_HIDECHANGEICON 0x00000800L -#define IOF_SHOWINSERTCONTROL 0x00001000L -#define IOF_SELECTCREATECONTROL 0x00002000L - -#define CF_SHOWHELPBUTTON 0x00000001L -#define CF_SETCONVERTDEFAULT 0x00000002L -#define CF_SETACTIVATEDEFAULT 0x00000004L -#define CF_SELECTCONVERTTO 0x00000008L -#define CF_SELECTACTIVATEAS 0x00000010L -#define CF_DISABLEDISPLAYASICON 0x00000020L -#define CF_DISABLEACTIVATEAS 0x00000040L -#define CF_HIDECHANGEICON 0x00000080L -#define CF_CONVERTONLY 0x00000100L - -#define CIF_SHOWHELP 0x00000001L -#define CIF_SELECTCURRENT 0x00000002L -#define CIF_SELECTDEFAULT 0x00000004L -#define CIF_SELECTFROMFILE 0x00000008L -#define CIF_USEICONEXE 0x00000010L - -#define BZ_DISABLECANCELBUTTON 0x00000001L -#define BZ_DISABLESWITCHTOBUTTON 0x00000002L -#define BZ_DISABLERETRYBUTTON 0x00000004L -#define BZ_NOTRESPONDINGDIALOG 0x00000008L #define OLEUI_ERR_STANDARDMAX 116 @@ -123,11 +73,6 @@ #define OLEUI_ERR_GLOBALMEMALLOC #define OLEUI_ERR_LOADSTRING 115 #define OLEUI_ERR_STANDARDMAX 116 -#define OPF_OBJECTISLINK 0x00000001L -#define OPF_NOFILLDEFAULT 0x00000002L -#define OPF_SHOWHELP 0x00000004L -#define OPF_DISABLECONVERT 0x00000008L - typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM); /***************************************************************************** @@ -189,6 +134,20 @@ DECL_WINELIB_TYPE_AW(OLEUIINSERTOBJECT) DECL_WINELIB_TYPE_AW(POLEUIINSERTOBJECT) DECL_WINELIB_TYPE_AW(LPOLEUIINSERTOBJECT) +#define IOF_SHOWHELP 0x00000001L +#define IOF_SELECTCREATENEW 0x00000002L +#define IOF_SELECTCREATEFROMFILE 0x00000004L +#define IOF_CHECKLINK 0x00000008L +#define IOF_CHECKDISPLAYASICON 0x00000010L +#define IOF_CREATENEWOBJECT 0x00000020L +#define IOF_CREATEFILEOBJECT 0x00000040L +#define IOF_CREATELINKOBJECT 0x00000080L +#define IOF_DISABLELINK 0x00000100L +#define IOF_VERIFYSERVERSEXIST 0x00000200L +#define IOF_DISABLEDISPLAYASICON 0x00000400L +#define IOF_HIDECHANGEICON 0x00000800L +#define IOF_SHOWINSERTCONTROL 0x00001000L +#define IOF_SELECTCREATECONTROL 0x00002000L /***************************************************************************** * CONVERT DIALOG @@ -249,6 +208,16 @@ DECL_WINELIB_TYPE_AW(OLEUICONVERT) DECL_WINELIB_TYPE_AW(POLEUICONVERT) DECL_WINELIB_TYPE_AW(LPOLEUICONVERT) +#define CF_SHOWHELPBUTTON 0x00000001L +#define CF_SETCONVERTDEFAULT 0x00000002L +#define CF_SETACTIVATEDEFAULT 0x00000004L +#define CF_SELECTCONVERTTO 0x00000008L +#define CF_SELECTACTIVATEAS 0x00000010L +#define CF_DISABLEDISPLAYASICON 0x00000020L +#define CF_DISABLEACTIVATEAS 0x00000040L +#define CF_HIDECHANGEICON 0x00000080L +#define CF_CONVERTONLY 0x00000100L + /***************************************************************************** * CHANGE ICON DIALOG */ @@ -291,6 +260,12 @@ DECL_WINELIB_TYPE_AW(POLEUICHANGEICON) DECL_WINELIB_TYPE_AW(LPOLEUICHANGEICON) +#define CIF_SHOWHELP 0x00000001L +#define CIF_SELECTCURRENT 0x00000002L +#define CIF_SELECTDEFAULT 0x00000004L +#define CIF_SELECTFROMFILE 0x00000008L +#define CIF_USEICONEXE 0x00000010L + /***************************************************************************** * PASTE SPECIAL DIALOG */ @@ -499,6 +474,15 @@ DECL_WINELIB_TYPE_AW(POLEUIBUSY) DECL_WINELIB_TYPE_AW(LPOLEUIBUSY) +#define BZ_DISABLECANCELBUTTON 0x00000001L +#define BZ_DISABLESWITCHTOBUTTON 0x00000002L +#define BZ_DISABLERETRYBUTTON 0x00000004L +#define BZ_NOTRESPONDINGDIALOG 0x00000008L + +/*********************************************************************************** + * OBJECT PROPERTIES DIALOG + */ + struct tagOLEUIOBJECTPROPSW; struct tagOLEUIOBJECTPROPSA; @@ -622,6 +606,12 @@ DECL_WINELIB_TYPE_AW(OLEUIOBJECTPROPS) DECL_WINELIB_TYPE_AW(POLEUIOBJECTPROPS) DECL_WINELIB_TYPE_AW(LPOLEUIOBJECTPROPS) +#define OPF_OBJECTISLINK 0x00000001L +#define OPF_NOFILLDEFAULT 0x00000002L +#define OPF_SHOWHELP 0x00000004L +#define OPF_DISABLECONVERT 0x00000008L + + /************************************************************************************ * CHANGE SOURCE DIALOG */ @@ -675,6 +665,12 @@ DECL_WINELIB_TYPE_AW(OLEUICHANGESOURCE) DECL_WINELIB_TYPE_AW(POLEUICHANGESOURCE) DECL_WINELIB_TYPE_AW(LPOLEUICHANGESOURCE) +/* Change Source Dialog flags */ +#define CSF_SHOWHELP 0x00000001L +#define CSF_VALIDSOURCE 0x00000002L +#define CSF_ONLYGETSOURCE 0x00000004L +#define CSF_EXPLORER 0x00000008L + /***************************************************************************** * IOleUILinkContainer interface

1 0

Huw Davies : oledlg: Add resource ids for the paste special dialog.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: c3ae917042374a97956f50a2e4a0969c20b4dfec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ae917042374a97956f50a2e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 18 15:13:03 2006 +0100 oledlg: Add resource ids for the paste special dialog. --- include/oledlg.h | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/oledlg.h b/include/oledlg.h index 8002a87..2d95f45 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -401,6 +401,27 @@ #define OLEUI_IOERR_ARRLINKTYPESINVALID #define OLEUI_PSERR_CLIPBOARDCHANGED (OLEUI_ERR_STANDARDMAX+3) #define OLEUI_PSERR_GETCLIPBOARDFAILED (OLEUI_ERR_STANDARDMAX+4) +/* Paste Special dialog resource ids */ +#define IDD_PASTESPECIAL 1003 +#define IDD_PASTESPECIAL4 1108 + +/* Paste Special dialog control ids */ +#define IDC_PS_PASTE 500 +#define IDC_PS_PASTELINK 501 +#define IDC_PS_SOURCETEXT 502 +#define IDC_PS_PASTELIST 503 +#define IDC_PS_PASTELINKLIST 504 +#define IDC_PS_DISPLAYLIST 505 +#define IDC_PS_DISPLAYASICON 506 +#define IDC_PS_ICONDISPLAY 507 +#define IDC_PS_CHANGEICON 508 +#define IDC_PS_RESULTIMAGE 509 +#define IDC_PS_RESULTTEXT 510 + +/***************************************************************************** + * EDIT LINKS DIALOG + */ + #define ELF_SHOWHELP 0x00000001L #define ELF_DISABLEUPDATENOW 0x00000002L #define ELF_DISABLEOPENSOURCE 0x00000004L

1 0

Mike McCormack : msi: Fix an uninitialized variable causing random conformance test failures.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: c2b4629228b74c9d12f54ca689538989e35e3ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b4629228b74c9d12f54ca68… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 20 23:24:08 2006 +0900 msi: Fix an uninitialized variable causing random conformance test failures. --- dlls/msi/tests/suminfo.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index ca61e76..d8825b9 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -397,6 +397,8 @@ static void test_summary_binary(void) * We can still read its type though...? */ sz = sizeof sval; + sval[0] = 0; + type = 0; r = MsiSummaryInfoGetProperty(hsuminfo, PID_LASTPRINTED, &type, NULL, NULL, sval, &sz); ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetProperty failed\n"); ok( !strcmp(sval, ""), "value incorrect\n");

1 0

Alexandre Julliard : winex11.drv: Avoid X error with unsupported pen styles .
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 60f88a5ac155698dc5cf348151c632a523a6d7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f88a5ac155698dc5cf34815… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 10:21:08 2006 +0200 winex11.drv: Avoid X error with unsupported pen styles. --- dlls/winex11.drv/graphics.c | 4 +--- dlls/winex11.drv/pen.c | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 1558aa5..975a941 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -243,9 +243,7 @@ BOOL X11DRV_SetupGCForPen( X11DRV_PDEVIC val.join_style = JoinRound; } wine_tsx11_lock(); - if ((physDev->pen.width <= 1) && - (physDev->pen.style != PS_SOLID) && - (physDev->pen.style != PS_INSIDEFRAME)) + if (physDev->pen.width <= 1 && physDev->pen.dash_len) { XSetDashes( gdi_display, physDev->gc, 0, physDev->pen.dashes, physDev->pen.dash_len ); val.line_style = (GetBkMode(physDev->hdc) == OPAQUE) ? LineDoubleDash : LineOnOffDash; diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index faeae5c..32d9e73 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -98,7 +98,11 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *p break; case PS_USERSTYLE: FIXME("PS_USERSTYLE is not supported\n"); - break; + /* fall through */ + default: + physDev->pen.dashes = NULL; + physDev->pen.dash_len = 0; + break; } return hpen; }

1 0

Jacek Caban : mshtml: Use mshtmcid.h defines where possible.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: a1f11939ed031be73f851db92934ed637caf9847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f11939ed031be73f851db92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 23:12:24 2006 +0200 mshtml: Use mshtmcid.h defines where possible. --- dlls/mshtml/Bg.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/De.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/En.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/Es.rc | 116 ++++++++++++++++++++++---------------------- dlls/mshtml/Fi.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/Fr.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/Hu.rc | 128 ++++++++++++++++++++++++------------------------ dlls/mshtml/Ko.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/Nl.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/No.rc | 126 +++++++++++++++++++++++----------------------- dlls/mshtml/Sv.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/Tr.rc | 124 +++++++++++++++++++++++----------------------- dlls/mshtml/resource.h | 66 ------------------------- 13 files changed, 743 insertions(+), 809 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1f11939ed031be73f851…

1 0

Jacek Caban : mshtml: Fix debug traces.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: e6b353dec8b6b2ef41ff9643886a1e629f7219a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b353dec8b6b2ef41ff96438… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 23:26:46 2006 +0200 mshtml: Fix debug traces. --- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 6970ef5..e618735 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -190,7 +190,7 @@ static HRESULT WINAPI HTMLInputElement_g nsAString_Finish(&value_str); - TRACE("value=%s\n", debugstr_w(value)); + TRACE("value=%s\n", debugstr_w(*p)); return S_OK; } diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 6a23c4f..ce1b40b 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -186,7 +186,7 @@ static HRESULT WINAPI HTMLSelectElement_ nsAString_Finish(&name_str); - TRACE("name=%s\n", debugstr_w(name)); + TRACE("name=%s\n", debugstr_w(*p)); return S_OK; } @@ -260,7 +260,7 @@ static HRESULT WINAPI HTMLSelectElement_ nsAString_Finish(&value_str); - TRACE("value=%s\n", debugstr_w(value)); + TRACE("value=%s\n", debugstr_w(*p)); return S_OK; }

1 0

Jacek Caban : shdocvw: Use navigate_url in WebBrowser::Navigate.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 4bcf1f554cbf7ca2ad16f23e79c013df6fb390f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bcf1f554cbf7ca2ad16f23e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 23:14:57 2006 +0200 shdocvw: Use navigate_url in WebBrowser::Navigate. --- dlls/shdocvw/webbrowser.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 47483c1..3746917 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -226,18 +226,11 @@ static HRESULT WINAPI WebBrowser_Navigat VARIANT *PostData, VARIANT *Headers) { WebBrowser *This = WEBBROWSER_THIS(iface); - VARIANT url; - HRESULT r; - FIXME("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, + TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, PostData, Headers); - V_VT(&url) = VT_BSTR; - V_BSTR(&url) = szUrl; - r = IWebBrowser2_Navigate2(iface, &url, Flags, - TargetFrameName, PostData, Headers); - - return r; + return navigate_url(&This->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface)

1 0

Jacek Caban : shdocvw: Move common Navigate2 code to navigate_url.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 02b54914e53ed820d369ee105fc946efd454ea4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b54914e53ed820d369ee105… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 23:14:00 2006 +0200 shdocvw: Move common Navigate2 code to navigate_url. --- dlls/shdocvw/ie.c | 36 +++--------------------------------- dlls/shdocvw/navigate.c | 43 ++++++++++++++++++++++++++++++++++++++++++- dlls/shdocvw/shdocvw.h | 2 +- dlls/shdocvw/webbrowser.c | 37 +++---------------------------------- 4 files changed, 49 insertions(+), 69 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 2c2414b..e4400ec 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -442,48 +442,18 @@ static HRESULT WINAPI InternetExplorer_N VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { InternetExplorer *This = WEBBROWSER_THIS(iface); - PBYTE post_data = NULL; - ULONG post_data_len = 0; - LPWSTR headers = NULL; - HRESULT hres; TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); - if((Flags && V_VT(Flags) != VT_EMPTY) - || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) - FIXME("Unsupported arguments\n"); - if(!URL) return S_OK; - if(V_VT(URL) != VT_BSTR) + if(V_VT(URL) != VT_BSTR) { + FIXME("Unsupported V_VT(URL) %d\n", V_VT(URL)); return E_INVALIDARG; - - if(PostData && V_VT(PostData) != VT_EMPTY) { - if(V_VT(PostData) != (VT_ARRAY | VT_UI1) - || V_ARRAY(PostData)->cDims != 1) { - WARN("Invalid PostData\n"); - return E_INVALIDARG; - } - - SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); - post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; - } - - if(Headers && V_VT(Headers) != VT_EMPTY) { - if(V_VT(Headers) != VT_BSTR) - return E_INVALIDARG; - - headers = V_BSTR(Headers); - TRACE("Headers: %s\n", debugstr_w(headers)); } - hres = navigate_url(&This->doc_host, V_BSTR(URL), post_data, post_data_len, headers); - - if(post_data) - SafeArrayUnaccessData(V_ARRAY(PostData)); - - return hres; + return navigate_url(&This->doc_host, V_BSTR(URL), Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI InternetExplorer_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 7ca73ac..b57df99 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -476,7 +476,7 @@ static HRESULT navigate(DocHost *This, I } -HRESULT navigate_url(DocHost *This, LPCWSTR url, PBYTE post_data, ULONG post_data_len, +static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, ULONG post_data_len, LPWSTR headers) { IBindStatusCallback *callback; @@ -507,6 +507,47 @@ HRESULT navigate_url(DocHost *This, LPCW return hres; } +HRESULT navigate_url(DocHost *This, BSTR url, VARIANT *Flags, VARIANT *TargetFrameName, + VARIANT *PostData, VARIANT *Headers) +{ + PBYTE post_data = NULL; + ULONG post_data_len = 0; + LPWSTR headers = NULL; + HRESULT hres; + + TRACE("navigating to %s\n", debugstr_w(url)); + + if((Flags && V_VT(Flags) != VT_EMPTY) + || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) + FIXME("Unsupported arguments\n"); + + if(PostData && V_VT(PostData) != VT_EMPTY && V_VT(PostData) != VT_ERROR) { + if(V_VT(PostData) != (VT_ARRAY | VT_UI1) + || V_ARRAY(PostData)->cDims != 1) { + WARN("Invalid PostData\n"); + return E_INVALIDARG; + } + + SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); + post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; + } + + if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) { + if(V_VT(Headers) != VT_BSTR) + return E_INVALIDARG; + + headers = V_BSTR(Headers); + TRACE("Headers: %s\n", debugstr_w(headers)); + } + + hres = bind_url_to_object(This, url, post_data, post_data_len, headers); + + if(post_data) + SafeArrayUnaccessData(V_ARRAY(PostData)); + + return hres; +} + HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, IBindStatusCallback *callback) { diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index a022eb2..e8ca951 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -192,7 +192,7 @@ HRESULT WebBrowserV2_Create(IUnknown*,RE void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); -HRESULT navigate_url(DocHost*,LPCWSTR,PBYTE,ULONG,LPWSTR); +HRESULT navigate_url(DocHost*,BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*); HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**); void InternetExplorer_WebBrowser_Init(InternetExplorer*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 20fb8bf..47483c1 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -660,52 +660,21 @@ static HRESULT WINAPI WebBrowser_Navigat VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { WebBrowser *This = WEBBROWSER_THIS(iface); - PBYTE post_data = NULL; - ULONG post_data_len = 0; - LPWSTR headers = NULL; - HRESULT hres; TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); if(!This->client) return E_FAIL; - if((Flags && V_VT(Flags) != VT_EMPTY) - || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)) - FIXME("Unsupported arguments\n"); - - if(!URL) return S_OK; - if(V_VT(URL) != VT_BSTR) + if(V_VT(URL) != VT_BSTR) { + FIXME("Unsupported V_VT(URL) %d\n", V_VT(URL)); return E_INVALIDARG; - - if(PostData && V_VT(PostData) != VT_EMPTY && V_VT(PostData) != VT_ERROR) { - if(V_VT(PostData) != (VT_ARRAY | VT_UI1) - || V_ARRAY(PostData)->cDims != 1) { - WARN("Invalid PostData\n"); - return E_INVALIDARG; - } - - SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); - post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; } - if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) { - if(V_VT(Headers) != VT_BSTR) - return E_INVALIDARG; - - headers = V_BSTR(Headers); - TRACE("Headers: %s\n", debugstr_w(headers)); - } - - hres = navigate_url(&This->doc_host, V_BSTR(URL), post_data, post_data_len, headers); - - if(post_data) - SafeArrayUnaccessData(V_ARRAY(PostData)); - - return hres; + return navigate_url(&This->doc_host, V_BSTR(URL), Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI WebBrowser_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf)

1 0

Andrew Talbot : comctl32: Cast-qual warnings fix.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 30dd37edb0f6ddcad47a5300fd964d90d032521b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30dd37edb0f6ddcad47a5300f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Oct 19 21:59:22 2006 +0100 comctl32: Cast-qual warnings fix. --- dlls/comctl32/comctl32undoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index aff2103..ad70a0b 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -174,7 +174,7 @@ DWORD WINAPI GetSize (LPVOID lpMem) *| DWORD nMaxItems; *| DWORD dwFlags; *| HKEY hKey; - *| LPCTSTR lpszSubKey; + *| LPTSTR lpszSubKey; *| PROC lpfnCompare; *|} CREATEMRULIST, *LPCREATEMRULIST; * @@ -212,7 +212,7 @@ typedef struct tagCREATEMRULISTA DWORD nMaxItems; DWORD dwFlags; HKEY hKey; - LPCSTR lpszSubKey; + LPSTR lpszSubKey; PROC lpfnCompare; } CREATEMRULISTA, *LPCREATEMRULISTA; @@ -222,7 +222,7 @@ typedef struct tagCREATEMRULISTW DWORD nMaxItems; DWORD dwFlags; HKEY hKey; - LPCWSTR lpszSubKey; + LPWSTR lpszSubKey; PROC lpfnCompare; } CREATEMRULISTW, *LPCREATEMRULISTW; @@ -357,7 +357,7 @@ void WINAPI FreeMRUList (HANDLE hMRUList } Free(mp->realMRU); Free(mp->array); - Free((LPWSTR)mp->extview.lpszSubKey); + Free(mp->extview.lpszSubKey); Free(mp); } @@ -742,7 +742,7 @@ HANDLE WINAPI CreateMRUListLazyW (LPCREA mp = Alloc(sizeof(WINEMRULIST)); memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW)); mp->extview.lpszSubKey = Alloc((strlenW(lpcml->lpszSubKey) + 1) * sizeof(WCHAR)); - strcpyW((LPWSTR)mp->extview.lpszSubKey, lpcml->lpszSubKey); + strcpyW(mp->extview.lpszSubKey, lpcml->lpszSubKey); mp->isUnicode = TRUE; return CreateMRUListLazy_common(mp); @@ -779,7 +779,7 @@ HANDLE WINAPI CreateMRUListLazyA (LPCREA len = MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, NULL, 0); mp->extview.lpszSubKey = Alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, - (LPWSTR)mp->extview.lpszSubKey, len); + mp->extview.lpszSubKey, len); mp->isUnicode = FALSE; return CreateMRUListLazy_common(mp); }

1 0