April 2008 - Wine-Commits - list.winehq.org

Vincent Povirk : start.exe: Add /Unix switch for native file managers.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: fc29e334f6dcaf566bc17c5c5514929a395686f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc29e334f6dcaf566bc17c5c5… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Sat Apr 12 20:30:42 2008 -0400 start.exe: Add /Unix switch for native file managers. --- programs/start/En.rc | 5 ++- programs/start/resources.h | 1 + programs/start/start.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 101 insertions(+), 2 deletions(-) diff --git a/programs/start/En.rc b/programs/start/En.rc index 3817a59..212046c 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -33,6 +33,7 @@ Options: \n\ /MAX[imized] Start the program maximized. \n\ /R[estored] Start the program normally (neither minimized nor maximized). \n\ /W[ait] Wait for started program to finish, then exit with its exit code. \n\ +/Unix Use a Unix filename and start the file like windows explorer. \n\ /L Show end-user license. \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -59,5 +60,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. \n\ See the COPYING.LIB file for license information. \n\ " -STRING_EXECFAIL "Application could not be started, or no application associated with the specified file.\nShellExecuteEx failed" +STRING_EXECFAIL, "Application could not be started, or no application associated with the specified file.\nShellExecuteEx failed" + +STRING_UNIXFAIL "Could not translate the specified Unix filename to a DOS filename." } diff --git a/programs/start/resources.h b/programs/start/resources.h index fb4fff8..f5abd31 100644 --- a/programs/start/resources.h +++ b/programs/start/resources.h @@ -21,3 +21,4 @@ #define STRING_USAGE 101 #define STRING_LICENSE 102 #define STRING_EXECFAIL 103 +#define STRING_UNIXFAIL 104 diff --git a/programs/start/start.c b/programs/start/start.c index 58748c8..c7a4ba4 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -151,13 +151,37 @@ static WCHAR *build_args( int argc, WCHAR **argvW ) return ret; } +static WCHAR *get_parent_dir(WCHAR* path) +{ + WCHAR *last_slash; + WCHAR *result; + int len; + + last_slash = strrchrW( path, '\\' ); + if (last_slash == NULL) + len = 1; + else + len = last_slash - path + 1; + + result = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + CopyMemory(result, path, (len-1)*sizeof(WCHAR)); + result[len-1] = '\0'; + + return result; +} + int wmain (int argc, WCHAR *argv[]) { SHELLEXECUTEINFOW sei; WCHAR *args = NULL; int i; + int unix_mode = 0; + WCHAR *dos_filename = NULL; + WCHAR *parent_directory = NULL; + DWORD binary_type; static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; + static const WCHAR unixW[] = { 'u', 'n', 'i', 'x', 0 }; memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); @@ -178,6 +202,10 @@ int wmain (int argc, WCHAR *argv[]) if (argv[i][0] != '/') break; + /* Unix paths can start with / so we have to assume anything following /U is not a flag */ + if (unix_mode) + break; + /* Handle all options in this word */ for (ci=0; argv[i][ci]; ) { /* Skip slash */ @@ -198,6 +226,15 @@ int wmain (int argc, WCHAR *argv[]) case 'R': /* sei.nShow = SW_SHOWNORMAL; */ break; + case 'u': + case 'U': + if (strncmpiW(&argv[i][ci], unixW, 4) == 0) + unix_mode = 1; + else { + WINE_ERR("Option '%s' not recognized\n", wine_dbgstr_w( argv[i]+ci-1)); + usage(); + } + break; case 'w': case 'W': sei.fMask |= SEE_MASK_NOCLOSEPROCESS; @@ -220,10 +257,68 @@ int wmain (int argc, WCHAR *argv[]) args = build_args( argc - i, &argv[i] ); sei.lpParameters = args; - if (!ShellExecuteExW(&sei)) + if (unix_mode) { + LPWSTR (*wine_get_dos_file_name_ptr)(LPCSTR); + char* multibyte_unixpath; + int multibyte_unixpath_len; + + wine_get_dos_file_name_ptr = (void*)GetProcAddress(GetModuleHandle("KERNEL32"), "wine_get_dos_file_name"); + + if (!wine_get_dos_file_name_ptr) + fatal_string(STRING_UNIXFAIL); + + multibyte_unixpath_len = WideCharToMultiByte(CP_UNIXCP, 0, sei.lpFile, -1, NULL, 0, NULL, NULL); + multibyte_unixpath = HeapAlloc(GetProcessHeap(), 0, multibyte_unixpath_len); + + WideCharToMultiByte(CP_UNIXCP, 0, sei.lpFile, -1, multibyte_unixpath, multibyte_unixpath_len, NULL, NULL); + + dos_filename = wine_get_dos_file_name_ptr(multibyte_unixpath); + + HeapFree(GetProcessHeap(), 0, multibyte_unixpath); + + if (!dos_filename) + fatal_string(STRING_UNIXFAIL); + + sei.lpFile = dos_filename; + sei.lpDirectory = parent_directory = get_parent_dir(dos_filename); + + if (GetBinaryTypeW(sei.lpFile, &binary_type)) { + WCHAR *commandline; + STARTUPINFOW startup_info; + PROCESS_INFORMATION process_information; + static WCHAR commandlineformat[] = {'"','%','s','"','%','s',0}; + + /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */ + + commandline = HeapAlloc(GetProcessHeap(), 0, (strlenW(sei.lpFile)+3+strlenW(sei.lpParameters))*sizeof(WCHAR)); + sprintfW(commandline, commandlineformat, sei.lpFile, sei.lpParameters); + + ZeroMemory(&startup_info, sizeof(startup_info)); + startup_info.cb = sizeof(startup_info); + + if (!CreateProcessW( + NULL, /* lpApplicationName */ + commandline, /* lpCommandLine */ + NULL, /* lpProcessAttributes */ + NULL, /* lpThreadAttributes */ + FALSE, /* bInheritHandles */ + CREATE_NEW_CONSOLE, /* dwCreationFlags */ + NULL, /* lpEnvironment */ + sei.lpDirectory, /* lpCurrentDirectory */ + &startup_info, /* lpStartupInfo */ + &process_information /* lpProcessInformation */ )) + { + fatal_string_error(STRING_EXECFAIL, GetLastError()); + } + sei.hProcess = process_information.hProcess; + } + } + else if (!ShellExecuteExW(&sei)) fatal_string_error(STRING_EXECFAIL, GetLastError()); HeapFree( GetProcessHeap(), 0, args ); + HeapFree( GetProcessHeap(), 0, dos_filename ); + HeapFree( GetProcessHeap(), 0, parent_directory ); if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode;

