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

Matteo Bruni : wined3d: Clamp fog coordinate in the vertex shader.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 2d810bdc892fc028d4180066c46649709058267f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d810bdc892fc028d4180066c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:15 2012 +0100 wined3d: Clamp fog coordinate in the vertex shader. --- dlls/wined3d/glsl_shader.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 682e740..d66522f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3938,11 +3938,10 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) { - shader_addline(buffer, "gl_FogFragCoord = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_FogFragCoord = clamp(OUT[%u].%c, 0.0, 1.0);\n", i, reg_mask[1]); } } shader_addline(buffer, "}\n"); - } else {

1 0

Matteo Bruni : d3d9/tests: Add shader model 2 fog tests.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 94953f165a772410ce21624e0feaad01f63a2db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94953f165a772410ce21624e0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:19 2012 +0100 d3d9/tests: Add shader model 2 fog tests. --- dlls/d3d9/tests/visual.c | 101 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 93 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94953f165a772410ce216…

1 0

Piotr Caban : urlmon: Reorganize FindMimeFromData implementation.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 3573c13eaa38f5457b6e69fd88849d72dac2b0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3573c13eaa38f5457b6e69fd8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 12:38:20 2012 +0100 urlmon: Reorganize FindMimeFromData implementation. --- dlls/urlmon/urlmon_main.c | 128 ++++++++++++++++++++++++++++---------------- 1 files changed, 81 insertions(+), 47 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index b02ddd0..836ef12 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -626,42 +626,33 @@ static BOOL text_richtext_filter(const BYTE *b, DWORD size) static BOOL text_html_filter(const BYTE *b, DWORD size) { - DWORD i; - - if(size < 5) + if(size < 6) return FALSE; - for(i = 0; i < size-5; i++) { - if((b[i] == '<' - && (b[i+1] == 'h' || b[i+1] == 'H') - && (b[i+2] == 't' || b[i+2] == 'T') - && (b[i+3] == 'm' || b[i+3] == 'M') - && (b[i+4] == 'l' || b[i+4] == 'L')) || - (b[i] == '<' - && (b[i+1] == 'h' || b[i+1] == 'H') - && (b[i+2] == 'e' || b[i+2] == 'E') - && (b[i+3] == 'a' || b[i+3] == 'A') - && (b[i+4] == 'd' || b[i+4] == 'D') - && b[i+5] == '>')) return TRUE; - } + if((b[0] == '<' + && (b[1] == 'h' || b[1] == 'H') + && (b[2] == 't' || b[2] == 'T') + && (b[3] == 'm' || b[3] == 'M') + && (b[4] == 'l' || b[4] == 'L')) + || (b[0] == '<' + && (b[1] == 'h' || b[1] == 'H') + && (b[2] == 'e' || b[2] == 'E') + && (b[3] == 'a' || b[3] == 'A') + && (b[4] == 'd' || b[4] == 'D'))) return TRUE; return FALSE; } static BOOL text_xml_filter(const BYTE *b, DWORD size) { - DWORD i; - - if(size < 6) + if(size < 7) return FALSE; - for(i=0; i<size-6; i++) { - if(b[i] == '<' && b[i+1] == '?' - && (b[i+2] == 'x' || b[i+2] == 'X') - && (b[i+3] == 'm' || b[i+3] == 'M') - && (b[i+4] == 'l' || b[i+4] == 'L') - && b[i+5] == ' ') return TRUE; - } + if(b[0] == '<' && b[1] == '?' + && (b[2] == 'x' || b[2] == 'X') + && (b[3] == 'm' || b[3] == 'M') + && (b[4] == 'l' || b[4] == 'L') + && b[5] == ' ') return TRUE; return FALSE; } @@ -760,12 +751,19 @@ static BOOL application_xmsdownload(const BYTE *b, DWORD size) return size > 2 && b[0] == 'M' && b[1] == 'Z'; } +static inline BOOL is_text_plain_char(BYTE b) +{ + if(b < 0x20 && b != '\n' && b != '\r' && b != '\t') + return FALSE; + return TRUE; +} + static BOOL text_plain_filter(const BYTE *b, DWORD size) { const BYTE *ptr; for(ptr = b; ptr < b+size-1; ptr++) { - if(*ptr < 0x20 && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') + if(!is_text_plain_char(*ptr)) return FALSE; } @@ -780,7 +778,7 @@ static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *proposed_mime, WCHAR **ret_mime) { LPCWSTR ret = NULL; - DWORD len, i; + int len, i, any_pos_mime = -1; static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; @@ -812,9 +810,10 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p static const struct { LPCWSTR mime; BOOL (*filter)(const BYTE *,DWORD); - } mime_filters[] = { + } mime_filters_any_pos[] = { {text_htmlW, text_html_filter}, - {text_xmlW, text_xml_filter}, + {text_xmlW, text_xml_filter} + }, mime_filters[] = { {text_richtextW, text_richtext_filter}, /* {audio_xaiffW, audio_xaiff_filter}, */ {audio_basicW, audio_basic_filter}, @@ -856,20 +855,47 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p return S_OK; } - if(proposed_mime && strcmpW(proposed_mime, app_octetstreamW)) { - for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { - if(!strcmpW(proposed_mime, mime_filters[i].mime)) + if(proposed_mime && (!strcmpW(proposed_mime, app_octetstreamW) + || !strcmpW(proposed_mime, text_plainW))) + proposed_mime = NULL; + + if(proposed_mime) { + ret = proposed_mime; + + for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(!strcmpW(proposed_mime, mime_filters_any_pos[i].mime)) { + any_pos_mime = i; + for(len=size; len>0; len--) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) + break; + } + if(!len) + ret = NULL; break; + } } - if(i == sizeof(mime_filters)/sizeof(*mime_filters) || mime_filters[i].filter(buf, size)) { - len = strlenW(proposed_mime)+1; - *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ret_mime) - return E_OUTOFMEMORY; + if(i == sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos)) { + for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + if(!strcmpW(proposed_mime, mime_filters[i].mime)) { + if(!mime_filters[i].filter(buf, size)) + ret = NULL; + break; + } + } + } + } - memcpy(*ret_mime, proposed_mime, len*sizeof(WCHAR)); - return S_OK; + /* Looks like a bug in native implementation, html and xml mimes + * are not looked for if none of them was proposed */ + if(!proposed_mime || any_pos_mime!=-1) { + for(len=size; !ret && len>0; len--) { + for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) { + ret = mime_filters_any_pos[i].mime; + break; + } + } } } @@ -880,16 +906,24 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p i++; } - TRACE("found %s for %s\n", debugstr_w(ret), debugstr_an((const char*)buf, min(32, size))); + if(any_pos_mime!=-1 && ret==text_plainW) + ret = mime_filters_any_pos[any_pos_mime].mime; + else if(proposed_mime && ret==app_octetstreamW) { + for(len=size; ret==app_octetstreamW && len>0; len--) { + if(!is_text_plain_char(buf[size-len])) + break; + for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) { + ret = text_plainW; + break; + } + } + } - if(proposed_mime) { - if(i == sizeof(mime_filters)/sizeof(*mime_filters)) + if(ret == app_octetstreamW) ret = proposed_mime; - - /* text/html is a special case */ - if(!strcmpW(proposed_mime, text_htmlW) && !strcmpW(ret, text_plainW)) - ret = text_htmlW; } + TRACE("found %s for %s\n", debugstr_w(ret), debugstr_an((const char*)buf, min(32, size))); len = strlenW(ret)+1; *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR));

1 0

Alexandre Julliard : wine.inf: Avoid creating empty registry values.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 7fb42984e2d5dc71d8ee2e9c166811d6da369b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb42984e2d5dc71d8ee2e9c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 11:36:54 2012 +0100 wine.inf: Avoid creating empty registry values. --- tools/wine.inf.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 14e9245..463ecfd 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3049,9 +3049,9 @@ ErrorControl=1 [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 -HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters" -HKLM,"System\CurrentControlSet\Services\Winsock\Parameters" -HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters" +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters",,16 [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Piotr Caban : urlmon/tests: Show that text/plain and application/ octet-stream mimes suggestions are ignorred.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: e85210f3c5812fdc596a1538f6471ad05ff6870e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85210f3c5812fdc596a1538f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 12:39:10 2012 +0100 urlmon/tests: Show that text/plain and application/octet-stream mimes suggestions are ignorred. --- dlls/urlmon/tests/misc.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 05a0b41..6af98f3 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -725,6 +725,22 @@ static void test_FindMimeFromData(void) continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, + mimeAppOctetStream, 0, &mime, 0); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); + ok(!lstrcmpW(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime + && !lstrcmpW(mime, mime_tests2[i].broken_mime)), + "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, + mimeTextPlain, 0, &mime, 0); + ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); + ok(!lstrcmpW(mime, mime_tests2[i].mime) || broken(mime_tests2[i].broken_mime + && !lstrcmpW(mime, mime_tests2[i].broken_mime)), + "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeTextHtml, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime)

1 0

Piotr Caban : urlmon/tests: Added text/xml mime filer tests.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: e69001ed67bfdf350c6ac973f05d00df5103356b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69001ed67bfdf350c6ac973f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 12:38:37 2012 +0100 urlmon/tests: Added text/xml mime filer tests. --- dlls/urlmon/tests/misc.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ad0edf6..2ce826e 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -440,6 +440,7 @@ static void test_CoInternetQueryInfo(void) static const WCHAR mimeTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR mimeTextPlain[] = {'t','e','x','t','/','p','l','a','i','n',0}; static const WCHAR mimeTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; +static const WCHAR mimeTextXml[] = {'t','e','x','t','/','x','m','l',0}; static const WCHAR mimeAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m',0}; static const WCHAR mimeImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; @@ -568,6 +569,12 @@ static BYTE data87[] = {' ','<','h','e','a','d'}; static BYTE data88[] = {' ','<','h','e','a','d','>'}; static BYTE data89[] = {'\t','\r','<','h','e','a','d','>'}; static BYTE data90[] = {'<','H','e','A','d','>'}; +static BYTE data91[] = {'<','?','x','m','l',' ',0}; +static BYTE data92[] = {'a','b','c','<','?','x','m','l',' ',' '}; +static BYTE data93[] = {'<','?','x','m','l',' ',' ','<','h','t','m','l','>'}; +static BYTE data94[] = {'<','h','t','m','l','>','<','?','x','m','l',' ',' '}; +static BYTE data95[] = {'{','\\','r','t','f','<','?','x','m','l',' ',' '}; +static BYTE data96[] = {'<','?','x','m','l',' '}; static const struct { BYTE *data; @@ -663,7 +670,13 @@ static const struct { {data87, sizeof(data87), mimeTextPlain}, {data88, sizeof(data88), mimeTextHtml, mimeTextPlain /* IE8 */}, {data89, sizeof(data89), mimeTextHtml, mimeTextPlain /* IE8 */}, - {data90, sizeof(data90), mimeTextHtml, mimeTextPlain /* IE8 */} + {data90, sizeof(data90), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data91, sizeof(data91), mimeTextXml, mimeTextPlain /* IE9 */}, + {data92, sizeof(data92), mimeTextXml, mimeTextPlain /* IE9 */}, + {data93, sizeof(data93), mimeTextXml, mimeTextPlain /* IE9 */}, + {data94, sizeof(data94), mimeTextHtml, mimeTextPlain /* IE9 */}, + {data95, sizeof(data95), mimeTextXml, mimeTextRichtext /* IE9 */}, + {data96, sizeof(data96), mimeTextPlain} }; static void test_FindMimeFromData(void) @@ -715,7 +728,7 @@ static void test_FindMimeFromData(void) mimeTextHtml, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) - || !lstrcmpW(mimeTextPlain, mime_tests2[i].mime)) + || !lstrcmpW(mimeTextPlain, mime_tests2[i].mime) || i==92) ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); else ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime));

1 0

Jacek Caban : mshtml: Recognize UTF-8 BOM.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: c17015d10a460427bb3516c9b24b582c2df0b322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17015d10a460427bb3516c9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 10:51:48 2012 +0100 mshtml: Recognize UTF-8 BOM. --- dlls/mshtml/navigate.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 69329c4..d3070b0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" +#define UTF8_STR "utf-8" #define UTF16_STR "utf-16" static const WCHAR emptyW[] = {0}; @@ -1092,6 +1093,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) && (BYTE)This->nsstream->buf[0] == 0xff && (BYTE)This->nsstream->buf[1] == 0xfe) This->nschannel->charset = heap_strdupA(UTF16_STR); + if(This->nsstream->buf_size >= 3 + && (BYTE)This->nsstream->buf[0] == 0xef + && (BYTE)This->nsstream->buf[1] == 0xbb + && (BYTE)This->nsstream->buf[2] == 0xbf) + This->nschannel->charset = heap_strdupA(UTF8_STR); if(!This->nschannel->content_type) { WCHAR *mime;

1 0

Alexandre Julliard : msvcrt: Export __C_specific handler in other msvcrt versions too.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 6cb3713e26aa4d89d4dc67601f67e3dc29f51f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb3713e26aa4d89d4dc67601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 13:27:29 2012 +0100 msvcrt: Export __C_specific handler in other msvcrt versions too. --- dlls/msvcr100/msvcr100.spec | 1 + dlls/msvcr80/msvcr80.spec | 1 + dlls/msvcr90/msvcr90.spec | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 99d6c3d..28b208e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -353,6 +353,7 @@ @ stub __AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) msvcrt.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) msvcrt.__CppXcptFilter @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ca284bf..ef24427 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -164,6 +164,7 @@ @ stub __AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) msvcrt.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) msvcrt.__CppXcptFilter @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2ede2cc..db3f973 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -161,6 +161,7 @@ @ stub __AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) msvcrt.__C_specific_handler @ cdecl __CppXcptFilter(long ptr) msvcrt.__CppXcptFilter @ stub __CxxCallUnwindDelDtor @ stub __CxxCallUnwindDtor

