March 2012 - Wine-Commits - list.winehq.org

Morten Rønne : wineconsole: Fixed a wrong word in message.
by Alexandre Julliard March 29, 2012

March 29, 2012

1 0

Christian Costa : qcap: Enable registration of all non yet implemented filters.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: e3c781376e501f6cb99af6dc6171b1da65e70010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c781376e501f6cb99af6dc6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:04:15 2012 +0200 qcap: Enable registration of all non yet implemented filters. --- dlls/qcap/qcap_main.c | 55 ++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index d89aafe..6f175cf 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); static LONG objects_ref = 0; -static const WCHAR wAudioCaptFilter[] = +static const WCHAR wAudioCaptureFilter[] = {'A','u','d','i','o',' ','C','a','p','t','u','r','e',' ','F','i','l','t','e','r',0}; static const WCHAR wAVICompressor[] = {'A','V','I',' ','C','o','m','p','r','e','s','s','o','r',0}; @@ -76,48 +76,47 @@ static const WCHAR wAudioInMixerProp[] = 'p','e','r','t','y',' ','P','a','g','e',0}; FactoryTemplate const g_Templates[] = { -/* { - wAudioCaptureFilter, - &CLSID_AudioCaptureFilter, - QCAP_createAudioCaptureFilter, + wAudioCaptureFilter, + &CLSID_AudioRecord, + NULL, /* FIXME: Implement QCAP_createAudioCaptureFilter */ NULL },{ - wAVICompressor, - &CLSID_AVICompressor, - QCAP_createAVICompressor, + wAVICompressor, + &CLSID_AVICo, + NULL, /* FIXME: Implement QCAP_createAVICompressor */ NULL - },*/{ + },{ wVFWCaptFilter, &CLSID_VfwCapture, QCAP_createVFWCaptureFilter, NULL - },/*{ + },{ wVFWCaptFilterProp, - &CLSID_VFWCaptureFilterPropertyPage, - QCAP_createVFWCaptureFilterPropertyPage, + &CLSID_CaptureProperties, + NULL, /* FIXME: Implement QCAP_createVFWCaptureFilterPropertyPage */ NULL },{ wAVIMux, - &CLSID_AVImux, - QCAP_createAVImux, + &CLSID_AviDest, + NULL, /* FIXME: Implement QCAP_createAVImux */ NULL },{ wAVIMuxPropPage, - &CLSID_AVImuxPropertyPage, - QCAP_createAVImuxPropertyPage, + &CLSID_AviMuxProptyPage, + NULL, /* FIXME: Implement QCAP_createAVImuxPropertyPage */ NULL },{ wAVIMuxPropPage1, - &CLSID_AVImuxPropertyPage1, - QCAP_createAVImuxPropertyPage1, + &CLSID_AviMuxProptyPage1, + NULL, /* FIXME: Implement QCAP_createAVImuxPropertyPage1 */ NULL },{ wFileWriter, &CLSID_FileWriter, - QCAP_createFileWriter, + NULL, /* FIXME: Implement QCAP_createFileWriter */ NULL - },*/{ + },{ wCaptGraphBuilder, &CLSID_CaptureGraphBuilder, QCAP_createCaptureGraphBuilder2, @@ -127,22 +126,22 @@ FactoryTemplate const g_Templates[] = { &CLSID_CaptureGraphBuilder2, QCAP_createCaptureGraphBuilder2, NULL - }/*,{ + },{ wInfPinTeeFilter, - &CLSID_InfinitePinTeeFilter, - QCAP_createInfinitePinTeeFilter, + &CLSID_InfTee, + NULL, /* FIXME: Implement QCAP_createInfinitePinTeeFilter */ NULL },{ wSmartTeeFilter, - &CLSID_SmartTeeFilter, - QCAP_createSmartTeeFilter, + &CLSID_SmartTee, + NULL, /* FIXME: Implement QCAP_createSmartTeeFilter */ NULL },{ wAudioInMixerProp, - &CLSID_AudioInputMixerPropertyPage, - QCAP_createAudioInputMixerPropertyPage, + &CLSID_AudioInputMixerProperties, + NULL, /* FIXME: Implement QCAP_createAudioInputMixerPropertyPage */ NULL - }*/ + } }; int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);

1 0

