November 2005 - Wine-Commits

wine/dlls/comctl32 tab.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21051 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 13:56:24 Modified files: dlls/comctl32 : tab.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Avoid printing out a possibly uninitialized variable. Patch: http://cvs.winehq.org/patch.py?id=21051 Old revision New revision Changes Path 1.120 1.121 +1 -2 wine/dlls/comctl32/tab.c Index: wine/dlls/comctl32/tab.c diff -u -p wine/dlls/comctl32/tab.c:1.120 wine/dlls/comctl32/tab.c:1.121 --- wine/dlls/comctl32/tab.c:1.120 2 Nov 2005 19:56:24 -0000 +++ wine/dlls/comctl32/tab.c 2 Nov 2005 19:56:24 -0000 @@ -1079,7 +1079,6 @@ static void TAB_SetItemBounds (TAB_INFO HFONT hFont, hOldFont; HDC hdc; RECT clientRect; - SIZE size; INT iTemp; RECT* rcItem; INT iIndex; @@ -1192,6 +1191,7 @@ static void TAB_SetItemBounds (TAB_INFO else { int tabwidth; + SIZE size; /* Calculate how wide the tab is depending on the text it contains */ GetTextExtentPoint32W(hdc, curr->pszText, lstrlenW(curr->pszText), &size); @@ -1231,7 +1231,6 @@ static void TAB_SetItemBounds (TAB_INFO curr->rect.bottom = 0; curr->rect.top = curItemRowCount - 1; - TRACE("TextSize: %li\n", size.cx); TRACE("Rect: T %li, L %li, B %li, R %li\n", curr->rect.top, curr->rect.left, curr->rect.bottom, curr->rect.right);

1 0

wine/dlls/msxml3 tests/domdoc.c node.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21050 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 13:55:30 Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : node.c Log message: Stefan Huehner <stefan(a)huehner.org> Extend get_nodeName add testcases for it. Patch: http://cvs.winehq.org/patch.py?id=21050 Old revision New revision Changes Path 1.3 1.4 +30 -2 wine/dlls/msxml3/tests/domdoc.c 1.10 1.11 +6 -0 wine/dlls/msxml3/node.c Index: wine/dlls/msxml3/tests/domdoc.c diff -u -p wine/dlls/msxml3/tests/domdoc.c:1.3 wine/dlls/msxml3/tests/domdoc.c:1.4 --- wine/dlls/msxml3/tests/domdoc.c:1.3 2 Nov 2005 19:55:30 -0000 +++ wine/dlls/msxml3/tests/domdoc.c 2 Nov 2005 19:55:30 -0000 @@ -64,6 +64,9 @@ static const WCHAR szComplete4[] = { static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; +static const WCHAR szDocument[] = { + '#', 'd', 'o', 'c', 'u', 'm', 'e', 'n', 't', 0 +}; static const WCHAR szOpen[] = { 'o','p','e','n',0 }; static const WCHAR szdl[] = { 'd','l',0 }; @@ -98,9 +101,9 @@ void test_domdoc( void ) ok( r == S_FALSE, "loadXML failed\n"); ok( b == VARIANT_FALSE, "failed to load XML string\n"); - /* try to laod an document from an non-existent file */ + /* try to load an document from an non-existent file */ b = VARIANT_TRUE; - str = SysAllocString ( szNonExistentFile ); + str = SysAllocString( szNonExistentFile ); VariantInit(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = str; @@ -151,6 +154,19 @@ void test_domdoc( void ) ok( r == S_OK, "should be no document element\n"); } + /* check if nodename is correct */ + r = IXMLDOMDocument_get_nodeName( doc, NULL ); + ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code"); + + /* content doesn't matter here */ + str = SysAllocString( szNonExistentFile ); + r = IXMLDOMDocument_get_nodeName( doc, &str ); + ok ( r == S_OK, "get_nodeName wrong code\n"); + ok ( str != NULL, "str is null\n"); + ok( !lstrcmpW( str, szDocument ), "incorrect nodeName\n"); + SysFreeString( str ); + + /* check that there's no document element */ element = NULL; r = IXMLDOMDocument_get_documentElement( doc, &element ); @@ -279,6 +295,18 @@ void test_domnode( void ) ok( r == S_OK, "get_baseName returned wrong code\n"); ok( lstrcmpW(str,szlc) == 0, "basename was wrong\n"); + /* check if nodename is correct */ + r = IXMLDOMElement_get_nodeName( element, NULL ); + ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code"); + + /* content doesn't matter here */ + str = SysAllocString( szNonExistentFile ); + r = IXMLDOMElement_get_nodeName( element, &str ); + ok ( r == S_OK, "get_nodeName wrong code\n"); + ok ( str != NULL, "str is null\n"); + ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n"); + SysFreeString( str ); + r = IXMLDOMElement_get_attributes( element, &map ); ok( r == S_OK, "get_attributes returned wrong code\n"); ok( map != NULL, "should be attributes\n"); Index: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.10 wine/dlls/msxml3/node.c:1.11 --- wine/dlls/msxml3/node.c:1.10 2 Nov 2005 19:55:30 -0000 +++ wine/dlls/msxml3/node.c 2 Nov 2005 19:55:30 -0000 @@ -178,6 +178,9 @@ static HRESULT WINAPI xmlnode_get_nodeNa TRACE("%p\n", This ); + if (!name) + return E_INVALIDARG; + if ( !This->node ) return E_FAIL; @@ -186,6 +189,9 @@ static HRESULT WINAPI xmlnode_get_nodeNa case XML_TEXT_NODE: str = (const xmlChar*) "#text"; break; + case XML_DOCUMENT_NODE: + str = (const xmlChar*) "#document"; + break; default: str = This->node->name; break;

