wine-commits May 2007

wine-commits@winehq.org

3 participants
715 discussions

Rob Shearman : shlwapi: Add a slash to the URL if there is no path component.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: bc0610646887e5a339a83ea21a94fc4ed6155adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0610646887e5a339a83ea21… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:06:00 2007 +0100 shlwapi: Add a slash to the URL if there is no path component. --- dlls/shlwapi/url.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 0991dad..1aa6d07 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -409,6 +409,8 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.') || (*wk1 == ':')) *wk2++ = *wk1++; state = 5; + if (!*wk1) + *wk2++ = slash; break; case 5: if (*wk1 != '/' && *wk1 != '\\') {state = 3; break;}

1 0

Rob Shearman : urlmon: The persisted version of URL monikers should be size of URL
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: d82c456e5f94fcdb07040eedd2bec04bffddbd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82c456e5f94fcdb07040eedd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:05:24 2007 +0100 urlmon: The persisted version of URL monikers should be size of URL including nul-terminating character (4-bytes), followed by the URL string including nul-terminating character. --- dlls/urlmon/umon.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 0f86b83..5c795f0 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -410,23 +410,23 @@ static HRESULT WINAPI URLMonikerImpl_Load(IMoniker* iface,IStream* pStm) URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT res; - ULONG len; + ULONG size; ULONG got; TRACE("(%p,%p)\n",This,pStm); if(!pStm) return E_INVALIDARG; - res = IStream_Read(pStm, &len, sizeof(ULONG), &got); + res = IStream_Read(pStm, &size, sizeof(ULONG), &got); if(SUCCEEDED(res)) { if(got == sizeof(ULONG)) { HeapFree(GetProcessHeap(), 0, This->URLName); - This->URLName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(len+1)); + This->URLName=HeapAlloc(GetProcessHeap(),0,size); if(!This->URLName) res = E_OUTOFMEMORY; else { - res = IStream_Read(pStm, This->URLName, len, NULL); - This->URLName[len] = 0; + res = IStream_Read(pStm, This->URLName, size, NULL); + This->URLName[size/sizeof(WCHAR) - 1] = 0; } } else @@ -445,16 +445,16 @@ static HRESULT WINAPI URLMonikerImpl_Save(IMoniker* iface, URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT res; - ULONG len; + ULONG size; TRACE("(%p,%p,%d)\n",This,pStm,fClearDirty); if(!pStm) return E_INVALIDARG; - len = strlenW(This->URLName); - res=IStream_Write(pStm,&len,sizeof(ULONG),NULL); + size = (strlenW(This->URLName) + 1)*sizeof(WCHAR); + res=IStream_Write(pStm,&size,sizeof(ULONG),NULL); if(SUCCEEDED(res)) - res=IStream_Write(pStm,This->URLName,len*sizeof(WCHAR),NULL); + res=IStream_Write(pStm,This->URLName,size,NULL); return res; } @@ -472,8 +472,7 @@ static HRESULT WINAPI URLMonikerImpl_GetSizeMax(IMoniker* iface, if(!pcbSize) return E_INVALIDARG; - pcbSize->u.LowPart = sizeof(ULONG) + (strlenW(This->URLName) * sizeof(WCHAR)); - pcbSize->u.HighPart = 0; + pcbSize->QuadPart = sizeof(ULONG) + ((strlenW(This->URLName)+1) * sizeof(WCHAR)); return S_OK; }

1 0

Rob Shearman : urlmon: Fix a typo in URLMonikerImpl_Save.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: d76a15a36dc411c3809091f227e6c4719b17edba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76a15a36dc411c3809091f22… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:04:49 2007 +0100 urlmon: Fix a typo in URLMonikerImpl_Save. The data in This->URLName should be written out, not the pointer followed by garbage. --- dlls/urlmon/umon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7765f27..0f86b83 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -454,7 +454,7 @@ static HRESULT WINAPI URLMonikerImpl_Save(IMoniker* iface, len = strlenW(This->URLName); res=IStream_Write(pStm,&len,sizeof(ULONG),NULL); if(SUCCEEDED(res)) - res=IStream_Write(pStm,&This->URLName,len*sizeof(WCHAR),NULL); + res=IStream_Write(pStm,This->URLName,len*sizeof(WCHAR),NULL); return res; }

1 0

