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

Alexandre Julliard : msvcrt: Export __C_specific handler in other msvcrt versions too.
by Alexandre Julliard 09 Mar '12

09 Mar '12

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 09 Mar '12

09 Mar '12

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

Piotr Caban : urlmon: Reorganize FindMimeFromData implementation.
by Alexandre Julliard 09 Mar '12

09 Mar '12

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

Piotr Caban : urlmon/tests: Added text/xml mime filer tests.
by Alexandre Julliard 09 Mar '12

09 Mar '12

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

Piotr Caban : urlmon/tests: Mark results returned by older urlmon broken in FindMimeFromData tests.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 04847ada41982d6434be65ae6a6b5e5c4e9810a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04847ada41982d6434be65ae6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 12:38:51 2012 +0100 urlmon/tests: Mark results returned by older urlmon broken in FindMimeFromData tests. --- dlls/urlmon/tests/misc.c | 205 ++++++++++++++++++++++----------------------- 1 files changed, 100 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04847ada41982d6434be6…

1 0

Piotr Caban : urlmon/tests: Show that text/plain and application/ octet-stream mimes suggestions are ignorred.
by Alexandre Julliard 09 Mar '12

09 Mar '12

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

Dmitry Timoshkov : kernel32: Add some CreateFile disposition and access tests.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 7a9fce25ec725a7d1942e414ec53fecbe4bc0458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9fce25ec725a7d1942e414e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 8 20:29:50 2012 +0800 kernel32: Add some CreateFile disposition and access tests. --- dlls/kernel32/tests/file.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 39e6cb9..9cfb664 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3151,6 +3151,92 @@ static void test_ReplaceFileW(void) } } +static void test_CreatFile(void) +{ + static const struct test_data + { + DWORD disposition, access, error, clean_up; + } td[] = + { + /* 0 */ { 0, 0, ERROR_INVALID_PARAMETER, 0 }, + /* 1 */ { 0, GENERIC_READ, ERROR_INVALID_PARAMETER, 0 }, + /* 2 */ { 0, GENERIC_READ|GENERIC_WRITE, ERROR_INVALID_PARAMETER, 0 }, + /* 3 */ { CREATE_NEW, 0, ERROR_FILE_EXISTS, 1 }, + /* 4 */ { CREATE_NEW, 0, 0, 1 }, + /* 5 */ { CREATE_NEW, GENERIC_READ, 0, 1 }, + /* 6 */ { CREATE_NEW, GENERIC_WRITE, 0, 1 }, + /* 7 */ { CREATE_NEW, GENERIC_READ|GENERIC_WRITE, 0, 0 }, + /* 8 */ { CREATE_ALWAYS, 0, 0, 0 }, + /* 9 */ { CREATE_ALWAYS, GENERIC_READ, 0, 0 }, + /* 10*/ { CREATE_ALWAYS, GENERIC_WRITE, 0, 0 }, + /* 11*/ { CREATE_ALWAYS, GENERIC_READ|GENERIC_WRITE, 0, 1 }, + /* 12*/ { OPEN_EXISTING, 0, ERROR_FILE_NOT_FOUND, 0 }, + /* 13*/ { CREATE_ALWAYS, 0, 0, 0 }, + /* 14*/ { OPEN_EXISTING, 0, 0, 0 }, + /* 15*/ { OPEN_EXISTING, GENERIC_READ, 0, 0 }, + /* 16*/ { OPEN_EXISTING, GENERIC_WRITE, 0, 0 }, + /* 17*/ { OPEN_EXISTING, GENERIC_READ|GENERIC_WRITE, 0, 1 }, + /* 18*/ { OPEN_ALWAYS, 0, 0, 0 }, + /* 19*/ { OPEN_ALWAYS, GENERIC_READ, 0, 0 }, + /* 20*/ { OPEN_ALWAYS, GENERIC_WRITE, 0, 0 }, + /* 21*/ { OPEN_ALWAYS, GENERIC_READ|GENERIC_WRITE, 0, 0 }, + /* 22*/ { TRUNCATE_EXISTING, 0, ERROR_INVALID_PARAMETER, 0 }, + /* 23*/ { TRUNCATE_EXISTING, GENERIC_READ, ERROR_INVALID_PARAMETER, 0 }, + /* 24*/ { TRUNCATE_EXISTING, GENERIC_WRITE, 0, 0 }, + /* 25*/ { TRUNCATE_EXISTING, GENERIC_READ|GENERIC_WRITE, 0, 0 } + }; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + DWORD i, ret, written; + HANDLE hfile; + + GetTempPath(MAX_PATH, temp_path); + GetTempFileName(temp_path, "tmp", 0, file_name); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + hfile = CreateFile(file_name, td[i].access, 0, NULL, td[i].disposition, 0, 0); + if (!td[i].error) + { + ok(hfile != INVALID_HANDLE_VALUE, "%d: CreateFile error %d\n", i, GetLastError()); + written = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &td[i].error, sizeof(td[i].error), &written, NULL); + if (td[i].access & GENERIC_WRITE) + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); + else + { + ok(!ret, "%d: WriteFile should fail\n", i); + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + } + CloseHandle(hfile); + } + else + { + /* FIXME: remove the condition below once Wine is fixed */ + if (td[i].disposition == TRUNCATE_EXISTING && !(td[i].access & GENERIC_WRITE)) + { + todo_wine + { + ok(hfile == INVALID_HANDLE_VALUE, "%d: CreateFile should fail\n", i); + ok(GetLastError() == td[i].error, "%d: expected %d, got %d\n", i, td[i].error, GetLastError()); + } + CloseHandle(hfile); + } + else + { + ok(hfile == INVALID_HANDLE_VALUE, "%d: CreateFile should fail\n", i); + ok(GetLastError() == td[i].error, "%d: expected %d, got %d\n", i, td[i].error, GetLastError()); + } + } + + if (td[i].clean_up) DeleteFile(file_name); + } + + DeleteFile(file_name); +} + START_TEST(file) { InitFunctionPointers(); @@ -3166,6 +3252,7 @@ START_TEST(file) test_GetTempFileNameA(); test_CopyFileA(); test_CopyFileW(); + test_CreatFile(); test_CreateFileA(); test_CreateFileW(); test_DeleteFileA();

1 0

Dmitry Timoshkov : gdiplus: Create GDI brush only when needed.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 0d7bc4b325de1788dc2643ac84d5579bed82d562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7bc4b325de1788dc2643ac8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 8 20:32:28 2012 +0800 gdiplus: Create GDI brush only when needed. --- dlls/gdiplus/brush.c | 150 +++----------------------------- dlls/gdiplus/gdiplus_private.h | 2 - dlls/gdiplus/graphics.c | 189 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 188 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d7bc4b325de1788dc264…

1 0

Jacek Caban : jscript: Added IVariantChangeType stub implementation.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 1cadd7cc32201357149430f385008606f112cec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cadd7cc32201357149430f38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:27:47 2012 +0100 jscript: Added IVariantChangeType stub implementation. --- dlls/jscript/jscript.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 68ace36..750104c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -46,6 +46,7 @@ typedef struct { IActiveScriptParseProcedure2 IActiveScriptParseProcedure2_iface; IActiveScriptProperty IActiveScriptProperty_iface; IObjectSafety IObjectSafety_iface; + IVariantChangeType IVariantChangeType_iface; LONG ref; @@ -70,6 +71,7 @@ void script_release(script_ctx_t *ctx) release_cc(ctx->cc); jsheap_free(&ctx->tmp_heap); SysFreeString(ctx->last_match); + heap_free(ctx); } @@ -373,6 +375,9 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IObjectSafety)) { TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); *ppv = &This->IObjectSafety_iface; + }else if(IsEqualGUID(riid, &IID_IVariantChangeType)) { + TRACE("(%p)->(IID_IVariantChangeType %p)\n", This, ppv); + *ppv = &This->IVariantChangeType_iface; } if(*ppv) { @@ -962,6 +967,43 @@ static const IObjectSafetyVtbl JScriptSafetyVtbl = { JScriptSafety_SetInterfaceSafetyOptions }; +static inline JScript *impl_from_IVariantChangeType(IVariantChangeType *iface) +{ + return CONTAINING_RECORD(iface, JScript, IVariantChangeType_iface); +} + +static HRESULT WINAPI VariantChangeType_QueryInterface(IVariantChangeType *iface, REFIID riid, void **ppv) +{ + JScript *This = impl_from_IVariantChangeType(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI VariantChangeType_AddRef(IVariantChangeType *iface) +{ + JScript *This = impl_from_IVariantChangeType(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) +{ + JScript *This = impl_from_IVariantChangeType(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) +{ + JScript *This = impl_from_IVariantChangeType(iface); + FIXME("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); + return E_NOTIMPL; +} + +static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { + VariantChangeType_QueryInterface, + VariantChangeType_AddRef, + VariantChangeType_Release, + VariantChangeType_ChangeType +}; + HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { @@ -986,6 +1028,7 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret->IActiveScriptParseProcedure2_iface.lpVtbl = &JScriptParseProcedureVtbl; ret->IActiveScriptProperty_iface.lpVtbl = &JScriptPropertyVtbl; ret->IObjectSafety_iface.lpVtbl = &JScriptSafetyVtbl; + ret->IVariantChangeType_iface.lpVtbl = &VariantChangeTypeVtbl; ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX;

1 0

Jacek Caban : jscript: Properly handle NULL strings in add_eval.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: f8b20563aa5c8419e82020698295d27e6aab5688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b20563aa5c8419e82020698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:28:02 2012 +0100 jscript: Properly handle NULL strings in add_eval. --- dlls/jscript/engine.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 11b434f..0ae142a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1509,8 +1509,11 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocStringLen(NULL, len1+len2); - memcpy(V_BSTR(retv), lstr, len1*sizeof(WCHAR)); - memcpy(V_BSTR(retv)+len1, rstr, (len2+1)*sizeof(WCHAR)); + if(len1) + memcpy(V_BSTR(retv), lstr, len1*sizeof(WCHAR)); + if(len2) + memcpy(V_BSTR(retv)+len1, rstr, len2*sizeof(WCHAR)); + V_BSTR(retv)[len1+len2] = 0; } if(V_VT(&l) != VT_BSTR)

1 0