[Mplayer-cvslog] CVS: main/loader win32.c,1.50,1.51
Alex Beregszaszi
alex at mplayerhq.hu
Sun Apr 21 02:31:18 CEST 2002
Update of /cvsroot/mplayer/main/loader
In directory mail:/var/tmp.root/cvs-serv27145
Modified Files:
win32.c
Log Message:
added _EH_prolog and some wsock32 funcs needed by mss1 codec -> mss1 codec works now
Index: win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/win32.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- win32.c 20 Apr 2002 23:15:12 -0000 1.50
+++ win32.c 21 Apr 2002 00:31:16 -0000 1.51
@@ -3147,6 +3147,7 @@
{
printf("CoCreateFreeThreadedMarshaler(%p, %p) called!\n",
pUnkOuter, ppUnkInner);
+// return 0;
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -3707,8 +3708,23 @@
return 1;
}
+/* these are needed for mss1 */
+/* defined in stubs.s */
+void exp_EH_prolog(void);
+#include <netinet/in.h>
+static WINAPI inline unsigned long int exphtonl(unsigned long int hostlong)
+{
+// dbgprintf("htonl(%x) => %x\n", hostlong, htonl(hostlong));
+ return htonl(hostlong);
+}
+
+static WINAPI inline unsigned long int expntohl(unsigned long int netlong)
+{
+// dbgprintf("ntohl(%x) => %x\n", netlong, ntohl(netlong));
+ return ntohl(netlong);
+}
struct exports
{
@@ -3900,6 +3916,7 @@
FF(fprintf,-1)
FF(printf,-1)
FF(getenv,-1)
+ FF(_EH_prolog,-1)
};
struct exports exp_winmm[]={
FF(GetDriverModuleHandle, -1)
@@ -3968,7 +3985,10 @@
FF(StringFromGUID2, -1)
FF(InitCommonControls, 17)
};
-
+struct exports exp_wsock32[]={
+ FF(htonl,8)
+ FF(ntohl,14)
+};
struct exports exp_msdmo[]={
FF(memcpy, -1) // just test
};
@@ -3987,6 +4007,7 @@
LL(ole32)
LL(crtdll)
LL(comctl32)
+ LL(wsock32)
LL(msdmo)
};
@@ -4109,7 +4130,7 @@
unfreecnt++;
my_release(mem);
}
- printf("Total Unfree %d bytes cnt %d [%p,%d]\n",unfree, unfreecnt, last_alloc, alccnt);
+ dbgprintf("Total Unfree %d bytes cnt %d [%p,%d]\n",unfree, unfreecnt, last_alloc, alccnt);
#endif
g_tls = NULL;
list = NULL;
More information about the MPlayer-cvslog
mailing list