1 0

Austin English : Spelling fixes.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 313a85f1630d2fc2f69815a6cf43e42e0c4829f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=313a85f1630d2fc2f69815a6c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 10 21:17:14 2008 -0500 Spelling fixes. --- dlls/opengl32/tests/opengl.c | 4 ++-- dlls/quartz/control.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/videorenderer.c | 2 +- dlls/riched20/paint.c | 4 ++-- dlls/riched20/style.c | 2 +- dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/undo.c | 4 ++-- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/ndr_stubless.c | 4 ++-- dlls/rpcrt4/ndr_stubless.h | 2 +- dlls/rpcrt4/rpcrt4_main.c | 2 +- dlls/rpcrt4/rpcss_np_client.h | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- dlls/rsaenh/mpi.c | 8 ++++---- dlls/rsaenh/rc2.c | 2 +- dlls/sane.ds/capability.c | 4 ++-- dlls/sane.ds/sane_i.h | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=313a85f1630d2fc2f6981…

1 0

Tony Wasserka : d3dx9: Add d3dx9tex.h.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: d9e98ea3d0cfe3889afaa848e6dc7173993ff925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e98ea3d0cfe3889afaa848e… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Apr 15 15:30:03 2008 +0200 d3dx9: Add d3dx9tex.h. --- include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9tex.h | 697 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 699 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9e98ea3d0cfe3889afaa…

