March 2006 - Wine-commits - list.winehq.org

Dmitry Timoshkov : winebrowser: Use CP_UNIXCP when translating URL passed on command line
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 182a66c0db3a9fa45c032f82f45ff155e3120ff5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=182a66c0db3a9fa45c032f8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Mar 4 18:16:26 2006 +0800 winebrowser: Use CP_UNIXCP when translating URL passed on command line to unicode. --- programs/winebrowser/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 094468f..f5ecfc8 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) char *unixpath; WCHAR unixpathW[MAX_PATH]; - MultiByteToWideChar( CP_ACP, 0, url, -1, unixpathW, MAX_PATH ); + MultiByteToWideChar( CP_UNIXCP, 0, url, -1, unixpathW, MAX_PATH ); if ((unixpath = wine_get_unix_file_name_ptr( unixpathW ))) { struct stat dummy;

1 0

Christian Gmeiner : mlang: Implement DllCanUnloadNow.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: ad4af1264fff1c949578a5fdd65a2e7bfa6544e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad4af1264fff1c949578a5f… Author: Christian Gmeiner <christian.gmeiner(a)students.fh-vorarlberg.ac.at> Date: Fri Mar 3 10:04:08 2006 +0100 mlang: Implement DllCanUnloadNow. --- dlls/mlang/mlang.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f2f759c..e339b02 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -453,6 +453,21 @@ static const struct mlang_data static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINFO *mime_cp_info); +static LONG dll_count; + +/* + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { @@ -735,8 +750,11 @@ static HRESULT WINAPI MLANGCF_CreateInst static HRESULT WINAPI MLANGCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("(%p)->(%d),stub!\n",This,dolock); + if (dolock) + LockModule(); + else + UnlockModule(); + return S_OK; } @@ -2281,6 +2299,9 @@ static HRESULT MultiLanguage_create(IUnk mlang->ref = 1; *ppObj = (LPVOID) mlang; TRACE("returning %p\n", mlang); + + LockModule(); + return S_OK; } @@ -2288,8 +2309,7 @@ static HRESULT MultiLanguage_create(IUnk HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); - return S_FALSE; + return dll_count == 0 ? S_OK : S_FALSE; } HRESULT WINAPI GetGlobalFontLinkObject(void)

1 0

lostwages/include winehq.conf
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23384 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 12:47:58 Modified files: include : winehq.conf Log message: update snapsot date to 0.9.9 Patch: http://cvs.winehq.org/patch.py?id=23384 Old revision New revision Changes Path 1.32 1.33 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.32 lostwages/include/winehq.conf:1.33 --- lostwages/include/winehq.conf:1.32 3 Mar 2006 18:47:58 -0000 +++ lostwages/include/winehq.conf 3 Mar 2006 18:47:58 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.8 +snapshot_date: 0.9.9 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

lostwages/news 2006030301.xml
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23383 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 12:47:13 Added files: news : 2006030301.xml Log message: news about 0.9.9 Patch: http://cvs.winehq.org/patch.py?id=23383 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006030301.xml Index: lostwages/news/2006030301.xml diff -u -p /dev/null lostwages/news/2006030301.xml:1.1 --- /dev/null 3 Mar 2006 18:47:13 -0000 +++ lostwages/news/2006030301.xml 3 Mar 2006 18:47:13 -0000 @@ -0,0 +1,27 @@ +<news> + <date>March 3, 2006</date> + <title>Wine 0.9.9 Released</title> + <body> +<p> +Wine 0.9.9 was released yesterday. Quite a few major additions appeared +in this release, including: +<ul> + <li> + <li> Many new features and improvements in Richedit.</li> + <li> More Web browser support.</li> + <li> Recursive directory change notifications.</li> + <li> Wine installation is now fully relocatable.</li> + <li> Direct3D 8 and 9 now use the same code.</li> + <li> Many debugger improvements.</li> + <li> Systray is now handled by the explorer process.</li> +</ul> +<p> + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.9.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.113">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. +</p> + </body> +</news>

1 0

lostwages/templates/en/wineconf survey06.templ ...
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23382 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:44:36 Added files: templates/en/wineconf: survey06.template survey06_done.template survey06_form.template Log message: adding survey for 2006 WineConf Patch: http://cvs.winehq.org/patch.py?id=23382 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey06.template Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey06_done.template Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey06_form.template Index: lostwages/templates/en/wineconf/survey06.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey06.template:1.1 --- /dev/null 3 Mar 2006 16:44:36 -0000 +++ lostwages/templates/en/wineconf/survey06.template 3 Mar 2006 16:44:36 -0000 @@ -0,0 +1,11 @@ + + +<table width="100%"><tr><td><img src="{$root}/images/wineconf/wc06_logo.jpg" width="300" height="152" alt="-LOGO-"></td> +<td align="right"><center><FONT size="+2"><b>Date: Undecided<br /> +Place: Undecided</b></font></center></td></tr></table> + +<hr /> + + + +<p> </p> Index: lostwages/templates/en/wineconf/survey06_done.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey06_done.template:1.1 --- /dev/null 3 Mar 2006 16:44:36 -0000 +++ lostwages/templates/en/wineconf/survey06_done.template 3 Mar 2006 16:44:36 -0000 @@ -0,0 +1,5 @@ +<h3>Thanks!</h3> + +<p>Your answers will help us decide where and when WineConf 2006 will happen.</p> + +<p> </p> Index: lostwages/templates/en/wineconf/survey06_form.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey06_form.template:1.1 --- /dev/null 3 Mar 2006 16:44:36 -0000 +++ lostwages/templates/en/wineconf/survey06_form.template 3 Mar 2006 16:44:36 -0000 @@ -0,0 +1,63 @@ +{$error} + +<p>We'd like your input as we plan Wineconf this year.</p> + +<p>Please only answer this if you are planning to come +(or would come if the answers you give here are +respected).</p> + +<form name="survey06" action="{$self}" method="post"> + +<table cellpadding="5"> + +<tr valign="top"> + <th>Name:</th> + <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> +</tr> + +<tr valign="top"> + <th>Email:</th> + <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> +</tr> + +<tr valign="top"> + <th>Day of Week:</th> + <td> + <input type="radio" name="q[day]" value="weekdays" />Weekdays<br /> + <input type="radio" name="q[day]" value="fri-sat" />Friday - Saturday<br /> + <input type="radio" name="q[day]" value="sat-sun" />Saturday - Sunday<br /> + </td> +</tr> + +<tr valign="top"> + <th>Date:</th> + <td> + <input type="checkbox" name="q[date][]" value="05-13-2006" />May 13th, 2006<br /> + <input type="checkbox" name="q[date][]" value="07-29-2006" />July 29th, 2006<br /> + <input type="checkbox" name="q[date][]" value="09-16-2006" />September 16th, 2006<br /> + <span class="small">(check all dates you can make)</span> + </td> +</tr> + +<tr valign="top"> + <th>Location:</th> + <td> + <input type="radio" name="q[place]" value="UK" />United Kingdom<br /> + <input type="radio" name="q[place]" value="DE" />Try to see if Stuttgart would have us again<br /> + <input type="radio" name="q[place]" value="MN" />Go back to St. Paul when it's warm<br /> + <input type="radio" name="q[place]" value="OTHER" /> Other (put in comments) + </td> +</tr> + +<tr valign="top"> + <th>Comments:</th> + <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> +</tr> + +</table> + +<p><input type="submit" name="submit" value=" Submit Survey " class="button" /></p> + +<input type="hidden" name="fields" value="name|email|day|date|place|comment" /> + +</form>

1 0

lostwages/include/plugins register.php
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23381 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:41:46 Modified files: include/plugins: register.php Log message: added support for checkbox answers (array) Patch: http://cvs.winehq.org/patch.py?id=23381 Old revision New revision Changes Path 1.3 1.4 +8 -1 lostwages/include/plugins/register.php Index: lostwages/include/plugins/register.php diff -u -p lostwages/include/plugins/register.php:1.3 lostwages/include/plugins/register.php:1.4 --- lostwages/include/plugins/register.php:1.3 3 Mar 2006 16:41:46 -0000 +++ lostwages/include/plugins/register.php 3 Mar 2006 16:41:46 -0000 @@ -43,7 +43,14 @@ else if ($_POST['submit']) $fh = fopen($db_file, 'a'); foreach ($fields as $field) { - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q'][$field]))); + if (is_array($_POST['q'][$field])) + { + fwrite($fh, preg_replace("/[\t\r\n]+/", " ", join(", ", $_POST['q'][$field]))); + } + else + { + fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q'][$field]))); + } fwrite($fh, "\t"); } fwrite($fh, "\n");

1 0

lostwages/images/wineconf wc06_logo.jpg
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23380 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:32:04 Added files: images/wineconf: wc06_logo.jpg Log message: adding logo for 2006 Patch: http://cvs.winehq.org/patch.py?id=23380 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/wineconf/wc06_logo.jpg

1 0

lostwages/templates/en/wineconf rsvp_form.template
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23379 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:31:36 Modified files: templates/en/wineconf: rsvp_form.template Log message: update for changes to plugin (field names) Patch: http://cvs.winehq.org/patch.py?id=23379 Old revision New revision Changes Path 1.1 1.2 +2 -0 lostwages/templates/en/wineconf/rsvp_form.template Index: lostwages/templates/en/wineconf/rsvp_form.template diff -u -p lostwages/templates/en/wineconf/rsvp_form.template:1.1 lostwages/templates/en/wineconf/rsvp_form.template:1.2 --- lostwages/templates/en/wineconf/rsvp_form.template:1.1 3 Mar 2006 16:31:36 -0000 +++ lostwages/templates/en/wineconf/rsvp_form.template 3 Mar 2006 16:31:36 -0000 @@ -25,4 +25,6 @@ <p><input type="submit" name="submit" value=" Submit RSVP " class="button" /></p> +<input type="hidden" name="fields" value="name|email|comment" /> + </form>

1 0

lostwages/include/plugins register.php
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23378 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:31:12 Modified files: include/plugins: register.php Log message: get the field names from the form Patch: http://cvs.winehq.org/patch.py?id=23378 Old revision New revision Changes Path 1.2 1.3 +8 -5 lostwages/include/plugins/register.php Index: lostwages/include/plugins/register.php diff -u -p lostwages/include/plugins/register.php:1.2 lostwages/include/plugins/register.php:1.3 --- lostwages/include/plugins/register.php:1.2 3 Mar 2006 16:31:12 -0000 +++ lostwages/include/plugins/register.php 3 Mar 2006 16:31:12 -0000 @@ -21,6 +21,9 @@ if (isset($_GET['done'])) } else if ($_POST['submit']) { + // fields + $fields = preg_split('/\|/', $_POST['fields']); + // check vars if (!$_POST['q']['name'] or !$_POST['q']['email'] or !preg_match("/\@/", $_POST['q']['email'])) { @@ -38,11 +41,11 @@ else if ($_POST['submit']) if (file_exists($db_file)) { $fh = fopen($db_file, 'a'); - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q']['name']))); - fwrite($fh, "\t"); - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q']['email']))); - fwrite($fh, "\t"); - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q']['comment']))); + foreach ($fields as $field) + { + fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q'][$field]))); + fwrite($fh, "\t"); + } fwrite($fh, "\n"); fclose($fh);

1 0

Huw Davies : gdi: Better support for 1bpp dib sections.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: b55746ab62739fc1e4c0d4a15484e0e8337bab75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b55746ab62739fc1e4c0d4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 2 12:13:28 2006 +0000 gdi: Better support for 1bpp dib sections. --- dlls/gdi/tests/bitmap.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/x11drv/dib.c | 52 +++++++++-- dlls/x11drv/palette.c | 28 +++++- dlls/x11drv/x11drv.h | 3 - 4 files changed, 281 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b55746ab62739fc1e4c…

1 0