August 2010 - Wine-commits - list.winehq.org

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_RemoveProperties .
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 84f6bb3e3f22eee70fca1602a546dd8e93d97bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f6bb3e3f22eee70fca1602a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Aug 23 18:59:52 2010 -0400 urlmon/tests: Added tests for IUriBuilder_RemoveProperties. --- dlls/urlmon/tests/uri.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 6bb05b7..84f89d1 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3805,6 +3805,37 @@ static const uri_builder_test uri_builder_tests[] = { } }; +typedef struct _uri_builder_remove_test { + const char *uri; + DWORD create_flags; + HRESULT create_builder_expected; + BOOL create_builder_todo; + + DWORD remove_properties; + HRESULT remove_expected; + BOOL remove_todo; + + const char *expected_uri; + DWORD expected_flags; + HRESULT expected_hres; + BOOL expected_todo; +} uri_builder_remove_test; + +static const uri_builder_remove_test uri_builder_remove_tests[] = { + { "http://google.com/test?test=y#Frag",0,S_OK,FALSE, + Uri_HAS_FRAGMENT|Uri_HAS_PATH|Uri_HAS_QUERY,S_OK,TRUE, + "http://google.com/",0,S_OK,TRUE + }, + { "http://user:pass(a)winehq.org/",0,S_OK,FALSE, + Uri_HAS_USER_NAME|Uri_HAS_PASSWORD,S_OK,TRUE, + "http://winehq.org/",0,S_OK,TRUE + }, + { "zip://google.com?Test=x",0,S_OK,FALSE, + Uri_HAS_HOST,S_OK,TRUE, + "zip:/?Test=x",0,S_OK,TRUE + } +}; + static inline LPWSTR a2w(LPCSTR str) { LPWSTR ret = NULL; @@ -6452,6 +6483,106 @@ static void test_IUriBuilder_IUriProperty(void) { if(builder) IUriBuilder_Release(builder); } +static void test_IUriBuilder_RemoveProperties(void) { + IUriBuilder *builder = NULL; + HRESULT hr; + DWORD i; + + hr = pCreateIUriBuilder(NULL, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + /* Properties that can't be removed. */ + const DWORD invalid = Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_RAW_URI|Uri_HAS_HOST_TYPE| + Uri_HAS_SCHEME|Uri_HAS_ZONE; + + for(i = Uri_PROPERTY_STRING_START; i <= Uri_PROPERTY_DWORD_LAST; ++i) { + hr = IUriBuilder_RemoveProperties(builder, i << 1); + if((i << 1) & invalid) { + todo_wine { + ok(hr == E_INVALIDARG, + "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", + hr, E_INVALIDARG, i); + } + } else { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x with prop=%d.\n", + hr, S_OK, i); + } + } + } + } + if(builder) IUriBuilder_Release(builder); + + for(i = 0; i < sizeof(uri_builder_remove_tests)/sizeof(uri_builder_remove_tests[0]); ++i) { + uri_builder_remove_test test = uri_builder_remove_tests[i]; + IUri *uri = NULL; + LPWSTR uriW; + + uriW = a2w(test.uri); + hr = pCreateUri(uriW, test.create_flags, 0, &uri); + if(SUCCEEDED(hr)) { + builder = NULL; + + hr = pCreateIUriBuilder(uri, 0, 0, &builder); + if(test.create_builder_todo) { + todo_wine { + ok(hr == test.create_builder_expected, + "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x on test %d.\n", + hr, test.create_builder_expected, i); + } + } else { + ok(hr == test.create_builder_expected, + "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x on test %d.\n", + hr, test.create_builder_expected, i); + } + if(SUCCEEDED(hr)) { + hr = IUriBuilder_RemoveProperties(builder, test.remove_properties); + if(test.remove_todo) { + todo_wine { + ok(hr == test.remove_expected, + "Error: IUriBuilder_RemoveProperties returned 0x%08x, expected 0x%08x on test %d.\n", + hr, test.remove_expected, i); + } + } else { + ok(hr == test.remove_expected, + "Error: IUriBuilder returned 0x%08x, expected 0x%08x on test %d.\n", + hr, test.remove_expected, i); + } + if(SUCCEEDED(hr)) { + IUri *result = NULL; + + hr = IUriBuilder_CreateUri(builder, test.expected_flags, 0, 0, &result); + if(test.expected_todo) { + todo_wine { + ok(hr == test.expected_hres, + "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x on test %d.\n", + hr, test.expected_hres, i); + } + } else { + ok(hr == test.expected_hres, + "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x on test %d.\n", + hr, test.expected_hres, i); + } + if(SUCCEEDED(hr)) { + BSTR received = NULL; + + hr = IUri_GetAbsoluteUri(result, &received); + ok(!strcmp_aw(test.expected_uri, received), + "Error: Expected %s but got %s instead on test %d.\n", + test.expected_uri, wine_dbgstr_w(received), i); + SysFreeString(received); + } + if(result) IUri_Release(result); + } + } + if(builder) IUriBuilder_Release(builder); + } + if(uri) IUri_Release(uri); + heap_free(uriW); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -6524,4 +6655,7 @@ START_TEST(uri) { trace("test IUriBuilder_IUriProperty...\n"); test_IUriBuilder_IUriProperty(); + + trace("test IUriBuilder_RemoveProperties...\n"); + test_IUriBuilder_RemoveProperties(); }

1 0

Ken Thomases : winex11: Pass window property to server in 64KB chunks.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: b95275115839ded61f4f56d2c6f444819a7671ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95275115839ded61f4f56d2c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Aug 23 22:40:19 2010 -0500 winex11: Pass window property to server in 64KB chunks. Large clipboard contents, like images, can exceed the maximum X request size if sent all at once, which can cause the X server to kill the connection. --- dlls/winex11.drv/clipboard.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 584136a..fcec86b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3227,11 +3227,20 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev if (hClipData && (lpClipData = GlobalLock(hClipData))) { + int mode = PropModeReplace; + TRACE("\tUpdating property %s, %d bytes\n", debugstr_w(lpFormat->Name), cBytes); wine_tsx11_lock(); - XChangeProperty(display, request, rprop, event->target, - 8, PropModeReplace, lpClipData, cBytes); + do + { + int nelements = min(cBytes, 65536); + XChangeProperty(display, request, rprop, event->target, + 8, mode, lpClipData, nelements); + mode = PropModeAppend; + cBytes -= nelements; + lpClipData += nelements; + } while (cBytes > 0); wine_tsx11_unlock(); GlobalUnlock(hClipData);

1 0

Piotr Caban : msvcp80: Added stub dll.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 71a49ebf770d9cc7e76b903bbbf4ae344c099f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a49ebf770d9cc7e76b903bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 23 16:36:24 2010 +0200 msvcp80: Added stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcp80/Makefile.in | 10 + dlls/msvcp80/msvcp80.c | 37 + dlls/msvcp80/msvcp80.spec | 5789 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 5838 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71a49ebf770d9cc7e76b9…

1 0

Andrew Talbot : cryptnet: Constify a variable.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: d68c0d1dd561ff9aeb540be79a7fc01f6c670b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68c0d1dd561ff9aeb540be79… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 23 22:22:56 2010 +0100 cryptnet: Constify a variable. --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 0b4e31d..e8e7adf 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1582,7 +1582,7 @@ static DWORD verify_cert_revocation_with_crl(PCCERT_CONTEXT cert, static DWORD verify_cert_revocation_from_dist_points_ext( const CRYPT_DATA_BLOB *value, PCCERT_CONTEXT cert, DWORD index, - FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, + FILETIME *pTime, DWORD dwFlags, const CERT_REVOCATION_PARA *pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { DWORD error = ERROR_SUCCESS, cbUrlArray;

1 0

Austin English : gdiplus: Add a stub for GdipWindingModeOutline.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 5435fbba553290e28f95e2a281015e3f4b6088ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5435fbba553290e28f95e2a28… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 23 16:54:53 2010 -0500 gdiplus: Add a stub for GdipWindingModeOutline. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2d99601..e1b9813 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -623,7 +623,7 @@ @ stdcall GdipVectorTransformMatrixPointsI(ptr ptr long) @ stdcall GdipWarpPath(ptr ptr ptr long long long long long long long) @ stdcall GdipWidenPath(ptr ptr ptr long) -@ stub GdipWindingModeOutline +@ stdcall GdipWindingModeOutline(ptr ptr long) @ stdcall GdiplusNotificationHook(ptr) @ stdcall GdiplusNotificationUnhook(ptr) @ stdcall GdiplusShutdown(ptr) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 02b5d9b..983ead9 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1653,3 +1653,9 @@ GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath* path) return Ok; } + +GpStatus WINGDIPAPI GdipWindingModeOutline(GpPath *path, GpMatrix *matrix, REAL flatness) +{ + FIXME("stub: %p, %p, %.2f\n", path, matrix, flatness); + return NotImplemented; +}

1 0

Austin English : gdiplus: Add a stub for GdipConvertToEmfPlusToFile.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 3745961b2e85da1f8d2718cef907cc62aced0e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3745961b2e85da1f8d2718cef… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 23 18:35:13 2010 -0500 gdiplus: Add a stub for GdipConvertToEmfPlusToFile. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e1b9813..8c6505c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -67,7 +67,7 @@ @ stdcall GdipCombineRegionRegion(ptr ptr long) @ stdcall GdipComment(ptr long ptr) @ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) -@ stub GdipConvertToEmfPlusToFile +@ stdcall GdipConvertToEmfPlusToFile(ptr ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToStream @ stdcall GdipCreateAdjustableArrowCap(long long long ptr) @ stub GdipCreateBitmapFromDirectDrawSurface diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7b50f53..bcee1aa 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3796,3 +3796,16 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) return stat; } + +/***************************************************************************** + * GdipConvertToEmfPlusToFile [GDIPLUS.@] + */ + +GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics* refGraphics, + GpMetafile* metafile, BOOL* conversionSuccess, + const WCHAR* filename, EmfType emfType, + const WCHAR* description, GpMetafile** out_metafile) +{ + FIXME("stub: %p, %p, %p, %p, %u, %p, %p\n", refGraphics, metafile, conversionSuccess, filename, emfType, description, out_metafile); + return NotImplemented; +}

1 0

Aric Stewart : usp10: Add Greek Script.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 2701b8f97a98b0b66cfa947471a6a79e5833969c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2701b8f97a98b0b66cfa94747… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 23 13:58:00 2010 -0500 usp10: Add Greek Script. --- dlls/usp10/shape.c | 1 + dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3644069..9140453 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -306,6 +306,7 @@ static const ScriptShapeData ShapingData[] = {{ syriac_features, 4}, "syrc", ContextualShape_Syriac}, {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, {{ NULL, 0}, "thaa", NULL}, + {{ standard_features, 2}, "grek", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d084bc0..93f33ea 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -56,6 +56,8 @@ static const scriptRange scriptRanges[] = { /* Latin Extended-B: U+0180–U+024F */ /* IPA Extensions: U+0250–U+02AF */ { Script_Latin, 0x00, 0x2af , Script_Numeric, Script_Punctuation}, + /* Greek: U+0370–U+03FF */ + { Script_Greek, 0x370, 0x3ff, 0, 0}, /* Hebrew: U+0590–U+05FF */ { Script_Hebrew, 0x590, 0x5ff, 0, 0}, /* Arabic: U+0600–U+06FF */ @@ -74,6 +76,8 @@ static const scriptRange scriptRanges[] = { { Script_Latin, 0x1d00, 0x1dbf, 0, 0}, /* Latin Extended Additional: U+1E00–U+1EFF */ { Script_Latin, 0x1e00, 0x1eff, 0, 0}, + /* Greek Extended: U+1F00–U+1FFF */ + { Script_Greek, 0x1f00, 0x1fff, 0, 0}, /* Latin Extended-C: U+2C60–U+2C7F */ { Script_Latin, 0x2c60, 0x2c7f, 0, 0}, /* Modifier Tone Letters: U+A700–U+A71F */ @@ -123,6 +127,8 @@ static const scriptData scriptInformation[] = { {LANG_PERSIAN, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {{Script_Thaana, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {LANG_DIVEHI, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Greek, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_GREEK, 0, 0, 0, 0, GREEK_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -132,7 +138,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[4].props, &scriptInformation[5].props, &scriptInformation[6].props, &scriptInformation[7].props, &scriptInformation[8].props, &scriptInformation[9].props, - &scriptInformation[10].props, &scriptInformation[11].props + &scriptInformation[10].props, &scriptInformation[11].props, + &scriptInformation[12].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 6e05365..94699d9 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -30,6 +30,7 @@ #define Script_Syriac 9 #define Script_Persian 10 #define Script_Thaana 11 +#define Script_Greek 12 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Cyrillic script.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: b21ca5628e24c0bc6c04ac9a2cdd04246f150383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21ca5628e24c0bc6c04ac9a2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 23 13:58:07 2010 -0500 usp10: Add Cyrillic script. --- dlls/usp10/shape.c | 1 + dlls/usp10/usp10.c | 11 ++++++++++- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9140453..6a8db33 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -307,6 +307,7 @@ static const ScriptShapeData ShapingData[] = {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, {{ NULL, 0}, "thaa", NULL}, {{ standard_features, 2}, "grek", NULL}, + {{ standard_features, 2}, "cyrl", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 93f33ea..af82180 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -58,6 +58,9 @@ static const scriptRange scriptRanges[] = { { Script_Latin, 0x00, 0x2af , Script_Numeric, Script_Punctuation}, /* Greek: U+0370–U+03FF */ { Script_Greek, 0x370, 0x3ff, 0, 0}, + /* Cyrillic: U+0400–U+04FF */ + /* Cyrillic Supplement: U+0500–U+052F */ + { Script_Cyrillic, 0x400, 0x52f, 0, 0}, /* Hebrew: U+0590–U+05FF */ { Script_Hebrew, 0x590, 0x5ff, 0, 0}, /* Arabic: U+0600–U+06FF */ @@ -80,6 +83,10 @@ static const scriptRange scriptRanges[] = { { Script_Greek, 0x1f00, 0x1fff, 0, 0}, /* Latin Extended-C: U+2C60–U+2C7F */ { Script_Latin, 0x2c60, 0x2c7f, 0, 0}, + /* Cyrillic Extended-A: U+2DE0–U+2DFF */ + { Script_Cyrillic, 0x2de0, 0x2dff, 0, 0}, + /* Cyrillic Extended-B: U+A640–U+A69F */ + { Script_Cyrillic, 0xa640, 0xa69f, 0, 0}, /* Modifier Tone Letters: U+A700–U+A71F */ /* Latin Extended-D: U+A720–U+A7FF */ { Script_Latin, 0xa700, 0xa7ff, 0, 0}, @@ -129,6 +136,8 @@ static const scriptData scriptInformation[] = { {LANG_DIVEHI, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {{Script_Greek, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_GREEK, 0, 0, 0, 0, GREEK_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Cyrillic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_RUSSIAN, 0, 0, 0, 0, RUSSIAN_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -139,7 +148,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[6].props, &scriptInformation[7].props, &scriptInformation[8].props, &scriptInformation[9].props, &scriptInformation[10].props, &scriptInformation[11].props, - &scriptInformation[12].props + &scriptInformation[12].props, &scriptInformation[13].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 94699d9..436af4d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -31,6 +31,7 @@ #define Script_Persian 10 #define Script_Thaana 11 #define Script_Greek 12 +#define Script_Cyrillic 13 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Armenian script.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 703dd4b1fce3abd29d9c1e0a0dd2b3045706cf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703dd4b1fce3abd29d9c1e0a0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 23 13:58:13 2010 -0500 usp10: Add Armenian script. --- dlls/usp10/shape.c | 1 + dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 6a8db33..92452f8 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -308,6 +308,7 @@ static const ScriptShapeData ShapingData[] = {{ NULL, 0}, "thaa", NULL}, {{ standard_features, 2}, "grek", NULL}, {{ standard_features, 2}, "cyrl", NULL}, + {{ standard_features, 2}, "armn", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index af82180..b59df43 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -61,6 +61,8 @@ static const scriptRange scriptRanges[] = { /* Cyrillic: U+0400–U+04FF */ /* Cyrillic Supplement: U+0500–U+052F */ { Script_Cyrillic, 0x400, 0x52f, 0, 0}, + /* Armenian: U+0530–U+058F */ + { Script_Armenian, 0x530, 0x58f, 0, 0}, /* Hebrew: U+0590–U+05FF */ { Script_Hebrew, 0x590, 0x5ff, 0, 0}, /* Arabic: U+0600–U+06FF */ @@ -92,6 +94,8 @@ static const scriptRange scriptRanges[] = { { Script_Latin, 0xa700, 0xa7ff, 0, 0}, /* Latin Ligatures: U+FB00–U+FB06 */ { Script_Latin, 0xfb00, 0xfb06, 0, 0}, + /* Armenian ligatures U+FB13..U+FB17 */ + { Script_Armenian, 0xfb13, 0xfb17, 0, 0}, /* Alphabetic Presentation Forms: U+FB1D–U+FB4F */ { Script_Hebrew, 0xfb1d, 0xfb4f, 0, 0}, /* Arabic Presentation Forms-A: U+FB50–U+FDFF*/ @@ -138,6 +142,8 @@ static const scriptData scriptInformation[] = { {LANG_GREEK, 0, 0, 0, 0, GREEK_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {{Script_Cyrillic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_RUSSIAN, 0, 0, 0, 0, RUSSIAN_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {{Script_Armenian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ARMENIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -148,7 +154,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[6].props, &scriptInformation[7].props, &scriptInformation[8].props, &scriptInformation[9].props, &scriptInformation[10].props, &scriptInformation[11].props, - &scriptInformation[12].props, &scriptInformation[13].props + &scriptInformation[12].props, &scriptInformation[13].props, + &scriptInformation[14].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 436af4d..b861c02 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -32,6 +32,7 @@ #define Script_Thaana 11 #define Script_Greek 12 #define Script_Cyrillic 13 +#define Script_Armenian 14 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Georgian script.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 7b11524ec3bdb4a7f6cbed0b5cbc2945ebcc78f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b11524ec3bdb4a7f6cbed0b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 23 13:58:21 2010 -0500 usp10: Add Georgian script. --- dlls/usp10/shape.c | 1 + dlls/usp10/usp10.c | 8 +++++++- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 92452f8..f48210e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -309,6 +309,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, "grek", NULL}, {{ standard_features, 2}, "cyrl", NULL}, {{ standard_features, 2}, "armn", NULL}, + {{ standard_features, 2}, "geor", NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b59df43..aac53f2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -77,6 +77,8 @@ static const scriptRange scriptRanges[] = { { Script_Arabic, 0x750, 0x77f, 0, 0}, /* Thaana: U+0780–U+07BF */ { Script_Thaana, 0x780, 0x7bf, 0, 0}, + /* Georgian: U+10A0–U+10FF */ + { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ { Script_Latin, 0x1d00, 0x1dbf, 0, 0}, /* Latin Extended Additional: U+1E00–U+1EFF */ @@ -85,6 +87,8 @@ static const scriptRange scriptRanges[] = { { Script_Greek, 0x1f00, 0x1fff, 0, 0}, /* Latin Extended-C: U+2C60–U+2C7F */ { Script_Latin, 0x2c60, 0x2c7f, 0, 0}, + /* Georgian: U+2D00–U+2D2F */ + { Script_Georgian, 0x2d00, 0x2d2f, 0, 0}, /* Cyrillic Extended-A: U+2DE0–U+2DFF */ { Script_Cyrillic, 0x2de0, 0x2dff, 0, 0}, /* Cyrillic Extended-B: U+A640–U+A69F */ @@ -144,6 +148,8 @@ static const scriptData scriptInformation[] = { {LANG_RUSSIAN, 0, 0, 0, 0, RUSSIAN_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {{Script_Armenian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARMENIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, + {{Script_Georgian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_GEORGIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -155,7 +161,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[8].props, &scriptInformation[9].props, &scriptInformation[10].props, &scriptInformation[11].props, &scriptInformation[12].props, &scriptInformation[13].props, - &scriptInformation[14].props + &scriptInformation[14].props, &scriptInformation[15].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index b861c02..6a3cb1b 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -33,6 +33,7 @@ #define Script_Greek 12 #define Script_Cyrillic 13 #define Script_Armenian 14 +#define Script_Georgian 15 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0