wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Alexandre Julliard : sidebar: Show unconfirmed bugs in task lists too. Added Wine 1.0.1 and Wine 1.2 tasks.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: bugzilla Branch: master Commit: 9b9349f8d859480e8510eccc6754dc12469f7bdf URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=9b9349f8d859480e8510e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 13:04:08 2008 +0200 sidebar: Show unconfirmed bugs in task lists too. Added Wine 1.0.1 and Wine 1.2 tasks. --- template/en/default/global/sidebar.html.tmpl | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 00ec623..7682ff9 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -32,11 +32,12 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.0.0&order=bugs.bug_severity" class="menuItem">Wine 1.0</a></td></tr> - <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords" class="menuItem">Regressions</a></td></tr> - <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords" class="menuItem">Tasklist</a></td></tr> - <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklet&keywords_type=anywords" class="menuItem">Tasklets</a></td></tr> - <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords" class="menuItem">with download</a></td></tr> + <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.0.1&order=bugs.bug_severity" class="menuItem">Wine 1.0.1</a></td></tr> + <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.2.0&order=bugs.bug_severity" class="menuItem">Wine 1.2</a></td></tr> + <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords" class="menuItem">Regressions</a></td></tr> + <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords" class="menuItem">Tasklist</a></td></tr> + <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklet&keywords_type=anywords" class="menuItem">Tasklets</a></td></tr> + <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords" class="menuItem">With download</a></td></tr> [% INCLUDE global/menu_end.html.tmpl %] [% IF user.id %]

1 0

Paul Vriens : kernel32/tests: Skip tests if function is not implemented.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: 8fb9503c6de08858aeca6d0feeb34467abcf403c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb9503c6de08858aeca6d0fe… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 13 11:44:44 2008 +0200 kernel32/tests: Skip tests if function is not implemented. --- dlls/kernel32/tests/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 48f57d5..57e0496 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1446,7 +1446,13 @@ static void test_FindFirstFileExA(void) _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); /* FindExLimitToDirectories is ignored */ + SetLastError(0xdeadbeef); handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0); + if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("FindFirstFileExA is not implemented\n"); + goto cleanup; + } ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); @@ -1467,6 +1473,8 @@ static void test_FindFirstFileExA(void) #undef CHECK_NAME ok(FindNextFile(handle, &search_results) == FALSE, "Fetching sixth file should failed\n"); + +cleanup: DeleteFileA("test-dir\\file1"); DeleteFileA("test-dir\\file2"); RemoveDirectoryA("test-dir\\dir1");

1 0