1 0

wine/ include/msi.h dlls/msi/msi.spec dlls/msi ...
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21049 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 13:54:31 Modified files: include : msi.h dlls/msi : msi.spec msi.c Log message: Mike McCormack <mike(a)codeweavers.com> Stub implementation for MsiAdvertiseScriptA/W. Patch: http://cvs.winehq.org/patch.py?id=21049 Old revision New revision Changes Path 1.34 1.35 +16 -0 wine/include/msi.h 1.49 1.50 +2 -2 wine/dlls/msi/msi.spec 1.112 1.113 +22 -0 wine/dlls/msi/msi.c Index: wine/include/msi.h diff -u -p wine/include/msi.h:1.34 wine/include/msi.h:1.35 --- wine/include/msi.h:1.34 2 Nov 2005 19:54:31 -0000 +++ wine/include/msi.h 2 Nov 2005 19:54:31 -0000 @@ -152,6 +152,18 @@ typedef enum tagADVERTISEFLAGS ADVERTISEFLAGS_USERASSIGN = 1 } ADVERTISEFLAGS; +typedef enum tagSCRIPTFLAGS +{ + SCRIPTFLAGS_CACHEINFO = 1, + SCRIPTFLAGS_SHORTCUTS = 4, + SCRIPTFLAGS_MACHINEASSIGN = 8, + SCRIPTFLAGS_REGDATA_APPINFO = 0x10, + SCRIPTFLAGS_REGDATA_CNFGINFO = 0x20, + SCRIPTFLAGS_VALIDATE_TRANSFORMS_LIST = 0x40, + SCRIPTFLAGS_REGDATA_CLASSINFO = 0x80, + SCRIPTFLAGS_REGDATA_EXTENSIONINFO = 0x100, +} SCRIPTFLAGS; + typedef enum tagINSTALLTYPE { INSTALLTYPE_DEFAULT = 0, @@ -540,6 +552,10 @@ UINT WINAPI MsiGetFileHashA(LPCSTR, DWOR UINT WINAPI MsiGetFileHashW(LPCWSTR, DWORD, PMSIFILEHASHINFO); #define MsiGetFileHash WINELIB_NAME_AW(MsiGetFileHash) +UINT WINAPI MsiAdvertiseScriptA(LPCSTR, DWORD, PHKEY, BOOL); +UINT WINAPI MsiAdvertiseScriptW(LPCWSTR, DWORD, PHKEY, BOOL); +#define MsiAdvertiseScript WINELIB_NAME_AW(MsiAdvertiseScript) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void); Index: wine/dlls/msi/msi.spec diff -u -p wine/dlls/msi/msi.spec:1.49 wine/dlls/msi/msi.spec:1.50 --- wine/dlls/msi/msi.spec:1.49 2 Nov 2005 19:54:31 -0000 +++ wine/dlls/msi/msi.spec 2 Nov 2005 19:54:31 -0000 @@ -169,8 +169,8 @@ 173 stdcall MsiGetComponentPathW(wstr wstr ptr ptr) 174 stdcall MsiApplyPatchA(str str long str) 175 stdcall MsiApplyPatchW(wstr wstr long wstr) -176 stub MsiAdvertiseScriptA -177 stub MsiAdvertiseScriptW +176 stdcall MsiAdvertiseScriptA(str long ptr long) +177 stdcall MsiAdvertiseScriptW(wstr long ptr long) 178 stub MsiGetPatchInfoA 179 stub MsiGetPatchInfoW 180 stdcall MsiEnumPatchesA(str long ptr ptr ptr) Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.112 wine/dlls/msi/msi.c:1.113 --- wine/dlls/msi/msi.c:1.112 2 Nov 2005 19:54:31 -0000 +++ wine/dlls/msi/msi.c 2 Nov 2005 19:54:31 -0000 @@ -2008,3 +2008,25 @@ UINT WINAPI MsiGetFileHashA( LPCSTR szFi FIXME("%s %08lx %p\n", debugstr_a(szFilePath), dwOptions, pHash ); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * MsiAdvertiseScriptW [MSI.@] + */ +UINT WINAPI MsiAdvertiseScriptW( LPCWSTR szScriptFile, DWORD dwFlags, + PHKEY phRegData, BOOL fRemoveItems ) +{ + FIXME("%s %08lx %p %d\n", + debugstr_w( szScriptFile ), dwFlags, phRegData, fRemoveItems ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * MsiAdvertiseScriptA [MSI.@] + */ +UINT WINAPI MsiAdvertiseScriptA( LPCSTR szScriptFile, DWORD dwFlags, + PHKEY phRegData, BOOL fRemoveItems ) +{ + FIXME("%s %08lx %p %d\n", + debugstr_a( szScriptFile ), dwFlags, phRegData, fRemoveItems ); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

