November 2010 - Wine-Commits

Vincent Povirk : mscoree: Use the new architecture to implement _CorExeMain .
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: e5d3294b83875dd0e42509e5a9c33a08ee190c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d3294b83875dd0e42509e5a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 13:24:01 2010 -0500 mscoree: Use the new architecture to implement _CorExeMain. --- dlls/mscoree/corruntimehost.c | 207 ++++++++++++++++++++++++++ dlls/mscoree/metahost.c | 9 + dlls/mscoree/mscoree_main.c | 317 ---------------------------------------- dlls/mscoree/mscoree_private.h | 12 +-- 4 files changed, 218 insertions(+), 327 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5d3294b83875dd0e4250…

1 0

Vincent Povirk : include: Add definition for ICLRRuntimeHost.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: ef85471bfab3ba3104a1cb5fe72a14a47b70b805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef85471bfab3ba3104a1cb5fe… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 10:49:08 2010 -0500 include: Add definition for ICLRRuntimeHost. --- include/mscoree.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/include/mscoree.idl b/include/mscoree.idl index 07231af..f8698cb 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -46,6 +46,8 @@ typedef enum RUNTIME_INFO_FLAGS { RUNTIME_INFO_DONT_SHOW_ERROR_DIALOG = 0x40 } RUNTIME_INFO_FLAGS; +typedef HRESULT (__stdcall *FExecuteInAppDomainCallback)([in] void* cookie); + [ uuid(F31D1788-C397-4725-87A5-6AF3472C2791), version(1.0), @@ -182,3 +184,43 @@ interface ICorRuntimeHost : IUnknown HRESULT CurrentDomain([out] IUnknown** appDomain); }; + +cpp_quote("DEFINE_GUID(CLSID_CLRRuntimeHost, 0x90f1a06e,0x7712,0x4762,0x86,0xb5,0x7a,0x5e,0xba,0x6b,0xdb,0x02);") + +[ + uuid(90f1a06c-7712-4762-86b5-7a5eba6bdb02), + local, + object +] +interface ICLRRuntimeHost : IUnknown +{ + HRESULT Start(); + + HRESULT Stop(); + + HRESULT SetHostControl([in] IHostControl *pHostControl); + + HRESULT GetCLRControl([out] ICLRControl **pCLRControl); + + HRESULT UnloadAppDomain([in] DWORD dwAppDomainId, + [in] BOOL fWaitUntilDone); + + HRESULT ExecuteInAppDomain([in] DWORD dwAppDomainId, + [in] FExecuteInAppDomainCallback pCallback, + [in] void *cookie); + + HRESULT GetCurrentAppDomainId([out] DWORD *pdwAppDomainId); + + HRESULT ExecuteApplication([in] LPCWSTR pwzAppFullName, + [in] DWORD dwManifestPaths, + [in] LPCWSTR *ppwzManifestPaths, + [in] DWORD dwActivationData, + [in] LPCWSTR *ppwzActivationData, + [out] int *pReturnValue); + + HRESULT ExecuteInDefaultAppDomain([in] LPCWSTR pwzAssemblyPath, + [in] LPCWSTR pwzTypeName, + [in] LPCWSTR pwzMethodName, + [in] LPCWSTR pwzArgument, + [out] DWORD *pReturnValue); +}

1 0