1 0

Louis Lenders : urlmon: Add stub for CoInternetSetFeatureEnabled.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: dd66542011c3a4376638bf4a9efb05fdfa346b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd66542011c3a4376638bf4a9… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Apr 13 20:42:32 2008 +0000 urlmon: Add stub for CoInternetSetFeatureEnabled. --- dlls/urlmon/internet.c | 9 +++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index b8168ab..8bde7b4 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -298,3 +298,12 @@ HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption, return S_OK; } + +/*********************************************************************** + * CoInternetSetFeatureEnabled (URLMON.@) + */ +HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST feature, DWORD flags, BOOL enable) +{ + FIXME("%d, 0x%08x, %x, stub\n", feature, flags, enable); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 1fa2f94..0f3c9c2 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -19,6 +19,7 @@ @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) +@ stdcall CoInternetSetFeatureEnabled(long long long) @ stub CompareSecurityIds @ stub CopyBindInfo @ stdcall CopyStgMedium(ptr ptr) diff --git a/include/urlmon.idl b/include/urlmon.idl index c77971f..9e03543 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1325,6 +1325,43 @@ interface ISoftDistExt : IUnknown [in] LPCODEBASEHOLD lpcbh); } +typedef enum _tagINTERNETFEATURELIST +{ + FEATURE_OBJECT_CACHING, + FEATURE_ZONE_ELEVATION, + FEATURE_MIME_HANDLING, + FEATURE_MIME_SNIFFING, + FEATURE_WINDOW_RESTRICTIONS, + FEATURE_WEBOC_POPUPMANAGEMENT, + FEATURE_BEHAVIORS, + FEATURE_DISABLE_MK_PROTOCOL, + FEATURE_LOCALMACHINE_LOCKDOWN, + FEATURE_SECURITYBAND, + FEATURE_RESTRICT_ACTIVEXINSTALL, + FEATURE_VALIDATE_NAVIGATE_URL, + FEATURE_RESTRICT_FILEDOWNLOAD, + FEATURE_ADDON_MANAGEMENT, + FEATURE_PROTOCOL_LOCKDOWN, + FEATURE_HTTP_USERNAME_PASSWORD_DISABLE, + FEATURE_SAFE_BINDTOOBJECT, + FEATURE_UNC_SAVEDFILECHECK, + FEATURE_GET_URL_DOM_FILEPATH_UNENCODED, + FEATURE_TABBED_BROWSING, + FEATURE_SSLUX, + FEATURE_DISABLE_NAVIGATION_SOUNDS, + FEATURE_DISABLE_LEGACY_COMPRESSION, + FEATURE_FORCE_ADDR_AND_STATUS, + FEATURE_XMLHTTP, + FEATURE_DISABLE_TELNET_PROTOCOL, + FEATURE_FEEDS, + FEATURE_BLOCK_INPUT_PROMPTS, + FEATURE_DOMSTORAGE, + FEATURE_XDOMAINREQUEST, + FEATURE_DATAURI, + FEATURE_AJAX_CONNECTIONSERVICES, + FEATURE_ENTRY_COUNT +} INTERNETFEATURELIST; + cpp_quote("DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);") cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4);") cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") @@ -1391,6 +1428,7 @@ cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0

Michael Hoffman : powrprof: Implement IsPwrHibernateAllowed.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 95fa6fbb57807ccec5a9a20c40517cf864590936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fa6fbb57807ccec5a9a20c4… Author: Michael Hoffman <blackdragon1157(a)gmail.com> Date: Wed Apr 16 17:59:01 2008 -0400 powrprof: Implement IsPwrHibernateAllowed. --- dlls/powrprof/powrprof.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 7d3b86e..c51434f 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -207,11 +207,9 @@ BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY p) BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) { - /* FIXME: See note #2 */ SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + return PowerCaps.SystemS4 && PowerCaps.HiberFilePresent; } BOOLEAN WINAPI IsPwrShutdownAllowed(VOID)

