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

Jacek Caban : wscript.exe: Added script engine host implementation.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 89ca878d1bc9bed3f78240762b34cbcccba9bfe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ca878d1bc9bed3f78240762… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 15:52:17 2010 +0200 wscript.exe: Added script engine host implementation. --- programs/wscript/Makefile.in | 2 +- programs/wscript/main.c | 178 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 1 deletions(-) diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 36d25f7..64c9678 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wscript.exe APPMODE = -mwindows -municode -IMPORTS = ole32 advapi32 +IMPORTS = uuid ole32 advapi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 5169b74..674bcba 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -18,16 +18,119 @@ #include <stdarg.h> +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <ole2.h> +#include <activscp.h> #include <wine/debug.h> #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); +static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + WINE_TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { + WINE_TRACE("(IID_IActiveScriptSite %p)\n", ppv); + *ppv = iface; + }else { + *ppv = NULL; + WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *plcid) +{ + WINE_TRACE("()\n"); + + *plcid = GetUserDefaultLCID(); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, + LPCOLESTR pstrName, DWORD dwReturnMask, IUnknown **ppunkItem, ITypeInfo **ppti) +{ + WINE_FIXME("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_GetDocVersionString(IActiveScriptSite *iface, + BSTR *pbstrVersion) +{ + WINE_FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptTerminate(IActiveScriptSite *iface, + const VARIANT *pvarResult, const EXCEPINFO *pexcepinfo) +{ + WINE_FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, + SCRIPTSTATE ssScriptState) +{ + WINE_TRACE("(%x)\n", ssScriptState); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, + IActiveScriptError *pscripterror) +{ + WINE_FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) +{ + WINE_TRACE("()\n"); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) +{ + WINE_TRACE("()\n"); + return S_OK; +} + +static IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { + ActiveScriptSite_QueryInterface, + ActiveScriptSite_AddRef, + ActiveScriptSite_Release, + ActiveScriptSite_GetLCID, + ActiveScriptSite_GetItemInfo, + ActiveScriptSite_GetDocVersionString, + ActiveScriptSite_OnScriptTerminate, + ActiveScriptSite_OnStateChange, + ActiveScriptSite_OnScriptError, + ActiveScriptSite_OnEnterScript, + ActiveScriptSite_OnLeaveScript +}; + +IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; + static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) { WCHAR fileid[64], progid[64]; @@ -68,8 +171,64 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) return SUCCEEDED(hres); } +static HRESULT create_engine(CLSID *clsid, IActiveScript **script_ret, + IActiveScriptParse **parser) +{ + IActiveScript *script; + IUnknown *unk; + HRESULT hres; + + hres = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return FALSE; + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScript, (void**)&script); + IUnknown_Release(unk); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)parser); + if(FAILED(hres)) { + IActiveScript_Release(script); + return FALSE; + } + + *script_ret = script; + return TRUE; +} + +static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser) +{ + HRESULT hres; + + static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; + static const WCHAR wshW[] = {'W','S','H',0}; + + hres = IActiveScript_SetScriptSite(script, &script_site); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScriptParse64_InitNew(parser); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_AddNamedItem(script, wscriptW, SCRIPTITEM_ISVISIBLE); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_AddNamedItem(script, wshW, SCRIPTITEM_ISVISIBLE); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + return SUCCEEDED(hres); +} + int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { + IActiveScriptParse *parser; + IActiveScript *script; const WCHAR *ext; CLSID clsid; @@ -86,5 +245,24 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm return 1; } + CoInitialize(NULL); + + if(!create_engine(&clsid, &script, &parser)) { + WINE_FIXME("Could not create script engine\n"); + CoUninitialize(); + return 1; + } + + if(init_engine(script, parser)) { + IActiveScript_Close(script); + }else { + WINE_FIXME("Script initialization failed\n"); + } + + IActiveScript_Release(script); + IUnknown_Release(parser); + + CoUninitialize(); + return 0; }

1 0