wine/dlls/msi where.c update.c table.c string. ...
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21048 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 08:24:22 Modified files: dlls/msi : where.c update.c table.c string.c select.c record.c order.c insert.c distinct.c delete.c create.c Log message: Mike McCormack <mike(a)codeweavers.com> Create the +msidb debug channel for msi database code. Patch: http://cvs.winehq.org/patch.py?id=21048 Old revision New revision Changes Path 1.21 1.22 +1 -1 wine/dlls/msi/where.c 1.9 1.10 +1 -1 wine/dlls/msi/update.c 1.49 1.50 +1 -1 wine/dlls/msi/table.c 1.16 1.17 +1 -1 wine/dlls/msi/string.c 1.12 1.13 +1 -1 wine/dlls/msi/select.c 1.30 1.31 +1 -1 wine/dlls/msi/record.c 1.12 1.13 +1 -1 wine/dlls/msi/order.c 1.15 1.16 +1 -1 wine/dlls/msi/insert.c 1.10 1.11 +1 -1 wine/dlls/msi/distinct.c 1.3 1.4 +1 -1 wine/dlls/msi/delete.c 1.15 1.16 +1 -1 wine/dlls/msi/create.c Index: wine/dlls/msi/where.c diff -u -p wine/dlls/msi/where.c:1.21 wine/dlls/msi/where.c:1.22 --- wine/dlls/msi/where.c:1.21 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/where.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ Index: wine/dlls/msi/update.c diff -u -p wine/dlls/msi/update.c:1.9 wine/dlls/msi/update.c:1.10 --- wine/dlls/msi/update.c:1.9 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/update.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ Index: wine/dlls/msi/table.c diff -u -p wine/dlls/msi/table.c:1.49 wine/dlls/msi/table.c:1.50 --- wine/dlls/msi/table.c:1.49 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/table.c 2 Nov 2005 14:24:22 -0000 @@ -37,7 +37,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct tagMSICOLUMNINFO { Index: wine/dlls/msi/string.c diff -u -p wine/dlls/msi/string.c:1.16 wine/dlls/msi/string.c:1.17 --- wine/dlls/msi/string.c:1.16 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/string.c 2 Nov 2005 14:24:22 -0000 @@ -35,7 +35,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { Index: wine/dlls/msi/select.c diff -u -p wine/dlls/msi/select.c:1.12 wine/dlls/msi/select.c:1.13 --- wine/dlls/msi/select.c:1.12 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/select.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ Index: wine/dlls/msi/record.c diff -u -p wine/dlls/msi/record.c:1.30 wine/dlls/msi/record.c:1.31 --- wine/dlls/msi/record.c:1.30 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/record.c 2 Nov 2005 14:24:22 -0000 @@ -39,7 +39,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSIFIELD_NULL 0 #define MSIFIELD_INT 1 Index: wine/dlls/msi/order.c diff -u -p wine/dlls/msi/order.c:1.12 wine/dlls/msi/order.c:1.13 --- wine/dlls/msi/order.c:1.12 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/order.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ Index: wine/dlls/msi/insert.c diff -u -p wine/dlls/msi/insert.c:1.15 wine/dlls/msi/insert.c:1.16 --- wine/dlls/msi/insert.c:1.15 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/insert.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */ Index: wine/dlls/msi/distinct.c diff -u -p wine/dlls/msi/distinct.c:1.10 wine/dlls/msi/distinct.c:1.11 --- wine/dlls/msi/distinct.c:1.10 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/distinct.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct tagDISTINCTSET { Index: wine/dlls/msi/delete.c diff -u -p wine/dlls/msi/delete.c:1.3 wine/dlls/msi/delete.c:1.4 --- wine/dlls/msi/delete.c:1.3 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/delete.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* Index: wine/dlls/msi/create.c diff -u -p wine/dlls/msi/create.c:1.15 wine/dlls/msi/create.c:1.16 --- wine/dlls/msi/create.c:1.15 2 Nov 2005 14:24:22 -0000 +++ wine/dlls/msi/create.c 2 Nov 2005 14:24:22 -0000 @@ -33,7 +33,7 @@ #include "query.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); +WINE_DEFAULT_DEBUG_CHANNEL(msidb); /* below is the query interface to a table */