Vincent Povirk : mscoree: Add stub implementation of ICLRRuntimeHost.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 1b68a243f5fbb7f1cfd1b3ecb0af168ad63b733d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b68a243f5fbb7f1cfd1b3ecb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 11:11:24 2010 -0500 mscoree: Add stub implementation of ICLRRuntimeHost. --- dlls/mscoree/corruntimehost.c | 124 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 1e9cc7f..cac9991 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -39,11 +39,17 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); struct RuntimeHost { const struct ICorRuntimeHostVtbl *lpVtbl; + const struct ICLRRuntimeHostVtbl *lpCLRHostVtbl; const CLRRuntimeInfo *version; const loaded_mono *mono; LONG ref; }; +static inline RuntimeHost *impl_from_ICLRRuntimeHost( ICLRRuntimeHost *iface ) +{ + return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpCLRHostVtbl)); +} + static inline RuntimeHost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) { return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpVtbl)); @@ -271,6 +277,121 @@ static const struct ICorRuntimeHostVtbl corruntimehost_vtbl = corruntimehost_CurrentDomain }; +static HRESULT WINAPI CLRRuntimeHost_QueryInterface(ICLRRuntimeHost* iface, + REFIID riid, + void **ppvObject) +{ + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_ICLRRuntimeHost ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + ICLRRuntimeHost_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI CLRRuntimeHost_AddRef(ICLRRuntimeHost* iface) +{ + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + return IUnknown_AddRef((IUnknown*)&This->lpVtbl); +} + +static ULONG WINAPI CLRRuntimeHost_Release(ICLRRuntimeHost* iface) +{ + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + return IUnknown_Release((IUnknown*)&This->lpVtbl); +} + +static HRESULT WINAPI CLRRuntimeHost_Start(ICLRRuntimeHost* iface) +{ + FIXME("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_Stop(ICLRRuntimeHost* iface) +{ + FIXME("(%p)\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_SetHostControl(ICLRRuntimeHost* iface, + IHostControl *pHostControl) +{ + FIXME("(%p,%p)\n", iface, pHostControl); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_GetCLRControl(ICLRRuntimeHost* iface, + ICLRControl **pCLRControl) +{ + FIXME("(%p,%p)\n", iface, pCLRControl); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_UnloadAppDomain(ICLRRuntimeHost* iface, + DWORD dwAppDomainId, BOOL fWaitUntilDone) +{ + FIXME("(%p,%u,%i)\n", iface, dwAppDomainId, fWaitUntilDone); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_ExecuteInAppDomain(ICLRRuntimeHost* iface, + DWORD dwAppDomainId, FExecuteInAppDomainCallback pCallback, void *cookie) +{ + FIXME("(%p,%u,%p,%p)\n", iface, dwAppDomainId, pCallback, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_GetCurrentAppDomainId(ICLRRuntimeHost* iface, + DWORD *pdwAppDomainId) +{ + FIXME("(%p,%p)\n", iface, pdwAppDomainId); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_ExecuteApplication(ICLRRuntimeHost* iface, + LPCWSTR pwzAppFullName, DWORD dwManifestPaths, LPCWSTR *ppwzManifestPaths, + DWORD dwActivationData, LPCWSTR *ppwzActivationData, int *pReturnValue) +{ + FIXME("(%p,%s,%u,%u)\n", iface, debugstr_w(pwzAppFullName), dwManifestPaths, dwActivationData); + return E_NOTIMPL; +} + +static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* iface, + LPCWSTR pwzAssemblyPath, LPCWSTR pwzTypeName, LPCWSTR pwzMethodName, + LPCWSTR pwzArgument, DWORD *pReturnValue) +{ + FIXME("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), + debugstr_w(pwzTypeName), debugstr_w(pwzMethodName), debugstr_w(pwzArgument)); + return E_NOTIMPL; +} + +static const struct ICLRRuntimeHostVtbl CLRHostVtbl = +{ + CLRRuntimeHost_QueryInterface, + CLRRuntimeHost_AddRef, + CLRRuntimeHost_Release, + CLRRuntimeHost_Start, + CLRRuntimeHost_Stop, + CLRRuntimeHost_SetHostControl, + CLRRuntimeHost_GetCLRControl, + CLRRuntimeHost_UnloadAppDomain, + CLRRuntimeHost_ExecuteInAppDomain, + CLRRuntimeHost_GetCurrentAppDomainId, + CLRRuntimeHost_ExecuteApplication, + CLRRuntimeHost_ExecuteInDefaultAppDomain +}; + HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, const loaded_mono *loaded_mono, RuntimeHost** result) { @@ -281,6 +402,7 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, return E_OUTOFMEMORY; This->lpVtbl = &corruntimehost_vtbl; + This->lpCLRHostVtbl = &CLRHostVtbl; This->ref = 1; This->version = runtime_version; This->mono = loaded_mono; @@ -296,6 +418,8 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) unk = (IUnknown*)&This->lpVtbl; + else if (IsEqualGUID(clsid, &CLSID_CLRRuntimeHost)) + unk = (IUnknown*)&This->lpCLRHostVtbl; else unk = NULL;

1 0

Vincent Povirk : mscoree: Load mono when creating a runtime host interface.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: cda37e44473548b89cab2ea3a603232eb4b5f091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda37e44473548b89cab2ea3a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 11:44:32 2010 -0500 mscoree: Load mono when creating a runtime host interface. --- dlls/mscoree/metahost.c | 92 ++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 9 ++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 17554a9..d781afd 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -66,18 +66,104 @@ static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = }; static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, 0 }; +#define NUM_ABI_VERSIONS 1 + +static loaded_mono loaded_monos[NUM_ABI_VERSIONS]; + +static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version); + +static void set_environment(LPCWSTR bin_path) +{ + WCHAR path_env[MAX_PATH]; + int len; + + static const WCHAR pathW[] = {'P','A','T','H',0}; + + /* We have to modify PATH as Mono loads other DLLs from this directory. */ + GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); + len = strlenW(path_env); + path_env[len++] = ';'; + strcpyW(path_env+len, bin_path); + SetEnvironmentVariableW(pathW, path_env); +} + static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) { - /* FIXME: stub */ + static const WCHAR bin[] = {'\\','b','i','n',0}; + static const WCHAR lib[] = {'\\','l','i','b',0}; + static const WCHAR etc[] = {'\\','e','t','c',0}; + WCHAR mono_dll_path[MAX_PATH+16], mono_bin_path[MAX_PATH+4]; + WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; + char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int trace_size; + char trace_setting[256]; + if (This->mono_abi_version == -1) MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); - if (This->mono_abi_version <= 0) + if (This->mono_abi_version <= 0 || This->mono_abi_version > NUM_ABI_VERSIONS) return E_FAIL; - *result = NULL; + *result = &loaded_monos[This->mono_abi_version-1]; + + if (!(*result)->mono_handle) + { + strcpyW(mono_bin_path, This->mono_path); + strcatW(mono_bin_path, bin); + set_environment(mono_bin_path); + + strcpyW(mono_lib_path, This->mono_path); + strcatW(mono_lib_path, lib); + WideCharToMultiByte(CP_UTF8, 0, mono_lib_path, -1, mono_lib_path_a, MAX_PATH, NULL, NULL); + + strcpyW(mono_etc_path, This->mono_path); + strcatW(mono_etc_path, etc); + WideCharToMultiByte(CP_UTF8, 0, mono_etc_path, -1, mono_etc_path_a, MAX_PATH, NULL, NULL); + + if (!find_mono_dll(This->mono_path, mono_dll_path, This->mono_abi_version)) goto fail; + + if (This->mono_abi_version != 1) goto fail; + + (*result)->mono_handle = LoadLibraryW(mono_dll_path); + + if (!(*result)->mono_handle) goto fail; + +#define LOAD_MONO_FUNCTION(x) do { \ + (*result)->x = (void*)GetProcAddress((*result)->mono_handle, #x); \ + if (!(*result)->x) { \ + goto fail; \ + } \ +} while (0); + + LOAD_MONO_FUNCTION(mono_config_parse); + LOAD_MONO_FUNCTION(mono_domain_assembly_open); + LOAD_MONO_FUNCTION(mono_jit_cleanup); + LOAD_MONO_FUNCTION(mono_jit_exec); + LOAD_MONO_FUNCTION(mono_jit_init); + LOAD_MONO_FUNCTION(mono_jit_set_trace_options); + LOAD_MONO_FUNCTION(mono_set_dirs); + +#undef LOAD_MONO_FUNCTION + + (*result)->mono_set_dirs(mono_lib_path_a, mono_etc_path_a); + + (*result)->mono_config_parse(NULL); + + trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); + + if (trace_size) + { + (*result)->mono_jit_set_trace_options(trace_setting); + } + } return S_OK; + +fail: + ERR("Could not load Mono into this process\n"); + FreeLibrary((*result)->mono_handle); + (*result)->mono_handle = NULL; + return E_FAIL; } static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost **result) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index a77de0a..37e6f29 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -64,6 +64,15 @@ extern void (*mono_set_dirs)(const char *assembly_dir, const char *config_dir); typedef struct loaded_mono { + HMODULE mono_handle; + + void (*mono_config_parse)(const char *filename); + MonoAssembly* (*mono_domain_assembly_open) (MonoDomain *domain, const char *name); + void (*mono_jit_cleanup)(MonoDomain *domain); + int (*mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); + MonoDomain* (*mono_jit_init)(const char *file); + int (*mono_jit_set_trace_options)(const char* options); + void (*mono_set_dirs)(const char *assembly_dir, const char *config_dir); } loaded_mono; /* loaded runtime interfaces */

1 0

Vincent Povirk : mscoree: Add a proper implementation of DllCanUnloadNow.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 1309731b4a3fbfcd10243a2c1f886e0a035d6d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1309731b4a3fbfcd10243a2c1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 13:42:24 2010 -0500 mscoree: Add a proper implementation of DllCanUnloadNow. --- dlls/mscoree/corruntimehost.c | 8 ++++++++ dlls/mscoree/metahost.c | 8 ++++++++ dlls/mscoree/mscoree_main.c | 7 ++++++- dlls/mscoree/mscoree_private.h | 4 ++++ 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 95f7ef3..46b9f91 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -108,6 +108,8 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, MonoDomain **result) list_add_tail(&This->domains, &entry->entry); + MSCOREE_LockModule(); + *result = entry->domain; end: @@ -149,6 +151,7 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) if (This->default_domain == domain) This->default_domain = NULL; HeapFree(GetProcessHeap(), 0, entry); + MSCOREE_UnlockModule(); break; } } @@ -193,6 +196,9 @@ static HRESULT WINAPI corruntimehost_QueryInterface(ICorRuntimeHost* iface, static ULONG WINAPI corruntimehost_AddRef(ICorRuntimeHost* iface) { RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); + + MSCOREE_LockModule(); + return InterlockedIncrement( &This->ref ); } @@ -201,6 +207,8 @@ static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); ULONG ref; + MSCOREE_UnlockModule(); + ref = InterlockedDecrement( &This->ref ); return ref; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 51897b2..018c1ee 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -225,11 +225,13 @@ static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, static ULONG WINAPI CLRRuntimeInfo_AddRef(ICLRRuntimeInfo* iface) { + MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRRuntimeInfo_Release(ICLRRuntimeInfo* iface) { + MSCOREE_UnlockModule(); return 1; } @@ -668,6 +670,8 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedIncrement(&This->ref); + MSCOREE_LockModule(); + TRACE("(%p) refcount=%u\n", iface, ref); return ref; @@ -678,6 +682,8 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedDecrement(&This->ref); + MSCOREE_UnlockModule(); + TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) @@ -818,11 +824,13 @@ static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, static ULONG WINAPI CLRMetaHost_AddRef(ICLRMetaHost* iface) { + MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) { + MSCOREE_UnlockModule(); return 1; } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0e96a47..e0d1e95 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -44,6 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +LONG dll_refs = 0; + static BOOL get_install_root(LPWSTR install_dir) { const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; @@ -398,7 +400,10 @@ HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllCanUnloadNow(VOID) { - return S_OK; + if (dll_refs) + return S_FALSE; + else + return S_OK; } INT WINAPI ND_RU1( const void *ptr, INT offset ) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5062431..00c3652 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -20,6 +20,10 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ +extern LONG dll_refs; +static inline void MSCOREE_LockModule(void) { InterlockedIncrement(&dll_refs); } +static inline void MSCOREE_UnlockModule(void) { InterlockedDecrement(&dll_refs); } + extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); typedef struct tagASSEMBLY ASSEMBLY;

1 0

Vincent Povirk : gdiplus: Allow more drawing operations to succeed without an HDC.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 8f1b72279030d60e9c11362bf8a9de420851191c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1b72279030d60e9c11362bf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 9 14:09:11 2010 -0600 gdiplus: Allow more drawing operations to succeed without an HDC. This should bring things to the mostly-regression-free-but-easier-to-debug state I was expecting when I removed DIBs from many bitmaps. --- dlls/gdiplus/graphics.c | 91 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 85 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5ec54ad..e85a8ba 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -98,11 +98,6 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) GpPointF pt[2]; DWORD dash_array[MAX_DASHLEN]; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - } - save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); @@ -1504,6 +1499,12 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); save_state = prepare_dc(graphics, pen); @@ -1540,6 +1541,12 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -1574,6 +1581,12 @@ GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -1780,6 +1793,12 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, if(count < 2) return InvalidParameter; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + pt = GdipAlloc(len_pt * sizeof(GpPointF)); if(!pt) return OutOfMemory; @@ -1895,6 +1914,12 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -2447,6 +2472,12 @@ GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -2476,6 +2507,12 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + pt[0].X = (REAL)x1; pt[0].Y = (REAL)y1; pt[1].X = (REAL)x2; @@ -2504,6 +2541,12 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + save_state = prepare_dc(graphics, pen); retval = draw_polyline(graphics, pen, points, count, TRUE); @@ -2529,6 +2572,12 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf = GdipAlloc(count * sizeof(GpPointF)); if(!ptf) return OutOfMemory; @@ -2560,6 +2609,12 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + save_state = prepare_dc(graphics, pen); retval = draw_poly(graphics, pen, path->pathdata.Points, @@ -2584,6 +2639,12 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + save_state = prepare_dc(graphics, pen); SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); @@ -2618,6 +2679,12 @@ GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf[0].X = x; ptf[0].Y = y; ptf[1].X = x + width; @@ -2661,6 +2728,12 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + ptf = GdipAlloc(4 * count * sizeof(GpPointF)); pti = GdipAlloc(4 * count * sizeof(POINT)); @@ -4015,7 +4088,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(!graphics->hdc) { FIXME("graphics object has no HDC\n"); - return NotImplemented; + return Ok; } if(format){ @@ -4581,6 +4654,12 @@ GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST Gp if(graphics->busy) return ObjectBusy; + if (!graphics->hdc) + { + FIXME("graphics object has no HDC\n"); + return Ok; + } + pti = GdipAlloc(sizeof(POINT) * count); save_state = prepare_dc(graphics, pen);

1 0

Jacek Caban : urlmon: Added IInternetProtocolEx support to BindProtocol.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 6c1f2e4f3f96c71a90fcabc000a8d0ce4883bd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1f2e4f3f96c71a90fcabc00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 10 13:23:34 2010 +0100 urlmon: Added IInternetProtocolEx support to BindProtocol. --- dlls/urlmon/bindprot.c | 343 +++++++++++++++++++++++++++++------------------ 1 files changed, 212 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c1f2e4f3f96c71a90fca…

1 0

Piotr Caban : shell32: Improved IShellFolder_GetUIObjectOf implementation.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: e062d4a6fffd6ee2806919aea7109bffa9a73408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e062d4a6fffd6ee2806919aea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 10 14:19:29 2010 +0100 shell32: Improved IShellFolder_GetUIObjectOf implementation. --- dlls/shell32/shell32_main.h | 2 + dlls/shell32/shfldr.h | 2 + dlls/shell32/shfldr_fs.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shfldr_unixfs.c | 7 +++ 4 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index af83fe4..77fd42a 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -69,6 +69,8 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes); DWORD WINAPI ParseFieldA(LPCSTR src, DWORD nField, LPSTR dst, DWORD len); DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len); +BOOL WINAPI GUIDFromStringW(LPCWSTR, LPGUID); + /**************************************************************************** * Class constructors */ diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 38e0a0b..56833d1 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -49,6 +49,8 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); +HRESULT SHELL32_CreateExtensionUIObject(IShellFolder2 *iface, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut); + static inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 305902c..850424d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -611,6 +611,90 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, } /************************************************************************** + * SHELL32_CreateExtensionUIObject (internal) + */ +HRESULT SHELL32_CreateExtensionUIObject(IShellFolder2 *iface, + LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut) +{ + static const WCHAR reg_blockedW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'S','h','e','l','l',' ','E','x','t','e','n','s','i','o','n','s','\\', + 'B','l','o','c','k','e','d',0}; + static const WCHAR formatW[] = {'.','%','s','\\','S','h','e','l','l','E','x','\\', + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; + + IPersistFile *persist_file; + char extensionA[20]; + WCHAR extensionW[20], buf[MAX_PATH]; + DWORD size = MAX_PATH; + STRRET path; + WCHAR *file; + GUID guid; + HKEY key; + HRESULT hr; + + + if(!_ILGetExtension(pidl, extensionA, 20)) + return S_FALSE; + + MultiByteToWideChar(CP_ACP, 0, extensionA, -1, extensionW, 20); + + sprintfW(buf, formatW, extensionW, riid->Data1, riid->Data2, riid->Data3, + riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], + riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + if(RegGetValueW(HKEY_CLASSES_ROOT, buf, NULL, RRF_RT_REG_SZ, + NULL, buf, &size) != ERROR_SUCCESS) + return S_FALSE; + + if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, reg_blockedW, 0, 0, 0, + KEY_READ, NULL, &key, NULL) != ERROR_SUCCESS) + return E_FAIL; + if(RegQueryValueExW(key, buf, 0, NULL, NULL, NULL) + != ERROR_FILE_NOT_FOUND) + return E_ACCESSDENIED; + RegCloseKey(key); + + if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_blockedW, 0, 0, 0, + KEY_READ, NULL, &key, NULL) != ERROR_SUCCESS) + return E_FAIL; + if(RegQueryValueExW(key, buf, 0, NULL, NULL, NULL) + != ERROR_FILE_NOT_FOUND) + return E_ACCESSDENIED; + RegCloseKey(key); + + if(!GUIDFromStringW(buf, &guid)) + return E_FAIL; + + hr = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistFile, (void**)&persist_file); + if(FAILED(hr)) + return hr; + + hr = IShellFolder_GetDisplayNameOf(iface, pidl, SHGDN_FORPARSING, &path); + if(SUCCEEDED(hr)) + hr = StrRetToStrW(&path, NULL, &file); + if(FAILED(hr)) { + IPersistFile_Release(persist_file); + return hr; + } + + hr = IPersistFile_Load(persist_file, file, STGM_READ); + CoTaskMemFree(file); + if(FAILED(hr)) { + IPersistFile_Release(persist_file); + return hr; + } + + hr = IPersistFile_QueryInterface(persist_file, riid, ppvOut); + IPersistFile_Release(persist_file); + return hr; +} + +/************************************************************************** * IShellFolder_fnGetUIObjectOf * * PARAMETERS @@ -651,6 +735,12 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, if (ppvOut) { *ppvOut = NULL; + if(cidl == 1) { + hr = SHELL32_CreateExtensionUIObject(iface, *apidl, riid, ppvOut); + if(hr != S_FALSE) + return hr; + } + if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index e02399a..11f3686 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1115,6 +1115,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetUIObjectOf(IShellFolder2* ifac { UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface); UINT i; + HRESULT hr; TRACE("(iface=%p, hwndOwner=%p, cidl=%d, apidl=%p, riid=%s, prgfInOut=%p, ppv=%p)\n", iface, hwndOwner, cidl, apidl, debugstr_guid(riid), prgfInOut, ppvOut); @@ -1125,6 +1126,12 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetUIObjectOf(IShellFolder2* ifac for (i=0; i<cidl; i++) if (!apidl[i]) return E_INVALIDARG; + + if(cidl == 1) { + hr = SHELL32_CreateExtensionUIObject(iface, *apidl, riid, ppvOut); + if(hr != S_FALSE) + return hr; + } if (IsEqualIID(&IID_IContextMenu, riid)) { *ppvOut = ISvItemCm_Constructor((IShellFolder*)iface, This->m_pidlLocation, apidl, cidl);

1 0

Maarten Lankhorst : winegstreamer: Fix GetState.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 482541447b3c9ecb978bbed4b863f3cf6916767e URL: http://source.winehq.org/git/wine.git/?a=commit;h=482541447b3c9ecb978bbed4b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 10 09:00:23 2010 +0100 winegstreamer: Fix GetState. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1c4b796..709dc42 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1180,7 +1180,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState); if (!This->gstfilter) { - pState = State_Stopped; + *pState = State_Stopped; return S_OK; }

1 0

Austin Lund : comctl32/tests: Fix band info tests that depend on system font heights.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 1eacb105b5f24b29dd2e4681b935f6e5925178eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eacb105b5f24b29dd2e4681b… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Nov 10 12:27:10 2010 +1000 comctl32/tests: Fix band info tests that depend on system font heights. --- dlls/comctl32/tests/rebar.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 98fd4e5..c62844b 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -32,6 +32,7 @@ static RECT height_change_notify_rect; static HWND hMainWnd; +static int system_font_height; #define check_rect(name, val, exp) ok(val.top == exp.top && val.bottom == exp.bottom && \ @@ -65,6 +66,17 @@ static BOOL is_font_installed(const char *name) return ret; } +static void init_system_font_height(void) { + HDC hDC; + TEXTMETRIC tm; + + hDC = CreateCompatibleDC(NULL); + GetTextMetrics(hDC, &tm); + DeleteDC(NULL); + + system_font_height = tm.tmHeight; +} + static HWND create_rebar_control(void) { HWND hwnd; @@ -814,13 +826,13 @@ static void test_bandinfo(void) rb.fMask = RBBIM_TEXT; rb.lpText = szABC; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(hRebar, 0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 35, -1); + expect_band_content(hRebar, 0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 3 + 2*system_font_height, -1); rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; ok(SendMessageA(hRebar, RB_INSERTBANDA, 1, (LPARAM)&rb), "RB_INSERTBAND failed\n"); expect_band_content(hRebar, 1, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 9, -1); - expect_band_content(hRebar, 0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 40, -1); + expect_band_content(hRebar, 0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 8 + 2*system_font_height, -1); rb.fMask = RBBIM_HEADERSIZE; rb.cxHeader = 50; @@ -839,7 +851,7 @@ static void test_bandinfo(void) rb.fStyle = RBBS_VARIABLEHEIGHT; rb.lpText = szABC; ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); - expect_band_content(hRebar, 0, RBBS_VARIABLEHEIGHT, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 20, 0x7fffffff, 0, 0, 0, 40, 5); + expect_band_content(hRebar, 0, RBBS_VARIABLEHEIGHT, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 20, 0x7fffffff, 0, 0, 0, 8 + 2*system_font_height, 5); DestroyWindow(hRebar); } @@ -962,6 +974,8 @@ START_TEST(rebar) INITCOMMONCONTROLSEX iccex; MSG msg; + init_system_font_height(); + /* LoadLibrary is needed. This file has no references to functions in comctl32 */ hComctl32 = LoadLibraryA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");

1 0