Jacek Caban : wscript.exe: Added engine lookup implementation.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 28efdcb52140bb0e9924f4d38976e43f9d4cbfa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28efdcb52140bb0e9924f4d38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 15:52:05 2010 +0200 wscript.exe: Added engine lookup implementation. --- programs/wscript/Makefile.in | 2 +- programs/wscript/main.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletions(-) diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 8d208ba..36d25f7 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wscript.exe APPMODE = -mwindows -municode -IMPORTS = +IMPORTS = ole32 advapi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 33e14e9..5169b74 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -20,13 +20,71 @@ #include <windef.h> #include <winbase.h> +#include <winreg.h> +#include <ole2.h> #include <wine/debug.h> +#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); +static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) +{ + WCHAR fileid[64], progid[64]; + DWORD res; + LONG size; + HKEY hkey; + HRESULT hres; + + static const WCHAR script_engineW[] = + {'\\','S','c','r','i','p','t','E','n','g','i','n','e',0}; + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, ext, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + size = sizeof(fileid)/sizeof(WCHAR); + res = RegQueryValueW(hkey, NULL, fileid, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + WINE_TRACE("fileid is %s\n", wine_dbgstr_w(fileid)); + + strcatW(fileid, script_engineW); + res = RegOpenKeyW(HKEY_CLASSES_ROOT, fileid, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + size = sizeof(progid)/sizeof(WCHAR); + res = RegQueryValueW(hkey, NULL, progid, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + WINE_TRACE("ProgID is %s\n", wine_dbgstr_w(progid)); + + hres = CLSIDFromProgID(progid, clsid); + return SUCCEEDED(hres); +} + int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { + const WCHAR *ext; + CLSID clsid; + WINE_FIXME("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); + + if(!*cmdline) + return 1; + + ext = strchrW(cmdline, '.'); + if(!ext) + ext = cmdline; + if(!get_engine_clsid(ext, &clsid)) { + WINE_FIXME("Could not fine engine for %s\n", wine_dbgstr_w(ext)); + return 1; + } + return 0; }

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add an address bar to IE.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: c5ac98290323b06f8da0ea7f73e9f1bd925ec220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ac98290323b06f8da0ea7f7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 27 13:09:47 2010 +0200 shdocvw: Add an address bar to IE. --- dlls/shdocvw/dochost.c | 3 +- dlls/shdocvw/iexplore.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/shdocvw/resource.h | 2 + dlls/shdocvw/shdocvw.h | 1 + 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index b3db012..4978989 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -311,7 +311,8 @@ void create_doc_view_hwnd(DocHost *This) doc_view_atom = RegisterClassExW(&wndclass); } - GetClientRect(This->frame_hwnd, &rect); /* FIXME */ + GetClientRect(This->frame_hwnd, &rect); + adjust_ie_docobj_rect(This->frame_hwnd, &rect); This->hwnd = CreateWindowExW(0, wszShell_DocObject_View, wszShell_DocObject_View, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 4d7c01c..e596c85 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -47,6 +47,15 @@ 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}; +void adjust_ie_docobj_rect(HWND frame, RECT* rc) +{ + HWND hwndRebar = GetDlgItem(frame, IDC_BROWSE_REBAR); + INT barHeight = SendMessageW(hwndRebar, RB_GETBARHEIGHT, 0, 0); + + rc->top += barHeight; + rc->bottom -= barHeight; +} + static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static InternetExplorer* This; @@ -105,18 +114,57 @@ static void ie_dialog_about(HWND hwnd) DestroyIcon(icon); } +static void create_rebar(HWND hwnd) +{ + HWND hwndRebar; + HWND hwndAddress; + REBARINFO rebarinf; + REBARBANDINFOW bandinf; + WCHAR addr[] = {'A','d','d','r','e','s','s',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); + rebarinf.fMask = 0; + rebarinf.himl = NULL; + rebarinf.cbSize = sizeof(rebarinf); + + SendMessageW(hwndRebar, RB_SETBARINFO, 0, (LPARAM)&rebarinf); + + 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.lpText = addr; + bandinf.cx = 100; + bandinf.cyMinChild = 20; + bandinf.hwndChild = hwndAddress; + + SendMessageW(hwndRebar, RB_INSERTBANDW, 0, (LPARAM)&bandinf); +} + static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) { SetWindowLongPtrW(hwnd, 0, (LONG_PTR) lpcs->lpCreateParams); + create_rebar(hwnd); + return 0; } static LRESULT iewnd_OnSize(InternetExplorer *This, INT width, INT height) { + HWND hwndRebar = GetDlgItem(This->frame_hwnd, IDC_BROWSE_REBAR); + INT barHeight = SendMessageW(hwndRebar, RB_GETBARHEIGHT, 0, 0); + RECT docarea = {0, 0, width, height}; + + adjust_ie_docobj_rect(This->frame_hwnd, &docarea); + if(This->doc_host.hwnd) - SetWindowPos(This->doc_host.hwnd, NULL, 0, 0, width, height, + SetWindowPos(This->doc_host.hwnd, NULL, docarea.left, docarea.top, docarea.right, docarea.bottom, SWP_NOZORDER | SWP_NOACTIVATE); + SetWindowPos(hwndRebar, NULL, 0, 0, width, barHeight, SWP_NOZORDER | SWP_NOACTIVATE); + return 0; } diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 31a7005..7283b71 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -24,6 +24,8 @@ #define IDR_BROWSE_MAIN_MENU 1000 #define IDD_BROWSE_OPEN 1001 #define IDC_BROWSE_OPEN_URL 1002 +#define IDC_BROWSE_REBAR 1003 +#define IDC_BROWSE_ADDRESSBAR 1004 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256 diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 6fbb20f..44919a5 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -270,6 +270,7 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r extern HINSTANCE shdocvw_hinstance; extern void register_iewindow_class(void); extern void unregister_iewindow_class(void); +extern void adjust_ie_docobj_rect(HWND, RECT*); HRESULT register_class_object(BOOL); HRESULT get_typeinfo(ITypeInfo**);

1 0

Jacek Caban : jscript: Register .js file type.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 35b8c9275965e0110ae5adbf802a9e7c7de6b22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b8c9275965e0110ae5adbf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 15:51:42 2010 +0200 jscript: Register .js file type. --- dlls/jscript/jscript.inf | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.inf b/dlls/jscript/jscript.inf index 9f683ed..3e2994b 100644 --- a/dlls/jscript/jscript.inf +++ b/dlls/jscript/jscript.inf @@ -3,11 +3,11 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg +AddReg=Classes.Reg, FileType.Reg [UnregisterDll] -DelReg=Classes.Reg +DelReg=Classes.Reg, FileType.Reg [Classes.Reg] @@ -93,5 +93,12 @@ HKCR,"LiveScript Author\CLSID",,,"%CLSID_JScriptAuthor%" HKCR,"LiveScript Author\OLEScript",,16 +;; FIXME: This probably should go to wshext.dll +[FileType.Reg] +HKCR,".js",,,"JSFile" +HKCR,"JSFile",,,"JSCript Script File" +HKCR,"JSFile\ScriptEngine",,,"JSCript" + + [Strings] MODULE="jscript.dll"

1 0

Jacek Caban : wscript.exe: Added parsing script file implmentation.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 07f169a959b755f976034017c9b107a504f4503e URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f169a959b755f976034017c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 15:52:30 2010 +0200 wscript.exe: Added parsing script file implmentation. --- programs/wscript/Makefile.in | 2 +- programs/wscript/main.c | 57 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 64c9678..97b1054 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wscript.exe APPMODE = -mwindows -municode -IMPORTS = uuid ole32 advapi32 +IMPORTS = uuid oleaut32 ole32 advapi32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 674bcba..f94c3ae 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -225,6 +225,60 @@ static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser) return SUCCEEDED(hres); } +static BSTR get_script_str(const WCHAR *filename) +{ + const char *file_map; + HANDLE file, map; + DWORD size, len; + BSTR ret; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + if(file == INVALID_HANDLE_VALUE) + return NULL; + + size = GetFileSize(file, NULL); + map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if(map == INVALID_HANDLE_VALUE) + return NULL; + + file_map = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); + CloseHandle(map); + if(!file_map) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, file_map, size, NULL, 0); + ret = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, file_map, size, ret, len); + + UnmapViewOfFile(file_map); + return ret; +} + +static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScriptParse *parser) +{ + BSTR text; + HRESULT hres; + + text = get_script_str(filename); + if(!text) { + WINE_FIXME("Could not get script text\n"); + return; + } + + hres = IActiveScriptParse64_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, + SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL); + SysFreeString(text); + if(FAILED(hres)) { + WINE_FIXME("ParseScriptText failed: %08x\n", hres); + return; + } + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + if(FAILED(hres)) + WINE_FIXME("SetScriptState failed: %08x\n", hres); +} + int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { IActiveScriptParse *parser; @@ -232,7 +286,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm const WCHAR *ext; CLSID clsid; - WINE_FIXME("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); + WINE_TRACE("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); if(!*cmdline) return 1; @@ -254,6 +308,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm } if(init_engine(script, parser)) { + run_script(cmdline, script, parser); IActiveScript_Close(script); }else { WINE_FIXME("Script initialization failed\n");

1 0

Jacek Caban : jscript: Return S_OK in SetScriptState for SCRIPTSTATE_INITIALIZED.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: c21061866340fbcaa1e1b6cf80e242aa2284115a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21061866340fbcaa1e1b6cf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 15:51:29 2010 +0200 jscript: Return S_OK in SetScriptState for SCRIPTSTATE_INITIALIZED. --- dlls/jscript/jscript.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c7c77e3..bcb81fa 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -378,6 +378,9 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s exec_queued_code(This); break; + case SCRIPTSTATE_INITIALIZED: + FIXME("unimplemented SCRIPTSTATE_INITIALIZED\n"); + return S_OK; default: FIXME("unimplemented state %d\n", ss); return E_NOTIMPL;

1 0

Jacek Caban : shdocvw: Moved IHlinkFrame implementation to separated object .
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: df2689d252bfcb806bab29c93ec12e204fa2d984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2689d252bfcb806bab29c93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 18:14:54 2010 +0200 shdocvw: Moved IHlinkFrame implementation to separated object. --- dlls/shdocvw/navigate.c | 48 +++++++++++++++++++++++++++++++------------- dlls/shdocvw/shdocvw.h | 15 ++++++++++++- dlls/shdocvw/webbrowser.c | 7 +++-- 3 files changed, 51 insertions(+), 19 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 6d73fd9..f527c3e 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -881,30 +881,30 @@ HRESULT go_home(DocHost *This) return navigate_url(This, wszPageName, NULL, NULL, NULL, NULL); } -#define HLINKFRAME_THIS(iface) DEFINE_THIS(WebBrowser, HlinkFrame, iface) +#define HLINKFRAME_THIS(iface) DEFINE_THIS(HlinkFrame, IHlinkFrame, iface) static HRESULT WINAPI HlinkFrame_QueryInterface(IHlinkFrame *iface, REFIID riid, void **ppv) { - WebBrowser *This = HLINKFRAME_THIS(iface); - return IWebBrowser2_QueryInterface(WEBBROWSER2(This), riid, ppv); + HlinkFrame *This = HLINKFRAME_THIS(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); } static ULONG WINAPI HlinkFrame_AddRef(IHlinkFrame *iface) { - WebBrowser *This = HLINKFRAME_THIS(iface); - return IWebBrowser2_AddRef(WEBBROWSER2(This)); + HlinkFrame *This = HLINKFRAME_THIS(iface); + return IUnknown_AddRef(This->outer); } static ULONG WINAPI HlinkFrame_Release(IHlinkFrame *iface) { - WebBrowser *This = HLINKFRAME_THIS(iface); - return IWebBrowser2_Release(WEBBROWSER2(This)); + HlinkFrame *This = HLINKFRAME_THIS(iface); + return IUnknown_Release(This->outer); } static HRESULT WINAPI HlinkFrame_SetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext *pihlbc) { - WebBrowser *This = HLINKFRAME_THIS(iface); + HlinkFrame *This = HLINKFRAME_THIS(iface); FIXME("(%p)->(%p)\n", This, pihlbc); return E_NOTIMPL; } @@ -912,7 +912,7 @@ static HRESULT WINAPI HlinkFrame_SetBrowseContext(IHlinkFrame *iface, static HRESULT WINAPI HlinkFrame_GetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext **ppihlbc) { - WebBrowser *This = HLINKFRAME_THIS(iface); + HlinkFrame *This = HLINKFRAME_THIS(iface); FIXME("(%p)->(%p)\n", This, ppihlbc); return E_NOTIMPL; } @@ -920,7 +920,7 @@ static HRESULT WINAPI HlinkFrame_GetBrowseContext(IHlinkFrame *iface, static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *pibsc, IHlink *pihlNavigate) { - WebBrowser *This = HLINKFRAME_THIS(iface); + HlinkFrame *This = HLINKFRAME_THIS(iface); IMoniker *mon; LPWSTR location = NULL; @@ -945,13 +945,13 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB return E_NOTIMPL; } - return navigate_hlink(&This->doc_host, mon, pbc, pibsc); + return navigate_hlink(This->doc_host, mon, pbc, pibsc); } static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, DWORD dwreserved) { - WebBrowser *This = HLINKFRAME_THIS(iface); + HlinkFrame *This = HLINKFRAME_THIS(iface); FIXME("(%p)->(%08x %p %s %s %d)\n", This, grfHLNF, pimkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), dwreserved); return E_NOTIMPL; @@ -960,7 +960,7 @@ static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, static HRESULT WINAPI HlinkFrame_UpdateHlink(IHlinkFrame *iface, ULONG uHLID, IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) { - WebBrowser *This = HLINKFRAME_THIS(iface); + HlinkFrame *This = HLINKFRAME_THIS(iface); FIXME("(%p)->(%u %p %s %s)\n", This, uHLID, pimkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); return E_NOTIMPL; @@ -1103,8 +1103,28 @@ static const ITargetFrame2Vtbl TargetFrame2Vtbl = { TargetFrame2_GetTargetAlias }; +BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IHlinkFrame, riid)) { + TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); + *ppv = HLINKFRAME(This); + }else { + return FALSE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return TRUE; +} + +void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) +{ + This->lpIHlinkFrameVtbl = &HlinkFrameVtbl; + + This->outer = outer; + This->doc_host = doc_host; +} + void WebBrowser_HlinkFrame_Init(WebBrowser *This) { - This->lpHlinkFrameVtbl = &HlinkFrameVtbl; This->lpITargetFrame2Vtbl = &TargetFrame2Vtbl; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index d1787cb..790eb73 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -66,6 +66,13 @@ typedef struct { IUnknown *impl; } ConnectionPointContainer; +typedef struct { + const IHlinkFrameVtbl *lpIHlinkFrameVtbl; + + IUnknown *outer; + DocHost *doc_host; +} HlinkFrame; + struct _task_header_t; typedef void (*task_proc_t)(DocHost*, struct _task_header_t*); @@ -128,10 +135,10 @@ struct WebBrowser { const IViewObject2Vtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; - const IHlinkFrameVtbl *lpHlinkFrameVtbl; const ITargetFrame2Vtbl *lpITargetFrame2Vtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; const IDataObjectVtbl *lpDataObjectVtbl; + HlinkFrame hlink_frame; LONG ref; @@ -188,7 +195,6 @@ struct InternetExplorer { #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define OLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) -#define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) #define DATAOBJECT(x) ((IDataObject*) &(x)->lpDataObjectVtbl) #define TARGETFRAME2(x) ((ITargetFrame2*) &(x)->lpITargetFrame2Vtbl) @@ -203,6 +209,8 @@ struct InternetExplorer { #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl) +#define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpIHlinkFrameVtbl) + void WebBrowser_OleObject_Init(WebBrowser*); void WebBrowser_ViewObject_Init(WebBrowser*); void WebBrowser_DataObject_Init(WebBrowser*); @@ -223,6 +231,9 @@ void DocHost_ClientSite_Release(DocHost*); void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*); void ConnectionPointContainer_Destroy(ConnectionPointContainer*); +void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*); +BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**); + HRESULT WebBrowserV1_Create(IUnknown*,REFIID,void**); HRESULT WebBrowserV2_Create(IUnknown*,REFIID,void**); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 4799686..de12aa5 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -100,9 +100,6 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); *ppv = OLECMD(This); - }else if(IsEqualGUID(&IID_IHlinkFrame, riid)) { - TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); - *ppv = HLINKFRAME(This); }else if(IsEqualGUID(&IID_ITargetFrame2, riid)) { TRACE("(%p)->(IID_ITargetFrame2 %p)\n", This, ppv); *ppv = TARGETFRAME2(This); @@ -133,6 +130,8 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { TRACE("(%p)->(IID_IViewObjectEx %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { + return S_OK; } if(*ppv) { @@ -1159,6 +1158,8 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi WebBrowser_ClassInfo_Init(ret); WebBrowser_HlinkFrame_Init(ret); + HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)WEBBROWSER2(ret), &ret->doc_host); + SHDOCVW_LockModule(); hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv);