1 0

wine/dlls/msi action.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21047 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 08:21:17 Modified files: dlls/msi : action.c Log message: Aric Stewart <aric(a)codeweavers.com> Force files to install if the REINSTALL property is set. Patch: http://cvs.winehq.org/patch.py?id=21047 Old revision New revision Changes Path 1.227 1.228 +3 -0 wine/dlls/msi/action.c Index: wine/dlls/msi/action.c diff -u -p wine/dlls/msi/action.c:1.227 wine/dlls/msi/action.c:1.228 --- wine/dlls/msi/action.c:1.227 2 Nov 2005 14:21:17 -0000 +++ wine/dlls/msi/action.c 2 Nov 2005 14:21:17 -0000 @@ -1607,6 +1607,8 @@ static UINT SetFeatureStates(MSIPACKAGE {'A','D','D','L','O','C','A','L',0}; static const WCHAR szRemove[] = {'R','E','M','O','V','E',0}; + static const WCHAR szReinstall[] = + {'R','E','I','N','S','T','A','L','L',0}; BOOL override = FALSE; MSICOMPONENT* component; MSIFEATURE *feature; @@ -1642,6 +1644,7 @@ static UINT SetFeatureStates(MSIPACKAGE */ override |= process_state_property(package,szAddLocal,INSTALLSTATE_LOCAL); override |= process_state_property(package,szRemove,INSTALLSTATE_ABSENT); + override |= process_state_property(package,szReinstall,INSTALLSTATE_LOCAL); if (!override) {

1 0