Paul Vriens : kernel32/tests: Fix a few typos.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: e7f5c45cf9e3d8e9cda02fab4bcc69ee7940024c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f5c45cf9e3d8e9cda02fab4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 13 11:37:28 2008 +0200 kernel32/tests: Fix a few typos. --- dlls/kernel32/tests/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f73f104..48f57d5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1456,7 +1456,7 @@ static void test_FindFirstFileExA(void) ok(strcmp(search_results.cFileName, "..") == 0, "Second entry should be '..' is %s\n", search_results.cFileName); ok(FindNextFile(handle, &search_results), "Fetching third file failed\n"); - ok(CHECK_NAME(search_results.cFileName), "Invalid thrid entry - %s\n", search_results.cFileName); + ok(CHECK_NAME(search_results.cFileName), "Invalid third entry - %s\n", search_results.cFileName); ok(FindNextFile(handle, &search_results), "Fetching fourth file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); @@ -1840,14 +1840,14 @@ static void test_overlapped(void) memset( &ov, 0, sizeof ov ); result = 1; r = GetOverlappedResult(0, &ov, &result, 0); - ok( r == TRUE, "should return false\n"); + ok( r == TRUE, "should return true\n"); ok( result == 0, "wrong result %u\n", result ); result = 0; ov.Internal = 0; ov.InternalHigh = 0xabcd; r = GetOverlappedResult(0, &ov, &result, 0); - ok( r == TRUE, "should return false\n"); + ok( r == TRUE, "should return true\n"); ok( result == 0xabcd, "wrong result %u\n", result ); SetLastError( 0xb00 );

1 0

Paul Vriens : credui: Typo and minor correction in Dutch resource.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: 63f68ade778dae512ced2c703d0ad70c0f67ec5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f68ade778dae512ced2c703… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 13 09:51:54 2008 +0200 credui: Typo and minor correction in Dutch resource. --- dlls/credui/credui_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_Nl.rc b/dlls/credui/credui_Nl.rc index 1f8ae55..dc568a6 100644 --- a/dlls/credui/credui_Nl.rc +++ b/dlls/credui/credui_Nl.rc @@ -44,7 +44,7 @@ STRINGTABLE DISCARDABLE IDS_TITLEFORMAT "Verbind met %s" IDS_MESSAGEFORMAT "Verbinden met %s" IDS_INCORRECTPASSWORDTITLE "Aanloggen mislukt" - IDS_INCORRECTPASSWORD "Controleer dat uw gebruikersnaame\nen wachtwoord correct zijn." + IDS_INCORRECTPASSWORD "Controleer of uw gebruikersnaam\nen wachtwoord correct zijn." IDS_CAPSLOCKONTITLE "Caps Lock staat Aan" IDS_CAPSLOCKON "Met Caps Lock aan kan uw wachtwoord verkeerd worden ingevoerd.\n\nDruk op de Caps Lock toets op uw toetsenbord om Caps Lock uit\nte zetten voor invoer van uw wachtwoord." }

1 0

Michael Stefaniuc : wininet: Add the Romanian translation.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: b5186aab0d40d0eee5127465571bd0a68bd07ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5186aab0d40d0eee51274655… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 13 00:51:46 2008 +0200 wininet: Add the Romanian translation. --- dlls/wininet/rsrc.rc | 1 + dlls/wininet/wininet_Ro.rc | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc index cac4d31..d8869a5 100644 --- a/dlls/wininet/rsrc.rc +++ b/dlls/wininet/rsrc.rc @@ -57,6 +57,7 @@ #include "wininet_No.rc" #include "wininet_Pl.rc" #include "wininet_Pt.rc" +#include "wininet_Ro.rc" #include "wininet_Ru.rc" #include "wininet_Si.rc" #include "wininet_Sv.rc" diff --git a/dlls/wininet/wininet_Ro.rc b/dlls/wininet/wininet_Ro.rc new file mode 100644 index 0000000..367bbb5 --- /dev/null +++ b/dlls/wininet/wininet_Ro.rc @@ -0,0 +1,49 @@ +/* + * Copyright 2003 Mike McCormack for CodeWeavers + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Introducere parolă de rețea" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Introduceți numele de utilizator și parola:", -1, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "Utilizator", -1, 40, 66, 50, 10 + LTEXT "Parolă", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Salvează această parolă (nesigur)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Renunță", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "Conexiune LAN" +} + +#pragma code_page(default)

1 0

Michael Stefaniuc : shell32: Add initial Romanian translation.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: a1d3aaa5289fd98e9d272b8df31d197c0f15ea6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d3aaa5289fd98e9d272b8df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 13 00:49:28 2008 +0200 shell32: Add initial Romanian translation. --- dlls/shell32/shell32_Ro.rc | 230 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shres.rc | 1 + 2 files changed, 231 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1d3aaa5289fd98e9d272…

1 0

Detlef Riekenberg : makedep: Fix a typo in the usage output.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: 5073aae038849a28037886760ce9bf417d3aadb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5073aae038849a28037886760… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 13 05:09:38 2008 +0200 makedep: Fix a typo in the usage output. --- tools/makedep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d7f820e..dd084aa 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -75,7 +75,7 @@ static const char Usage[] = " -Idir Search for include files in directory 'dir'\n" " -Cdir Search for source files in directory 'dir'\n" " -Sdir Set the top source directory\n" - " -Sdir Set the top object directory\n" + " -Tdir Set the top object directory\n" " -fxxx Store output in file 'xxx' (default: Makefile)\n" " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n";