Dmitry Timoshkov : advapi32: Add event security access tests.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: d574e7948e87d11de591b8d25012365622da02a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d574e7948e87d11de591b8d25… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 16 18:31:43 2012 +0800 advapi32: Add event security access tests. --- dlls/advapi32/tests/security.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0b653ff..9db84a4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4104,6 +4104,27 @@ static void test_mutex_security(HANDLE token) CloseHandle (mutex); } +static void test_event_security(HANDLE token) +{ + HANDLE event; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + event = OpenEvent(0, FALSE, "WineTestEvent"); + ok(!event, "event should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + event = CreateEvent(NULL, FALSE, FALSE, "WineTestEvent"); + ok(event != 0, "CreateEvent error %d\n", GetLastError()); + + test_default_handle_security(token, event, &mapping); + + CloseHandle(event); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4175,6 +4196,7 @@ static void test_kernel_objects_security(void) ok(token_type == TokenImpersonation, "expected TokenImpersonation, got %d\n", token_type); test_mutex_security(token); + test_event_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Piotr Caban : msvcp90: Added support for exception reraising in ios_base:: clear.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 2f87a5d4590b5f601f63dd81146b6d07c6441deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f87a5d4590b5f601f63dd811… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 29 16:13:13 2012 +0200 msvcp90: Added support for exception reraising in ios_base::clear. --- dlls/msvcp90/exception.c | 2 ++ dlls/msvcp90/ios.c | 10 +++++----- dlls/msvcp90/msvcp90.h | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 2c635ed..0965716 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -684,6 +684,8 @@ void throw_exception(exception_type et, const char *str) const char *addr = str; switch(et) { + case EXCEPTION_RERAISE: + _CxxThrowException(NULL, NULL); case EXCEPTION: { exception e; MSVCP_exception_ctor(&e, &addr); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9a582eb..27703a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1942,13 +1942,13 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, MSVCP { TRACE("(%p %x %x)\n", this, state, reraise); - if(reraise) { - FIXME("reraise is not supported\n"); + this->state = state & IOSTATE_mask; + if(!(this->state & this->except)) return; - } - this->state = state & IOSTATE_mask; - if(this->state & this->except & IOSTATE_eofbit) + if(reraise) + throw_exception(EXCEPTION_RERAISE, NULL); + else if(this->state & this->except & IOSTATE_eofbit) throw_exception(EXCEPTION_FAILURE, "eofbit is set"); else if(this->state & this->except & IOSTATE_failbit) throw_exception(EXCEPTION_FAILURE, "failbit is set"); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 8c3ceb5..c774e98 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -157,6 +157,7 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { + EXCEPTION_RERAISE, EXCEPTION, EXCEPTION_BAD_ALLOC, EXCEPTION_LOGIC_ERROR,

1 0

Christian Costa : strmbase: Display dll in which we are searching a class to instanciate.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 67d429f0f35a10413e962bd7496938df3074ae8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d429f0f35a10413e962bd74… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 09:00:39 2012 +0200 strmbase: Display dll in which we are searching a class to instanciate. --- dlls/strmbase/dllfunc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 34e03e6..5c9b8ab 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -362,7 +362,10 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * if (i == g_cTemplates) { - ERR("%s: no class found.\n", debugstr_guid(rclsid)); + char dllname[MAX_PATH]; + if (!GetModuleFileNameA(g_hInst, dllname, sizeof(dllname))) + strcpy(dllname, "???"); + ERR("%s: no class found in %s.\n", debugstr_guid(rclsid), dllname); return CLASS_E_CLASSNOTAVAILABLE; } else if (!pList->m_lpfnNew)

1 0

Piotr Caban : msvcp90: Added this parameter to cdecl functions defined inside class.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: d04c15cc2318b257312bc5e62ef9ea0616ed4510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04c15cc2318b257312bc5e62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 29 16:11:45 2012 +0200 msvcp90: Added this parameter to cdecl functions defined inside class. --- dlls/msvcp90/locale.c | 12 ++++++------ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d04c15cc2318b257312bc…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 1aeb4dcd41efc84eb2ffeb67fdc020d63896a3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aeb4dcd41efc84eb2ffeb67f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 29 16:12:01 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 630 +++++++++++++++++++------------------- dlls/msvcp60/msvcp60.spec | 378 ++++++++++++------------ dlls/msvcp70/msvcp70.spec | 622 +++++++++++++++++++------------------- dlls/msvcp71/msvcp71.spec | 662 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 704 +++++++++++++++++++++--------------------- 5 files changed, 1498 insertions(+), 1498 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1aeb4dcd41efc84eb2ffe…

1 0

Frédéric Delanoy : cmd: Use BOOL instead of int for boolean variables.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 0e4ceb9a8dde88cd23bcad62fe0b874bf8267a93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4ceb9a8dde88cd23bcad62f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Mar 29 18:05:59 2012 +0200 cmd: Use BOOL instead of int for boolean variables. --- programs/cmd/batch.c | 8 ++++---- programs/cmd/builtins.c | 2 +- programs/cmd/wcmd.h | 4 ++-- programs/cmd/wcmdmain.c | 23 +++++++++++------------ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 2b33b69..05314f4 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -40,8 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); * a label to goto once opened. */ -void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HANDLE pgmHandle) { - +void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HANDLE pgmHandle) +{ HANDLE h = INVALID_HANDLE_VALUE; BATCH_CONTEXT *prev_context; @@ -583,7 +583,7 @@ void WCMD_call (WCHAR *command) { /* Run other program if no leading ':' */ if (*command != ':') { - WCMD_run_program(command, 1); + WCMD_run_program(command, TRUE); } else { WCHAR gotoLabel[MAX_PATH]; @@ -600,7 +600,7 @@ void WCMD_call (WCHAR *command) { li.u.LowPart = SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); - WCMD_batch (param1, command, 1, gotoLabel, context->h); + WCMD_batch (param1, command, TRUE, gotoLabel, context->h); SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7e6bd77..ebb1c80 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1416,7 +1416,7 @@ void WCMD_give_help (const WCHAR *command) static const WCHAR helpW[] = {' ', '/','?','\0'}; strcpyW(cmd, command); strcatW(cmd, helpW); - WCMD_run_program(cmd, 0); + WCMD_run_program(cmd, FALSE); return; } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3623213..4e021d9 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -54,7 +54,7 @@ typedef struct _CMD_LIST { } CMD_LIST; void WCMD_assoc (const WCHAR *, BOOL); -void WCMD_batch (WCHAR *, WCHAR *, int, WCHAR *, HANDLE); +void WCMD_batch (WCHAR *, WCHAR *, BOOL, WCHAR *, HANDLE); void WCMD_call (WCHAR *command); void WCMD_change_tty (void); void WCMD_choice (const WCHAR *); @@ -86,7 +86,7 @@ void WCMD_print_error (void); void WCMD_pushd (const WCHAR *command); void WCMD_remove_dir (WCHAR *command); void WCMD_rename (void); -void WCMD_run_program (WCHAR *command, int called); +void WCMD_run_program (WCHAR *command, BOOL called); void WCMD_setlocal (const WCHAR *command); void WCMD_setshow_date (void); void WCMD_setshow_default (const WCHAR *command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c6c3e0e..93a2bb8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -993,8 +993,8 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) * findexecutable to achieve this which is left untouched. */ -void WCMD_run_program (WCHAR *command, int called) { - +void WCMD_run_program (WCHAR *command, BOOL called) +{ WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; WCHAR *pathposn; @@ -1585,7 +1585,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, break; default: prev_echo_mode = echo_mode; - WCMD_run_program (whichcmd, 0); + WCMD_run_program (whichcmd, FALSE); echo_mode = prev_echo_mode; } HeapFree( GetProcessHeap(), 0, cmd ); @@ -2336,19 +2336,19 @@ int wmain (int argc, WCHAR *argvW[]) argsLeft = args; for (arg = argvW; argsLeft>0; arg++,argsLeft--) { - int has_space,bcount; + BOOL has_space = FALSE; + int bcount; WCHAR* a; - has_space=0; bcount=0; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space = TRUE; while (*a!='\0') { if (*a=='\\') { bcount++; } else { if (*a==' ' || *a=='\t') { - has_space=1; + has_space = TRUE; } else if (*a=='"') { /* doubling of '\' preceding a '"', * plus escaping of said '"' @@ -2395,20 +2395,19 @@ int wmain (int argc, WCHAR *argvW[]) argsLeft = args; for (arg = argvW; argsLeft>0; arg++,argsLeft--) { - int has_space,has_quote; + BOOL has_space = FALSE, has_quote = FALSE; WCHAR* a; /* Check for quotes and spaces in this argument */ - has_space=has_quote=0; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space = TRUE; while (*a!='\0') { if (*a==' ' || *a=='\t') { - has_space=1; + has_space = TRUE; if (has_quote) break; } else if (*a=='"') { - has_quote=1; + has_quote = TRUE; if (has_space) break; }

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::get_domain implementation.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 5b56d06074883984c4723b602b71770223bc67ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b56d06074883984c4723b602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 15:05:43 2012 +0200 mshtml: Added IHTMLDocument2::get_domain implementation. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- dlls/mshtml/tests/htmllocation.c | 19 ++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 32b54ec..3cbfe8d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -622,8 +622,17 @@ static HRESULT WINAPI HTMLDocument_put_domain(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_FAIL; + } + + hres = IUri_GetHost(This->window->uri, p); + return FAILED(hres) ? hres : S_OK; } static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index ebdb056..d314a13 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -105,11 +105,8 @@ static int str_eq_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; - if(strw == NULL || stra == NULL){ - if((void*)strw == (void*)stra) - return 1; - return 0; - } + if(!strw || !stra) + return (void*)strw == (void*)stra; WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); return !lstrcmpA(stra, buf); @@ -172,7 +169,7 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) SysFreeString(str); } -static void test_hostname(IHTMLLocation *loc, const struct location_test *test) +static void test_hostname(IHTMLLocation *loc, IHTMLDocument2 *doc, const struct location_test *test) { HRESULT hres; BSTR str; @@ -189,6 +186,14 @@ static void test_hostname(IHTMLLocation *loc, const struct location_test *test) "%s: expected retrieved hostname to be L\"%s\", was: %s\n", test->name, test->hostname, wine_dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "%s: get_domain failed: 0x%08x\n", test->name, hres); + if(hres == S_OK) + ok(str_eq_wa(str, test->hostname ? test->hostname : ""), + "%s: expected retrieved domain to be L\"%s\", was: %s\n", + test->name, test->hostname, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_port(IHTMLLocation *loc, const struct location_test *test) @@ -345,7 +350,7 @@ static void perform_test(const struct location_test* test) test_href(location, test); test_protocol(location, test); test_host(location, test); - test_hostname(location, test); + test_hostname(location, doc, test); test_port(location, test); test_pathname(location, test); test_search(location, test);

1 0

Aric Stewart : wineqtdecoder: Read the header of unknown incoming streams to try to identify common formats .
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: cc6b7592ee8490e17e0a4af3bde90a824268ffb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6b7592ee8490e17e0a4af3b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 10:18:49 2012 -0500 wineqtdecoder: Read the header of unknown incoming streams to try to identify common formats. --- dlls/wineqtdecoder/qtdatahandler.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index 4cca607..4d3b0a3 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -325,6 +325,22 @@ static pascal ComponentResult myDataHGetFileTypeOrdering ( DataHandler dh, return noErr; } +typedef struct { + const CFStringRef fname; + const int sig_length; + const BYTE sig[10]; +} signature; + +static const signature stream_sigs[] = { + {CFSTR("video.asf"),4,{0x30,0x26,0xb2,0x75}}, + {CFSTR("video.mov"),8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}}, + {CFSTR("video.mp4"),8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}}, + {CFSTR("video.m4v"),8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}}, + {CFSTR("video.flv"),4,{0x46,0x4C,0x56,0x01}}, + {CFSTR("video.mpg"),3,{0x00,0x00,0x01}}, + {CFSTR("avideo.rm"),4,{0x2E,0x52,0x4D,0x46}} +}; + static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) { Handle storage = GetComponentInstanceStorage(dh); @@ -342,7 +358,20 @@ static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) else if(IsEqualIID(&data->dataRef.streamSubtype, &MEDIASUBTYPE_QTMovie)) CFStringGetPascalString(CFSTR("video.mov"),str,256,kCFStringEncodingMacRoman); else + { + BYTE header[10] = {0,0,0,0,0,0,0,0,0,0}; + int i; + IAsyncReader_SyncRead(data->dataRef.pReader, 0, 8, header); + + for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++) + if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0) + { + CFStringGetPascalString(stream_sigs[i].fname,str,256,kCFStringEncodingMacRoman); + return noErr; + } + return badComponentSelector; + } return noErr; }

1 0