wine/dlls/ntdll resource.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21046 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 08:18:20 Modified files: dlls/ntdll : resource.c Log message: Robert Shearman <rob(a)codeweavers.com> Make LdrAccessResource call an internal function to satisfy Shrinker. Patch: http://cvs.winehq.org/patch.py?id=21046 Old revision New revision Changes Path 1.15 1.16 +32 -5 wine/dlls/ntdll/resource.c Index: wine/dlls/ntdll/resource.c diff -u -p wine/dlls/ntdll/resource.c:1.15 wine/dlls/ntdll/resource.c:1.16 --- wine/dlls/ntdll/resource.c:1.15 2 Nov 2005 14:18:20 -0000 +++ wine/dlls/ntdll/resource.c 2 Nov 2005 14:18:20 -0000 @@ -318,11 +318,14 @@ NTSTATUS WINAPI LdrFindResource_U( HMODU } -/********************************************************************** - * LdrAccessResource (NTDLL.@) - */ -NTSTATUS WINAPI LdrAccessResource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, - void **ptr, ULONG *size ) +/* don't penalize other platforms stuff needed on i386 for compatibility */ +#ifdef __i386__ +NTSTATUS WINAPI access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, + void **ptr, ULONG *size ) +#else +static inline NTSTATUS access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, + void **ptr, ULONG *size ) +#endif { NTSTATUS status; @@ -355,6 +358,30 @@ NTSTATUS WINAPI LdrAccessResource( HMODU return status; } +/********************************************************************** + * LdrAccessResource (NTDLL.@) + */ +#ifdef __i386__ +/* Shrinker depends on the "call access_resource" instruction being there */ +__ASM_GLOBAL_FUNC( LdrAccessResource, + "pushl %ebp\n" + "movl %esp, %ebp\n" + "pushl 24(%ebp)\n" + "pushl 20(%ebp)\n" + "pushl 16(%ebp)\n" + "pushl 12(%ebp)\n" + "pushl 8(%ebp)\n" + "call access_resource\n" + "leave\n" + "ret\n" +); +#else +NTSTATUS WINAPI LdrAccessResource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, + void **ptr, ULONG *size ) +{ + return access_resource( hmod, entry, ptr, size ); +} +#endif /********************************************************************** * RtlFindMessage (NTDLL.@)

1 0

wine/ server/named_pipe.c dlls/ntdll/tests/om.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21045 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 08:15:10 Modified files: server : named_pipe.c dlls/ntdll/tests: om.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Fix error returned when opening nonexistent pipes. Patch: http://cvs.winehq.org/patch.py?id=21045 Old revision New revision Changes Path 1.51 1.52 +1 -5 wine/server/named_pipe.c 1.3 1.4 +2 -2 wine/dlls/ntdll/tests/om.c Index: wine/server/named_pipe.c diff -u -p wine/server/named_pipe.c:1.51 wine/server/named_pipe.c:1.52 --- wine/server/named_pipe.c:1.51 2 Nov 2005 14:15:10 -0000 +++ wine/server/named_pipe.c 2 Nov 2005 14:15:10 -0000 @@ -598,12 +598,8 @@ DECL_HANDLER(open_named_pipe) struct named_pipe *pipe; int fds[2]; - pipe = open_named_pipe( get_req_data(), get_req_data_size(), req->attributes ); - if (!pipe) - { - set_error( STATUS_NO_SUCH_FILE ); + if (!(pipe = open_named_pipe( get_req_data(), get_req_data_size(), req->attributes ))) return; - } server = find_server2( pipe, ps_idle_server, ps_wait_open ); release_object( pipe ); Index: wine/dlls/ntdll/tests/om.c diff -u -p wine/dlls/ntdll/tests/om.c:1.3 wine/dlls/ntdll/tests/om.c:1.4 --- wine/dlls/ntdll/tests/om.c:1.3 2 Nov 2005 14:15:10 -0000 +++ wine/dlls/ntdll/tests/om.c 2 Nov 2005 14:15:10 -0000 @@ -127,13 +127,13 @@ void test_namespace_pipe(void) pRtlInitUnicodeString(&str, buffer3); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE, "pNtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08lx)\n", status); pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "pNtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08lx)\n", status); pNtClose(pipe);

1 0

wine/server thread.h thread.c context_x86_64.c ...
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21044 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 08:12:13 Modified files: server : thread.h thread.c context_x86_64.c context_sparc.c context_powerpc.c context_i386.c Log message: Moved the platform-independent part of the get/set_thread_context requests to a common file. Patch: http://cvs.winehq.org/patch.py?id=21044 Old revision New revision Changes Path 1.64 1.65 +2 -0 wine/server/thread.h 1.128 1.129 +38 -0 wine/server/thread.c 1.2 1.3 +24 -48 wine/server/context_x86_64.c 1.14 1.15 +20 -48 wine/server/context_sparc.c 1.10 1.11 +18 -50 wine/server/context_powerpc.c 1.32 1.33 +28 -52 wine/server/context_i386.c

