wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Nikolay Sivov : ole32: Fix QueryInterface for file-based ILockBytes.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: 382acd526fd6e226eb2f6afd085454f7f7ae7099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382acd526fd6e226eb2f6afd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 18 10:05:26 2012 +0400 ole32: Fix QueryInterface for file-based ILockBytes. --- dlls/ole32/filelockbytes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index ac0263c..ce74566 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -141,7 +141,7 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN static HRESULT WINAPI FileLockBytesImpl_QueryInterface(ILockBytes *iface, REFIID riid, void **ppvObject) { - if (IsEqualIID(riid, &IID_ILockBytes) || IsEqualIID(riid, &IID_ILockBytes)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ILockBytes)) *ppvObject = iface; else {

1 0

Jacek Caban : winegecko: Added 1.7 release.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: tools Branch: master Commit: 5f7b0d4644d2838993734d0cd7174130412361bf URL: http://source.winehq.org/git/tools.git/?a=commit;h=5f7b0d4644d2838993734d0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 18 12:48:32 2012 +0200 winegecko: Added 1.7 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 20e7434..08262f3 100644 --- a/winegecko.php +++ b/winegecko.php @@ -66,7 +66,9 @@ $aFileSizes = array( '1.5-x86'=>15950848, '1.5-x86_64'=>16345088, '1.6-x86'=>16802816, - '1.6-x86_64'=>17251328 + '1.6-x86_64'=>17251328, + '1.7-x86'=>16995328, + '1.7-x86_64'=>17438720 ); // Exact size of the file:

1 0

André Hentschel : Wine 1.5.9 freigegeben
by Jeremy Newman 18 Jul '12

18 Jul '12

Module: website Branch: master Commit: ee3982da55bc29c8b7976865245182ae258d83d3 URL: http://source.winehq.org/git/website.git/?a=commit;h=ee3982da55bc29c8b79768… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 17 21:19:02 2012 +0200 Wine 1.5.9 freigegeben --- news/de/2012071701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012071701.xml b/news/de/2012071701.xml new file mode 100644 index 0000000..62c07fd --- /dev/null +++ b/news/de/2012071701.xml @@ -0,0 +1,17 @@ +<news> +<date>17. Juli 2012</date> +<title>Wine 1.5.9 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für GPOS Schrifttabellen in Uniscribe.</li> + <li>Unterstützung für XRandr 1.2 und 1.3.</li> + <li>Parser Verbesserungen für den HLSL Compiler.</li> + <li>Mehr Algorithmen für den Schlüsselaustausch unter Mac OS.</li> + <li>Relay tracing unter ARM.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.9.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

Alexandre Julliard : Wine release 1.5.9
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: website Branch: master Commit: 4b47a1e778aa7aa0d699d5d9a2f512568488ee8a URL: http://source.winehq.org/git/website.git/?a=commit;h=4b47a1e778aa7aa0d699d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 20:52:24 2012 +0200 Wine release 1.5.9 --- news/en/2012071701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012071701.xml b/news/en/2012071701.xml new file mode 100644 index 0000000..b1912db --- /dev/null +++ b/news/en/2012071701.xml @@ -0,0 +1,17 @@ +<news> +<date>July 17, 2012</date> +<title>Wine 1.5.9 Released</title> +<body> + The Wine development release 1.5.9 is now available. + <a href="{$root}/announce/1.5.9">What's new</a> in this release: +<ul> + <li>Support for GPOS font tables in Uniscribe.</li> + <li>Support for XRandr 1.2 and 1.3.</li> + <li>Parser improvements for the HLSL compiler.</li> + <li>More key exchange algorithms supported on Mac OS.</li> + <li>Relay tracing on ARM.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.9 : Alexandre Julliard : Release 1.5.9
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: refs/tags/wine-1.5.9 Tag: 06dacaaa564f280bb82add7e6d82390feaa549b9 URL: http://source.winehq.org/git/wine.git/?a=tag;h=06dacaaa564f280bb82add7e6d82… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 20:41:30 2012 +0200 Release 1.5.9

1 0

Alexandre Julliard : Release 1.5.9.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: e7389d875d8204f51c48b12f59b6714ef94b845a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7389d875d8204f51c48b12f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 20:41:28 2012 +0200 Release 1.5.9. --- ANNOUNCE | 902 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 403 insertions(+), 519 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7389d875d8204f51c48b…

1 0

Francois Gouget : mshtml: Avoid returning with an unset URL policy in error cases.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f93ca73e61e0212f7023376e48458cb8dee9c593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93ca73e61e0212f7023376e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 17 14:42:18 2012 +0200 mshtml: Avoid returning with an unset URL policy in error cases. --- dlls/mshtml/secmgr.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index ff349ac..f961bca 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -104,9 +105,7 @@ static HRESULT confirm_safety_load(HTMLDocumentNode *This, struct CONFIRMSAFETY CATID init_catid = CATID_SafeForInitializing; hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &init_catid, 0, NULL); - if(FAILED(hres)) - return hres; - + assert(SUCCEEDED(hres)); *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; }

