comparison loader/module.c @ 7386:174e2a58b4cd

avifile sync - 95% cosmetics 5% bug

7385:e2fcdd7608b1

#include <unistd.h>
#include <sys/mman.h>
#include <sys/types.h>


#include <wine/windef.h>
#include <wine/winerror.h>
#include <wine/heap.h>
#include <wine/module.h>
#include <wine/pe_image.h>
#include <wine/debugtools.h>
#ifdef HAVE_LIBDL
#include <dlfcn.h>
#include <wine/elfdll.h>
#endif
#include "win32.h"
#include "module.h"
//#include "driver.h"

//#undef TRACE
//#define TRACE printf

struct modref_list_t;

typedef struct modref_list_t
{
    WINE_MODREF* wm;
    struct modref_list_t *next;
    struct modref_list_t *prev;
} modref_list;

//WINE_MODREF *local_wm=NULL;
modref_list* local_wm=NULL;

HANDLE SegptrHeap;

    /* Call DLL entry point */

    //local_wm=wm;
    if(local_wm)
    {
        local_wm->next=malloc(sizeof(modref_list));
        local_wm->next->prev=local_wm;
        local_wm->next->next=NULL;
        local_wm->next->wm=wm;
        local_wm=local_wm->next;
    }
    else
    {
	local_wm=malloc(sizeof(modref_list));
	local_wm->next=local_wm->prev=NULL;
	local_wm->wm=wm;
    }
    /* Remove recursion flag */
    wm->flags &= ~WINE_MODREF_MARKER;

	if(!libname)
	{
		SetLastError(ERROR_INVALID_PARAMETER);
		return 0;
	}
	printf("Loading DLL: '%s'\n", libname);
//	if(fs_installed==0)
//	    install_fs();

	while (wm == 0 && listpath[++i])
	{

		}
	}

	if (!wm)
	    printf("Win32 LoadLibrary failed to load: %s\n", checked);
	else
	{
	    extern char *win32_codec_name;
//	    printf("Loaded %s to address %p\n", libname, wm->module);
	    /* XXX: FIXME, _VERY_ UGLY HACK */
	    if (!strcmp(libname, "m3jpegdec.ax"))
		win32_codec_name = strdup("m3jpeg32.dll");
	}

	return wm ? wm->module : 0;
}

7386:174e2a58b4cd

#include <unistd.h>
#include <sys/mman.h>
#include <sys/types.h>


#include "wine/windef.h"
#include "wine/winerror.h"
#include "wine/heap.h"
#include "wine/module.h"
#include "wine/pe_image.h"
#include "wine/debugtools.h"
#ifdef HAVE_LIBDL
#include <dlfcn.h>
#include "wine/elfdll.h"
#endif
#include "win32.h"
#include "driver.h"

//#undef TRACE
//#define TRACE printf

//WINE_MODREF *local_wm=NULL;
modref_list* local_wm=NULL;

HANDLE SegptrHeap;

    /* Call DLL entry point */

    //local_wm=wm;
    if(local_wm)
    {
	local_wm->next = (modref_list*) malloc(sizeof(modref_list));
        local_wm->next->prev=local_wm;
        local_wm->next->next=NULL;
        local_wm->next->wm=wm;
        local_wm=local_wm->next;
    }
    else
    {
	local_wm = (modref_list*)malloc(sizeof(modref_list));
	local_wm->next=local_wm->prev=NULL;
	local_wm->wm=wm;
    }
    /* Remove recursion flag */
    wm->flags &= ~WINE_MODREF_MARKER;

	if(!libname)
	{
		SetLastError(ERROR_INVALID_PARAMETER);
		return 0;
	}
//	if(fs_installed==0)
//	    install_fs();

	while (wm == 0 && listpath[++i])
	{

		}
	}

	if (!wm)
	    printf("Win32 LoadLibrary failed to load: %s\n", checked);


	return wm ? wm->module : 0;
}