1 0

Paul Chitescu : d3dx9_36: Provide an empty error message in the stub D3DXCompileShader.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 8068d4ee2280108aabd09c1f8b0cf8631774cb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8068d4ee2280108aabd09c1f8… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jul 28 13:50:46 2010 +0300 d3dx9_36: Provide an empty error message in the stub D3DXCompileShader. --- dlls/d3dx9_36/shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9677e0b..2c21773 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -661,6 +661,8 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, TRACE("Shader source:\n"); TRACE("%s\n", debugstr_an(pSrcData, srcDataLen)); + if (ppErrorMsgs) + D3DXCreateBuffer(1, ppErrorMsgs); /* zero fill used as string end */ return D3DERR_INVALIDCALL; }

1 0

Jacek Caban : shdocvw: Inherit HlinkFrame in InternetExplorer object.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: cf6d9d6986f8347c154bffa8fa2cf9a47b96fb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6d9d6986f8347c154bffa8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 18:15:38 2010 +0200 shdocvw: Inherit HlinkFrame in InternetExplorer object. --- dlls/shdocvw/ie.c | 2 ++ dlls/shdocvw/iexplore.c | 2 ++ dlls/shdocvw/shdocvw.h | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 9d661ca..a484de5 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -47,6 +47,8 @@ static HRESULT WINAPI InternetExplorer_QueryInterface(IWebBrowser2 *iface, REFII }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = CONPTCONT(&This->doc_host.cps); + }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { + return S_OK; } if(*ppv) { diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index fa643fe..4d7c01c 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -279,6 +279,8 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) InternetExplorer_WebBrowser_Init(ret); + HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)WEBBROWSER2(ret), &ret->doc_host); + create_frame_hwnd(ret); ret->doc_host.frame_hwnd = ret->frame_hwnd; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index a922b9e..6fbb20f 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -173,6 +173,7 @@ struct WebBrowser { struct InternetExplorer { const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; + HlinkFrame hlink_frame; LONG ref;

1 0

Huw Davies : ole32: Pass a real IUnknown ptr to CoMarshalInterface.
by Alexandre Julliard July 28, 2010

July 28, 2010

Module: wine Branch: master Commit: 127260bb628d029c7608e96013bcec207e635249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=127260bb628d029c7608e9601… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 28 11:42:04 2010 +0100 ole32: Pass a real IUnknown ptr to CoMarshalInterface. --- dlls/ole32/ole2.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f570167..a9a4885 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -409,6 +409,7 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) HRESULT hr; IStream *stream; HANDLE map; + IUnknown *unk; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -449,7 +450,15 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); if(FAILED(hr)) return hr; - hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)pDropTarget, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + hr = IDropTarget_QueryInterface(pDropTarget, &IID_IUnknown, (void**)&unk); + if(FAILED(hr)) + { + IStream_Release(stream); + return hr; + } + hr = CoMarshalInterface(stream, &IID_IDropTarget, unk, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + IUnknown_Release(unk); + if(SUCCEEDED(hr)) { hr = create_map_from_stream(stream, &map);

1 0