1 0

Alexandre Julliard : user32/tests: Move DlgDirList tests to avoid changing the current directory for other tests .
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: d8c90fa40b0bf08a9f0789dff34eb632a7482de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c90fa40b0bf08a9f0789dff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 14:50:47 2012 +0200 user32/tests: Move DlgDirList tests to avoid changing the current directory for other tests. --- dlls/user32/tests/listbox.c | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 4be7604..ef4a35b 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1335,28 +1335,6 @@ static void test_listbox_dlgdir(void) ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); - /* Test behavior when loading folders from root with and without wildcard */ - strcpy(pathBuffer, "C:\\"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, - "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); - - strcpy(pathBuffer, "C:\\*"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); - ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, - "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); - - /* Try loading files from an invalid folder */ - SetLastError(0xdeadbeef); - strcpy(pathBuffer, "C:\\INVALID$$DIR"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, - "GetLastError should return 0x589, got 0x%X\n",GetLastError()); - - /* Now test DlgDirSelectEx() in normal operation */ /* Fill with everything - drives, directory and all plain files. */ strcpy(pathBuffer, "*"); @@ -1433,6 +1411,8 @@ static void test_listbox_dlgdir(void) } } + DeleteFileA( "wtest1.tmp.c" ); + /* Now test DlgDirSelectEx() in abnormal operation */ /* Fill list with bogus entries, that look somewhat valid */ SendMessage(g_listBox, LB_RESETCONTENT, 0, 0); @@ -1493,9 +1473,29 @@ static void test_listbox_dlgdir(void) ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); } } - DestroyWindow(hWnd); - DeleteFileA( "wtest1.tmp.c" ); + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + + DestroyWindow(hWnd); } START_TEST(listbox)

1 0