1 0

Rob Shearman : rpcrt4: Clear a hole in the ps1 structure in test_simple_struct.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: 9196337e09a8f397cfbea5682febde4b5d0dcf6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9196337e09a8f397cfbea5682… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jun 12 22:57:55 2008 +0100 rpcrt4: Clear a hole in the ps1 structure in test_simple_struct. --- dlls/rpcrt4/tests/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 89b79d2..26f67a7 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -896,6 +896,9 @@ static void test_simple_struct(void) test_pointer_marshal(fmtstr_simple_struct, &s1, 24, wiredata, 28, NULL, 0, "struct"); } + /* zero the entire structure, including the hole */ + memset(&ps1, 0, sizeof(&ps1)); + /* FC_PSTRUCT */ ps1.l1 = 0xdeadbeef; l = 0xcafebabe;

1 0

Rob Shearman : rpcrt4: Initialise the array to be marshalled in test_conformant_array.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: c82ffcec6052c16c34e3e40190f8a1ee346a3d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82ffcec6052c16c34e3e4019… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jun 12 22:58:49 2008 +0100 rpcrt4: Initialise the array to be marshalled in test_conformant_array. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 1ff5e3b..89b79d2 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1315,6 +1315,7 @@ static void test_conformant_array(void) void *ptr; unsigned char *mem, *mem_orig; unsigned char memsrc[20]; + unsigned int i; static const unsigned char fmtstr_conf_array[] = { @@ -1328,6 +1329,9 @@ static void test_conformant_array(void) 0x5b /* FC_END */ }; + for (i = 0; i < sizeof(memsrc); i++) + memsrc[i] = i * i; + StubDesc = Object_StubDesc; StubDesc.pFormatTypes = fmtstr_conf_array;

1 0

Stefan Dösinger : wined3d: Only read back offscreen targets on a target change.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: 535e61892cc3a4085b54e8ae9ee45f2abb9134de URL: http://source.winehq.org/git/wine.git/?a=commit;h=535e61892cc3a4085b54e8ae9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 12 21:18:46 2008 +0200 wined3d: Only read back offscreen targets on a target change. This avoids calling PreLoad needlessly on a thread change during offscreen rendering and breaks up the endless recursion due to lastTID != newTID. --- dlls/wined3d/context.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 203152b..382f96d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -951,7 +951,34 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); } } - if (readTexture) { + + /* When switching away from an offscreen render target, and we're not using FBOs, + * we have to read the drawable into the texture. This is done via PreLoad(and + * SFLAG_INDRAWABLE set on the surface). There are some things that need care though. + * PreLoad needs a GL context, and FindContext is called before the context is activated. + * It also has to be called with the old rendertarget active, otherwise a wrong drawable + * is read. This leads to these possible situations: + * + * 0) lastActiveRenderTarget == target && oldTid == newTid: + * Nothing to do, we don't even reach this code in this case... + * + * 1) lastActiveRenderTarget != target && oldTid == newTid: + * The currently active context is OK for readback. Call PreLoad, and it + * performs the read + * + * 2) lastActiveRenderTarget == target && oldTid != newTid: + * Nothing to do - the drawable is unchanged + * + * 3) lastActiveRenderTarget != target && oldTid != newTid: + * This is tricky. We have to get a context with the old drawable from somewhere + * before we can switch to the new context. In this case, PreLoad calls + * ActivateContext(lastActiveRenderTarget) from the new(current) thread. This + * is case (2) then. The old drawable is activated for the new thread, and the + * readback can be done. The recursed ActivateContext does *not* call PreLoad again. + * After that, the outer ActivateContext(which calls PreLoad) can activate the new + * target for the new thread + */ + if (readTexture && This->lastActiveRenderTarget != target) { BOOL oldInDraw = This->isInDraw; /* PreLoad requires a context to load the texture, thus it will call ActivateContext.

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
95
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 June 2008