diff options
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | loader/win32.c | 32 |
2 files changed, 40 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 9b22a406c0..245486733e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1158,6 +1158,14 @@ videocodec sp5x dll "sp5x_32.dll" out BGR24,BGR15 flip +videocodec vivd2 + status working + fourcc GXVE,gxve + driver vfw + dll "ViVD2.dll" + out YUY2,YV12,I420,YVU9 + out BGR32,BGR24,BGR15 + ; quicktime codecs: videocodec qt3ivx diff --git a/loader/win32.c b/loader/win32.c index 8a9218d8f7..ccecc61df3 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -533,6 +533,10 @@ static HMODULE WINAPI expGetDriverModuleHandle(DRVR* pdrv) #define MODULE_HANDLE_ddraw ((HMODULE)0x123) #define MODULE_HANDLE_advapi32 ((HMODULE)0x124) #endif +#define MODULE_HANDLE_comdlg32 ((HMODULE)0x125) +#define MODULE_HANDLE_msvcrt ((HMODULE)0x126) +#define MODULE_HANDLE_ole32 ((HMODULE)0x127) +#define MODULE_HANDLE_winmm ((HMODULE)0x128) static HMODULE WINAPI expGetModuleHandleA(const char* name) { @@ -2293,6 +2297,15 @@ static int WINAPI expLoadLibraryA(char* name) return MODULE_HANDLE_advapi32; #endif + if (strcasecmp(name, "comdlg32.dll") == 0 || strcasecmp(name, "comdlg32") == 0) + return MODULE_HANDLE_comdlg32; + if (strcasecmp(name, "msvcrt.dll") == 0 || strcasecmp(name, "msvcrt") == 0) + return MODULE_HANDLE_msvcrt; + if (strcasecmp(name, "ole32.dll") == 0 || strcasecmp(name, "ole32") == 0) + return MODULE_HANDLE_ole32; + if (strcasecmp(name, "winmm.dll") == 0 || strcasecmp(name, "winmm") == 0) + return MODULE_HANDLE_winmm; + result=LoadLibraryA(name); dbgprintf("Returned LoadLibraryA(0x%x='%s'), def_path=%s => 0x%x\n", name, name, def_path, result); @@ -2326,6 +2339,14 @@ static void* WINAPI expGetProcAddress(HMODULE mod, char* name) case MODULE_HANDLE_advapi32: result=LookupExternalByName("advapi32.dll", name); break; #endif + case MODULE_HANDLE_comdlg32: + result=LookupExternalByName("comdlg32.dll", name); break; + case MODULE_HANDLE_msvcrt: + result=LookupExternalByName("msvcrt.dll", name); break; + case MODULE_HANDLE_ole32: + result=LookupExternalByName("ole32.dll", name); break; + case MODULE_HANDLE_winmm: + result=LookupExternalByName("winmm.dll", name); break; default: result=GetProcAddress(mod, name); } @@ -4585,6 +4606,12 @@ static void *exprealloc(void *ptr, size_t size) return my_realloc(ptr, size); } +/* Fake GetOpenFileNameA from comdlg32.dll for ViVD codec */ +static WIN_BOOL WINAPI expGetOpenFileNameA(/*LPOPENFILENAMEA*/ void* lpfn) +{ + return 1; +} + struct exports { char name[64]; @@ -4975,6 +5002,10 @@ struct exports exp_ddraw[]={ }; #endif +struct exports exp_comdlg32[]={ + FF(GetOpenFileNameA, -1) +}; + #define LL(X) \ {#X".dll", sizeof(exp_##X)/sizeof(struct exports), exp_##X}, @@ -4998,6 +5029,7 @@ struct libs libraries[]={ #ifdef QTX LL(ddraw) #endif + LL(comdlg32) }; static void ext_stubs(void) |