May 2008 - Wine-commits - list.winehq.org

Jeremy Newman : fix the year
by Jeremy Newman 14 May '08

14 May '08

Module: website Branch: master Commit: ce3bb584be082895a79b7e17e11d39977eac44b8 URL: http://source.winehq.org/git/website.git/?a=commit;h=ce3bb584be082895a79b7e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 14 16:28:21 2008 -0500 fix the year --- templates/en/wineconf/survey.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/wineconf/survey.template b/templates/en/wineconf/survey.template index 341fd80..7ded9ea 100644 --- a/templates/en/wineconf/survey.template +++ b/templates/en/wineconf/survey.template @@ -1,4 +1,4 @@ - + <table width="100%"> <tr>

1 0

Rico Schüller : Add Wine Forums to Bugzilla' s WineHQ Menu
by Jeremy Newman 14 May '08

14 May '08

Module: bugzilla Branch: master Commit: 6a5cfbbc9695c13c874422004567b42a8c076d72 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=6a5cfbbc9695c13c87442… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 14 22:38:46 2008 +0200 Add Wine Forums to Bugzilla's WineHQ Menu Hi, this patch adds Wine Forums to Bugzilla's WineHQ Menu (see bug 9442). Cheers Rico >From c9402c4e34a081ade21067c13f2617afa45045e0 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Rico=20Sch=FCller?= <kgbricola(a)web.de> Date: Mon, 12 May 2008 14:16:21 +0200 Subject: [PATCH] Add Wine Forums to Bugzilla's WineHQ Menu --- template/en/default/global/sidebar.html.tmpl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index a328e7b..00ec623 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -6,6 +6,7 @@ <tr class=sideMenu><td> <a href="http://bugs.winehq.org/" class=menuItem>Bugzilla</a></td></tr> <tr class=sideMenu><td> <a href="http://wiki.winehq.org/" class=menuItem>Wine Wiki</a></td></tr> + <tr class=sideMenu><td> <a href="http://forum.winehq.org/" class=menuItem>Wine Forums</a></td></tr> [% INCLUDE global/menu_end.html.tmpl %] <!-- [% INCLUDE global/menu_start.html.tmpl

1 0

Jeremy Newman : updating for 2008 WineConf
by Jeremy Newman 14 May '08

14 May '08

Module: website Branch: master Commit: c443ee6a8ecfbeb16b41427b060ad81917259f41 URL: http://source.winehq.org/git/website.git/?a=commit;h=c443ee6a8ecfbeb16b4142… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 14 15:35:05 2008 -0500 updating for 2008 WineConf updates by Jeremy White <jwhite(a)codeweavers.com> --- templates/en/wineconf.template | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/templates/en/wineconf.template b/templates/en/wineconf.template index f4e667c..f520e86 100644 --- a/templates/en/wineconf.template +++ b/templates/en/wineconf.template @@ -1,43 +1,31 @@ - + <table width="100%"> <tr> <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center><FONT size="+2"><b>September 16 - 17, 2006<br> Reading, UK</b></font></center></td> + <td align="right"><center><FONT size="+2"><b>September 27 - 28, 2008<br> Saint Paul, Minnesota</b></font></center></td> </tr> </table> -<p>WineConf 2006 will be held in Reading, UK on 16th and 17th September 2006. -You should plan on arriving on 15th September unless you can arrive very early -on Saturday. We'll probably organize an informal dinner on Saturday night. +<p>WineConf 2008 will be held in Saint Paul, Minnesota on 27th and 28th September 2008. At this point, much remains to be done and the number of people attending will likely determine the agenda.</p> <p>To help people with travel, informal or late-breaking information and -meeting up check out the <a href="http://wiki.winehq.org/WineConf2006">Wiki -page on WineConf 2006</a>.</p> +meeting up check out the <a href="http://wiki.winehq.org/WineConf2008">Wiki +page on WineConf 2008</a>.</p> <hr /> <h2>Location</h2> -Nike Lecture Theatre<br /><br /> -University of Reading<br /> -Whiteknights<br /> -Reading<br /> -RG6 6AQ<br /> -United Kingdom<br /> -<p><a href="{$root}/site/wineconf/travel">Comprehensive travel -information, including accommodation arrangements.</a></p> +<p>Somewhere in Saint Paul, Minnesota, U.S.A. Details T.B.D.</p> <hr /> <h2>RSVP</h2> -<p>Everyone attending the conference, except respondents to the April survey, -should also fill in the <a href="{$root}/site/wineconf/rsvp">RSVP form</a> as -soon as possible. Anyone wanting accommodation at the University of Reading -should also read the <a href="{$root}/site/wineconf/travel">travel arrangements -page</a> for details on how to get a room. -</p> +<p>Everyone attending the conference +should also fill in the <a href="{$root}/site/wineconf/survey">RSVP form</a> as +soon as possible. </p> <hr /> <h2>Agenda</h2>