1 0

docs/en wine-faq.sgml
by Dimi Paun Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 1130937534219311569425376 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/11/02 05:18:54 Modified files: en : wine-faq.sgml Log message: Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - user user -> user Old revision New revision Changes Path 1.13 1.14 +1 -1 docs/en/wine-faq.sgml Index: docs/en/wine-faq.sgml diff -u -p docs/en/wine-faq.sgml:1.13 docs/en/wine-faq.sgml:1.14 --- docs/en/wine-faq.sgml 2 Nov 2005 13:18:54 -0000 +++ /dev/null 2 Nov 2005 13:18:54 -0000 @@ -1575,7 +1575,7 @@ export PATH=$PATH:/path/to/wine/binary or equipment donations, to aid the Wine developers in reaching their goals. </para> <para> - One area where every Wine user user can contribute to this project is by sending high quality + One area where every Wine user can contribute to this project is by sending high quality bug reports to our Bugzilla and helping the developers with any follow up questions that they may have about a bug that you have come across. It is not only impossible but also impractical for a developers to have a copy of every program on the market. This is why we need your

1 0

wine/dlls/shell32 shfldr_unixfs.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21043 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 05:43:20 Modified files: dlls/shell32 : shfldr_unixfs.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Added some comments to document unixfs. Patch: http://cvs.winehq.org/patch.py?id=21043 Old revision New revision Changes Path 1.56 1.57 +104 -0 wine/dlls/shell32/shfldr_unixfs.c Index: wine/dlls/shell32/shfldr_unixfs.c diff -u -p wine/dlls/shell32/shfldr_unixfs.c:1.56 wine/dlls/shell32/shfldr_unixfs.c:1.57 --- wine/dlls/shell32/shfldr_unixfs.c:1.56 2 Nov 2005 11:43:20 -0000 +++ wine/dlls/shell32/shfldr_unixfs.c 2 Nov 2005 11:43:20 -0000 @@ -18,6 +18,110 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* + * As you know, windows and unix do have a different philosophy with regard to + * the question of how a filesystem should be laid out. While we unix geeks + * learned to love the 'one-tree-rooted-at-/' approach, windows has in fact + * a whole forest of filesystem trees, each of which is typically identified by + * a drive letter. + * + * We would like wine to integrate as smoothly as possible (that is without + * sacrificing win32 compatibility) into the unix environment. For the + * filesystem question, this means we really would like those windows + * applications to work with unix path- and file-names. Unfortunately, this + * seems to be impossible in general. Therefore we have those symbolic links + * in wine's 'dosdevices' directory, which are used to simulate drives + * to keep windows applications happy. And as a consequence, we have those + * drive letters show up now and then in GUI applications running under wine, + * which gets the unix hardcore fans all angry, shouting at us @#!&$%* wine + * hackers that we are seducing the big companies not to port their applications + * to unix. + * + * DOS paths do appear at various places in GUI applications. Sometimes, they + * show up in the title bar of an application's window. They tend to accumulate + * in the most-recently-used section of the file-menu. And I've even seen some + * in a configuration dialog's edit control. In those examples, wine can't do a + * lot about this, since path-names can't be told appart from ordinary strings + * here. That's different in the file dialogs, though. + * + * With the introduction of the 'shell' in win32, Microsoft established an + * abstraction layer on top of the filesystem, called the shell namespace (I was + * told that Gnome's virtual filesystem is conceptually similar). In the shell + * namespace, one doesn't use ascii- or unicode-strings to uniquely identify + * objects. Instead Microsoft introduced item-identifier-lists (The c type is + * called ITEMIDLIST) as an abstraction of path-names. As you probably would + * have guessed, an item-identifier-list is a list of item-identifiers (whose + * c type's funny name is SHITEMID), which are opaque binary objects. This means + * that no application (apart from Microsoft Office) should make any assumptions + * on the internal structure of these SHITEMIDs. + * + * Since the user prefers to be presented the good-old DOS file-names instead of + * binary ITEMIDLISTs, a translation method between string-based file-names and + * ITEMIDLISTs was established. At the core of this are the COM-Interface + * IShellFolder and especially it's methods ParseDisplayName and + * GetDisplayNameOf. Basically, you give a DOS-path (let's say C:\windows) to + * ParseDisplayName and get a SHITEMID similar to <Desktop|My Computer|C:|windows|>. + * Since it's opaque, you can't see the 'C', the 'windows' and the other stuff. + * You can only figure out that the ITEMIDLIST is composed of four SHITEMIDS. + * The file dialog applies IShellFolder's BindToObject method to bind to each of + * those four objects (Desktop, My Computer, C: and windows. All of them have to + * implement the IShellFolder interface.) and asks them how they would like to be + * displayed (basically their icon and the string displayed). If the file dialog + * asks <Desktop|My Computer|C:|windows> which sub-objects it contains (via + * EnumObjects) it gets a list of opaque SHITEMIDs, which can be concatenated to + * <Desktop|...|windows> to build a new ITEMIDLIST and browse, for instance, + * into <system32>. This means the file dialog browses the shell namespace by + * identifying objects via ITEMIDLISTs. Once the user has selected a location to + * save his valuable file, the file dialog calls IShellFolder's GetDisplayNameOf + * method to translate the ITEMIDLIST back to a DOS filename. + * + * It seems that one intention of the shell namespace concept was to make it + * possible to have objects in the namespace, which don't have any counterpart + * in the filesystem. The 'My Computer' shell folder object is one instance + * which comes to mind (Go try to save a file into 'My Computer' on windows.) + * So, to make matters a little more complex, before the file dialog asks a + * shell namespace object for it's DOS path, it asks if it actually has one. + * This is done via the IShellFolder::GetAttributesOf method, which sets the + * SFGAO_FILESYSTEM if - and only if - it has. + * + * The two things, described in the previous two paragraphs, are what unixfs is + * based on. So basically, if UnixDosFolder's ParseDisplayName method is called + * with a 'c:\windows' path-name, it doesn't return an + * <Desktop|My Computer|C:|windows|> ITEMIDLIST. Instead, it uses + * shell32's wine_get_unix_path_name and the _posix_ (which means not the win32) + * fileio api's to figure out that c: is mapped to - let's say - + * /home/mjung/.wine/drive_c and then constructs a + * <Desktop|/|home|mjung|.wine|drive_c> ITEMIDLIST. Which is what the file + * dialog uses to display the folder and file objects, which is why you see a + * unix path. When the user has found a nice place for his file and hits the + * save button, the ITEMIDLIST of the selected folder object is passed to + * GetDisplayNameOf, which returns a _DOS_ path name + * (like H:\home_of_my_new_file out of <|Desktop|/|home|mjung|home_of_my_new_file|>). + * Unixfs basically mounts your dos devices together in order to construct + * a copy of your unix filesystem structure. + * + * But what if none of the symbolic links in 'dosdevices' points to '/', you + * might ask ("And I don't want wine have access to my complete hard drive, you + * *%&1#!"). No problem, as I stated above, unixfs uses the _posix_ apis to + * construct the ITEMIDLISTs. Folders, which aren't accessible via a drive letter, + * don't have the SFGAO_FILESYSTEM flag set. So the file dialogs should'nt allow + * the user to select such a folder for file storage (And if it does anyhow, it + * will not be able to return a valid path, since there is none). Think of those + * folders as a hierarchy of 'My Computer'-like folders, which happen to be a + * shadow of your unix filesystem tree. And since all of this stuff doesn't + * change anything at all in wine's fileio api's, windows applications will have + * no more access rights as they had before. + * + * To sum it all up, you can still savely run wine with you root account (Just + * kidding, don't do it.) + * + * If you are now standing in front of your computer, shouting hotly + * "I am not convinced, Mr. Rumsfeld^H^H^H^H^H^H^H^H^H^H^H^H", fire up regedit + * and delete HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\ + * Explorer\Desktop\Namespace\{9D20AAE8-0625-44B0-9CA7-71889C2254D9} and you + * will be back in the pre-unixfs days. + */ + #include "config.h" #include "wine/port.h"

1 0