1 0

Piotr Caban : urlmon: Added text/xml filter.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: f0e5fa4622186c387acb411a05ef06eff9bf88a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e5fa4622186c387acb411a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 12:38:05 2012 +0100 urlmon: Added text/xml filter. --- dlls/urlmon/urlmon_main.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 94c4b44..b02ddd0 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -637,8 +637,7 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) && (b[i+2] == 't' || b[i+2] == 'T') && (b[i+3] == 'm' || b[i+3] == 'M') && (b[i+4] == 'l' || b[i+4] == 'L')) || - ((size - i >= 6) - && b[i] == '<' + (b[i] == '<' && (b[i+1] == 'h' || b[i+1] == 'H') && (b[i+2] == 'e' || b[i+2] == 'E') && (b[i+3] == 'a' || b[i+3] == 'A') @@ -649,6 +648,24 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) return FALSE; } +static BOOL text_xml_filter(const BYTE *b, DWORD size) +{ + DWORD i; + + if(size < 6) + return FALSE; + + for(i=0; i<size-6; i++) { + if(b[i] == '<' && b[i+1] == '?' + && (b[i+2] == 'x' || b[i+2] == 'X') + && (b[i+3] == 'm' || b[i+3] == 'M') + && (b[i+4] == 'l' || b[i+4] == 'L') + && b[i+5] == ' ') return TRUE; + } + + return FALSE; +} + static BOOL audio_basic_filter(const BYTE *b, DWORD size) { return size > 4 @@ -767,6 +784,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; + static const WCHAR text_xmlW[] = {'t','e','x','t','/','x','m','l',0}; static const WCHAR audio_basicW[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; static const WCHAR audio_wavW[] = {'a','u','d','i','o','/','w','a','v',0}; static const WCHAR image_gifW[] = {'i','m','a','g','e','/','g','i','f',0}; @@ -796,6 +814,7 @@ static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *p BOOL (*filter)(const BYTE *,DWORD); } mime_filters[] = { {text_htmlW, text_html_filter}, + {text_xmlW, text_xml_filter}, {text_richtextW, text_richtext_filter}, /* {audio_xaiffW, audio_xaiff_filter}, */ {audio_basicW, audio_basic_filter},

1 0

Nikolay Sivov : msxml3: Stub support for IMXAttributes.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: d69afaa95dd26f742694a959d07e8f47c09edcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69afaa95dd26f742694a959d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 8 23:11:45 2012 +0300 msxml3: Stub support for IMXAttributes. --- dlls/msxml3/factory.c | 14 +++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/mxwriter.c | 236 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 42 +++++++- 4 files changed, 291 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d69afaa95dd26f742694a…

1 0