← Back to branch summary

~ubuntu-branches/ubuntu/saucy/wine1.4/saucy-proposed

« back to all changes in this revision

Viewing changes to dlls/mscoree/corruntimehost.c

  • Committer: Package Import Robot
  • Author(s): Scott Ritchie
  • Date: 2012-09-05 17:52:55 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120905175255-rfqf16qo5ybmdlj5
Tags: 1.4.1-0ubuntu1
https://launchpad.net/bugs/1016047
https://launchpad.net/bugs/978293
* New upstream release (LP: #1016047)
  - Translation updates.
  - Various bug fixes.
* debian/control: Recommend libasound2-plugins (LP: #978293)

Show diffs side-by-side

added added

removed removed

Lines of Context:
dlls/mscoree/corruntimehost.c
148
148
    MonoObject *appdomain_object;
149
149
    IUnknown *unk;
150
150
 
 
151
    This->mono->mono_thread_attach(domain);
 
152
 
151
153
    assembly = This->mono->mono_domain_assembly_open(domain, "mscorlib");
152
154
    if (!assembly)
153
155
    {
560
562
 
561
563
    hr = E_FAIL;
562
564
 
 
565
    This->mono->mono_thread_attach(domain);
 
566
 
563
567
    filenameA = WtoA(pwzAssemblyPath);
564
568
    assembly = This->mono->mono_domain_assembly_open(domain, filenameA);
565
569
    if (!assembly)
658
662
 
659
663
    if (SUCCEEDED(hr))
660
664
    {
 
665
        This->mono->mono_thread_attach(domain);
 
666
 
661
667
        type = This->mono->mono_reflection_type_from_name(nameA, NULL);
662
668
        if (!type)
663
669
        {
705
711
 *
706
712
 * NOTE: The IUnknown* is created with a reference to the object.
707
713
 * Until they have a reference, objects must be in the stack to prevent the
708
 
 * garbage collector from freeing them. */
 
714
 * garbage collector from freeing them.
 
715
 *
 
716
 * mono_thread_attach must have already been called for this thread. */
709
717
HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj,
710
718
    IUnknown **ppUnk)
711
719
{
1025
1033
 
1026
1034
            hr = CLASS_E_CLASSNOTAVAILABLE;
1027
1035
 
 
1036
            host->mono->mono_thread_attach(domain);
 
1037
 
1028
1038
            filenameA = WtoA(filename);
1029
1039
            assembly = host->mono->mono_domain_assembly_open(domain, filenameA);
1030
1040
            HeapFree(GetProcessHeap(), 0, filenameA);