December 2006 - Wine-commits

Jacek Caban : urlmon: Added application/java mime filter.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: edf73245fee34f7ef5e16f5ee4aa242565f15d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf73245fee34f7ef5e16f5ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:19:14 2006 +0100 urlmon: Added application/java mime filter. --- dlls/urlmon/tests/misc.c | 11 ++++++++++- dlls/urlmon/urlmon_main.c | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 8f640f9..cbf8db0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -339,10 +339,13 @@ static const WCHAR mimeImageXPng[] = {'i static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const WCHAR mimeVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR mimeVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; +static const WCHAR mimeAppXCompressed[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR mimeAppXZip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR mimeAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; +static const WCHAR mimeAppJava[] = {'a','p','p','l','i','c','a','t','i','o','n','/','j','a','v','a',0}; static const struct { LPCWSTR url; @@ -418,6 +421,9 @@ static BYTE data58[] = {0x1f,0x8b}; static BYTE data59[] = {0x50,0x4b,'x'}; static BYTE data60[] = {0x50,0x4b}; static BYTE data61[] = {0x50,0x4b,'<','h','t','m','l','>',0}; +static BYTE data62[] = {0xca,0xfe,0xba,0xbe,'x'}; +static BYTE data63[] = {0xca,0xfe,0xba,0xbe}; +static BYTE data64[] = {0xca,0xfe,0xba,0xbe,'<','h','t','m','l','>',0}; static const struct { BYTE *data; @@ -484,7 +490,10 @@ static const struct { {data58, sizeof(data58), mimeAppOctetStream}, {data59, sizeof(data59), mimeAppXZip}, {data60, sizeof(data60), mimeTextPlain}, - {data61, sizeof(data61), mimeTextHtml} + {data61, sizeof(data61), mimeTextHtml}, + {data62, sizeof(data62), mimeAppJava}, + {data63, sizeof(data63), mimeTextPlain}, + {data64, sizeof(data64), mimeTextHtml} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 57e1e0f..ce80ba6 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -479,6 +479,11 @@ static BOOL application_xgzip_filter(con return size > 2 && b[0] == 0x1f && b[1] == 0x8b; } +static BOOL application_java_filter(const BYTE const *b, DWORD size) +{ + return size > 4 && b[0] == 0xca && b[1] == 0xfe && b[2] == 0xba && b[3] == 0xbe; +} + static BOOL text_plain_filter(const BYTE const *b, DWORD size) { const BYTE *ptr; @@ -543,6 +548,8 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR wszAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; + static const WCHAR wszAppJava[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'j','a','v','a',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -561,6 +568,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszVideoMpeg, video_mpeg_filter}, {wszAppXZip, application_xzip_filter}, {wszAppXGzip, application_xgzip_filter}, + {wszAppJava, application_java_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter} };

1 0

Jacek Caban : urlmon: Added application/pdf mime filter.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 8afd947f15a362ca7e1961085d3a909bf6ff5657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afd947f15a362ca7e1961085… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:20:03 2006 +0100 urlmon: Added application/pdf mime filter. --- dlls/urlmon/tests/misc.c | 9 ++++++++- dlls/urlmon/urlmon_main.c | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cbf8db0..6c13a3d 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -346,6 +346,7 @@ static const WCHAR mimeAppXZip[] = {'a', static const WCHAR mimeAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR mimeAppJava[] = {'a','p','p','l','i','c','a','t','i','o','n','/','j','a','v','a',0}; +static const WCHAR mimeAppPdf[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; static const struct { LPCWSTR url; @@ -424,6 +425,9 @@ static BYTE data61[] = {0x50,0x4b,'<','h static BYTE data62[] = {0xca,0xfe,0xba,0xbe,'x'}; static BYTE data63[] = {0xca,0xfe,0xba,0xbe}; static BYTE data64[] = {0xca,0xfe,0xba,0xbe,'<','h','t','m','l','>',0}; +static BYTE data65[] = {0x25,0x50,0x44,0x46,'x'}; +static BYTE data66[] = {0x25,0x50,0x44,0x46}; +static BYTE data67[] = {0x25,0x50,0x44,0x46,'x','<','h','t','m','l','>'}; static const struct { BYTE *data; @@ -493,7 +497,10 @@ static const struct { {data61, sizeof(data61), mimeTextHtml}, {data62, sizeof(data62), mimeAppJava}, {data63, sizeof(data63), mimeTextPlain}, - {data64, sizeof(data64), mimeTextHtml} + {data64, sizeof(data64), mimeTextHtml}, + {data65, sizeof(data65), mimeAppPdf}, + {data66, sizeof(data66), mimeTextPlain}, + {data67, sizeof(data67), mimeTextHtml} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index ce80ba6..a352f30 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -469,6 +469,11 @@ static BOOL video_mpeg_filter(const BYTE && (b[3] == 0xb3 || b[3] == 0xba); } +static BOOL application_pdf_filter(const BYTE const *b, DWORD size) +{ + return size > 4 && b[0] == 0x25 && b[1] == 0x50 && b[2] == 0x44 && b[3] == 0x46; +} + static BOOL application_xzip_filter(const BYTE const *b, DWORD size) { return size > 2 && b[0] == 0x50 && b[1] == 0x4b; @@ -544,6 +549,8 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR wszVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; + static const WCHAR wszAppPdf[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'p','d','f',0}; static const WCHAR wszAppXZip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR wszAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', @@ -566,6 +573,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszImageBmp, image_bmp_filter}, {wszVideoAvi, video_avi_filter}, {wszVideoMpeg, video_mpeg_filter}, + {wszAppPdf, application_pdf_filter}, {wszAppXZip, application_xzip_filter}, {wszAppXGzip, application_xgzip_filter}, {wszAppJava, application_java_filter},

1 0

Jacek Caban : shdoclc: Added IDS_MESSAGE_BOX_TITLE string.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 92ecf233106885b1cd846bcc07f9578b1047410d URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ecf233106885b1cd846bcc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:22:09 2006 +0100 shdoclc: Added IDS_MESSAGE_BOX_TITLE string. --- dlls/shdoclc/En.rc | 5 +++++ dlls/shdoclc/shdoclc.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/shdoclc/En.rc b/dlls/shdoclc/En.rc index be7e494..95e5384 100644 --- a/dlls/shdoclc/En.rc +++ b/dlls/shdoclc/En.rc @@ -19,6 +19,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" +} + IDR_BROWSE_CONTEXT_MENU MENU { POPUP "Default" diff --git a/dlls/shdoclc/shdoclc.h b/dlls/shdoclc/shdoclc.h index f4160ff..6df37af 100644 --- a/dlls/shdoclc/shdoclc.h +++ b/dlls/shdoclc/shdoclc.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define IDS_MESSAGE_BOX_TITLE 2213 + #define IDR_BROWSE_CONTEXT_MENU 24641 #define IDM_TRACETAGS 6004

1 0

Jacek Caban : mshtml: Added get_parentWindow implementation.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: fb4980d6a9059a728899ae9678657839255e2b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4980d6a9059a728899ae967… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:21:16 2006 +0100 mshtml: Added get_parentWindow implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmldoc.c | 11 +- dlls/mshtml/htmlwindow.c | 733 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 15 + 4 files changed, 758 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb4980d6a9059a728899a…

1 0

Francois Gouget : gdi32: Add a prototype for GetFontUnicodeRanges().
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: da5e750a16fde433a74991f6efffa94f2e298984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5e750a16fde433a74991f6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 6 13:42:59 2006 +0100 gdi32: Add a prototype for GetFontUnicodeRanges(). --- include/wingdi.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 008ba9e..34b54eb 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3452,6 +3452,7 @@ UINT WINAPI GetEnhMetaFileHeader(HE UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY); DWORD WINAPI GetFontData(HDC,DWORD,DWORD,LPVOID,DWORD); DWORD WINAPI GetFontLanguageInfo(HDC); +DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET); DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,INT,LPWORD,DWORD); DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,INT,LPWORD,DWORD); #define GetGlyphIndices WINELIB_NAME_AW(GetGlyphIndices)

1 0

Paul Vriens : ntdll/tests: Fix typo.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: fd15939497c15a66f2c3139bfd2ea0a8ea87669b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd15939497c15a66f2c3139bf… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Dec 6 14:43:33 2006 +0100 ntdll/tests: Fix typo. --- dlls/ntdll/tests/rtl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 59871de..8d7f227 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -340,7 +340,7 @@ static void test_RtlUniform(void) expected = seed * 0xffffffed + 0x7fffffc3 + (seed & 1); result = pRtlUniform(&seed); ok(result == expected, - "RtlUniform(&seed (seed == 2)) returns %x, expected %x\n", + "RtlUniform(&seed (seed == 3)) returns %x, expected %x\n", result, expected); seed = 0x6bca1aa;

1 0

Jacek Caban : urlmon: Added application/x-gzip-compression filter.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 3d767fcb55080b3e6f7c361302d827ab3dce0e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d767fcb55080b3e6f7c36130… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:17:26 2006 +0100 urlmon: Added application/x-gzip-compression filter. --- dlls/urlmon/tests/misc.c | 12 +++++++++++- dlls/urlmon/urlmon_main.c | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 425de1b..d759961 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -339,6 +339,8 @@ static const WCHAR mimeImageXPng[] = {'i static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const WCHAR mimeVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR mimeVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; +static const WCHAR mimeAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const struct { LPCWSTR url; @@ -407,6 +409,10 @@ static BYTE data51[] = {0x00,0x00,0x01,0 static BYTE data52[] = {0x00,0x00,0x01,0xb8,0xff}; static BYTE data53[] = {0x00,0x00,0x01,0xba}; static BYTE data54[] = {0x00,0x00,0x01,0xba,'<','h','t','m','l','>'}; +static BYTE data55[] = {0x1f,0x8b,'x'}; +static BYTE data56[] = {0x1f}; +static BYTE data57[] = {0x1f,0x8b,'<','h','t','m','l','>','t','e','s','t',0}; +static BYTE data58[] = {0x1f,0x8b}; static const struct { BYTE *data; @@ -466,7 +472,11 @@ static const struct { {data51, sizeof(data51), mimeVideoMpeg}, {data52, sizeof(data52), mimeAppOctetStream}, {data53, sizeof(data53), mimeAppOctetStream}, - {data54, sizeof(data54), mimeTextHtml} + {data54, sizeof(data54), mimeTextHtml}, + {data55, sizeof(data55), mimeAppXGzip}, + {data56, sizeof(data56), mimeTextPlain}, + {data57, sizeof(data57), mimeTextHtml}, + {data58, sizeof(data58), mimeAppOctetStream} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index d36803c..fca5150 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -469,6 +469,11 @@ static BOOL video_mpeg_filter(const BYTE && (b[3] == 0xb3 || b[3] == 0xba); } +static BOOL application_xgzip_filter(const BYTE const *b, DWORD size) +{ + return size > 2 && b[0] == 0x1f && b[1] == 0x8b; +} + static BOOL text_plain_filter(const BYTE const *b, DWORD size) { const BYTE *ptr; @@ -529,6 +534,8 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR wszVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; + static const WCHAR wszAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -545,6 +552,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszImageBmp, image_bmp_filter}, {wszVideoAvi, video_avi_filter}, {wszVideoMpeg, video_mpeg_filter}, + {wszAppXGzip, application_xgzip_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter} };

1 0

Jacek Caban : urlmon: Added application/x-zip-compressed filter.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: d5c6f6ec2571a2bfec736758c6f55b03fbdcd5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c6f6ec2571a2bfec736758c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:18:23 2006 +0100 urlmon: Added application/x-zip-compressed filter. --- dlls/urlmon/tests/misc.c | 10 +++++++++- dlls/urlmon/urlmon_main.c | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d759961..8f640f9 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -339,6 +339,8 @@ static const WCHAR mimeImageXPng[] = {'i static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const WCHAR mimeVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR mimeVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; +static const WCHAR mimeAppXZip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR mimeAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; @@ -413,6 +415,9 @@ static BYTE data55[] = {0x1f,0x8b,'x'}; static BYTE data56[] = {0x1f}; static BYTE data57[] = {0x1f,0x8b,'<','h','t','m','l','>','t','e','s','t',0}; static BYTE data58[] = {0x1f,0x8b}; +static BYTE data59[] = {0x50,0x4b,'x'}; +static BYTE data60[] = {0x50,0x4b}; +static BYTE data61[] = {0x50,0x4b,'<','h','t','m','l','>',0}; static const struct { BYTE *data; @@ -476,7 +481,10 @@ static const struct { {data55, sizeof(data55), mimeAppXGzip}, {data56, sizeof(data56), mimeTextPlain}, {data57, sizeof(data57), mimeTextHtml}, - {data58, sizeof(data58), mimeAppOctetStream} + {data58, sizeof(data58), mimeAppOctetStream}, + {data59, sizeof(data59), mimeAppXZip}, + {data60, sizeof(data60), mimeTextPlain}, + {data61, sizeof(data61), mimeTextHtml} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index fca5150..57e1e0f 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -469,6 +469,11 @@ static BOOL video_mpeg_filter(const BYTE && (b[3] == 0xb3 || b[3] == 0xba); } +static BOOL application_xzip_filter(const BYTE const *b, DWORD size) +{ + return size > 2 && b[0] == 0x50 && b[1] == 0x4b; +} + static BOOL application_xgzip_filter(const BYTE const *b, DWORD size) { return size > 2 && b[0] == 0x1f && b[1] == 0x8b; @@ -534,6 +539,8 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR wszVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; + static const WCHAR wszAppXZip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR wszAppXGzip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; @@ -552,6 +559,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszImageBmp, image_bmp_filter}, {wszVideoAvi, video_avi_filter}, {wszVideoMpeg, video_mpeg_filter}, + {wszAppXZip, application_xzip_filter}, {wszAppXGzip, application_xgzip_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter}

1 0

Alexandre Julliard : gdi32: Only mmap a given font file once.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 834d20024bc71462474fd793b7f1d846635b30a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834d20024bc71462474fd793b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 21:31:53 2006 +0100 gdi32: Only mmap a given font file once. FT_New_Face always creates a new mapping of the font file, so do the mapping by hand and use FT_New_Memory_Face instead. --- dlls/gdi32/freetype.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f77047e..6301a5f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -29,6 +29,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_SYS_MMAN_H +# include <sys/mman.h> +#endif #include <string.h> #include <dirent.h> #include <stdio.h> @@ -125,6 +128,7 @@ MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_Matrix_Multiply); MAKE_FUNCPTR(FT_MulFix); MAKE_FUNCPTR(FT_New_Face); +MAKE_FUNCPTR(FT_New_Memory_Face); MAKE_FUNCPTR(FT_Outline_Get_Bitmap); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); @@ -253,6 +257,7 @@ typedef struct { struct tagGdiFont { struct list entry; FT_Face ft_face; + struct font_mapping *mapping; LPWSTR name; int charset; int codepage; @@ -385,6 +390,18 @@ typedef struct tagFontSubst { NameCs to; } FontSubst; +struct font_mapping +{ + struct list entry; + int refcount; + dev_t dev; + ino_t ino; + void *data; + size_t size; +}; + +static struct list mappings_list = LIST_INIT( mappings_list ); + static BOOL have_installed_roman_font = FALSE; /* CreateFontInstance will fail if this is still FALSE */ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; @@ -1644,6 +1661,7 @@ BOOL WineEngInit(void) LOAD_FUNCPTR(FT_Matrix_Multiply) LOAD_FUNCPTR(FT_MulFix) LOAD_FUNCPTR(FT_New_Face) + LOAD_FUNCPTR(FT_New_Memory_Face) LOAD_FUNCPTR(FT_Outline_Get_Bitmap) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) @@ -1867,6 +1885,57 @@ static LONG calc_ppem_for_height(FT_Face return ppem; } +static struct font_mapping *map_font( const char *name ) +{ + struct font_mapping *mapping; + struct stat st; + int fd; + + if ((fd = open( name, O_RDONLY )) == -1) return NULL; + if (fstat( fd, &st ) == -1) goto error; + + LIST_FOR_EACH_ENTRY( mapping, &mappings_list, struct font_mapping, entry ) + { + if (mapping->dev == st.st_dev && mapping->ino == st.st_ino) + { + mapping->refcount++; + close( fd ); + return mapping; + } + } + if (!(mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(*mapping) ))) + goto error; + + mapping->data = mmap( NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 ); + close( fd ); + + if (mapping->data == MAP_FAILED) + { + HeapFree( GetProcessHeap(), 0, mapping ); + return NULL; + } + mapping->refcount = 1; + mapping->dev = st.st_dev; + mapping->ino = st.st_ino; + mapping->size = st.st_size; + list_add_tail( &mappings_list, &mapping->entry ); + return mapping; + +error: + close( fd ); + return NULL; +} + +static void unmap_font( struct font_mapping *mapping ) +{ + if (!--mapping->refcount) + { + list_remove( &mapping->entry ); + munmap( mapping->data, mapping->size ); + HeapFree( GetProcessHeap(), 0, mapping ); + } +} + static LONG load_VDMX(GdiFont*, LONG); static FT_Face OpenFontFile(GdiFont *font, char *file, FT_Long face_index, LONG width, LONG height) @@ -1875,7 +1944,14 @@ static FT_Face OpenFontFile(GdiFont *fon FT_Face ft_face; TRACE("%s, %ld, %d x %d\n", debugstr_a(file), face_index, width, height); - err = pFT_New_Face(library, file, face_index, &ft_face); + + if (!(font->mapping = map_font( file ))) + { + WARN("failed to map %s\n", debugstr_a(file)); + return 0; + } + + err = pFT_New_Memory_Face(library, font->mapping->data, font->mapping->size, face_index, &ft_face); if(err) { ERR("FT_New_Face rets %d\n", err); return 0; @@ -1973,6 +2049,7 @@ static void free_font(GdiFont *font) } if (font->ft_face) pFT_Done_Face(font->ft_face); + if (font->mapping) unmap_font( font->mapping ); HeapFree(GetProcessHeap(), 0, font->kern_pairs); HeapFree(GetProcessHeap(), 0, font->potm); HeapFree(GetProcessHeap(), 0, font->name);

1 0

Markus Amsler : d3d8: Handle surface refcount forwarding in d3d8.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 0d725490d643b8c654afbbeeedbfe754e6dcda3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d725490d643b8c654afbbeee… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue Dec 5 00:29:37 2006 +0100 d3d8: Handle surface refcount forwarding in d3d8. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/d3d8_private.h | 5 +++++ dlls/d3d8/device.c | 12 ++++++++++++ dlls/d3d8/surface.c | 20 ++++++++------------ dlls/d3d8/tests/device.c | 2 +- dlls/d3d8/texture.c | 2 +- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index dffc08e..49006b5 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -57,7 +57,7 @@ static ULONG WINAPI IDirect3DCubeTexture if (ref == 0) { TRACE("Releasing child %p\n", This->wineD3DCubeTexture); - IWineD3DCubeTexture_Release(This->wineD3DCubeTexture); + IWineD3DCubeTexture_Destroy(This->wineD3DCubeTexture, D3D8CB_DestroySurface); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 4e8b96b..de553c6 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -246,6 +246,9 @@ struct IDirect3DSurface8Impl /* Parent reference */ LPDIRECT3DDEVICE8 parentDevice; + + /* If set forward refcounting to this object */ + IUnknown *forwardReference; }; /* ------------------ */ @@ -593,4 +596,6 @@ extern HRESULT WINAPI D3D8CB_CreateRende extern ULONG WINAPI D3D8CB_DestroyDepthStencilSurface (IWineD3DSurface *pSurface); +extern ULONG WINAPI D3D8CB_DestroySurface(IWineD3DSurface *pSurface); + #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 565f4af..68a1a5f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1622,8 +1622,20 @@ HRESULT WINAPI D3D8CB_CreateSurface(IUnk *ppSurface = d3dSurface->wineD3DSurface; IUnknown_Release(d3dSurface->parentDevice); d3dSurface->parentDevice = NULL; + d3dSurface->forwardReference = pSuperior; } else { FIXME("(%p) IDirect3DDevice8_CreateSurface failed\n", device); } return res; } + +ULONG WINAPI D3D8CB_DestroySurface(IWineD3DSurface *pSurface) { + IDirect3DSurface8Impl* surfaceParent; + TRACE("(%p) call back\n", pSurface); + + IWineD3DSurface_GetParent(pSurface, (IUnknown **) &surfaceParent); + /* GetParent's AddRef was forwarded to an object in destruction. + * Releasing it here again would cause an endless recursion. */ + surfaceParent->forwardReference = NULL; + return IDirect3DSurface8_Release((IDirect3DSurface8*) surfaceParent); +} diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 8ab312e..61db485 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -42,15 +42,13 @@ static HRESULT WINAPI IDirect3DSurface8I static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; - IUnknown *containerParent = NULL; TRACE("(%p)\n", This); - IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); - if (containerParent) { - /* Forward to the containerParent */ - TRACE("(%p) : Forwarding to %p\n", This, containerParent); - return IUnknown_AddRef(containerParent); + if (This->forwardReference) { + /* Forward refcounting */ + TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); + return IUnknown_AddRef(This->forwardReference); } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedIncrement(&This->ref); @@ -61,15 +59,13 @@ static ULONG WINAPI IDirect3DSurface8Imp static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; - IUnknown *containerParent = NULL; TRACE("(%p)\n", This); - IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); - if (containerParent) { - /* Forward to the containerParent */ - TRACE("(%p) : Forwarding to %p\n", This, containerParent); - return IUnknown_Release(containerParent); + if (This->forwardReference) { + /* Forward refcounting */ + TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); + return IUnknown_Release(This->forwardReference); } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedDecrement(&This->ref); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e7e274c..5508c2f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -490,7 +490,7 @@ static void test_refcount(void) /* check implicit back buffer */ hr = IDirect3DSwapChain8_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer); todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); - todo_wine CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT( pSwapChain, 1); if(pBackBuffer) { todo_wine CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DDevice8, pDevice); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 2ab8514..17af4ee 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -57,7 +57,7 @@ static ULONG WINAPI IDirect3DTexture8Imp TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IWineD3DTexture_Release(This->wineD3DTexture); + IWineD3DTexture_Destroy(This->wineD3DTexture, D3D8CB_DestroySurface); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); }

1 0