1 0

Michael Hoffman : powrprof: Implement IsPwrShutdownAllowed.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: c189b5f9e2e5b146ca8ec25deba04a4aa2a2a52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c189b5f9e2e5b146ca8ec25de… Author: Michael Hoffman <blackdragon1157(a)gmail.com> Date: Wed Apr 16 17:59:52 2008 -0400 powrprof: Implement IsPwrShutdownAllowed. --- dlls/powrprof/powrprof.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 58a7919..7d3b86e 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -216,11 +216,9 @@ BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) { - /* FIXME: See note #2 */ SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + return PowerCaps.SystemS5; } BOOLEAN WINAPI IsPwrSuspendAllowed(VOID)

1 0

Michael Hoffman : powrprof: Implement IsPwrSuspendAllowed.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: 1cfaa915709e14373cd303e7dfccea2fba97ac83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfaa915709e14373cd303e7d… Author: Michael Hoffman <blackdragon1157(a)gmail.com> Date: Wed Apr 16 18:00:33 2008 -0400 powrprof: Implement IsPwrSuspendAllowed. --- dlls/powrprof/powrprof.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index e17acc9..58a7919 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -225,11 +225,9 @@ BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) BOOLEAN WINAPI IsPwrSuspendAllowed(VOID) { - /* FIXME: See note #2 */ SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + return PowerCaps.SystemS1 && PowerCaps.SystemS2 && PowerCaps.SystemS3; } BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy)

1 0

Jacek Caban : mshtml: Move get_typeinfo to dispex.c.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: be59368dd1176becfd582d0d959e16b23430b97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be59368dd1176becfd582d0d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:32:18 2008 +0200 mshtml: Move get_typeinfo to dispex.c. --- dlls/mshtml/dispex.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/main.c | 52 +-------------------------------------- dlls/mshtml/mshtml_private.h | 15 ++++++----- 3 files changed, 64 insertions(+), 58 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f665c8f..6596f76 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -31,6 +31,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_IHTMLWindow2, +}; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if(!typelib) { + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + } + + if(!typeinfos[tid]) { + ITypeInfo *typeinfo; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 0389833..1c52c5a 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -49,47 +49,6 @@ DWORD mshtml_tls = 0; static HINSTANCE shdoclc = NULL; -static ITypeLib *typelib; -static ITypeInfo *typeinfos[LAST_tid]; - -static REFIID tid_ids[] = { - &IID_IHTMLWindow2 -}; - -HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) -{ - HRESULT hres; - - if(!typelib) { - ITypeLib *tl; - - hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &tl); - if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) - ITypeLib_Release(tl); - } - - if(!typeinfos[tid]) { - ITypeInfo *typeinfo; - - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); - if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid failed: %08x\n", hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) - ITypeInfo_Release(typeinfo); - } - - *typeinfo = typeinfos[tid]; - return S_OK; -} - static void thread_detach(void) { thread_data_t *thread_data; @@ -107,16 +66,7 @@ static void thread_detach(void) static void process_detach(void) { close_gecko(); - - if(typelib) { - unsigned i; - - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) - if(typeinfos[i]) - ITypeInfo_Release(typeinfos[i]); - - ITypeLib_Release(typelib); - } + release_typelib(); if(shdoclc) FreeLibrary(shdoclc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1bd4bb1..67e27a4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -57,6 +57,12 @@ typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; typedef struct nsChannelBSC nsChannelBSC; +/* NOTE: make sure to keep in sync with dispex.c */ +typedef enum { + IHTMLWindow2_tid, + LAST_tid +} tid_t; + typedef struct { const IDispatchExVtbl *lpIDispatchExVtbl; @@ -524,13 +530,8 @@ HWND get_thread_hwnd(void); void push_task(task_t*); void remove_doc_tasks(const HTMLDocument*); -/* typelibs */ -enum tid_t { - IHTMLWindow2_tid, - LAST_tid -}; - -HRESULT get_typeinfo(enum tid_t, ITypeInfo**); +HRESULT get_typeinfo(tid_t,ITypeInfo**); +void release_typelib(void); DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);

