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

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 : hlink: Improve the saving of hlinks by documenting the unknown header values and saving out more data .
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 0f063c72b26f1bdb4afec9343122c6b9155720c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f063c72b26f1bdb4afec9343… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:06:47 2007 +0100 hlink: Improve the saving of hlinks by documenting the unknown header values and saving out more data. Add tests for saving hlinks with different properties. --- dlls/hlink/link.c | 103 +++++++++++++++++++-- dlls/hlink/tests/hlink.c | 226 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 315 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f063c72b26f1bdb4afec…

1 0

Rob Shearman : hlink: Improve the loading of hlinks.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 7b2e7cb81a24abee2e802734f36f3c9a1ad3e97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2e7cb81a24abee2e802734f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:07:29 2007 +0100 hlink: Improve the loading of hlinks. --- dlls/hlink/link.c | 114 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 94 insertions(+), 20 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 9601a33..c450951 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); #define HLINK_SAVE_FRIENDLY_PRESENT 0x10 /* 0x20, 0x40 unknown */ #define HLINK_SAVE_TARGET_FRAME_PRESENT 0x80 +/* known flags */ +#define HLINK_SAVE_ALL (HLINK_SAVE_TARGET_FRAME_PRESENT|HLINK_SAVE_FRIENDLY_PRESENT|HLINK_SAVE_LOCATION_PRESENT|0x04|HLINK_SAVE_MONIKER_IS_ABSOLUTE|HLINK_SAVE_MONIKER_PRESENT) static const IHlinkVtbl hlvt; static const IPersistStreamVtbl psvt; @@ -650,23 +652,6 @@ static HRESULT WINAPI IPersistStream_fnIsDirty(IPersistStream* iface) return E_NOTIMPL; } -static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface, - IStream* pStm) -{ - HRESULT r = E_NOTIMPL; - DWORD hdr[2]; - DWORD read; - HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); - - IStream_Read(pStm, &hdr, sizeof(hdr), &read); - /* FIXME: unknown header values */ - - r = OleLoadFromStream(pStm, &IID_IMoniker, (LPVOID*)&(This->Moniker)); - TRACE("Load Result 0x%x (%p)\n", r, This->Moniker); - - return r; -} - static HRESULT write_hlink_string(IStream *pStm, LPCWSTR str) { DWORD len; @@ -677,10 +662,10 @@ static HRESULT write_hlink_string(IStream *pStm, LPCWSTR str) len = strlenW(str) + 1; hr = IStream_Write(pStm, &len, sizeof(len), NULL); - /* FIXME: error checking */ + if (FAILED(hr)) return hr; hr = IStream_Write(pStm, str, len * sizeof(WCHAR), NULL); - /* FIXME: error checking */ + if (FAILED(hr)) return hr; return S_OK; } @@ -690,6 +675,94 @@ static inline ULONG size_hlink_string(LPCWSTR str) return sizeof(DWORD) + (strlenW(str) + 1) * sizeof(WCHAR); } +static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str) +{ + LPWSTR str; + DWORD len; + ULONG read; + HRESULT hr; + + hr = IStream_Read(pStm, &len, sizeof(len), &read); + if (FAILED(hr)) return hr; + if (read != sizeof(len)) return STG_E_READFAULT; + + TRACE("read len %d\n", len); + + str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!str) return E_OUTOFMEMORY; + + hr = IStream_Read(pStm, str, len * sizeof(WCHAR), &read); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, str); + return hr; + } + if (read != len * sizeof(WCHAR)) + { + HeapFree(GetProcessHeap(), 0, str); + return STG_E_READFAULT; + } + TRACE("read string %s\n", debugstr_w(str)); + + *out_str = str; + return S_OK; +} + +static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface, + IStream* pStm) +{ + HRESULT r; + DWORD hdr[2]; + DWORD read; + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + + r = IStream_Read(pStm, &hdr, sizeof(hdr), &read); + if (read != sizeof(hdr) || (hdr[0] != HLINK_SAVE_MAGIC)) + { + r = E_FAIL; + goto end; + } + if (hdr[1] & ~HLINK_SAVE_ALL) + FIXME("unknown flag(s) 0x%x\n", hdr[1] & ~HLINK_SAVE_ALL); + + if (hdr[1] & HLINK_SAVE_TARGET_FRAME_PRESENT) + { + TRACE("loading target frame name\n"); + r = read_hlink_string(pStm, &This->TargetFrameName); + if (FAILED(r)) goto end; + } + + if (hdr[1] & HLINK_SAVE_FRIENDLY_PRESENT) + { + TRACE("loading target friendly name\n"); + if (!(hdr[1] & 0x4)) + FIXME("0x4 flag not present with friendly name flag - not sure what this means\n"); + r = read_hlink_string(pStm, &This->FriendlyName); + if (FAILED(r)) goto end; + } + + if (hdr[1] & HLINK_SAVE_MONIKER_PRESENT) + { + TRACE("loading moniker\n"); + r = OleLoadFromStream(pStm, &IID_IMoniker, (LPVOID*)&(This->Moniker)); + if (FAILED(r)) + goto end; + This->absolute = hdr[1] & HLINK_SAVE_MONIKER_IS_ABSOLUTE ? TRUE : FALSE; + } + + if (hdr[1] & HLINK_SAVE_LOCATION_PRESENT) + { + TRACE("loading location\n"); + r = read_hlink_string(pStm, &This->Location); + if (FAILED(r)) goto end; + } + +end: + TRACE("Load Result 0x%x (%p)\n", r, This->Moniker); + + return r; +} + static HRESULT WINAPI IPersistStream_fnSave(IPersistStream* iface, IStream* pStm, BOOL fClearDirty) { @@ -742,7 +815,7 @@ static HRESULT WINAPI IPersistStream_fnSave(IPersistStream* iface, r = OleSaveToStream(monstream, pStm); IPersistStream_Release(monstream); } - IMoniker_Release(moniker); + if (FAILED(r)) goto end; } if (This->Location) @@ -752,6 +825,7 @@ static HRESULT WINAPI IPersistStream_fnSave(IPersistStream* iface, } end: + if (moniker) IMoniker_Release(moniker); TRACE("Save Result 0x%x\n", r); return r;