1 0

Jeremy Newman : updating survey form for 2008 WineConf
by Jeremy Newman 14 May '08

14 May '08

Module: website Branch: master Commit: c14c2289a3ea4050342716629c8314fb837840ee URL: http://source.winehq.org/git/website.git/?a=commit;h=c14c2289a3ea4050342716… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 14 15:13:44 2008 -0500 updating survey form for 2008 WineConf updates by Jeremy White <jwhite(a)codeweavers.com> --- templates/en/wineconf/survey_form.template | 74 ++++++++++++++++++++++----- 1 files changed, 60 insertions(+), 14 deletions(-) diff --git a/templates/en/wineconf/survey_form.template b/templates/en/wineconf/survey_form.template index ef9049f..5463d6a 100644 --- a/templates/en/wineconf/survey_form.template +++ b/templates/en/wineconf/survey_form.template @@ -4,33 +4,79 @@ <form name="survey" action="{$self}" method="post"> -<p>We have had 3 generous offers to host Wineconf 2007. -However, we don't have a clear consenus of which of these three offers -to proceed with.</p> +<p> +The current plan is to host Wineconf in Saint Paul, Minnesota, over the +weekend of September 27 and 28, 2008. +</p> +<p> +This year we have some funding in the Wine Party Fund for travel costs. +The hope is that this will mitigate the pain for many Europeans that might not otherwise +come to Minnesota. It's not an infinite supply, so we will +have to prioritize to favor people with proven contribution histories. +</p> +<p> +Please fill out this survey to help me figure out how to manage that +funding and to help me plan the dates. +</p> + +<p>How does the location work for you:</p> -<p>So, we're going to go with a vote. Please only vote if you seriously -intend to attend Wineconf this year.</p> +<ol> + <li> + <input type="radio" name="q[location]" value="good" checked="checked" /> + I am happy to come to the USA, it's the best choice for me. + </li> + + <li> + <input type="radio" name="q[location]" value="okay" /> + St. Paul is okay for this year, but in general, Europe is better. + </li> -<p>The three choices we have are as follows:</p> + <li> + <input type="radio" name="q[location]" value="hateusa" /> + I will never travel to the USA under any circumstances. + </li> +</ol> + +<p>How does the date work:</p> <ol> <li> - <input type="radio" name="q[where]" value="Zurich" checked="checked" /> - Zurich, Switzerland, hosted by Mike Hearn, with the possibility - of a satellite site near Los Angeles. + <input type="radio" name="q[date]" value="fine" checked="checked" /> + The weekend of September 27th works fine for me. </li> <li> - <input type="radio" name="q[where]" value="Amsterdam" /> - Amsterdam or Utrech, Netherlands, hosted by Hans Leidekker. + <input type="radio" name="q[date]" value="move" /> + I could make it, but I need a different date (please specify below). </li> <li> - <input type="radio" name="q[where]" value="Bratislava" /> - Bratislava, Slovakia, hosted by Martin Pilka. + <input type="radio" name="q[date]" value="no" /> + This fall is just bad for me; I can't come. </li> </ol> +<p>Do you need travel sponsorship:</p> + +<ol> + + <li> + <input type="radio" name="q[money]" value="need" /> + I can't come without financial aid. + </li> + <li> + <input type="radio" name="q[money]" value="some" /> + I could come, but boy would it be nice to have some help. + </li> + + <li> + <input type="radio" name="q[money]" value="none" /> + I don't need any financial help for the travel. + </li> + +</ol> + <table> <tr> @@ -52,6 +98,6 @@ intend to attend Wineconf this year.</p> <p><input type="submit" name="submit" value=" Submit Survey " class="button" /></p> -<input type="hidden" name="fields" value="where|name|email|comment" /> +<input type="hidden" name="fields" value="location|date|money|name|email|comment" /> </form>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 14 May '08