1 0

Jacek Caban : mshtml: Added generic IDispatchEx implementation and use it in OnNavigator.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: ed6a8acca71a37060234168aa5c755787d5dce2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6a8acca71a37060234168aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:31:43 2008 +0200 mshtml: Added generic IDispatchEx implementation and use it in OnNavigator. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/dispex.c | 176 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 11 +++ dlls/mshtml/omnavigator.c | 6 ++ 4 files changed, 194 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index a19428a..97ae6f1 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -10,6 +10,7 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ conpoint.c \ + dispex.c \ editor.c \ hlink.c \ htmlanchor.c \ diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c new file mode 100644 index 0000000..f665c8f --- /dev/null +++ b/dlls/mshtml/dispex.c @@ -0,0 +1,176 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * 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 <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) + +static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x)\n", This, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppunk); + return E_NOTIMPL; +} + +#undef DISPATCHEX_THIS + +static IDispatchExVtbl DispatchExVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +void init_dispex(DispatchEx *dispex, IUnknown *outer) +{ + dispex->lpIDispatchExVtbl = &DispatchExVtbl; + dispex->outer = outer; +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6682370..1bd4bb1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -21,6 +21,7 @@ #include "mshtml.h" #include "mshtmhst.h" #include "hlink.h" +#include "dispex.h" #include "wine/list.h" #include "wine/unicode.h" @@ -57,6 +58,14 @@ typedef struct BSCallback BSCallback; typedef struct nsChannelBSC nsChannelBSC; typedef struct { + const IDispatchExVtbl *lpIDispatchExVtbl; + + IUnknown *outer; +} DispatchEx; + +void init_dispex(DispatchEx*,IUnknown*); + +typedef struct { const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; LONG ref; @@ -334,6 +343,8 @@ typedef struct { #define HTMLOPTFACTORY(x) ((IHTMLOptionElementFactory*) &(x)->lpHTMLOptionElementFactoryVtbl) #define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl) +#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) + #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index d1bcdca..1a1e7e8 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + DispatchEx dispex; const IOmNavigatorVtbl *lpIOmNavigatorVtbl; LONG ref; @@ -53,6 +54,9 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = OMNAVIGATOR(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IOmNavigator, riid)) { TRACE("(%p)->(IID_IOmNavigator %p)\n", This, ppv); *ppv = OMNAVIGATOR(This); @@ -305,5 +309,7 @@ IOmNavigator *OmNavigator_Create(void) ret->lpIOmNavigatorVtbl = &OmNavigatorVtbl; ret->ref = 1; + init_dispex(&ret->dispex, (IUnknown*)OMNAVIGATOR(ret)); + return OMNAVIGATOR(ret); }

1 0

Jacek Caban : mshtml: Added IActiveScriptDebug32 stub implementation.
by Alexandre Julliard April 17, 2008

April 17, 2008

