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

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

Aug. 24, 2010

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

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_HasBeenModified.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 47e93adc744daf5aa252e34e723f17ac213ad48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e93adc744daf5aa252e34e7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 20 18:29:43 2010 -0400 urlmon/tests: Added tests for IUriBuilder_HasBeenModified. --- dlls/urlmon/tests/uri.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 5 +++ 2 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cadc20a..bff36a3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6297,16 +6297,20 @@ static void test_IUriBuilder(void) { } if(SUCCEEDED(hr)) { DWORD j; + BOOL modified = FALSE, received = FALSE; /* Perform all the string property changes. */ for(j = 0; j < URI_BUILDER_STR_PROPERTY_COUNT; ++j) { uri_builder_property prop = test.properties[j]; - if(prop.change) + if(prop.change) { + modified = TRUE; change_property(builder, &prop, i); + } } if(test.port_prop.change) { hr = IUriBuilder_SetPort(builder, test.port_prop.set, test.port_prop.value); + modified = TRUE; if(test.port_prop.todo) { todo_wine { ok(hr == test.port_prop.expected, @@ -6320,6 +6324,20 @@ static void test_IUriBuilder(void) { } } + hr = IUriBuilder_HasBeenModified(builder, &received); + todo_wine { + ok(hr == S_OK, + "Error IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, i); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(received == modified, + "Error: Expected received to be %d but was %d instead on uri_builder_tests[%d].\n", + modified, received, i); + } + } + /* Test the "Get*" functions. */ test_IUriBuilder_GetFragment(builder, &test, i); test_IUriBuilder_GetHost(builder, &test, i); @@ -6340,6 +6358,57 @@ static void test_IUriBuilder(void) { } } +static void test_IUriBuilder_HasBeenModified(void) { + HRESULT hr; + IUriBuilder *builder = NULL; + + 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)) { + static const WCHAR hostW[] = {'w','i','n','e','h','q','.','c','o','m',0}; + IUri *uri = NULL; + BOOL received; + + hr = IUriBuilder_HasBeenModified(builder, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + + hr = IUriBuilder_SetHost(builder, hostW); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + + hr = IUriBuilder_HasBeenModified(builder, &received); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + if(SUCCEEDED(hr)) + todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + hr = IUriBuilder_SetIUri(builder, uri); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + + hr = IUriBuilder_HasBeenModified(builder, &received); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + if(SUCCEEDED(hr)) + todo_wine { ok(received == FALSE, "Error: Expected received to be FALSE.\n"); } + } + if(uri) IUri_Release(uri); + } + if(builder) IUriBuilder_Release(builder); +} + START_TEST(uri) { HMODULE hurlmon; @@ -6406,4 +6475,7 @@ START_TEST(uri) { trace("test IUriBuilder_GetInvalidArgs...\n"); test_IUriBuilder_GetInvalidArgs(); + + trace("test IUriBuilder_HasBeenModified...\n"); + test_IUriBuilder_HasBeenModified(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3355a97..64a7ef1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4418,6 +4418,11 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr static HRESULT WINAPI UriBuilder_HasBeenModified(IUriBuilder *iface, BOOL *pfModified) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p)\n", This, pfModified); + + if(!pfModified) + return E_POINTER; + FIXME("(%p)->(%p)\n", This, pfModified); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder's IUri property.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 3b383e2175f66a8b095dc3981633b604550cb6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b383e2175f66a8b095dc3981… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Aug 22 15:26:31 2010 -0400 urlmon/tests: Added tests for IUriBuilder's IUri property. --- dlls/urlmon/tests/uri.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 5 +++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index bff36a3..6bb05b7 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6409,6 +6409,49 @@ static void test_IUriBuilder_HasBeenModified(void) { if(builder) IUriBuilder_Release(builder); } +/* Test IUriBuilder {Get,Set}IUri functions. */ +static void test_IUriBuilder_IUriProperty(void) { + IUriBuilder *builder = NULL; + HRESULT hr; + + 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)) { + IUri *uri = NULL; + + hr = IUriBuilder_GetIUri(builder, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + + hr = pCreateUri(http_urlW, 0, 0, &uri); + if(SUCCEEDED(hr)) { + ULONG cur_count, orig_count; + + /* IUriBuilder doesn't clone the IUri, it use the same IUri. */ + orig_count = get_refcnt(uri); + hr = IUriBuilder_SetIUri(builder, uri); + cur_count = get_refcnt(uri); + if(SUCCEEDED(hr)) { + todo_wine { + ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count+1, cur_count); + } + } + + hr = IUriBuilder_SetIUri(builder, NULL); + cur_count = get_refcnt(uri); + if(SUCCEEDED(hr)) { + todo_wine { + ok(cur_count == orig_count, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count, cur_count); + } + } + } + if(uri) IUri_Release(uri); + } + if(builder) IUriBuilder_Release(builder); +} + START_TEST(uri) { HMODULE hurlmon; @@ -6478,4 +6521,7 @@ START_TEST(uri) { trace("test IUriBuilder_HasBeenModified...\n"); test_IUriBuilder_HasBeenModified(); + + trace("test IUriBuilder_IUriProperty...\n"); + test_IUriBuilder_IUriProperty(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 64a7ef1..4a13f33 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4181,6 +4181,11 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, static HRESULT WINAPI UriBuilder_GetIUri(IUriBuilder *iface, IUri **ppIUri) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p)\n", This, ppIUri); + + if(!ppIUri) + return E_POINTER; + FIXME("(%p)->(%p)\n", This, ppIUri); return E_NOTIMPL; }

1 0

Austin English : gdiplus: Add a stub for GdipWindingModeOutline.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

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

Andrew Talbot : cryptnet: Constify a variable.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

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 GdipConvertToEmfPlusToFile.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

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

Anders Jonsson : devenum: Add Swedish translation.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 1ef44dcce7003840ccb6ce4778242d8a0f94ef88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef44dcce7003840ccb6ce477… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Aug 23 21:19:43 2010 +0200 devenum: Add Swedish translation. --- dlls/devenum/Makefile.in | 1 + dlls/devenum/Sv.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index b194a29..a3debed 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -32,6 +32,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sv.rc \ Uk.rc \ devenum.rc diff --git a/dlls/devenum/Sv.rc b/dlls/devenum/Sv.rc new file mode 100644 index 0000000..8c53cf9 --- /dev/null +++ b/dlls/devenum/Sv.rc @@ -0,0 +1,33 @@ +/* + * Resources for Device Enumerator + * + * Copyright 2010 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "devenum_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_DEVENUM_DSDEFAULT "Förvalt DirectSound" + IDS_DEVENUM_DS "DirectSound: %s" + IDS_DEVENUM_WODEFAULT "Förvald WaveOut-enhet" + IDS_DEVENUM_MIDEFAULT "Förvald MidiOut-enhet" +}

1 0

Aric Stewart : usp10: Add Georgian script.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

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

Stefan Leichter : msvideo: Forward MCIWndCreate16 to MCIWndCreateA.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 6894af6fc0232d9ed7b62fa5e83b4dc3e453076b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6894af6fc0232d9ed7b62fa5e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Aug 23 21:33:00 2010 +0200 msvideo: Forward MCIWndCreate16 to MCIWndCreateA. --- dlls/msvideo.dll16/msvideo.dll16.spec | 2 +- dlls/msvideo.dll16/msvideo16.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo.dll16.spec b/dlls/msvideo.dll16/msvideo.dll16.spec index b44fcde..894fc9c 100644 --- a/dlls/msvideo.dll16/msvideo.dll16.spec +++ b/dlls/msvideo.dll16/msvideo.dll16.spec @@ -62,7 +62,7 @@ 244 stub ICSEQCOMPRESSFRAMESTART 245 stub ICSEQCOMPRESSFRAMEEND 246 stub ICSEQCOMPRESSFRAME -250 stub _MCIWNDCREATE +250 cdecl _MCIWndCreate(word word long str) MCIWndCreate16 251 stub _MCIWNDREGISTERCLASS 252 stub GETOPENFILENAMEPREVIEW 253 stub GETSAVEFILENAMEPREVIEW diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index e157808..93724c9 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -30,6 +30,7 @@ #include "winreg.h" #include "winuser.h" #include "wine/winbase16.h" +#include "wownt32.h" #include "vfw16.h" #include "wine/debug.h" @@ -973,3 +974,12 @@ BOOL WINAPI VIDEO_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds, } return TRUE; } + +/*********************************************************************** + * MCIWndCreate(MSVIDEO.250) + */ +HWND16 CDECL MCIWndCreate16(HWND16 hwnd, HINSTANCE16 hinst16, + DWORD style, LPSTR file) +{ + return HWND_16(MCIWndCreateA(HWND_32(hwnd), 0, style, file)); +}

1 0

Aric Stewart : usp10: Add Cyrillic script.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

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