wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Thomas Faber : shell32/tests: Remove a misleading test.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 9551179c0b94a8eb4b33d36e5aaf42a998b4b085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9551179c0b94a8eb4b33d36e5… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jun 29 16:09:09 2015 -0400 shell32/tests: Remove a misleading test. --- dlls/shell32/tests/shlview.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index af57e60..eafaec5 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -694,7 +694,6 @@ static void test_IFolderView(void) HRESULT hr; INT ret, count; POINT pt; - LONG ref1, ref2; RECT r; hr = SHGetDesktopFolder(&desktop); @@ -822,14 +821,8 @@ if (0) hr = IFolderView_GetFolder(fv, &IID_IShellFolder, NULL); ok(hr == E_POINTER, "got (0x%08x)\n", hr); - ref1 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); hr = IFolderView_GetFolder(fv, &IID_IShellFolder, (void**)&folder); ok(hr == S_OK, "got (0x%08x)\n", hr); - ref2 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); - ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ - "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); if (folder) IShellFolder_Release(folder);

1 0

Thomas Faber : shell32: Use QueryInterface in FolderView_GetFolder.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: e582495927c253ddb5b6e5b01d3cf845207bdc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e582495927c253ddb5b6e5b01… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jun 29 15:39:25 2015 -0400 shell32: Use QueryInterface in FolderView_GetFolder. test_IFolderView has a test that shows that the shell folder's reference count before and after the call to IFolderView_GetFolder is the same. However this is misleading because it is not a property of the IFolderView_GetFolder method, but of the desktop shell folder object that's used in the folder view. Windows <=2003 uses a cached object and its AddRef/Release methods return constants. --- dlls/shell32/pidl.c | 1 + dlls/shell32/shlview.c | 10 +--------- dlls/shell32/tests/ebrowser.c | 2 +- dlls/shell32/tests/shlview.c | 6 ++++++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index d16ca57..1856c12 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1477,6 +1477,7 @@ HRESULT WINAPI SHGetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl) { /* We might be able to get IPersistFolder2 from a shellfolder. */ ret = SHGetIDListFromObject((IUnknown*)psf, ppidl); + IShellFolder_Release(psf); } IFolderView_Release(pfv); return ret; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index e6691f8..b763468 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2713,15 +2713,7 @@ static HRESULT WINAPI FolderView_GetFolder(IFolderView2 *iface, REFIID riid, voi TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - if (!ppv) return E_POINTER; - - if (IsEqualIID(riid, &IID_IShellFolder)) - { - *ppv = This->pSFParent; - return S_OK; - } - - return E_NOINTERFACE; + return IShellFolder_QueryInterface(This->pSFParent, riid, ppv); } static HRESULT WINAPI FolderView_Item(IFolderView2 *iface, int index, PITEMID_CHILD *ppidl) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 4c255a1..c9d81a4 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1469,7 +1469,7 @@ static void test_navigation(void) test_browse_pidl_sb(peb2, &ebev, pidl_relative, SBSP_RELATIVE, S_OK, 1, 1, 0, 1); ILFree(pidl_relative); - /* IShellFolder_Release(psf); */ + IShellFolder_Release(psf); IFolderView_Release(pfv); } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6525dd2..af57e60 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -688,6 +688,7 @@ static void test_IFolderView(void) IShellBrowser *browser; IFolderView2 *fv2; IFolderView *fv; + IUnknown *unk; HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; @@ -830,6 +831,11 @@ if (0) ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); + if (folder) IShellFolder_Release(folder); + + hr = IFolderView_GetFolder(fv, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if (unk) IUnknown_Release(unk); hr = IFolderView_QueryInterface(fv, &IID_IFolderView2, (void**)&fv2); if (hr != S_OK)

1 0

Thomas Faber : shell32: Add missing parameter check in ISF_Desktop_fnQueryInterface.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: c0cd954f98545ff21e68abdfd7b4fdaf17c17005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cd954f98545ff21e68abdfd… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jun 27 06:40:11 2015 -0400 shell32: Add missing parameter check in ISF_Desktop_fnQueryInterface. --- dlls/shell32/shfldr_desktop.c | 2 ++ dlls/shell32/tests/shfldr_special.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 4aa1dcf..40cd752 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -106,6 +106,8 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + if (!ppvObj) return E_POINTER; + *ppvObj = NULL; if (IsEqualIID (riid, &IID_IUnknown) || diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 8f97347..6d61220 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -224,9 +224,24 @@ if (0) CoUninitialize(); } +static void test_desktop_folder(void) +{ + IShellFolder *psf; + HRESULT hr; + + hr = SHGetDesktopFolder(&psf); + ok(hr == S_OK, "Got %x\n", hr); + + hr = IShellFolder_QueryInterface(psf, &IID_IShellFolder, NULL); + ok(hr == E_POINTER, "Got %x\n", hr); + + IShellFolder_Release(psf); +} + START_TEST(shfldr_special) { test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder(); + test_desktop_folder(); }

1 0

Nikolay Sivov : gdi32: Clarify offsets and sizes in vdmx table lookup code.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: d5c9a8a57adcba58b3418156f267e64bc6ffbc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c9a8a57adcba58b3418156f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 21:32:07 2015 +0300 gdi32: Clarify offsets and sizes in vdmx table lookup code. --- dlls/gdi32/freetype.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 07d80a2..73824ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4463,6 +4463,12 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') typedef struct { + WORD version; + WORD numRecs; + WORD numRatios; +} VDMX_Header; + +typedef struct { BYTE bCharSet; BYTE xRatio; BYTE yStartRatio; @@ -4475,9 +4481,15 @@ typedef struct { BYTE endsz; } VDMX_group; +typedef struct { + WORD yPelHeight; + WORD yMax; + WORD yMin; +} VDMX_vTable; + static LONG load_VDMX(GdiFont *font, LONG height) { - WORD hdr[3]; + VDMX_Header hdr; VDMX_group group; BYTE devXRatio, devYRatio; USHORT numRecs, numRatios; @@ -4485,7 +4497,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - result = get_font_data(font, MS_VDMX_TAG, 0, hdr, sizeof(hdr)); + result = get_font_data(font, MS_VDMX_TAG, 0, &hdr, sizeof(hdr)); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ return ppem; @@ -4494,14 +4506,14 @@ static LONG load_VDMX(GdiFont *font, LONG height) devXRatio = 1; devYRatio = 1; - numRecs = GET_BE_WORD(hdr[1]); - numRatios = GET_BE_WORD(hdr[2]); + numRecs = GET_BE_WORD(hdr.numRecs); + numRatios = GET_BE_WORD(hdr.numRatios); - TRACE("numRecs = %d numRatios = %d\n", numRecs, numRatios); + TRACE("version = %d numRecs = %d numRatios = %d\n", GET_BE_WORD(hdr.version), numRecs, numRatios); for(i = 0; i < numRatios; i++) { Ratios ratio; - offset = (3 * 2) + (i * sizeof(Ratios)); + offset = sizeof(hdr) + (i * sizeof(Ratios)); get_font_data(font, MS_VDMX_TAG, offset, &ratio, sizeof(Ratios)); offset = -1; @@ -4516,11 +4528,11 @@ static LONG load_VDMX(GdiFont *font, LONG height) devYRatio >= ratio.yStartRatio && devYRatio <= ratio.yEndRatio)) { - WORD tmp; + WORD group_offset; - offset = (3 * 2) + (numRatios * 4) + (i * 2); - get_font_data(font, MS_VDMX_TAG, offset, &tmp, sizeof(tmp)); - offset = GET_BE_WORD(tmp); + offset = sizeof(hdr) + numRatios * sizeof(ratio) + i * sizeof(group_offset); + get_font_data(font, MS_VDMX_TAG, offset, &group_offset, sizeof(group_offset)); + offset = GET_BE_WORD(group_offset); break; } } @@ -4538,8 +4550,8 @@ static LONG load_VDMX(GdiFont *font, LONG height) TRACE("recs=%d startsz=%d endsz=%d\n", recs, startsz, endsz); - vTable = HeapAlloc(GetProcessHeap(), 0, recs * 6); - result = get_font_data(font, MS_VDMX_TAG, offset + 4, vTable, recs * 6); + vTable = HeapAlloc(GetProcessHeap(), 0, recs * sizeof(VDMX_vTable)); + result = get_font_data(font, MS_VDMX_TAG, offset + sizeof(group), vTable, recs * sizeof(VDMX_vTable)); if(result == GDI_ERROR) { FIXME("Failed to retrieve vTable\n"); goto end;

1 0

André Hentschel : Improve WWN 392
by Jeremy Newman 29 Jun '15

29 Jun '15

Module: website Branch: master Commit: 6200bb142ff0a8fa69cad3b6e051c932c0a0a0c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=6200bb142ff0a8fa69cad3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 29 19:24:34 2015 +0200 Improve WWN 392 --- wwn/en/wn20150607_392.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index 495e69a..3741114 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -79,7 +79,7 @@ We have four projects which are already in the coding period: At the moment wine's implementation of this API is mostly full of stubs, and there's quite a bit of work left before something can be drawn on the screen. My role here mainly focuses on implementing object Creation/Initialization functions for some of the main interfaces, mainly devices, textures and viewports, all of which are COM based. If time permits, I will also work on implementing some frequently used frames and lighting functions. The API is quite old (it has been removed since DX 8 SDK, and the dll doesn't come included with vista onwards) but there are a few popular games that used it. Namely, Lego Rock Raiders and Steel Beasts, and applications as well, like FMS (Flying Model Simulator). So there is some merit in working on this. Implementing these functions will help accelerate further development of this API to get some long-awaited apps to run on wine (I can see quite a few threads on google of people trying to get FMS running, and a couple for LRR too, so there is some demand for it). As an added bonus, I also get to interact with wine's ddraw implementation for this one, which could potentially help ddraw's implementation via possible bug detection/fixes and implementing any ddraw functionality that d3drm requires. TL;DR: I'm implementing a main chunk of a graphics API called Direct3D Retained Mode, which is based on Direct3D Immediate Mode. The API is mostly a stub in wine and this project should help get things going. -[1] - https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575… +[1] - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…">https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…</a> </blockquote> Implement the Visual C++ iostream library - @@ -95,10 +95,10 @@ We have four projects which are already in the coding period: <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/yonghao…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107628.html">by YongHao Hu</a> <blockquote> -My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. +My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. Though there are many methods to implement the functions like _File_size and _Equivalent etc, the hard part is finding the most appropriate one. New applications like MSVC12[1] would benefit from this. -[1]: //bugs.winehq.org/show_bug.cgi?id=35774 +[1]: <a href="//bugs.winehq.org/show_bug.cgi?id=35774">bugs.winehq.org/show_bug.cgi?id=35774</a> </blockquote> Improve mshtml.dll - @@ -119,9 +119,9 @@ I can't tell how many applications' status on appdb will change from "garbage" to "silver/gold", but IMHO, implementing XMLHttpRequest is necessary to make wine IE more usable. -[0]: http://en.wikipedia.org/wiki/XMLHttpRequest -[1]: https://getfirebug.com/firebuglite -[2]: https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest +[0]: <a href="http://en.wikipedia.org/wiki/XMLHttpRequest">http://en.wikipedia.org/wiki/XMLHttpRequest</a> +[1]: <a href="https://getfirebug.com/firebuglite">https://getfirebug.com/firebuglite</a> +[2]: <a href="https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest">https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest</a> </blockquote> ]]> </section> @@ -180,7 +180,8 @@ SourceForge. The main uses for SourceForge is for mirroring tarballs, wine-gecko/wine-mono installers, and the wine-gecko git repository. -[1] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… +[1] <a href="http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin…"> +http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijacking-gimp-photo-editor-company-claims-project-was-abandoned</a> </blockquote>

1 0

Julian Rüger : German translation for release 1.7.46
by Jeremy Newman 29 Jun '15

29 Jun '15

Module: website Branch: master Commit: 100c8bc59b466bde451e2f85acc3ed81aea6a351 URL: http://source.winehq.org/git/website.git/?a=commit;h=100c8bc59b466bde451e2f… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jun 29 17:10:14 2015 +0200 German translation for release 1.7.46 --- news/de/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015062601.xml b/news/de/2015062601.xml new file mode 100644 index 0000000..2f4a77e --- /dev/null +++ b/news/de/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>26. Juni 2015</date> +<title>Wine 1.7.46 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.46 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.46">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserungen am BITS-Dateitransferdienst.</li> + <li>Weitere Fortschritte der DirectWrite-Implementierung.</li> + <li>Unterstützung für gemeinsam verwendete Benutzerdaten unter 64-Bit.</li> + <li>Diverse Verbesserungen der C++-Laufzeit.</li> + <li>Ein wenig mehr Unterstützung der 64-Bit ARM-Plattform.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.46
by Jeremy Newman 29 Jun '15

29 Jun '15

Module: website Branch: master Commit: 46458045a2b872dd29a73f99ca221f9e2dea8096 URL: http://source.winehq.org/git/website.git/?a=commit;h=46458045a2b872dd29a73f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 27 07:14:35 2015 +0200 Polish translation for release 1.7.46 --- news/pl/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015062601.xml b/news/pl/2015062601.xml new file mode 100644 index 0000000..a92c078 --- /dev/null +++ b/news/pl/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>Czerwiec 26, 2015</date> +<title>Wydano Wine 1.7.46</title> +<body> + Wydanie rozwojowe Wine 1.7.46 jest już dostępne. + <a href="{$root}/announce/1.7.46">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszenia w usłudze przesyłania plików BITS.</li> + <li>Postęp w implementacji DirectWrite.</li> + <li>Wsparcie dla współdzielonych danych użytkownika na 64-bitach.</li> + <li>Rozmaite ulepszenia w bibliotece uruchomieniowej C++.</li> + <li>Większe wsparcie na platformie 64-bitowej ARM.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Thomas Faber : shell32/tests: Do not leak shell folder references.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 9353a36d8fc8bb400bc2227914db0f2e60a19c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9353a36d8fc8bb400bc222791… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jun 26 20:43:22 2015 +0200 shell32/tests: Do not leak shell folder references. --- dlls/shell32/tests/shfldr_special.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index cfb31be..8f97347 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -77,6 +77,7 @@ static void test_parse_for_entire_network(void) attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); + IShellFolder_Release(psfDesktop); if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) @@ -125,6 +126,7 @@ static void test_parse_for_control_panel(void) "Unexpected attributes : %08x\n", attr); ILFree(pidl); + IShellFolder_Release(psfDesktop); } static void test_printers_folder(void)

1 0

Jacek Caban : vbscript: Treat empty regexp pattern the same way as NULL pattern.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 392736c5e8f7b5b23240cbe48879a168550c3d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392736c5e8f7b5b23240cbe48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 11:55:56 2015 +0200 vbscript: Treat empty regexp pattern the same way as NULL pattern. --- dlls/vbscript/tests/regexp.vbs | 17 +++++++++++++++++ dlls/vbscript/vbregexp.c | 28 +++++++++++----------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/tests/regexp.vbs b/dlls/vbscript/tests/regexp.vbs index 0354fb7..834be21 100644 --- a/dlls/vbscript/tests/regexp.vbs +++ b/dlls/vbscript/tests/regexp.vbs @@ -174,4 +174,21 @@ Call ok(x.IgnoreCase = false, "RegExp.IgnoreCase = " & x.IgnoreCase) Call ok(x.Global = false, "RegExp.Global = " & x.Global) Call ok(x.Multiline = false, "RegExp.Multiline = " & x.Multiline) +set matches = x.execute("test") +Call ok(matches.Count = 1, "matches.Count = " & matches.Count) +x.pattern = "" +set matches = x.execute("test") +Call ok(matches.Count = 1, "matches.Count = " & matches.Count) +set match = matches.item(0) +Call ok(match.Value = "", "match.Value = " & match.Value) +x.global = true +set matches = x.execute("test") +Call ok(matches.Count = 5, "matches.Count = " & matches.Count) +set match = matches.item(0) +Call ok(match.Value = "", "match.Value = " & match.Value) +set match = matches.item(4) +Call ok(match.Value = "", "match.Value = " & match.Value) +matches = x.test("test") +Call ok(matches = true, "matches = " & matches) + Call reportSuccess() diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 0a399b9..800ea5e 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1189,29 +1189,23 @@ static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern) { RegExp2 *This = impl_from_IRegExp2(iface); - WCHAR *p; - DWORD size; + WCHAR *new_pattern; TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(pattern)); - if(!pattern) { - heap_free(This->pattern); - if(This->regexp) { - regexp_destroy(This->regexp); - This->regexp = NULL; - } - This->pattern = NULL; - return S_OK; + if(pattern && *pattern) { + SIZE_T size = (SysStringLen(pattern)+1) * sizeof(WCHAR); + new_pattern = heap_alloc(size); + if(!new_pattern) + return E_OUTOFMEMORY; + memcpy(new_pattern, pattern, size); + }else { + new_pattern = NULL; } - size = (SysStringLen(pattern)+1) * sizeof(WCHAR); - p = heap_alloc(size); - if(!p) - return E_OUTOFMEMORY; - heap_free(This->pattern); - This->pattern = p; - memcpy(p, pattern, size); + This->pattern = new_pattern; + if(This->regexp) { regexp_destroy(This->regexp); This->regexp = NULL;

1 0

Nikolay Sivov : dwrite: Always set canWrapLineAfter for last cluster.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: e27a13e3a2b92f9d8103ea202c5f15f57c2ceefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27a13e3a2b92f9d8103ea202… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 12:52:38 2015 +0300 dwrite: Always set canWrapLineAfter for last cluster. --- dlls/dwrite/layout.c | 5 ++++- dlls/dwrite/tests/layout.c | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3863e5c..752bd50 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -825,8 +825,11 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) break; } - if (hr == S_OK) + if (hr == S_OK) { layout->cluster_count = cluster; + if (cluster) + layout->clustermetrics[cluster-1].canWrapLineAfter = TRUE; + } IDWriteTextAnalyzer_Release(analyzer); return hr; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c7ca5b7..43233f4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1659,7 +1659,6 @@ todo_wine ok(metrics[2].width > 0.0, "got %.2f\n", metrics[2].width); ok(metrics[2].length == 1, "got %d\n", metrics[2].length); -todo_wine ok(metrics[2].canWrapLineAfter == 1, "got %d\n", metrics[2].canWrapLineAfter); ok(metrics[2].isWhitespace == 0, "got %d\n", metrics[2].isWhitespace); ok(metrics[2].isNewline == 0, "got %d\n", metrics[2].isNewline); @@ -1686,7 +1685,6 @@ todo_wine /* object sets a width to 123.0, but returns failure from GetMetrics() */ ok(metrics[0].width == 0.0, "got %.2f\n", metrics[0].width); ok(metrics[0].length == 4, "got %d\n", metrics[0].length); -todo_wine ok(metrics[0].canWrapLineAfter == 1, "got %d\n", metrics[0].canWrapLineAfter); ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); @@ -1715,7 +1713,6 @@ todo_wine ok(metrics[1].width == 0.0, "got %.2f\n", metrics[1].width); ok(metrics[1].length == 2, "got %d\n", metrics[1].length); -todo_wine ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); ok(metrics[1].isWhitespace == 0, "got %d\n", metrics[1].isWhitespace); ok(metrics[1].isNewline == 0, "got %d\n", metrics[1].isNewline); @@ -1763,7 +1760,6 @@ todo_wine hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 2, &count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 1, "got %u\n", count); -todo_wine ok(metrics[0].canWrapLineAfter == 1, "got %d\n", metrics[0].canWrapLineAfter); IDWriteTextLayout_Release(layout);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015