1 0

Rob Shearman : mlang: Implement ConvertINetString.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: f21e9c2aa89a12db3dda5493556fd2195b6f1468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21e9c2aa89a12db3dda54935… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 23 19:12:59 2007 +0100 mlang: Implement ConvertINetString. --- dlls/mlang/mlang.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 8133744..6d5142b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -601,9 +601,46 @@ HRESULT WINAPI ConvertINetString( LPINT pcDstSize ) { - FIXME("%p %d %d %s %p %p %p: stub!\n", pdwMode, dwSrcEncoding, dwDstEncoding, + TRACE("%p %d %d %s %p %p %p\n", pdwMode, dwSrcEncoding, dwDstEncoding, debugstr_a(pSrcStr), pcSrcSize, pDstStr, pcDstSize); - return E_NOTIMPL; + + if (dwSrcEncoding == CP_UNICODE) + { + INT cSrcSizeW; + if (pcSrcSize && *pcSrcSize != -1) + { + cSrcSizeW = *pcSrcSize / sizeof(WCHAR); + pcSrcSize = &cSrcSizeW; + } + return ConvertINetUnicodeToMultiByte(pdwMode, dwDstEncoding, (LPCWSTR)pSrcStr, pcSrcSize, pDstStr, pcDstSize); + } + else if (dwDstEncoding == CP_UNICODE) + { + HRESULT hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, (LPWSTR)pDstStr, pcDstSize); + *pcDstSize *= sizeof(WCHAR); + return hr; + } + else + { + INT cDstSizeW; + LPWSTR pDstStrW; + HRESULT hr; + + TRACE("convert %s from %d to %d\n", debugstr_a(pSrcStr), dwSrcEncoding, dwDstEncoding); + + hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, NULL, &cDstSizeW); + if (hr != S_OK) + return hr; + + pDstStrW = HeapAlloc(GetProcessHeap(), 0, cDstSizeW * sizeof(WCHAR)); + hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, pDstStrW, &cDstSizeW); + if (hr != S_OK) + return hr; + + hr = ConvertINetUnicodeToMultiByte(pdwMode, dwDstEncoding, pDstStrW, &cDstSizeW, pDstStr, pcDstSize); + HeapFree(GetProcessHeap(), 0, pDstStrW); + return hr; + } } static HRESULT GetFamilyCodePage(

1 0

Hwang YunSong(황윤성) : 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(a)cvs.winehq.org:/home/wine cvs login - </span> - </td></tr> -</table> +<div class="inverse commandWidth"> + <p>CVSROOT=:pserver:cvs(a)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(a)cvs.winehq.org:/home/wine MODULE<br/> - </span> - </td></tr> -</table> +<div class="inverse commandWidth"> + <p>git cvsimport -v -k -d :pserver:cvs(a)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(a)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(a)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

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

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

Marcus Meissner : quartz: ppinsplitter might be used uninitialized ( Coverity).
by Alexandre Julliard 23 May '07

23 May '07

Module: wine Branch: master Commit: d2bc96bf8a6ec09667164b91c602357524c4b55a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bc96bf8a6ec09667164b91c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 22 21:28:47 2007 +0100 quartz: ppinsplitter might be used uninitialized (Coverity). --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e6c19f5..02728d5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -997,7 +997,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, IBaseFilter* preader = NULL; IBaseFilter* psplitter = NULL; IPin* ppinreader = NULL; - IPin* ppinsplitter; + IPin* ppinsplitter = NULL; IEnumPins* penumpins; ULONG pin; HRESULT hr;

1 0