Module: wine Branch: master Commit: d0d8dc2811b495914b1c1b6eb45b62ae26b2e5ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d8dc2811b495914b1c1b6eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:31:00 2008 +0200 mshtml: Added IActiveScriptDebug32 stub implementation. --- dlls/mshtml/script.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 412a3ec..6a6442e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "ole2.h" #include "activscp.h" +#include "activdbg.h" #include "objsafe.h" #include "wine/debug.h" @@ -44,6 +45,7 @@ typedef struct { const IActiveScriptSiteVtbl *lpIActiveScriptSiteVtbl; const IActiveScriptSiteInterruptPollVtbl *lpIActiveScriptSiteInterruptPollVtbl; const IActiveScriptSiteWindowVtbl *lpIActiveScriptSiteWindowVtbl; + const IActiveScriptSiteDebug32Vtbl *lpIActiveScriptSiteDebug32Vtbl; LONG ref; @@ -61,6 +63,7 @@ typedef struct { #define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpIActiveScriptSiteVtbl) #define ACTSCPPOLL(x) ((IActiveScriptSiteInterruptPoll*) &(x)->lpIActiveScriptSiteInterruptPollVtbl) #define ACTSCPWIN(x) ((IActiveScriptSiteWindow*) &(x)->lpIActiveScriptSiteWindowVtbl) +#define ACTSCPDBG32(x) ((IActiveScriptSiteDebug32*) &(x)->lpIActiveScriptSiteDebug32Vtbl) static BOOL init_script_engine(ScriptHost *script_host) { @@ -205,6 +208,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); *ppv = ACTSCPWIN(This); + }else if(IsEqualGUID(&IID_IActiveScriptSiteDebug32, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteDebug32 %p)\n", This, ppv); + *ppv = ACTSCPDBG32(This); }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -426,6 +432,70 @@ static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { ActiveScriptSiteWindow_EnableModeless }; +#define ACTSCPDBG32_THIS(iface) DEFINE_THIS(ScriptHost, IActiveScriptSiteDebug32, iface) + +static HRESULT WINAPI ActiveScriptSiteDebug32_QueryInterface(IActiveScriptSiteDebug32 *iface, + REFIID riid, void **ppv) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + return IActiveScriptSite_QueryInterface(ACTSCPSITE(This), riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteDebug32_AddRef(IActiveScriptSiteDebug32 *iface) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + return IActiveScriptSite_AddRef(ACTSCPSITE(This)); +} + +static ULONG WINAPI ActiveScriptSiteDebug32_Release(IActiveScriptSiteDebug32 *iface) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + return IActiveScriptSite_Release(ACTSCPSITE(This)); +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_GetDocumentContextFromPosition(IActiveScriptSiteDebug32 *iface, + DWORD dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, IDebugDocumentContext **ppsc) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%x %u %u %p)\n", This, dwSourceContext, uCharacterOffset, uNumChars, ppsc); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_GetApplication(IActiveScriptSiteDebug32 *iface, IDebugApplication32 **ppda) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppda); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_GetRootApplicationNode(IActiveScriptSiteDebug32 *iface, + IDebugApplicationNode **ppdanRoot) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppdanRoot); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_OnScriptErrorDebug(IActiveScriptSiteDebug32 *iface, + IActiveScriptErrorDebug *pErrorDebug, BOOL *pfEnterDebugger, BOOL *pfCallOnScriptErrorWhenContinuing) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%p %p %p)\n", This, pErrorDebug, pfEnterDebugger, pfCallOnScriptErrorWhenContinuing); + return E_NOTIMPL; +} + +#undef ACTSCPDBG32_THIS + +static const IActiveScriptSiteDebug32Vtbl ActiveScriptSiteDebug32Vtbl = { + ActiveScriptSiteDebug32_QueryInterface, + ActiveScriptSiteDebug32_AddRef, + ActiveScriptSiteDebug32_Release, + ActiveScriptSiteDebug32_GetDocumentContextFromPosition, + ActiveScriptSiteDebug32_GetApplication, + ActiveScriptSiteDebug32_GetRootApplicationNode, + ActiveScriptSiteDebug32_OnScriptErrorDebug +}; + static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) { ScriptHost *ret; @@ -435,6 +505,7 @@ static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) ret->lpIActiveScriptSiteVtbl = &ActiveScriptSiteVtbl; ret->lpIActiveScriptSiteInterruptPollVtbl = &ActiveScriptSiteInterruptPollVtbl; ret->lpIActiveScriptSiteWindowVtbl = &ActiveScriptSiteWindowVtbl; + ret->lpIActiveScriptSiteDebug32Vtbl = &ActiveScriptSiteDebug32Vtbl; ret->ref = 1; ret->doc = doc; ret->script_state = SCRIPTSTATE_UNINITIALIZED;

1 0