Rob Shearman : hlink: Fix HlinkCreateFromString to create a URL moniker if the input target is a URL .
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 873905ac43151a6b1c5df93e4a0bea791549bf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873905ac43151a6b1c5df93e4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:04:13 2007 +0100 hlink: Fix HlinkCreateFromString to create a URL moniker if the input target is a URL. --- dlls/hlink/hlink_main.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1a595ae..3a4632f 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -134,17 +134,22 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (FAILED(r)) { - FIXME("ParseDisplayName failed, falling back to file\n"); - r = CreateFileMoniker(pwzTarget,&pTgtMk); + LPCWSTR p = strchrW(pwzTarget, ':'); + if (p && (p - pwzTarget > 1)) + r = CreateURLMoniker(NULL, pwzTarget, &pTgtMk); + else + r = CreateFileMoniker(pwzTarget,&pTgtMk); } - if (pTgtMk) + if (FAILED(r)) { - IHlink_SetMonikerReference(hl, 0, pTgtMk, pwzLocation); - IMoniker_Release(pTgtMk); + ERR("couldn't create moniker for %s, failed with error 0x%08x\n", + debugstr_w(pwzTarget), r); + return r; } - else - FIXME("Unable to come up with a moniker, expect problems\n"); + + IHlink_SetMonikerReference(hl, 0, pTgtMk, pwzLocation); + IMoniker_Release(pTgtMk); IHlink_SetStringReference(hl, HLINKSETF_TARGET, pwzTarget, NULL); }

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : xcopy: New Korean resource.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 58634e84816230310500a63bf6e029efb58de1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58634e84816230310500a63bf… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed May 23 16:25:17 2007 +0900 xcopy: New Korean resource. --- programs/xcopy/Ko.rc | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/xcopy/rsrc.rc | 1 + 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc new file mode 100644 index 0000000..843be88 --- /dev/null +++ b/programs/xcopy/Ko.rc @@ -0,0 +1,80 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Korean language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2007 YunSong Hwang(hys545(a)dreamwiz.com) + * + * 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_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "�ùٸ�� Ű�� - xcopy /?�� ÿ�\n" + STRING_INVPARM, "�ùٸ�� Ű�� '%s' - xcopy /?�� ÿ�\n" + STRING_PAUSE, "<enter> �� 簡 ��۵� ��Դϴ�\n" + STRING_SIMCOPY, "%d �� Դϴ�\n" + STRING_COPY, "%d �� Ǿ��ϴ�\n" + STRING_QISDIR, "'%s'�� ̳� ��丮?\n" \ + "�Դϱ�?\n" \ + "(F - ��, D - ��丮)\n" + STRING_SRCPROMPT,"%s? (��|�ƴϿ�)\n" + STRING_OVERWRITE,"%s�� �ڽ��ϱ�? (��|�ƴϿ�|��)\n" + STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n" + STRING_OPENFAIL, "'%s' �� \n" + STRING_READFAIL, "'%s�� ߽��ϴ�'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - �� ̳� ��丮 �� \n\ +\n\ +��:\n\ +XCOPY �� [��] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Assume directory if destination does not exist and copying 2 or \n\ +\tmore files\n\ +[/S] ��丮�ϰ� �� 丮 ��\n\ +[/E] �� 丮�� ؼ� ��丮�� 丮 ��\n\ +[/Q] ��ϰ� ��Ǵ� ��̳� ��丮�� ǥ�� ʰ� ��.\n\ +[/F] ��ϴ� �� ֱ�\n\ +[/L] �� ָ鼭 �� ۾�\n\ +[/W] �� ϱ� �� Ȯ��ϱ�\n\ +[/T] �� ʰ� �� 丮 �� \n\ +[/Y] �� Ȯ�� ʱ�\n\ +[/-Y] �� Ȯ��ϱ�\n\ +[/P] ��ϴ� ��ȿ� �� ϸ�� Ȯ��\n\ +[/N] ª�� ̸�� ؼ� ��\n\ +[/U] �̹� �� 丮�� ϴ� ��ϸ� ��\n\ +[/R] �б� �� ϵ� �� \n\ +[/H] �� ̳� �ý�� ϵ� ��ؼ� ��\n\ +[/C] ��ϴ� ��ȿ� �� ߻��ص� �� \n\ +[/A] �� Ӽ�� Ǿ��ִ� ��ϸ� ��\n\ +[/M] �� Ӽ�� ϸ鼭 �� Ӽ�� Ǿ��ִ� \n\ +\��ϸ� �� \n\ +[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ +\t\tIf no date is supplied, only copy if destination is older\n\ +\t\tthan source\n\n" + +} diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index 1f7882c..23f778c 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -22,5 +22,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Ko.rc" #include "Pl.rc" #include "Ru.rc"

1 0

appdb/cron cleanup.php
by WineHQ 24 May '07

24 May '07

ChangeSet ID: 31132 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/23 21:29:44 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add removeScreenshotsWithMissingFiles() to the nightly cron script. This will close a hole where we could potentially have screenshots in the database that don't have thumbnails or images. Patch: http://cvs.winehq.org/patch.py?id=31132 Old revision New revision Changes Path 1.32 1.33 +57 -0 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.32 appdb/cron/cleanup.php:1.33 --- appdb/cron/cleanup.php:1.32 24 May 2007 2:29:44 -0000 +++ appdb/cron/cleanup.php 24 May 2007 2:29:44 -0000 @@ -81,6 +81,8 @@ orphanSessionListCheck(); /* report error log entries to admins and flush the error log after doing so */ reportErrorLogEntries(); +/* remove screenshots that are missing their screenshot and thumbnail files */ +removeScreenshotsWithMissingFiles(); /* Users that are unwarned and inactive since $iMonths */ function unwarnedAndInactiveSince($iMonths) @@ -236,4 +238,59 @@ function reportErrorLogEntries() error_log::flush(); } +// returns an array of iScreenshotIds of screenshots that are +// missing their files +function getMissingScreenshotArray() +{ + $aMissingScreenshotIds = array(); + + // retrieve all screenshots, not queued, not rejected + $hResult = Screenshot::objectGetEntries(false, false); + + // go through each screenshot + while($oRow = mysql_fetch_object($hResult)) + { + $iScreenshotId = $oRow->id; + $oScreenshot = new Screenshot($iScreenshotId); + + // load the screenshot and thumbnail + $oScreenshot->load_image(true); + $oScreenshot->load_image(false); + + // are the screenshot and thumbnail images not loaded? if so + // add this screenshot id to the array + if(!$oScreenshot->oScreenshotImage->isLoaded() && + !$oScreenshot->oThumbnailImage->isLoaded()) + { + // add the screenshot id to the array + $aMissingScreenshotIds[] = $iScreenshotId; + } + } + + return $aMissingScreenshotIds; +} + +function removeScreenshotsWithMissingFiles() +{ + $aMissingScreenshotIds = getMissingScreenshotArray(); + + // build the email to admins about what we are doing + $sMsg = "Found ".count($aMissingScreenshotIds)." screenshots with missing files.\r\n"; + //FIXME: uncomment the below line when we uncomment the below lines in the script + // $sMsg.= "Deleting these screenshots.\r\n"; + + $sSubject = "Screenshots deleted\r\n"; + + $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ + if($sEmail) + mail_appdb($sEmail, $sSubject, $sMsg); + + //FIXME: activate this after we see the results from the nightly cron script email + // remove the screenshots with missing files + // foreach($aMissingScreenshotIds as $iScreenshotId) + // { + // $oScreenshot = new Screenshot($iScreenshotId); + // $oScreenshot->delete(true); // delete the screenshot silently + // } +} ?>

1 0

lostwages/ ./winehq_styles.css templates/en/gi ...
by Jeremy Newman 23 May '07

23 May '07

ChangeSet ID: 31131 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/05/23 13:24:34 Modified files: . : winehq_styles.css templates/en : git.template Log message: Alex Waite <awaite2(a)uiuc.edu> remove some tables and unnecessary markup Patch: http://cvs.winehq.org/patch.py?id=31131 Old revision New revision Changes Path 1.16 1.17 +2 -1 lostwages/winehq_styles.css 1.3 1.4 +34 -58 lostwages/templates/en/git.template Index: lostwages/winehq_styles.css diff -u -p lostwages/winehq_styles.css:1.16 lostwages/winehq_styles.css:1.17 --- lostwages/winehq_styles.css:1.16 23 May 2007 18:24:34 -0000 +++ lostwages/winehq_styles.css 23 May 2007 18:24:34 -0000 @@ -44,7 +44,7 @@ p.indent { padding-left: 1em; .blueish { background-color: #bed5f7; } /* text colors */ -.inverse { color: #FFFFFF; } +.inverse { color: #FFFFFF; background: #000000; } .disabled { color: #999999; } .normal { color: #000000; } .error { color: #ff0000; } @@ -74,6 +74,7 @@ p.indent { padding-left: 1em; .small { font-size: 10px; } .big { font-size: 14px; } .rowtitle { background-color: black; color: white; font-weight: bold; } +.commandWidth { width: 500px; } /* Generic Buttons */ .button { background-color: #A50D0D; color: #ffffff; font-family: Sans-Serif; font-size: 12px; padding: 0; } Index: lostwages/templates/en/git.template diff -u -p lostwages/templates/en/git.template:1.3 lostwages/templates/en/git.template:1.4 --- lostwages/templates/en/git.template:1.3 23 May 2007 18:24:34 -0000 +++ lostwages/templates/en/git.template 23 May 2007 18:24:34 -0000 @@ -24,7 +24,7 @@ such as the Linux Kernel source. </p> <li><a href="#docs">Documentation module available from Sourceforge</a> </ol> -<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> <a name="clone" class="hidden"></a> @@ -32,14 +32,11 @@ such as the Linux Kernel source. </p> <p>To check out the entire Wine source tree, do:</p> - <table width="500" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - git clone git://source.winehq.org/git/wine.git wine<br> - </span> - </td></tr> - </table> +<div class="inverse commandWidth"> + <p>git clone git://source.winehq.org/git/wine.git wine</p> +</div> -<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> <a name="uptodate" class="hidden"></a> @@ -48,15 +45,12 @@ such as the Linux Kernel source. </p> <p>A quick way to clean up your tree after you've been modifying it and want to remove changes you haven't checked in is this: </p> - <table width="500" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - cd wine<br> - git diff-index -p HEAD > total-<i>x.x.x</i>.diff<br> - patch -p1 -R < total-<i>x.x.x</i>.diff<br> - git reset<br> - </span> - </td></tr> - </table> +<div class="inverse commandWidth"> + <p>cd wine<br /> + git diff-index -p HEAD > total-<i>x.x.x</i>.diff<br /> + patch -p1 -R < total-<i>x.x.x</i>.diff<br /> + git reset</p> +</div> <p>Using the current x.x.x tags, you can keep a history of changes that were in your Wine tree.</p> @@ -64,31 +58,25 @@ that were in your Wine tree.</p> <p>If you have made commits to the tree, and want to remove them all, you can use the following more dangerous command:</p> - <table width="500" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - git reset --hard origin<br> - </span> - </td></tr> - </table> +<div class="inverse commandWidth"> + <p>git reset --hard origin</p> +</div> <p>This will wipe out any local changes you have made, so use it with caution.</p> -<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> <h1>Staying Up-To-Date</h1> <p> First, make sure to clean your tree as described above, then run the following commands from the top level wine directory:</p> - <table width="500" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - git fetch<br> - git rebase origin<br> - </span> - </td></tr> - </table> +<div class="inverse commandWidth"> + <p>git fetch<br /> + git rebase origin</p> +</div> -<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> <a name="sourcetree" class=hidden></a> @@ -107,7 +95,7 @@ This cross-references source is based on <li><a href="http://source.winehq.org/git">source.winehq.org/git</a>, on the primary Git repository </ul> -<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> <a name="modules" class=hidden></a> @@ -124,48 +112,36 @@ This cross-references source is based on <p>To login to the CVS server, run in a terminal:</p> -<table width="500" border=0 cellpadding=10> - <tr><td class=black> - <span class=inverse> - CVSROOT=:pserver:cvs@cvs.winehq.org:/home/wine cvs login - </span> - </td></tr> -</table> +<div class="inverse commandWidth"> + <p>CVSROOT=:pserver:cvs@cvs.winehq.org:/home/wine cvs login</p> +</div> <p>Use "cvs" as the password (without the quotes).</p> <p>To get a git repository of one of the modules listed above create a new directory and in a terminal run in that directory:</p> -<table width="550" border=0 cellpadding=10> - <tr><td class=black> - <span class=inverse> - git cvsimport -v -k -d :pserver:cvs@cvs.winehq.org:/home/wine MODULE<br/> - </span> - </td></tr> -</table> +<div class="inverse commandWidth"> + <p>git cvsimport -v -k -d :pserver:cvs@cvs.winehq.org:/home/wine MODULE</p> +</div> <p>Replace MODULE with one of the module names listed above.<br/> But be aware that this can take quite some time.</p> -<p><img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> <a name="docs" class=hidden></a> <h1>Documentation module available from Sourceforge</h1> -<p>The documentation lives in a separate CVS tree on Sourceforge.<br/> +<p>The documentation lives in a separate CVS tree on Sourceforge.<br /> To get a git repository of the documentation create a new directory and in a terminal run in that directory:</p> -<table width="550" border=0 cellpadding=10> - <tr><td class=black> - <span class=inverse> - git cvsimport -v -k -d :pserver:anonymous@wine.cvs.sourceforge.net:/cvsroot/wine docs<br/> - </span> - </td></tr> -</table> -<p>But be aware that this can take quite some time.</p> +<div class="inverse commandWidth"> + <p>git cvsimport -v -k -d :pserver:anonymous@wine.cvs.sourceforge.net:/cvsroot/wine docs</p> +</div> +<p>But be aware that this can take quite some time.</p> -<p> </p> +<p> </p> \ No newline at end of file

1 0

Robert Reif : dsound: Add missing interface ID.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 91d580433c3410a22fc347f031382117edb2f5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d580433c3410a22fc347f03… Author: Robert Reif <reif(a)earthlink.net> Date: Wed May 23 07:38:30 2007 -0400 dsound: Add missing interface ID. --- dlls/dsound/dsound.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index a9c0230..2a72027 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1071,6 +1071,7 @@ HRESULT DSOUND_Create8( TRACE("(%s, %p)\n", debugstr_guid(riid), ppDS); if (!IsEqualIID(riid, &IID_IUnknown) && + !IsEqualIID(riid, &IID_IDirectSound) && !IsEqualIID(riid, &IID_IDirectSound8)) { *ppDS = 0; return E_NOINTERFACE;

1 0

Maarten Lankhorst : mpr: Small fixes to WNetGetConnection.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: c3bfe66ade8d324e20a448d50b3a6fda2affa8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bfe66ade8d324e20a448d50… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 22 21:33:17 2007 +0200 mpr: Small fixes to WNetGetConnection. Convert unc\server\share to \\server\share and be more tolerant to null pointers if only length is requested. --- dlls/mpr/wnet.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 8999b74..0abe0e8 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -3,6 +3,7 @@ * * Copyright 1999 Ulrich Weigand * Copyright 2004 Juan Lang + * Copyright 2007 Maarten Lankhorst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1526,10 +1527,10 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName, if (!lpLocalName) ret = WN_BAD_POINTER; - else if (!lpRemoteName) - ret = WN_BAD_POINTER; else if (!lpBufferSize) ret = WN_BAD_POINTER; + else if (!lpRemoteName && *lpBufferSize) + ret = WN_BAD_POINTER; else { int len = MultiByteToWideChar(CP_ACP, 0, lpLocalName, -1, NULL, 0); @@ -1622,10 +1623,10 @@ DWORD WINAPI WNetGetConnectionW( LPCWSTR lpLocalName, if (!lpLocalName) ret = WN_BAD_POINTER; - else if (!lpRemoteName) - ret = WN_BAD_POINTER; else if (!lpBufferSize) ret = WN_BAD_POINTER; + else if (!lpRemoteName && *lpBufferSize) + ret = WN_BAD_POINTER; else if (!lpLocalName[0]) ret = WN_BAD_LOCALNAME; else @@ -1636,8 +1637,17 @@ DWORD WINAPI WNetGetConnectionW( LPCWSTR lpLocalName, { case DRIVE_REMOTE: { - WCHAR remote[MAX_PATH]; + static const WCHAR unc[] = { 'u','n','c','\\' }; + WCHAR rremote[MAX_PATH], *remote = rremote; if (!QueryDosDeviceW( lpLocalName, remote, MAX_PATH )) remote[0] = 0; + else if (!strncmpW(remote, unc, 4)) + { + remote += 2; + remote[0] = '\\'; + } + else if (remote[0] != '\\' || remote[1] != '\\') + FIXME("Don't know how to convert %s to an unc\n", debugstr_w(remote)); + if (strlenW(remote) + 1 > *lpBufferSize) { *lpBufferSize = strlenW(remote) + 1;

1 0

Francois Gouget : port.h: Issue an error if port. h is included after the regular Wine headers.
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: 41b099172fc992fa0c39693c88b63b9d9e7be9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b099172fc992fa0c39693c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 22 18:12:05 2007 +0200 port.h: Issue an error if port.h is included after the regular Wine headers. --- include/wine/port.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 8861408..6ab0627 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -25,6 +25,10 @@ # error You must include config.h to use this header #endif +#ifdef __WINE_BASETSD_H +# error You must include port.h before all other headers +#endif + #define _FILE_OFFSET_BITS 64 #define _GNU_SOURCE /* for pread/pwrite */ #include <fcntl.h>

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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 May 2007