Alex Henrie : user32: Minimize and maximize boxes can only appear when WS_SYSMENU is set.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: c412d6f521e6d5f3cc28de677fc61c00a7a875ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c412d6f521e6d5f3cc28de677… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 10 18:06:06 2012 -0600 user32: Minimize and maximize boxes can only appear when WS_SYSMENU is set. --- dlls/user32/nonclient.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 08ce674..bc7fcc0 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -576,8 +576,7 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) rect.top += GetSystemMetrics(SM_CYCAPTION) - 1; if (!PtInRect( &rect, pt )) { - BOOL min_or_max_box = (style & WS_MAXIMIZEBOX) || - (style & WS_MINIMIZEBOX); + BOOL min_or_max_box = (style & WS_SYSMENU) && (style & (WS_MINIMIZEBOX|WS_MAXIMIZEBOX)); if (ex_style & WS_EX_LAYOUTRTL) { /* Check system menu */

1 0

Aric Stewart : usp10: Implement GPOS Coverage-based Chaining Context Glyph Positioning.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 6ae4cfe973612550e923899bb462133722ced3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae4cfe973612550e923899bb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 17 07:21:37 2012 -0500 usp10: Implement GPOS Coverage-based Chaining Context Glyph Positioning. --- dlls/usp10/opentype.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index fcdc9a4..cc57f65 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -388,6 +388,32 @@ typedef struct { GPOS_MarkRecord MarkRecord[1]; } GPOS_MarkArray; +typedef struct { + WORD SequenceIndex; + WORD LookupListIndex; +} GPOS_PosLookupRecord; + +typedef struct { + WORD PosFormat; + WORD BacktrackGlyphCount; + WORD Coverage[1]; +} GPOS_ChainContextPosFormat3_1; + +typedef struct { + WORD InputGlyphCount; + WORD Coverage[1]; +} GPOS_ChainContextPosFormat3_2; + +typedef struct { + WORD LookaheadGlyphCount; + WORD Coverage[1]; +} GPOS_ChainContextPosFormat3_3; + +typedef struct { + WORD PosCount; + GPOS_PosLookupRecord PosLookupRecord[1]; +} GPOS_ChainContextPosFormat3_4; + /********** * CMAP **********/ @@ -974,6 +1000,8 @@ INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, IN /********** * GPOS **********/ +static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset); + static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD ppem) { static const WORD mask[3] = {3,0xf,0xff}; @@ -1259,6 +1287,99 @@ static VOID GPOS_apply_MarkToBase(const OT_LookupTable *look, const WORD *glyphs } } +static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, GOFFSET *pGoffset) +{ + int j; + + TRACE("Chaining Contextual Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GPOS_ChainContextPosFormat3_1 *ccpf3; + int dirLookahead = write_dir; + int dirBacktrack = -1 * write_dir; + + offset = GET_BE_WORD(look->SubTable[j]); + ccpf3 = (const GPOS_ChainContextPosFormat3_1*)((const BYTE*)look+offset); + + if (GET_BE_WORD(ccpf3->PosFormat) == 1) + { + FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); + continue; + } + else if (GET_BE_WORD(ccpf3->PosFormat) == 2) + { + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); + continue; + } + else if (GET_BE_WORD(ccpf3->PosFormat) == 3) + { + int k; + int indexGlyphs; + const GPOS_ChainContextPosFormat3_2 *ccpf3_2; + const GPOS_ChainContextPosFormat3_3 *ccpf3_3; + const GPOS_ChainContextPosFormat3_4 *ccpf3_4; + + TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Positioning)\n"); + + for (k = 0; k < GET_BE_WORD(ccpf3->BacktrackGlyphCount); k++) + { + offset = GET_BE_WORD(ccpf3->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccpf3+offset, glyphs[glyph_index + (dirBacktrack * (k+1))]) == -1) + break; + } + if (k != GET_BE_WORD(ccpf3->BacktrackGlyphCount)) + continue; + TRACE("Matched Backtrack\n"); + + ccpf3_2 = (const GPOS_ChainContextPosFormat3_2*)(((LPBYTE)ccpf3)+sizeof(GPOS_ChainContextPosFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccpf3->BacktrackGlyphCount)-1))); + + indexGlyphs = GET_BE_WORD(ccpf3_2->InputGlyphCount); + for (k = 0; k < indexGlyphs; k++) + { + offset = GET_BE_WORD(ccpf3_2->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccpf3+offset, glyphs[glyph_index + (write_dir * k)]) == -1) + break; + } + if (k != indexGlyphs) + continue; + TRACE("Matched IndexGlyphs\n"); + + ccpf3_3 = (const GPOS_ChainContextPosFormat3_3*)(((LPBYTE)ccpf3_2)+sizeof(GPOS_ChainContextPosFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_2->InputGlyphCount)-1))); + + for (k = 0; k < GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); k++) + { + offset = GET_BE_WORD(ccpf3_3->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccpf3+offset, glyphs[glyph_index + (dirLookahead * (indexGlyphs + k))]) == -1) + break; + } + if (k != GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)) + continue; + TRACE("Matched LookAhead\n"); + + ccpf3_4 = (const GPOS_ChainContextPosFormat3_4*)(((LPBYTE)ccpf3_3)+sizeof(GPOS_ChainContextPosFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)-1))); + + if (GET_BE_WORD(ccpf3_4->PosCount)) + { + for (k = 0; k < GET_BE_WORD(ccpf3_4->PosCount); k++) + { + int lookupIndex = GET_BE_WORD(ccpf3_4->PosLookupRecord[k].LookupListIndex); + int SequenceIndex = GET_BE_WORD(ccpf3_4->PosLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("Position: %i -> %i %i\n",k, SequenceIndex, lookupIndex); + GPOS_apply_lookup(lpotm, lplogfont, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count, pGoffset); + } + return glyph_index + indexGlyphs + GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); + } + else return glyph_index + 1; + } + else + FIXME("Unhandled Chaining Contextual Positioning Format %i\n",GET_BE_WORD(ccpf3->PosFormat)); + } + return glyph_index + 1; +} + static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset) { int offset; @@ -1334,6 +1455,10 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I } break; } + case 8: + { + return GPOS_apply_ChainContextPos(lpotm, lplogfont, piAdvance, lookup, look, glyphs, glyph_index, write_dir, glyph_count, ppem, pGoffset); + } default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); }

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
72
Older →

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 July 2012