April 2009 - Wine-commits - list.winehq.org

Tobias Jakobi : wined3d: Add newline to fixme.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 9657e81429bed75c7b09291fc752a88d7d3a3245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9657e81429bed75c7b09291fc… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Fri Apr 10 16:17:55 2009 +0200 wined3d: Add newline to fixme. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5cea411..7e2b234 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -673,7 +673,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if(shader_is_pshader_version(ins->reg_maps->shader_version)) { const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; if(ps->cur_args->texrect_fixup & (1 << sampler_idx)) { - FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead)."); + FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); } } break;

1 0

Maik Schulz : german translation patch for 1.1.19 release news
by Jeremy Newman 14 Apr '09

14 Apr '09

Module: website Branch: master Commit: b5ac3ec033e5f88950ea5d5a30af6c3ef2021bde URL: http://source.winehq.org/git/website.git/?a=commit;h=b5ac3ec033e5f88950ea5d… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Fri Apr 10 18:22:08 2009 +0200 german translation patch for 1.1.19 release news Cheers, -Maik >From 1a791f2b000cd7ac93ad95df1903f02ce01f7ba6 Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Fri, 10 Apr 2009 18:20:25 +0200 Subject: german translation for release 1.1.19 news item --- news/de/2009041001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2009041001.xml b/news/de/2009041001.xml new file mode 100644 index 0000000..8647311 --- /dev/null +++ b/news/de/2009041001.xml @@ -0,0 +1,17 @@ +<news> +<date>10. April 2009</date> +<title>Wine 1.1.19 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Visual C++ Projektdateien in winemaker.</li> + <li>Verbesserungen am Esound Treiber.</li> + <li>Viele Aufräumarbeiten am Direct3D Quellcode.</li> + <li>Fehlerbehebungen an der OLE Zwischenablage.</li> + <li>Kompilierung unter OpenBSD funktioniert jetzt.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.19.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.19
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: website Branch: master Commit: f38ed7385e4cff6955c656256b82387dde6580d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=f38ed7385e4cff6955c656… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 17:52:15 2009 +0200 Wine release 1.1.19 --- news/en/2009041001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009041001.xml b/news/en/2009041001.xml new file mode 100644 index 0000000..010f6a6 --- /dev/null +++ b/news/en/2009041001.xml @@ -0,0 +1,17 @@ +<news> +<date>April 10, 2009</date> +<title>Wine 1.1.19 Released</title> +<body> + The Wine development release 1.1.19 is now available. + <a href="{$root}/announce/1.1.19">What's new</a> in this release: +<ul> + <li>Support for Visual C++ project files in winemaker.</li> + <li>Improvements to the Esound driver.</li> + <li>Many Direct3D code cleanups.</li> + <li>Fixes to OLE clipboard handling.</li> + <li>OpenBSD compilation fixed.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.19.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

Alexandre Julliard : Release 1.1.19.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: f43762f6f8f1588abd67ce1a576d98ec40c005ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43762f6f8f1588abd67ce1a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 17:45:51 2009 +0200 Release 1.1.19. --- ANNOUNCE | 816 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 469 insertions(+), 367 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f43762f6f8f1588abd67c…

1 0

Tag wine-1.1.19 : Alexandre Julliard : Release 1.1.19
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: refs/tags/wine-1.1.19 Tag: c965be17970bfc840cd94ff6644ef96a774a07db URL: http://source.winehq.org/git/wine.git/?a=tag;h=c965be17970bfc840cd94ff6644e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 17:45:51 2009 +0200 Release 1.1.19

1 0

Hans Leidekker : wine.inf: Register msctf classes.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 8320686fb2f05bc32955372a3b92b54ae6a3c459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8320686fb2f05bc32955372a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:24:06 2009 +0200 wine.inf: Register msctf classes. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1f423a2..0c3a5cc 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2397,6 +2397,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,itss.dll,1 11,,jscript.dll,1 11,,mlang.dll,1 +11,,msctf.dll,1 11,,mshtml.dll,1 11,,msi.dll,1 11,,msiexec.exe,1

1 0

Nikolay Sivov : comctl32/updown: Allow ranges with max < min for Up/ Down control.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: b2917cf59894cb2f92ad8e69c1e6bc2038bc5e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2917cf59894cb2f92ad8e69c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 10 04:52:27 2009 -0400 comctl32/updown: Allow ranges with max < min for Up/Down control. --- dlls/comctl32/updown.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index d0bc27c..a4b9271 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -470,6 +470,27 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) } /*********************************************************************** + * UPDOWN_SetRange + * + * Handle UDM_SETRANGE, UDM_SETRANGE32 + * + * FIXME: handle Max == Min properly: + * - arrows should be disabled (without WS_DISABLED set), + * visually they can't be pressed and don't respond; + * - all input messages should still pass in. + */ +static LRESULT UPDOWN_SetRange(UPDOWN_INFO *infoPtr, INT Max, INT Min) +{ + infoPtr->MaxVal = Max; + infoPtr->MinVal = Min; + + TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n", + infoPtr->MinVal, infoPtr->MaxVal, infoPtr->Self); + + return 0; +} + +/*********************************************************************** * UPDOWN_MouseWheel * * Handle mouse wheel scrolling @@ -1045,12 +1066,11 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal); case UDM_SETRANGE: - /* we must have: */ - infoPtr->MaxVal = (short)(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */ - infoPtr->MinVal = (short)HIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */ - /* |Max-Min| <= UD_MAXVAL */ - TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n", - infoPtr->MinVal, infoPtr->MaxVal, hwnd); + /* we must have: + UD_MINVAL <= Max <= UD_MAXVAL + UD_MINVAL <= Min <= UD_MAXVAL + |Max-Min| <= UD_MAXVAL */ + UPDOWN_SetRange(infoPtr, (short)lParam, (short)HIWORD(lParam)); break; case UDM_GETRANGE32: @@ -1059,12 +1079,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case UDM_SETRANGE32: - infoPtr->MinVal = (INT)wParam; - infoPtr->MaxVal = (INT)lParam; - if (infoPtr->MaxVal <= infoPtr->MinVal) - infoPtr->MaxVal = infoPtr->MinVal + 1; - TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n", - infoPtr->MinVal, infoPtr->MaxVal, hwnd); + UPDOWN_SetRange(infoPtr, (INT)lParam, (INT)wParam); break; case UDM_GETPOS32:

