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

Pierre d'Herbemont : shell: Move SHIsFileAvailableOffline from shell. c to shlfileop.c to
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 0eb07db3b6cb34c9638e8112a24bf94de4f96005 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0eb07db3b6cb34c9638e811… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Fri Jul 7 14:38:18 2006 +0200 shell: Move SHIsFileAvailableOffline from shell.c to shlfileop.c to ensure the 16/32 bits separation. --- dlls/shell32/shell.c | 6 ------ dlls/shell32/shlfileop.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index c8a78f8..533ccdb 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -86,12 +86,6 @@ BOOL WINAPI SHELL_DllEntryPoint(DWORD Re return TRUE; } -HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) -{ - FIXME("(%s, %p) stub\n", debugstr_w(path), status); - return E_FAIL; -} - /************************************************************************* * DragAcceptFiles [SHELL.9] */ diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 49fa995..977e301 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -151,6 +151,12 @@ static void SHELL32_FreeUnicodeBuf(LPWST HeapFree(GetProcessHeap(), 0, wPath); } +HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) +{ + FIXME("(%s, %p) stub\n", debugstr_w(path), status); + return E_FAIL; +} + /************************************************************************** * SHELL_DeleteDirectory() [internal] *

1 0

Paul Vriens : wininet: Use correct way of determining the password for anonymous ftp.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 3a831bab513f0fb511459cf9d25730e1b01a5047 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a831bab513f0fb511459cf… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jul 7 13:30:33 2006 +0200 wininet: Use correct way of determining the password for anonymous ftp. --- dlls/wininet/ftp.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 03540e6..95a186b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1665,6 +1665,15 @@ BOOL WINAPI FtpCommandW( HINTERNET hConn * HINTERNET a session handle on success * NULL on failure * + * NOTES: + * + * Windows uses 'anonymous' as the username, when given a NULL username + * and a NULL password. The password is first looked up in: + * + * HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings\EmailName + * + * If this entry is not present it uses the current username as the password. + * */ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, @@ -1672,8 +1681,13 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext, DWORD dwInternalFlags) { + static const WCHAR szKey[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; + static const WCHAR szValue[] = {'E','m','a','i','l','N','a','m','e',0}; static const WCHAR szDefaultUsername[] = {'a','n','o','n','y','m','o','u','s','\0'}; - static const WCHAR szDefaultPassword[] = {'u','s','e','r','@','s','e','r','v','e','r','\0'}; static const WCHAR szEmpty[] = {'\0'}; struct sockaddr_in socketAddr; INT nsocket = -1; @@ -1729,8 +1743,24 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW FIXME("Proxy bypass is ignored.\n"); } if ( !lpszUserName) { + HKEY key; + WCHAR szPassword[MAX_PATH]; + DWORD len = sizeof(szPassword); + lpwfs->lpszUserName = WININET_strdupW(szDefaultUsername); - lpwfs->lpszPassword = WININET_strdupW(szDefaultPassword); + + RegOpenKeyW(HKEY_CURRENT_USER, szKey, &key); + if (RegQueryValueExW(key, szValue, NULL, NULL, (LPBYTE)szPassword, &len)) { + /* Nothing in the registry, get the username and use that as the password */ + if (!GetUserNameW(szPassword, &len)) { + /* Should never get here, but use an empty password as failsafe */ + strcpyW(szPassword, szEmpty); + } + } + RegCloseKey(key); + + TRACE("Password used for anonymous ftp : (%s)\n", debugstr_w(szPassword)); + lpwfs->lpszPassword = WININET_strdupW(szPassword); } else { lpwfs->lpszUserName = WININET_strdupW(lpszUserName);

1 0

Vitaliy Margolen : d3d8: Fix remaining refcount tests and tighten all tests .
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 145442a79d462ba9beb2327f4e47459dfd56359f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=145442a79d462ba9beb2327… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Jul 7 07:31:56 2006 -0600 d3d8: Fix remaining refcount tests and tighten all tests. --- dlls/d3d8/d3d8_private.h | 3 ++ dlls/d3d8/device.c | 6 +++- dlls/d3d8/directx.c | 12 +++++-- dlls/d3d8/surface.c | 1 + dlls/d3d8/swapchain.c | 2 + dlls/d3d8/tests/device.c | 78 ++++++++++++++++++++++------------------------ 6 files changed, 57 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=145442a79d462ba9beb…

1 0

Mike McCormack : include: Add indexsvr.idl (IWordBreaker).
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: aa44a063fd82801ce4fd3c9869f99437504555c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa44a063fd82801ce4fd3c9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 7 14:18:19 2006 +0900 include: Add indexsvr.idl (IWordBreaker). --- include/.gitignore | 1 include/Makefile.in | 1 include/indexsvr.idl | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 0 deletions(-) create mode 100644 include/indexsvr.idl diff --git a/include/.gitignore b/include/.gitignore index 762edb8..7996266 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -13,6 +13,7 @@ downloadmgr.h exdisp.h hlink.h iads.h +indexsvr.h mediaobj.h mimeinfo.h mlang.h diff --git a/include/Makefile.in b/include/Makefile.in index 02a009b..0b7039b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -18,6 +18,7 @@ WINDOWS_IDL_SRCS = \ exdisp.idl \ hlink.idl \ iads.idl \ + indexsvr.idl \ mediaobj.idl \ mimeinfo.idl \ mlang.idl \ diff --git a/include/indexsvr.idl b/include/indexsvr.idl new file mode 100644 index 0000000..056bb52 --- /dev/null +++ b/include/indexsvr.idl @@ -0,0 +1,126 @@ +/* + * Copyright 2006 Mike McCormack + * + * 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 + */ + +import "unknwn.idl"; + +/* + * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it... + * Not sure that function pointers are even legal in idl. + */ +cpp_quote("struct tagTEXT_SOURCE;"); +cpp_quote("typedef HRESULT (WINAPI *PFNFILLTEXTBUFFER)(struct tagTEXT_SOURCE *pTextSource);"); +cpp_quote("#if 0"); +typedef void* PFNFILLTEXTBUFFER; +cpp_quote("#endif"); + +typedef struct tagTEXT_SOURCE +{ + PFNFILLTEXTBUFFER pfnFillTextBuffer; + const WCHAR *awcBuffer; + ULONG iEnd; + ULONG iCur; +} TEXT_SOURCE; + +typedef enum tagWORDREP_BREAK_TYPE +{ + WORDREP_BREAK_EOW = 0, + WORDREP_BREAK_EOS = 1, + WORDREP_BREAK_EOP = 2, + WORDREP_BREAK_EOC = 3 +} WORDREP_BREAK_TYPE; + + +/***************************************************************************** + * IWordSink interface + */ +[ + unique, + uuid(cc907054-c058-101a-b554-08002b33b0e6), + object, + local +] +interface IWordSink : IUnknown +{ + HRESULT PutWord( + [in] ULONG cwc, + [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, + [in] ULONG cwcSrcLen, + [in] ULONG cwcSrcPos); + HRESULT PutAltWord( + [in] ULONG cwc, + [size_is(cwcSrcLen)][in] const WCHAR *pwcInBuf, + [in] ULONG cwcSrcLen, + [in] ULONG cwcSrcPos); + HRESULT StartAltPhrase(void); + HRESULT EndAltPhrase(void); + HRESULT PutBreak( + [in] WORDREP_BREAK_TYPE breakType); +} + +/***************************************************************************** + * IPhraseSink interface + */ +[ + unique, + uuid(cc906ff0-c058-101a-b554-08002b33b0e6), + object, + local +] +interface IPhraseSink: IUnknown +{ + HRESULT PutSmallPhrase( + [size_is(cwcNoun)][in] const WCHAR *pwcNoun, + [in] ULONG cwcNoun, + [size_is(cwcModifier)][in] const WCHAR *pwcModifier, + [in] ULONG cwcModifier, + [in] ULONG ulAttachmentType); + HRESULT PutPhrase( + [size_is(cwcPhrase)][in] const WCHAR *pwcPhrase, + [in] ULONG cwcPhrase); +} + +/***************************************************************************** + * IWordBreaker interface + */ +[ + unique, + uuid(d53552c8-77e3-101a-b552-08002b33b0e6), + object, + local +] +interface IWordBreaker: IUnknown +{ + HRESULT Init( + [in] BOOL fQuery, + [in] ULONG ulMaxTokenSize, + [out] BOOL *pfLicense); + HRESULT BreakText( + [in] TEXT_SOURCE pTextSource, + [in] IWordSink *pWordSink, + [in] IPhraseSink *pPhraseSink); + HRESULT ComposePhrase( + [size_is(cwcNoun)][in] const WCHAR *pwcNoun, + [in] ULONG cwcNoun, + [size_is(cwcModifier)][in] const WCHAR *pwcModifier, + [in] ULONG cwcModifier, + [in] ULONG ulAttachmentType, + [size_is(*pcwcPhrase)][out] WCHAR *pwcPhrase, + [out][in] ULONG *pcwcPhrase); + HRESULT GetLicenseToUse( + [string][out] const WCHAR **ppwcsLicense); +}

1 0

Mike McCormack : uuid: Add indexsvr's IIDs to libuuid.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: f55c9b65116291ecce57d9e80a74d02bf2b5274d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f55c9b65116291ecce57d9e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 7 14:18:30 2006 +0900 uuid: Add indexsvr's IIDs to libuuid. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 20116ee..41795b6 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -64,6 +64,7 @@ #include "downloadmgr.h" #include "objsel.h" #include "hlink.h" #include "optary.h" +#include "indexsvr.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Pierre d'Herbemont : server: Fix context_powerpc.c compilation.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 2c38a7d543289e2653305a786f5c234b29b482f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c38a7d543289e2653305a7… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Fri Jul 7 12:42:53 2006 +0200 server: Fix context_powerpc.c compilation. --- server/context_powerpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/context_powerpc.c b/server/context_powerpc.c index e7c4455..5ce6364 100644 --- a/server/context_powerpc.c +++ b/server/context_powerpc.c @@ -34,6 +34,8 @@ #ifdef HAVE_SYS_PTRACE_H # include <sys/ptrace.h> #endif +#include "windef.h" + #if 0 /* no longer used */ #ifndef PTRACE_PEEKUSER @@ -48,8 +50,6 @@ # define PTRACE_POKEUSER PT_WRITE_D # endif #endif /* PTRACE_POKEUSER */ -#include "windef.h" - #include "file.h" #include "thread.h" #include "request.h"

1 0

appdb/. appsubmit.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26285 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:07:29 Modified files: . : appsubmit.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Add documentation to appsubmit.hp Patch: http://cvs.winehq.org/patch.py?id=26285 Old revision New revision Changes Path 1.49 1.50 +24 -4 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.49 appdb/appsubmit.php:1.50 --- appdb/appsubmit.php:1.49 7 Jul 2006 16: 7:29 -0000 +++ appdb/appsubmit.php 7 Jul 2006 16: 7:29 -0000 @@ -1,8 +1,28 @@ <?php -/************************************/ -/* code to Submit and Resubmit Apps */ -/************************************/ - +/** + * Submit new applications or versions. + * + * Optional parameters: + * - sAppType, + * - sSub, + * - iAppId, application identifier + * - iVersionId, version identifier + * - iTestingId, + * - sAppVendorName, + * - iVendorId, + * - sAppWebpage, + * - sAppKeywords, + * - iDistributionId, + * OR + * - sDistribution, + * + * TODO: + * - move and rename functions in their respective modules + * - rename sAppType by bIsApplication + * - rename sSub by iAction and use integer constants to replace "Submit", "view", "delete" + */ + +// application environment include("path.php"); require_once(BASE."include/incl.php"); require_once(BASE."include/tableve.php");

1 0

appdb/. addcomment.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26284 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:04:55 Modified files: . : addcomment.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Remove unused originator Patch: http://cvs.winehq.org/patch.py?id=26284 Old revision New revision Changes Path 1.30 1.31 +0 -5 appdb/addcomment.php Index: appdb/addcomment.php diff -u -p appdb/addcomment.php:1.30 appdb/addcomment.php:1.31 --- appdb/addcomment.php:1.30 7 Jul 2006 16: 4:55 -0000 +++ appdb/addcomment.php 7 Jul 2006 16: 4:55 -0000 @@ -61,7 +61,6 @@ if(!empty($aClean['sBody'])) if($oRow) { $mesTitle = "<b>Replying To ...</b> $oRow->subject\n"; - $originator = $oRow->userId; echo html_frame_start($oRow->subject,500); echo htmlify_urls($oRow->body), "<br /><br />\n"; echo html_frame_end(); @@ -89,10 +88,6 @@ if(!empty($aClean['sBody'])) echo "<input type=\"hidden\" name=\"iThread\" value=\"".$aClean['iThread']."\" />\n"; echo "<input type=\"hidden\" name=\"iAppId\" value=\"".$aClean['iAppId']."\" />\n"; echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$aClean['iVersionId']."\" />\n"; - if (!empty($aClean['iThread'])) - { - echo "<input type=\"hidden\" name=\"iOriginator\" value=\"$originator\" />\n"; - } echo "</form>"; }

1 0

appdb/include filter.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26283 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:01:26 Modified files: include : filter.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Empty numeric values should default to 0 Patch: http://cvs.winehq.org/patch.py?id=26283 Old revision New revision Changes Path 1.4 1.5 +2 -0 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.4 appdb/include/filter.php:1.5 --- appdb/include/filter.php:1.4 7 Jul 2006 16: 1:26 -0000 +++ appdb/include/filter.php 7 Jul 2006 16: 1:26 -0000 @@ -17,6 +17,8 @@ function filter_gpc() case "f": // float if(is_numeric($_REQUEST[$aKeys[$i]])) $aClean[$aKeys[$i]] = $_REQUEST[$aKeys[$i]]; + elseif(empty($_REQUEST[$aKeys[$i]])) + $aClean[$aKeys[$i]] = 0; else util_show_error_page_and_exit("Fatal error: ".$aKeys[$i]." should be a numeric value."); break;

1 0

appdb/unit_test .htaccess
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26282 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 10:57:11 Added files: unit_test : .htaccess Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Protect unit_test directory from access with .htaccess containing 'deny from all'. Suggestion by Jonathan Ernst <jonathan(a)ernstfamily.ch> Patch: http://cvs.winehq.org/patch.py?id=26282 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/unit_test/.htaccess Index: appdb/unit_test/.htaccess diff -u -p /dev/null appdb/unit_test/.htaccess:1.1 --- /dev/null 7 Jul 2006 15:57:11 -0000 +++ appdb/unit_test/.htaccess 7 Jul 2006 15:57:11 -0000 @@ -0,0 +1,3 @@ +# default permissions +# prevent web access to this directory +deny from all

1 0