14 May '08

Module: website Branch: master Commit: e686d968abbc2d02407df2e1e247bb0e5234bb65 URL: http://source.winehq.org/git/website.git/?a=commit;h=e686d968abbc2d02407df2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 14 15:14:33 2008 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

James Hawkins : ntdll: Fix a test that fails in win2k3.
by Alexandre Julliard 14 May '08

14 May '08

Module: wine Branch: master Commit: 2470b0b31605133ec046330dd79fdccaa7ba33fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2470b0b31605133ec046330dd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 14 14:55:00 2008 -0500 ntdll: Fix a test that fails in win2k3. --- dlls/ntdll/tests/exception.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 80a8fbd..0aa880a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -215,8 +215,10 @@ LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionIn */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xa); + ok(context->Eip == (DWORD)code_mem + 0xa || + context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */ + "Eip at %x instead of %x or %x\n", context->Eip, + (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else { @@ -245,8 +247,10 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", - context->Eip, (DWORD)code_mem + 0xa); + ok(context->Eip == (DWORD)code_mem + 0xa || + context->Eip == (DWORD)code_mem + 0xb, /* win2k3 */ + "Eip at %x instead of %x or %x\n", context->Eip, + (DWORD)code_mem + 0xa, (DWORD)code_mem + 0xb); } else {

1 0

James Hawkins : ntdll: Fix a few tests that fail in win2k3.
by Alexandre Julliard 14 May '08

14 May '08

Module: wine Branch: master Commit: cfce5be4ce3b515550fb8759c63f9242f3a1a02a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfce5be4ce3b515550fb8759c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 14 14:34:35 2008 -0500 ntdll: Fix a few tests that fail in win2k3. --- dlls/ntdll/tests/rtlstr.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 5239de0..aa4a391 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -233,15 +233,18 @@ static void test_RtlInitUnicodeStringEx(void) ok(result == STATUS_NAME_TOO_LONG, "pRtlInitUnicodeStringEx(&uni, 0) returns %x, expected %x\n", result, STATUS_NAME_TOO_LONG); - ok(uni.Length == 12345, - "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected %u\n", - uni.Length, 12345); - ok(uni.MaximumLength == 12345, - "pRtlInitUnicodeStringEx(&uni, 0) sets MaximumLength to %u, expected %u\n", - uni.MaximumLength, 12345); - ok(uni.Buffer == (void *) 0xdeadbeef, - "pRtlInitUnicodeStringEx(&uni, 0) sets Buffer to %p, expected %x\n", - uni.Buffer, 0xdeadbeef); + ok(uni.Length == 12345 || + uni.Length == 0, /* win2k3 */ + "pRtlInitUnicodeStringEx(&uni, 0) sets Length to %u, expected 12345 or 0\n", + uni.Length); + ok(uni.MaximumLength == 12345 || + uni.MaximumLength == 0, /* win2k3 */ + "pRtlInitUnicodeStringEx(&uni, 0) sets MaximumLength to %u, expected 12345 or 0\n", + uni.MaximumLength); + ok(uni.Buffer == (void *) 0xdeadbeef || + uni.Buffer == teststring2, /* win2k3 */ + "pRtlInitUnicodeStringEx(&uni, 0) sets Buffer to %p, expected %x or %p\n", + uni.Buffer, 0xdeadbeef, teststring2); uni.Length = 12345; uni.MaximumLength = 12345; @@ -1477,8 +1480,8 @@ static const int2str_t int2str[] = { { 2, 1000, 10, 33, "1111101000\0------------------------", STATUS_SUCCESS}, { 2, 10000, 14, 33, "10011100010000\0--------------------", STATUS_SUCCESS}, { 2, 32767, 15, 33, "111111111111111\0-------------------", STATUS_SUCCESS}, - { 2, 32768, 16, 33, "1000000000000000\0------------------", STATUS_SUCCESS}, - { 2, 65535, 16, 33, "1111111111111111\0------------------", STATUS_SUCCESS}, +/* { 2, 32768, 16, 33, "1000000000000000\0------------------", STATUS_SUCCESS}, broken on windows */ +/* { 2, 65535, 16, 33, "1111111111111111\0------------------", STATUS_SUCCESS}, broken on windows */ { 2, 65536, 17, 33, "10000000000000000\0-----------------", STATUS_SUCCESS}, { 2, 100000, 17, 33, "11000011010100000\0-----------------", STATUS_SUCCESS}, { 2, 1000000, 20, 33, "11110100001001000000\0--------------", STATUS_SUCCESS}, @@ -1532,8 +1535,8 @@ static const int2str_t int2str[] = { {16, 4294967294U, 8, 9, "FFFFFFFE\0--------------------------", STATUS_SUCCESS}, {16, 4294967295U, 8, 9, "FFFFFFFF\0--------------------------", STATUS_SUCCESS}, /* max unsigned int */ - { 2, 32768, 16, 17, "1000000000000000\0------------------", STATUS_SUCCESS}, - { 2, 32768, 16, 16, "1000000000000000-------------------", STATUS_SUCCESS}, +/* { 2, 32768, 16, 17, "1000000000000000\0------------------", STATUS_SUCCESS}, broken on windows */ +/* { 2, 32768, 16, 16, "1000000000000000-------------------", STATUS_SUCCESS}, broken on windows */ { 2, 65536, 17, 18, "10000000000000000\0-----------------", STATUS_SUCCESS}, { 2, 65536, 17, 17, "10000000000000000------------------", STATUS_SUCCESS}, { 2, 131072, 18, 19, "100000000000000000\0----------------", STATUS_SUCCESS},

1 0

Alexander Dorofeyev : wined3d: Only copy front buffer to screen in gdi RealizePalette.
by Alexandre Julliard 14 May '08

14 May '08

Module: wine Branch: master Commit: 2027b0587d5d2c20985ce5e45e48caa4cd420d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2027b0587d5d2c20985ce5e45… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed May 14 22:25:10 2008 +0300 wined3d: Only copy front buffer to screen in gdi RealizePalette. --- dlls/wined3d/surface_gdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 1302ac3..030b848 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -650,7 +650,7 @@ HRESULT WINAPI IWineGDISurfaceImpl_RealizePalette(IWineD3DSurface *iface) { /* Update the image because of the palette change. Some games like e.g Red Alert call SetEntries a lot to implement fading. */ - if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) + if(This == (IWineD3DSurfaceImpl *) This->resource.wineD3DDevice->ddraw_primary) x11_copy_to_screen(This, NULL); return WINED3D_OK;

1 0

James Hawkins : msi: Create the MSI hidden window on demand.
by Alexandre Julliard 14 May '08

14 May '08

Module: wine Branch: master Commit: 69c02d0b0301edeaa55cc4de512173649f9f1e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c02d0b0301edeaa55cc4de5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 14 14:22:54 2008 -0500 msi: Create the MSI hidden window on demand. --- dlls/msi/dialog.c | 3 +++ dlls/msi/msi_main.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b83ae48..0e5799f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3482,6 +3482,9 @@ msi_dialog *msi_dialog_create( MSIPACKAGE* package, TRACE("%p %s\n", package, debugstr_w(szDialogName)); + if (!hMsiHiddenWindow) + msi_dialog_register_class(); + /* allocate the structure for the dialog to use */ dialog = msi_alloc_zero( sizeof *dialog + sizeof(WCHAR)*strlenW(szDialogName) ); if( !dialog ) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 2c32b3b..25fb18b 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -72,7 +72,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: msi_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); - msi_dialog_register_class(); break; case DLL_PROCESS_DETACH: if (msi_typelib) ITypeLib_Release( msi_typelib );

1 0

Austin English : wine.inf: Add a fake dll for sensapi.dll.
by Alexandre Julliard 14 May '08

14 May '08

Module: wine Branch: master Commit: c154b0252aba1a592b9723425a670943397076a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c154b0252aba1a592b9723425… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 14 10:58:44 2008 -0500 wine.inf: Add a fake dll for sensapi.dll. --- 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 aa18b87..4be0805 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2276,6 +2276,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,rsaenh.dll 11,,rundll32.exe 11,,schannel.dll +11,,sensapi.dll 11,,setupapi.dll 11,,shdocvw.dll 11,,shell32.dll

1 0