1 0

Paul Vriens : usp10/tests: Fix some test failures on Vista and W2K8 ( ScriptShape).
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 277a84a989764ae4668a6f398295637aad24f148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277a84a989764ae4668a6f398… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 10 09:48:22 2009 +0200 usp10/tests: Fix some test failures on Vista and W2K8 (ScriptShape). --- dlls/usp10/tests/usp10.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c8bb551..6c33b0f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -40,7 +40,7 @@ static void test_ScriptShape(HDC hdc) BOOL ret; HRESULT hr; SCRIPT_CACHE sc = NULL; - WORD glyphs[4]; + WORD glyphs[4], logclust[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; int nb, widths[4]; @@ -65,10 +65,16 @@ static void test_ScriptShape(HDC hdc) ok(hr == E_PENDING, "ScriptShape should return E_PENDING not %08x\n", hr); hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); + ok(!hr || + hr == E_INVALIDARG, /* Vista, W2K8 */ + "ScriptShape should return S_OK or E_INVALIDARG, not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); - hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); + hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL);

1 0

Paul Vriens : usp10/tests: Fix some test failures on Vista and W2K8 ( ScriptPlace).
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: a12cc39ca3d6ebbf4c21be0ecb5a7849e211dddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a12cc39ca3d6ebbf4c21be0ec… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 10 09:51:32 2009 +0200 usp10/tests: Fix some test failures on Vista and W2K8 (ScriptPlace). --- dlls/usp10/tests/usp10.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6c33b0f..d485fc8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -44,6 +44,8 @@ static void test_ScriptShape(HDC hdc) SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; int nb, widths[4]; + GOFFSET offset[4]; + ABC abc[4]; hr = ScriptItemize(NULL, 4, 2, NULL, NULL, items, NULL); ok(hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG not %08x\n", hr); @@ -81,9 +83,19 @@ static void test_ScriptShape(HDC hdc) ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); + ok(hr == E_PENDING || + hr == E_INVALIDARG, /* Vista, W2K8 */ + "ScriptPlace should return E_PENDING or E_INVALIDARG, not %08x\n", hr); + + hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, offset, NULL); ok(hr == E_PENDING, "ScriptPlace should return E_PENDING not %08x\n", hr); - hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); + hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, abc); + ok(hr == E_PENDING || + hr == E_INVALIDARG, /* Vista, W2K8 */ + "ScriptPlace should return E_PENDING or E_INVALIDARG, not %08x\n", hr); + + hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, offset, NULL); ok(!hr, "ScriptPlace should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n");

1 0

Stefan Dösinger : wined3d: Deal with reserved shader constants in the backend.
by Alexandre Julliard 10 Apr '09

10 Apr '09

Module: wine Branch: master Commit: 754b5cf2adc73a917d7d60c35d5cad5897a5e92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=754b5cf2adc73a917d7d60c35… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 22 12:24:28 2009 +0100 wined3d: Deal with reserved shader constants in the backend. This moves the GLSL and ARB specific reserved constants out of directx.c into the get_caps methods of the shader backends. That way the number of reserved constants remains in the backend. GL_LIMITS({v/p}shader_constantsF) now contains the real number of constants as advertised by GL instead of some mixture of GL info and backend implementation specifics. This makes it easier for backends to decide how many constants to use. --- dlls/wined3d/arb_program_shader.c | 22 +++++++++++++++++----- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/directx.c | 26 ++++++++++---------------- dlls/wined3d/glsl_shader.c | 21 ++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 51 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=754b5cf2adc73a917d7d6…

1 0